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

Code style fixes for nanoframework/nf-interpreter PR#1921 #1922

Merged
merged 1 commit into from
May 20, 2021
Merged

Code style fixes for nanoframework/nf-interpreter PR#1921 #1922

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
10 changes: 2 additions & 8 deletions src/System.IO.Ports/sys_io_ser_native.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//-----------------------------------------------------------------------------
//
// ** WARNING! **
// ** WARNING! **
// This file was generated automatically by a tool.
// Re-running the tool will overwrite this file.
// You should copy this file to a custom location
Expand Down Expand Up @@ -59,15 +59,13 @@ struct Library_sys_io_ser_native_System_IO_Ports_SerialDataEvent
static const int FIELD__Event = 4;

//--//

};

struct Library_sys_io_ser_native_System_IO_Ports_SerialDataReceivedEventArgs
{
static const int FIELD___data = 1;

//--//

};

struct Library_sys_io_ser_native_System_IO_Ports_SerialDeviceController
Expand All @@ -77,7 +75,6 @@ struct Library_sys_io_ser_native_System_IO_Ports_SerialDeviceController
static const int FIELD_STATIC__s_deviceCollection = 2;

//--//

};

struct Library_sys_io_ser_native_System_IO_Ports_SerialPort
Expand Down Expand Up @@ -115,25 +112,22 @@ struct Library_sys_io_ser_native_System_IO_Ports_SerialPort
NANOCLR_NATIVE_DECLARE(GetDeviceSelector___STATIC__STRING);

//--//

};

struct Library_sys_io_ser_native_System_IO_Ports_SerialDeviceEventListener
{
static const int FIELD___serialDevicesMap = 1;

//--//

};

struct Library_sys_io_ser_native_System_IO_Ports_SerialStream
{
static const int FIELD___serial = 1;

//--//

};

extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_IO_Ports;

#endif //_SYS_IO_SER_NATIVE_H_
#endif //_SYS_IO_SER_NATIVE_H_
33 changes: 18 additions & 15 deletions targets/ChibiOS/_nanoCLR/System.IO.Ports/sys_io_ser_native_System_IO_Ports_SerialPort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ static void RxChar(UARTDriver *uartp, uint16_t c)
NATIVE_INTERRUPT_END
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::get_BytesToRead___I4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::get_BytesToRead___I4(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -276,7 +276,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::get_BytesToRead___
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeDispose___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeDispose___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();

Expand Down Expand Up @@ -369,9 +369,9 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeDispose___VO
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
NANOCLR_HEADER();
{
NF_PAL_UART *palUart;

Expand Down Expand Up @@ -455,7 +455,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID(
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeConfig___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeConfig___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -602,7 +602,8 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeConfig___VOI
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWrite___VOID__SZARRAY_U1__I4__I4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWrite___VOID__SZARRAY_U1__I4__I4(
CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -633,7 +634,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWrite___VOID
// get the size of the buffer
length = dataBuffer->m_numOfElements;

if(count > length)
if (count > length)
{
NANOCLR_SET_AND_LEAVE(CLR_E_BUFFER_TOO_SMALL);
}
Expand Down Expand Up @@ -706,9 +707,9 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWrite___VOID
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeStore___U4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeStore___U4(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
NANOCLR_HEADER();

NF_PAL_UART *palUart = NULL;

Expand Down Expand Up @@ -772,7 +773,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeStore___U4(
#endif
}

CLR_RT_HeapBlock hbTimeout;
CLR_RT_HeapBlock hbTimeout;
hbTimeout.SetInteger((CLR_INT64)pThis[FIELD___writeTimeout].NumericByRef().s4 * TIME_CONVERSION__TO_MILLISECONDS);
// setup timeout
NANOCLR_CHECK_HRESULT(stack.SetupTimeoutFromTicks(hbTimeout, timeoutTicks));
Expand Down Expand Up @@ -862,7 +863,8 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeStore___U4(
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__SZARRAY_U1__I4__I4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__SZARRAY_U1__I4__I4(
CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();

Expand All @@ -873,7 +875,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__S

size_t count = 0;
size_t bytesRead = 0;
size_t readOffset = 0;
size_t readOffset = 0;
size_t bytesToRead = 0;

int64_t *timeoutTicks;
Expand Down Expand Up @@ -945,7 +947,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__S
#endif
}

CLR_RT_HeapBlock hbTimeout;
CLR_RT_HeapBlock hbTimeout;
hbTimeout.SetInteger((CLR_INT64)pThis[FIELD___writeTimeout].NumericByRef().s4 * TIME_CONVERSION__TO_MILLISECONDS);
// setup timeout
NANOCLR_CHECK_HRESULT(stack.SetupTimeoutFromTicks(hbTimeout, timeoutTicks));
Expand Down Expand Up @@ -1023,7 +1025,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__S
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeSetWatchChar___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeSetWatchChar___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -1088,7 +1090,8 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeSetWatchChar
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::GetDeviceSelector___STATIC__STRING( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::GetDeviceSelector___STATIC__STRING(
CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down
23 changes: 13 additions & 10 deletions ...ts/FreeRTOS/NXP/_nanoCLR/System.IO.Ports/sys_io_ser_native_System_IO_Ports_SerialPort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ extern "C"
}
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::get_BytesToRead___I4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::get_BytesToRead___I4(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -175,7 +175,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::get_BytesToRead___
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeDispose___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeDispose___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -208,7 +208,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeDispose___VO
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -301,7 +301,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID(
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeConfig___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeConfig___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -394,7 +394,8 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeConfig___VOI
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWrite___VOID__SZARRAY_U1__I4__I4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWrite___VOID__SZARRAY_U1__I4__I4(
CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -457,7 +458,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWrite___VOID
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeStore___U4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeStore___U4(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -573,7 +574,8 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeStore___U4(
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__SZARRAY_U1__I4__I4( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__SZARRAY_U1__I4__I4(
CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand Down Expand Up @@ -690,7 +692,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__S
NANOCLR_CHECK_HRESULT(
g_CLR_RT_ExecutionEngine
.WaitEvents(stack.m_owningThread, *timeoutTicks, Event_SerialPortIn, eventResult));

if (!eventResult)
{
// event timeout
Expand All @@ -714,7 +716,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeRead___U4__S
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeSetWatchChar___VOID( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeSetWatchChar___VOID(CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
{
Expand All @@ -739,7 +741,8 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeSetWatchChar
NANOCLR_NOCLEANUP();
}

HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::GetDeviceSelector___STATIC__STRING( CLR_RT_StackFrame &stack )
HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::GetDeviceSelector___STATIC__STRING(
CLR_RT_StackFrame &stack)
{
NANOCLR_HEADER();
char deviceSelectorString[41] = {0};
Expand Down
Loading