Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix I2C assembly declarations #1023

Merged
merged 1 commit into from
Nov 26, 2018
Merged

Fix I2C assembly declarations #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.I2c/win_dev_i2c_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::NativeInit___VOID,
Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::DisposeNative___VOID,
Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::NativeTransmit___WindowsDevicesI2cI2cTransferResult__SZARRAY_U1__SZARRAY_U1,
Expand All @@ -56,7 +55,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
};

const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_Windows_Devices_I2c =
Expand Down
20 changes: 9 additions & 11 deletions targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.I2c/win_dev_i2c_native.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cConnectionSettings

struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cController
{
static const int FIELD_STATIC___syncLock = 0;

static const int FIELD___controllerId = 1;
static const int FIELD__s_deviceCollection = 2;
static const int FIELD___syncLock = 1;
static const int FIELD___controllerId = 2;
static const int FIELD__s_deviceCollection = 3;

NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
NANOCLR_NATIVE_DECLARE(GetDeviceSelector___STATIC__STRING);
Expand All @@ -38,8 +37,8 @@ struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cController

struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cControllerManager
{
static const int FIELD_STATIC___syncLock = 1;
static const int FIELD_STATIC__s_controllersCollection = 2;
static const int FIELD_STATIC___syncLock = 0;
static const int FIELD_STATIC__s_controllersCollection = 1;


//--//
Expand All @@ -48,11 +47,10 @@ struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cControllerManager

struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice
{
static const int FIELD_STATIC___syncLock = 3;

static const int FIELD___deviceId = 1;
static const int FIELD___connectionSettings = 2;
static const int FIELD___disposed = 3;
static const int FIELD___syncLock = 1;
static const int FIELD___deviceId = 2;
static const int FIELD___connectionSettings = 3;
static const int FIELD___disposed = 4;

NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
NANOCLR_NATIVE_DECLARE(DisposeNative___VOID);
Expand Down
2 changes: 0 additions & 2 deletions targets/FreeRTOS/ESP32_DevKitC/nanoCLR/Windows.Devices.I2c/win_dev_i2c_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::NativeInit___VOID,
Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::DisposeNative___VOID,
Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::NativeTransmit___WindowsDevicesI2cI2cTransferResult__SZARRAY_U1__SZARRAY_U1,
Expand All @@ -56,7 +55,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
};

const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_Windows_Devices_I2c =
Expand Down
21 changes: 9 additions & 12 deletions targets/FreeRTOS/ESP32_DevKitC/nanoCLR/Windows.Devices.I2c/win_dev_i2c_native.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,15 @@ struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cConnectionSettings
static const int FIELD___busSpeed = 2;
static const int FIELD___sharingMode = 3;


//--//

};

struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cController
{
static const int FIELD_STATIC___syncLock = 0;

static const int FIELD___controllerId = 1;
static const int FIELD__s_deviceCollection = 2;
static const int FIELD___syncLock = 1;
static const int FIELD___controllerId = 2;
static const int FIELD__s_deviceCollection = 3;

NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
NANOCLR_NATIVE_DECLARE(GetDeviceSelector___STATIC__STRING);
Expand All @@ -37,8 +35,8 @@ struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cController

struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cControllerManager
{
static const int FIELD_STATIC___syncLock = 1;
static const int FIELD_STATIC__s_controllersCollection = 2;
static const int FIELD_STATIC___syncLock = 0;
static const int FIELD_STATIC__s_controllersCollection = 1;


//--//
Expand All @@ -47,11 +45,10 @@ struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cControllerManager

struct Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice
{
static const int FIELD_STATIC___syncLock = 3;

static const int FIELD___deviceId = 1;
static const int FIELD___connectionSettings = 2;
static const int FIELD___disposed = 3;
static const int FIELD___syncLock = 1;
static const int FIELD___deviceId = 2;
static const int FIELD___connectionSettings = 3;
static const int FIELD___disposed = 4;

NANOCLR_NATIVE_DECLARE(NativeInit___VOID);
NANOCLR_NATIVE_DECLARE(DisposeNative___VOID);
Expand Down