Skip to content

Commit 2def4aa

Browse files
josesimoesjosesimoes
committed
Update and migrate native drivers using Span<byte> and ReadOnlySpan<byte> 
1 parent d3415e7 commit 2def4aa

17 files changed

+208
-179
lines changed

‎src/System.Device.I2c.Slave/sys_dev_i2c_slave_native.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99

1010
static const CLR_RT_MethodHandler method_lookup[] =
1111
{
12-
NULL,
13-
NULL,
14-
NULL,
15-
NULL,
16-
NULL,
17-
NULL,
18-
NULL,
19-
NULL,
20-
NULL,
21-
NULL,
12+
nullptr,
13+
nullptr,
14+
nullptr,
15+
nullptr,
16+
nullptr,
17+
nullptr,
18+
nullptr,
19+
nullptr,
20+
nullptr,
21+
nullptr,
2222
Library_sys_dev_i2c_slave_native_System_Device_I2c_I2cSlaveDevice::NativeInit___VOID,
2323
Library_sys_dev_i2c_slave_native_System_Device_I2c_I2cSlaveDevice::NativeDispose___VOID,
24-
Library_sys_dev_i2c_slave_native_System_Device_I2c_I2cSlaveDevice::NativeTransmit___I4__SystemSpanByte__SystemSpanByte__I4,
24+
Library_sys_dev_i2c_slave_native_System_Device_I2c_I2cSlaveDevice::NativeTransmit___I4__SystemSpan_1__SystemReadOnlySpan_1__I4,
2525
};
2626

2727
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Device_I2c_Slave =
2828
{
2929
"System.Device.I2c.Slave",
30-
0x4238164B,
30+
0x984281A1,
3131
method_lookup,
32-
{ 1, 0, 0, 0 }
32+
{ 100, 2, 0, 0 }
3333
};
3434

3535
// clang-format on

‎src/System.Device.I2c.Slave/sys_dev_i2c_slave_native.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct Library_sys_dev_i2c_slave_native_System_Device_I2c_I2cSlaveDevice
2121

2222
NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
2323
NANOCLR_NATIVE_DECLARE(NativeDispose___VOID);
24-
NANOCLR_NATIVE_DECLARE(NativeTransmit___I4__SystemSpanByte__SystemSpanByte__I4);
24+
NANOCLR_NATIVE_DECLARE(NativeTransmit___I4__SystemSpan_1__SystemReadOnlySpan_1__I4);
2525

2626
//--//
2727
};

‎src/System.Device.I2c/sys_dev_i2c_native.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@
1010

1111
static const CLR_RT_MethodHandler method_lookup[] =
1212
{
13-
NULL,
14-
NULL,
15-
NULL,
16-
NULL,
17-
NULL,
18-
NULL,
19-
NULL,
20-
NULL,
21-
NULL,
22-
NULL,
23-
NULL,
24-
NULL,
25-
NULL,
26-
NULL,
27-
NULL,
28-
NULL,
29-
NULL,
30-
NULL,
31-
NULL,
13+
nullptr,
14+
nullptr,
15+
nullptr,
16+
nullptr,
17+
nullptr,
18+
nullptr,
19+
nullptr,
20+
nullptr,
21+
nullptr,
22+
nullptr,
23+
nullptr,
24+
nullptr,
25+
nullptr,
26+
nullptr,
27+
nullptr,
28+
nullptr,
29+
nullptr,
30+
nullptr,
31+
nullptr,
3232
Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::NativeInit___VOID,
3333
Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::NativeDispose___VOID,
34-
Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::NativeTransmit___SystemDeviceI2cI2cTransferResult__SystemSpanByte__SystemSpanByte,
35-
NULL,
34+
Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::NativeTransmit___SystemDeviceI2cI2cTransferResult__SystemReadOnlySpan_1__SystemSpan_1,
35+
nullptr,
3636
};
3737

3838
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Device_I2c =
3939
{
4040
"System.Device.I2c",
41-
0xFA806D33,
41+
0x27CE6AB3,
4242
method_lookup,
43-
{ 100, 0, 0, 2 }
43+
{ 100, 2, 0, 0 }
4444
};
4545

4646
// clang-format on

‎src/System.Device.I2c/sys_dev_i2c_native.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice
5454

5555
NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
5656
NANOCLR_NATIVE_DECLARE(NativeDispose___VOID);
57-
NANOCLR_NATIVE_DECLARE(NativeTransmit___SystemDeviceI2cI2cTransferResult__SystemSpanByte__SystemSpanByte);
57+
NANOCLR_NATIVE_DECLARE(NativeTransmit___SystemDeviceI2cI2cTransferResult__SystemReadOnlySpan_1__SystemSpan_1);
5858

5959
//--//
6060
};

‎src/System.Device.I2c/sys_dev_i2c_native_System_Device_I2c_I2cDevice_stubs.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ HRESULT Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::NativeDispose___
2525
}
2626

2727
HRESULT Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::
28-
NativeTransmit___SystemDeviceI2cI2cTransferResult__SystemSpanByte__SystemSpanByte(CLR_RT_StackFrame &stack)
28+
NativeTransmit___SystemDeviceI2cI2cTransferResult__SystemReadOnlySpan_1__SystemSpan_1(CLR_RT_StackFrame &stack)
2929
{
3030
NANOCLR_HEADER();
3131

‎src/System.Device.I2s/sys_dev_i2s_native.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,41 @@
99

1010
static const CLR_RT_MethodHandler method_lookup[] =
1111
{
12-
NULL,
13-
NULL,
14-
NULL,
15-
NULL,
16-
NULL,
17-
NULL,
18-
NULL,
19-
NULL,
20-
NULL,
21-
NULL,
22-
NULL,
23-
NULL,
24-
NULL,
25-
NULL,
26-
NULL,
27-
NULL,
28-
NULL,
29-
NULL,
30-
NULL,
31-
NULL,
32-
NULL,
33-
Library_sys_dev_i2s_native_System_Device_I2s_I2sDevice::Read___VOID__SystemSpanByte,
34-
Library_sys_dev_i2s_native_System_Device_I2s_I2sDevice::Write___VOID__SystemSpanByte,
35-
NULL,
12+
nullptr,
13+
nullptr,
14+
nullptr,
15+
nullptr,
16+
nullptr,
17+
nullptr,
18+
nullptr,
19+
nullptr,
20+
nullptr,
21+
nullptr,
22+
nullptr,
23+
nullptr,
24+
nullptr,
25+
nullptr,
26+
nullptr,
27+
nullptr,
28+
nullptr,
29+
nullptr,
30+
nullptr,
31+
nullptr,
32+
nullptr,
33+
Library_sys_dev_i2s_native_System_Device_I2s_I2sDevice::Read___VOID__SystemSpan_1,
34+
Library_sys_dev_i2s_native_System_Device_I2s_I2sDevice::Write___VOID__SystemReadOnlySpan_1,
35+
nullptr,
3636
Library_sys_dev_i2s_native_System_Device_I2s_I2sDevice::NativeInit___VOID,
3737
Library_sys_dev_i2s_native_System_Device_I2s_I2sDevice::NativeDispose___VOID,
38-
NULL,
38+
nullptr,
3939
};
4040

4141
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Device_I2s =
4242
{
4343
"System.Device.I2s",
44-
0x478490FE,
44+
0x8E87DD63,
4545
method_lookup,
46-
{ 100, 0, 0, 1 }
46+
{ 100, 2, 0, 0 }
4747
};
4848

4949
// clang-format on

‎src/System.Device.I2s/sys_dev_i2s_native.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ struct Library_sys_dev_i2s_native_System_Device_I2s_I2sDevice
6666
static const int FIELD___disposed = 1;
6767
static const int FIELD___connectionSettings = 2;
6868

69-
NANOCLR_NATIVE_DECLARE(Read___VOID__SystemSpanByte);
70-
NANOCLR_NATIVE_DECLARE(Write___VOID__SystemSpanByte);
69+
NANOCLR_NATIVE_DECLARE(Read___VOID__SystemSpan_1);
70+
NANOCLR_NATIVE_DECLARE(Write___VOID__SystemReadOnlySpan_1);
7171
NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
7272
NANOCLR_NATIVE_DECLARE(NativeDispose___VOID);
7373

‎src/System.Device.Spi/sys_dev_spi_native.cpp‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,60 +9,60 @@
99

1010
static const CLR_RT_MethodHandler method_lookup[] =
1111
{
12-
NULL,
13-
NULL,
14-
NULL,
12+
nullptr,
13+
nullptr,
14+
nullptr,
1515
Library_sys_dev_spi_native_System_Device_Spi_SpiBusInfo::NativeMaxClockFrequency___I4,
1616
Library_sys_dev_spi_native_System_Device_Spi_SpiBusInfo::NativeMinClockFrequency___I4,
17-
NULL,
18-
NULL,
19-
NULL,
20-
NULL,
21-
NULL,
22-
NULL,
23-
NULL,
24-
NULL,
25-
NULL,
26-
NULL,
27-
NULL,
28-
NULL,
29-
NULL,
30-
NULL,
31-
NULL,
32-
NULL,
33-
NULL,
34-
NULL,
35-
NULL,
36-
NULL,
37-
NULL,
38-
NULL,
39-
NULL,
40-
NULL,
41-
NULL,
42-
NULL,
43-
NULL,
44-
NULL,
45-
NULL,
46-
NULL,
47-
NULL,
48-
NULL,
17+
nullptr,
18+
nullptr,
19+
nullptr,
20+
nullptr,
21+
nullptr,
22+
nullptr,
23+
nullptr,
24+
nullptr,
25+
nullptr,
26+
nullptr,
27+
nullptr,
28+
nullptr,
29+
nullptr,
30+
nullptr,
31+
nullptr,
32+
nullptr,
33+
nullptr,
34+
nullptr,
35+
nullptr,
36+
nullptr,
37+
nullptr,
38+
nullptr,
39+
nullptr,
40+
nullptr,
41+
nullptr,
42+
nullptr,
43+
nullptr,
44+
nullptr,
45+
nullptr,
46+
nullptr,
47+
nullptr,
48+
nullptr,
4949
Library_sys_dev_spi_native_System_Device_Spi_SpiDevice::DisposeNative___VOID,
50-
Library_sys_dev_spi_native_System_Device_Spi_SpiDevice::NativeTransfer___VOID__SystemSpanByte__SystemSpanByte__BOOLEAN,
5150
Library_sys_dev_spi_native_System_Device_Spi_SpiDevice::NativeTransfer___VOID__SZARRAY_U2__SZARRAY_U2__BOOLEAN,
51+
Library_sys_dev_spi_native_System_Device_Spi_SpiDevice::NativeTransfer___VOID__SystemReadOnlySpan_1__SystemSpan_1__BOOLEAN,
5252
Library_sys_dev_spi_native_System_Device_Spi_SpiDevice::NativeInit___VOID,
5353
Library_sys_dev_spi_native_System_Device_Spi_SpiDevice::NativeOpenDevice___I4,
54-
NULL,
55-
NULL,
56-
NULL,
57-
NULL,
54+
nullptr,
55+
nullptr,
56+
nullptr,
57+
nullptr,
5858
};
5959

6060
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Device_Spi =
6161
{
6262
"System.Device.Spi",
63-
0x3F6E2A7E,
63+
0x686BF72E,
6464
method_lookup,
65-
{ 100, 1, 2, 0 }
65+
{ 100, 2, 0, 0 }
6666
};
6767

6868
// clang-format on

‎src/System.Device.Spi/sys_dev_spi_native.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ struct Library_sys_dev_spi_native_System_Device_Spi_SpiDevice
6767
static const int FIELD___bufferSingleOperation = 5;
6868

6969
NANOCLR_NATIVE_DECLARE(DisposeNative___VOID);
70-
NANOCLR_NATIVE_DECLARE(NativeTransfer___VOID__SystemSpanByte__SystemSpanByte__BOOLEAN);
7170
NANOCLR_NATIVE_DECLARE(NativeTransfer___VOID__SZARRAY_U2__SZARRAY_U2__BOOLEAN);
71+
NANOCLR_NATIVE_DECLARE(NativeTransfer___VOID__SystemReadOnlySpan_1__SystemSpan_1__BOOLEAN);
7272
NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
7373
NANOCLR_NATIVE_DECLARE(NativeOpenDevice___I4);
7474

0 commit comments

Comments
 (0)