Skip to content

Commit 2948038

Browse files
josesimoesjosesimoes
committed
Update declarations of several assemblies
1 parent a92a7f8 commit 2948038

File tree

7 files changed

+79
-64
lines changed

7 files changed

+79
-64
lines changed

‎src/nanoFramework.ResourceManager/nf_system_resourcemanager.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "nf_system_resourcemanager.h"
88

9+
// clang-format off
910

1011
static const CLR_RT_MethodHandler method_lookup[] =
1112
{
@@ -31,7 +32,9 @@ static const CLR_RT_MethodHandler method_lookup[] =
3132
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_ResourceManager =
3233
{
3334
"nanoFramework.ResourceManager",
34-
0xDCD7DF4D,
35+
0x874533DF,
3536
method_lookup,
36-
{ 100, 0, 0, 1 }
37+
{ 100, 2, 0, 0 }
3738
};
39+
40+
// clang-format on

‎src/nanoFramework.ResourceManager/nf_system_resourcemanager.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ struct Library_nf_system_resourcemanager_System_Resources_ResourceManager
2828
//--//
2929

3030
NANOCLR_NATIVE_DECLARE(GetObject___STATIC__OBJECT__SystemResourcesResourceManager__SystemEnum__I4__I4);
31-
3231
};
3332

3433
struct Library_nf_system_resourcemanager_nanoFramework_Runtime_Native_ResourceUtility
@@ -37,7 +36,6 @@ struct Library_nf_system_resourcemanager_nanoFramework_Runtime_Native_ResourceUt
3736
NANOCLR_NATIVE_DECLARE(GetObject___STATIC__OBJECT__SystemResourcesResourceManager__SystemEnum__I4__I4);
3837

3938
//--//
40-
4139
};
4240

4341
extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_ResourceManager;

‎targets/AzureRTOS/SiliconLabs/_nanoCLR/nanoFramework.Hardware.GiantGecko/nf_hardware_giantgecko.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ static const CLR_RT_MethodHandler method_lookup[] =
1313
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_GpioConfiguration::SetSlewRateAlternate___STATIC__VOID__I4__U1,
1414
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_GpioConfiguration::SetDriveStrenght___STATIC__VOID__I4__nanoFrameworkHardwareGiantGeckoGpioConfigurationDriveStrenght,
1515
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_GpioConfiguration::SetDriveStrenghtAlternate___STATIC__VOID__I4__nanoFrameworkHardwareGiantGeckoGpioConfigurationDriveStrenght,
16-
NULL,
17-
NULL,
16+
nullptr,
17+
nullptr,
1818
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Power::NativeEnterHibernateMode___STATIC__VOID,
1919
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Power::NativeEnterShutoffMode___STATIC__VOID,
20-
NULL,
20+
nullptr,
2121
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Rtc::GetAlarm___STATIC__SystemDateTime,
2222
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Rtc::NativeRtcSetAlarm___STATIC__VOID__I4__U1__U1__U1__U1__U1,
23-
NULL,
24-
NULL,
25-
NULL,
26-
NULL,
27-
NULL,
23+
nullptr,
24+
nullptr,
25+
nullptr,
26+
nullptr,
27+
nullptr,
2828
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Utilities::NativeGetDeviceUniqueId___STATIC__VOID__SZARRAY_U1,
2929
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Utilities::NativeGetProductionRevision___STATIC__U1,
3030
Library_nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Utilities::NativeGetDeviceFamily___STATIC__U1,
@@ -34,9 +34,9 @@ static const CLR_RT_MethodHandler method_lookup[] =
3434
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Hardware_GiantGecko =
3535
{
3636
"nanoFramework.Hardware.GiantGecko",
37-
0xF42EF338,
37+
0x7945DFE7,
3838
method_lookup,
39-
{ 100, 0, 0, 2 }
39+
{ 100, 2, 0, 0 }
4040
};
4141

4242
// clang-format on

‎targets/ChibiOS/_nanoCLR/nanoFramework.Hardware.Stm32/nf_hardware_stm32_native.cpp‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,57 +9,57 @@
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-
NULL,
34-
NULL,
35-
NULL,
36-
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+
nullptr,
34+
nullptr,
35+
nullptr,
36+
nullptr,
3737
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_BackupMemory::ReadBytes___STATIC__VOID__U4__SZARRAY_U1,
3838
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_BackupMemory::WriteBytes___STATIC__VOID__U4__SZARRAY_U1,
3939
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_BackupMemory::GetSize___STATIC__I4,
4040
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Configuration::ConfigurePin___STATIC__VOID__I4__nanoFrameworkHardwareStm32GpioConfiguration,
4141
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Configuration::AddAdcChannel___STATIC__U4__U4__U4__U4,
4242
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Configuration::RemoveAdcChannel___STATIC__VOID__U4,
43-
NULL,
44-
NULL,
45-
NULL,
46-
NULL,
47-
NULL,
48-
NULL,
49-
NULL,
50-
NULL,
51-
NULL,
52-
NULL,
43+
nullptr,
44+
nullptr,
45+
nullptr,
46+
nullptr,
47+
nullptr,
48+
nullptr,
49+
nullptr,
50+
nullptr,
51+
nullptr,
52+
nullptr,
5353
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Power::get_WakeupReason___STATIC__nanoFrameworkHardwareStm32PowerWakeupReasonType,
5454
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Power::DisableWakeupPin___STATIC__VOID__nanoFrameworkHardwareStm32PowerWakeupPin,
5555
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Power::EnableWakeupPin___STATIC__VOID__nanoFrameworkHardwareStm32PowerWakeupPin,
5656
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Power::NativeEnterStandbyMode___STATIC__VOID,
57-
NULL,
57+
nullptr,
5858
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_RTC::GetAlarm___STATIC__SystemDateTime,
5959
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_RTC::Native_RTC_SetAlarm___STATIC__VOID__U1__U1__U1__U1,
60-
NULL,
61-
NULL,
62-
NULL,
60+
nullptr,
61+
nullptr,
62+
nullptr,
6363
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Utilities::NativeGetDeviceUniqueId___STATIC__VOID__SZARRAY_U1,
6464
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Utilities::NativeGetDeviceId___STATIC__U4,
6565
Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Utilities::NativeGetDeviceRevisionId___STATIC__U4,
@@ -68,9 +68,9 @@ static const CLR_RT_MethodHandler method_lookup[] =
6868
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Hardware_Stm32 =
6969
{
7070
"nanoFramework.Hardware.Stm32",
71-
0xFE16F347,
71+
0x8D28F472,
7272
method_lookup,
73-
{ 100, 0, 5, 1 }
73+
{ 100, 2, 0, 0 }
7474
};
7575

7676
// clang-format on

‎targets/ChibiOS/_nanoCLR/nanoFramework.Hardware.Stm32/nf_hardware_stm32_native.h‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ typedef enum __nfpack GpioConfiguration_IOMode
1515
GpioConfiguration_IOMode_Input = 0,
1616
GpioConfiguration_IOMode_Output = 1,
1717
GpioConfiguration_IOMode_AlternateFunction = 2,
18-
GpioConfiguration_IOMode_Analog = 4,
18+
GpioConfiguration_IOMode_Analog = 3,
1919
GpioConfiguration_IOMode_OutputPushPull = 1,
2020
GpioConfiguration_IOMode_OutputOpenDrain = 17,
2121
} GpioConfiguration_IOMode;
2222

2323
typedef enum __nfpack GpioConfiguration_PullUpDownActivation
2424
{
25-
GpioConfiguration_PullUpDownActivation_None = 0,
25+
GpioConfiguration_PullUpDownActivation_Floating = 0,
2626
GpioConfiguration_PullUpDownActivation_PullUp = 1,
2727
GpioConfiguration_PullUpDownActivation_PullDown = 2,
2828
} GpioConfiguration_PullUpDownActivation;
@@ -35,6 +35,20 @@ typedef enum __nfpack GpioConfiguration_Speed
3535
GpioConfiguration_Speed_VeryHigh = 3,
3636
} GpioConfiguration_Speed;
3737

38+
typedef enum __nfpack Power_WakeupPin
39+
{
40+
Power_WakeupPin_Pin1 = 1,
41+
Power_WakeupPin_Pin2 = 2,
42+
Power_WakeupPin_Pin3 = 3,
43+
} Power_WakeupPin;
44+
45+
typedef enum __nfpack Power_WakeupReasonType
46+
{
47+
Power_WakeupReasonType_Undetermined = 0,
48+
Power_WakeupReasonType_FromStandby = 1,
49+
Power_WakeupReasonType_FromPin = 2,
50+
} Power_WakeupReasonType;
51+
3852
struct Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_BackupMemory
3953
{
4054
static const int FIELD_STATIC___size = 0;

‎targets/TI_SimpleLink/_nanoCLR/nanoFramework.Hardware.TI/nf_hardware_ti_native.cpp‎

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

1010
static const CLR_RT_MethodHandler method_lookup[] =
1111
{
12-
NULL,
13-
NULL,
12+
nullptr,
13+
nullptr,
1414
Library_nf_hardware_ti_native_nanoFramework_Hardware_TI_Power::ConfigureWakeupFromGpioPin___STATIC__VOID__SZARRAY_nanoFrameworkHardwareTIPowerPinWakeupConfig,
1515
Library_nf_hardware_ti_native_nanoFramework_Hardware_TI_Power::get_SourceOfReset___STATIC__nanoFrameworkHardwareTIPowerResetSource,
1616
Library_nf_hardware_ti_native_nanoFramework_Hardware_TI_Power::NativeEnterShutdownMode___STATIC__VOID,
1717
Library_nf_hardware_ti_native_nanoFramework_Hardware_TI_Power::NativeEnterStandbyMode___STATIC__VOID__SystemTimeSpan,
18-
NULL,
19-
NULL,
18+
nullptr,
19+
nullptr,
2020
Library_nf_hardware_ti_native_nanoFramework_Hardware_TI_Utilities::NativeGetIeeeAddress___STATIC__SZARRAY_U1,
2121
};
2222

2323
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Hardware_TI =
2424
{
2525
"nanoFramework.Hardware.TI",
26-
0x8A9130A3,
26+
0x0CC345B2,
2727
method_lookup,
28-
{ 100, 0, 0, 3 }
28+
{ 100, 2, 0, 0 }
2929
};
3030

3131
// clang-format on

‎targets/TI_SimpleLink/_nanoCLR/nanoFramework.Hardware.TI/nf_hardware_ti_native.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ struct Library_nf_hardware_ti_native_nanoFramework_Hardware_TI_Utilities
6565

6666
extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Hardware_TI;
6767

68-
#endif //NF_HARDWARE_TI_NATIVE_H
68+
#endif // NF_HARDWARE_TI_NATIVE_H

0 commit comments

Comments
 (0)