Skip to content

Commit d3415e7

Browse files
committed
Update declarations of several assemblies
***NO_CI***
1 parent 6e4d887 commit d3415e7

File tree

5 files changed

+273
-263
lines changed

5 files changed

+273
-263
lines changed

src/System.IO.Ports/sys_io_ser_native.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ static const CLR_RT_MethodHandler method_lookup[] =
103103
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_IO_Ports =
104104
{
105105
"System.IO.Ports",
106-
0xB798CE30,
106+
0x26931685,
107107
method_lookup,
108-
{ 100, 1, 6, 1 }
108+
{ 100, 2, 0, 0 }
109109
};
110110

111111
// clang-format on

src/System.IO.Ports/sys_io_ser_native.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct Library_sys_io_ser_native_System_IO_Ports_SerialDataReceivedEventArgs
6565
struct Library_sys_io_ser_native_System_IO_Ports_SerialDeviceController
6666
{
6767
static const int FIELD_STATIC___syncLock = 0;
68-
static const int FIELD_STATIC__s_deviceCollection = 1;
68+
static const int FIELD_STATIC___deviceCollection = 1;
6969

7070
//--//
7171
};
@@ -127,7 +127,7 @@ struct Library_sys_io_ser_native_System_IO_Ports_SerialDeviceEventListener
127127

128128
struct Library_sys_io_ser_native_System_IO_Ports_SerialStream
129129
{
130-
static const int FIELD___serial = 1;
130+
static const int FIELD___serial = 2;
131131

132132
//--//
133133
};

targets/ESP32/_nanoCLR/nanoFramework.Hardware.ESP32/nanoFramework_hardware_esp32_native.cpp

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

1111
static const CLR_RT_MethodHandler method_lookup[] =
1212
{
13-
NULL,
14-
NULL,
15-
NULL,
16-
NULL,
13+
nullptr,
14+
nullptr,
15+
nullptr,
16+
nullptr,
1717
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Configuration::NativeSetPinFunction___STATIC__VOID__I4__I4,
1818
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Configuration::NativeGetPinFunction___STATIC__I4__I4,
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,
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,
3535
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_HighResTimer::NativeEspTimerCreate___I4,
3636
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_HighResTimer::NativeEspTimerDispose___VOID,
3737
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_HighResTimer::NativeStop___VOID,
3838
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_HighResTimer::NativeStartOneShot___VOID__U8,
3939
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_HighResTimer::NativeStartPeriodic___VOID__U8,
40-
NULL,
40+
nullptr,
4141
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_HighResTimer::NativeGetCurrent___STATIC__U8,
42-
NULL,
43-
NULL,
44-
NULL,
45-
NULL,
46-
NULL,
47-
NULL,
48-
NULL,
49-
NULL,
50-
NULL,
42+
nullptr,
43+
nullptr,
44+
nullptr,
45+
nullptr,
46+
nullptr,
47+
nullptr,
48+
nullptr,
49+
nullptr,
50+
nullptr,
5151
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Logging::NativeSetLogLevel___STATIC__VOID__STRING__I4,
52-
NULL,
53-
NULL,
52+
nullptr,
53+
nullptr,
5454
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_NativeMemory::NativeGetMemoryTotalSize___STATIC__U4__I4,
5555
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_NativeMemory::NativeGetMemoryTotalFreeSize___STATIC__U4__I4,
5656
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_NativeMemory::NativeGetMemoryLargestFreeBlock___STATIC__U4__I4,
57-
NULL,
58-
NULL,
59-
NULL,
60-
NULL,
61-
NULL,
62-
NULL,
63-
NULL,
64-
NULL,
65-
NULL,
66-
NULL,
67-
NULL,
57+
nullptr,
58+
nullptr,
59+
nullptr,
60+
nullptr,
61+
nullptr,
62+
nullptr,
63+
nullptr,
64+
nullptr,
65+
nullptr,
66+
nullptr,
67+
nullptr,
6868
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Sleep::NativeEnableWakeupByTimer___STATIC__nanoFrameworkHardwareEsp32EspNativeError__U8,
6969
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Sleep::NativeEnableWakeupByPin___STATIC__nanoFrameworkHardwareEsp32EspNativeError__nanoFrameworkHardwareEsp32SleepWakeupGpioPin__I4,
7070
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Sleep::NativeEnableWakeupByMultiPins___STATIC__nanoFrameworkHardwareEsp32EspNativeError__nanoFrameworkHardwareEsp32SleepWakeupGpioPin__nanoFrameworkHardwareEsp32SleepWakeupMode,
@@ -75,50 +75,50 @@ static const CLR_RT_MethodHandler method_lookup[] =
7575
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Sleep::NativeGetWakeupCause___STATIC__nanoFrameworkHardwareEsp32SleepWakeupCause,
7676
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Sleep::NativeGetWakeupGpioPin___STATIC__nanoFrameworkHardwareEsp32SleepWakeupGpioPin,
7777
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Sleep::NativeGetWakeupTouchpad___STATIC__I4,
78-
NULL,
79-
NULL,
80-
NULL,
81-
NULL,
82-
NULL,
83-
NULL,
84-
NULL,
85-
NULL,
86-
NULL,
87-
NULL,
88-
NULL,
89-
NULL,
90-
NULL,
91-
NULL,
92-
NULL,
93-
NULL,
94-
NULL,
95-
NULL,
96-
NULL,
97-
NULL,
98-
NULL,
99-
NULL,
100-
NULL,
101-
NULL,
102-
NULL,
103-
NULL,
104-
NULL,
105-
NULL,
106-
NULL,
107-
NULL,
108-
NULL,
109-
NULL,
110-
NULL,
111-
NULL,
112-
NULL,
113-
NULL,
114-
NULL,
115-
NULL,
116-
NULL,
117-
NULL,
118-
NULL,
119-
NULL,
120-
NULL,
121-
NULL,
78+
nullptr,
79+
nullptr,
80+
nullptr,
81+
nullptr,
82+
nullptr,
83+
nullptr,
84+
nullptr,
85+
nullptr,
86+
nullptr,
87+
nullptr,
88+
nullptr,
89+
nullptr,
90+
nullptr,
91+
nullptr,
92+
nullptr,
93+
nullptr,
94+
nullptr,
95+
nullptr,
96+
nullptr,
97+
nullptr,
98+
nullptr,
99+
nullptr,
100+
nullptr,
101+
nullptr,
102+
nullptr,
103+
nullptr,
104+
nullptr,
105+
nullptr,
106+
nullptr,
107+
nullptr,
108+
nullptr,
109+
nullptr,
110+
nullptr,
111+
nullptr,
112+
nullptr,
113+
nullptr,
114+
nullptr,
115+
nullptr,
116+
nullptr,
117+
nullptr,
118+
nullptr,
119+
nullptr,
120+
nullptr,
121+
nullptr,
122122
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeInit___VOID,
123123
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeDeinit___VOID,
124124
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeRead___U4,
@@ -127,26 +127,26 @@ static const CLR_RT_MethodHandler method_lookup[] =
127127
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeGetTouchSpeed___VOID__BYREF_I4__BYREF_I4,
128128
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeSetChargeSpeed___VOID__I4__I4,
129129
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeCalibrate___I4__I4,
130-
NULL,
131-
NULL,
132-
NULL,
133-
NULL,
134-
NULL,
135-
NULL,
136-
NULL,
137-
NULL,
138-
NULL,
139-
NULL,
140-
NULL,
141-
NULL,
142-
NULL,
143-
NULL,
144-
NULL,
145-
NULL,
146-
NULL,
147-
NULL,
148-
NULL,
149-
NULL,
130+
nullptr,
131+
nullptr,
132+
nullptr,
133+
nullptr,
134+
nullptr,
135+
nullptr,
136+
nullptr,
137+
nullptr,
138+
nullptr,
139+
nullptr,
140+
nullptr,
141+
nullptr,
142+
nullptr,
143+
nullptr,
144+
nullptr,
145+
nullptr,
146+
nullptr,
147+
nullptr,
148+
nullptr,
149+
nullptr,
150150
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeGetGpioNumberFromTouchNumber___STATIC__I4__I4,
151151
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeGetTriggerMode___STATIC__nanoFrameworkHardwareEsp32TouchTouchTriggerMode,
152152
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeSetTriggerMode___STATIC__VOID__nanoFrameworkHardwareEsp32TouchTouchTriggerMode,
@@ -163,48 +163,48 @@ static const CLR_RT_MethodHandler method_lookup[] =
163163
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeGetDenoise___STATIC__VOID__nanoFrameworkHardwareEsp32TouchDenoiseSetting,
164164
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeSetDenoise___STATIC__VOID__nanoFrameworkHardwareEsp32TouchDenoiseSetting,
165165
Library_nanoFramework_hardware_esp32_native_nanoFramework_Hardware_Esp32_Touch_TouchPad::NativeDenoiseEnabled___STATIC__VOID__BOOLEAN,
166-
NULL,
167-
NULL,
168-
NULL,
169-
NULL,
170-
NULL,
171-
NULL,
172-
NULL,
173-
NULL,
174-
NULL,
175-
NULL,
176-
NULL,
177-
NULL,
178-
NULL,
179-
NULL,
180-
NULL,
181-
NULL,
182-
NULL,
183-
NULL,
184-
NULL,
185-
NULL,
186-
NULL,
187-
NULL,
188-
NULL,
189-
NULL,
190-
NULL,
191-
NULL,
192-
NULL,
193-
NULL,
166+
nullptr,
167+
nullptr,
168+
nullptr,
169+
nullptr,
170+
nullptr,
171+
nullptr,
172+
nullptr,
173+
nullptr,
174+
nullptr,
175+
nullptr,
176+
nullptr,
177+
nullptr,
178+
nullptr,
179+
nullptr,
180+
nullptr,
181+
nullptr,
182+
nullptr,
183+
nullptr,
184+
nullptr,
185+
nullptr,
186+
nullptr,
187+
nullptr,
188+
nullptr,
189+
nullptr,
190+
nullptr,
191+
nullptr,
192+
nullptr,
193+
nullptr,
194194
Library_nanoFramework_hardware_esp32_native_System_Device_Gpio_GpioPulseCounter::NativeInit___VOID,
195195
Library_nanoFramework_hardware_esp32_native_System_Device_Gpio_GpioPulseCounter::NativeRead___SystemDeviceGpioGpioPulseCount__BOOLEAN,
196196
Library_nanoFramework_hardware_esp32_native_System_Device_Gpio_GpioPulseCounter::NativeStart___VOID,
197197
Library_nanoFramework_hardware_esp32_native_System_Device_Gpio_GpioPulseCounter::NativeStop___VOID,
198198
Library_nanoFramework_hardware_esp32_native_System_Device_Gpio_GpioPulseCounter::NativeDispose___VOID,
199-
NULL,
199+
nullptr,
200200
};
201201

202202
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Hardware_Esp32 =
203203
{
204204
"nanoFramework.Hardware.Esp32",
205-
0x6A20A689,
205+
0x074FBD7C,
206206
method_lookup,
207-
{ 100, 0, 10, 0 }
207+
{ 100, 2, 0, 0 }
208208
};
209209

210210
// clang-format on

0 commit comments

Comments
 (0)