Merge pull request #177 from smaillet-ms/Add-SpiDevinceInfo-native

Add SpiDevinceInfo native layer support with reference STM32F4 implementation

Author: smaillet-ms

CLR/Libraries/Windows_Devices/windows_devices_native.cpp

@@ -12,6 +12,34 @@
 
 static const CLR_RT_MethodHandler method_lookup[] =
 {
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
     NULL,
     NULL,
     NULL,
@@ -84,8 +112,8 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
+    Library_windows_devices_native_Windows_Devices_Spi_SpiBusInfo::_ctor___VOID__I4,
     NULL,
-    Library_windows_devices_native_Windows_Devices_Spi_SpiBusInfo::get_ChipSelectLineCount___I4,
     NULL,
     NULL,
     NULL,
@@ -120,12 +148,13 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
+    NULL,
 };
 
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_Windows_Devices =
 {
     "Windows.Devices", 
-    0xF71D0B80,
+    0xDD62098A,
     method_lookup
 };
 

CLR/Libraries/Windows_Devices/windows_devices_native.h

@@ -11,6 +11,28 @@
 #define _WINDOWS_DEVICES_NATIVE_H_
 
 #include <TinyCLR_Interop.h>
+
+struct Library_windows_devices_native_Windows_Devices_Adc_AdcChannel
+{
+    static const int FIELD__m_channelNumber = 1;
+    static const int FIELD__m_controller = 2;
+    static const int FIELD__m_provider = 3;
+    static const int FIELD__m_disposed = 4;
+
+
+    //--//
+
+};
+
+struct Library_windows_devices_native_Windows_Devices_Adc_AdcController
+{
+    static const int FIELD__m_provider = 1;
+
+
+    //--//
+
+};
+
 struct Library_windows_devices_native_Windows_Devices_Enumeration_DeviceInformation
 {
     static const int FIELD__m_id = 1;
@@ -123,7 +145,11 @@ struct Library_windows_devices_native_Windows_Devices_I2c_I2cTransferResult
 
 struct Library_windows_devices_native_Windows_Devices_Spi_SpiBusInfo
 {
-    TINYCLR_NATIVE_DECLARE(get_ChipSelectLineCount___I4);
+    static const int FIELD__MinClockFrequency_ = 1;
+    static const int FIELD__MaxClockFrequency_ = 2;
+    static const int FIELD__ChipSelectLineCount_ = 3;
+
+    TINYCLR_NATIVE_DECLARE(_ctor___VOID__I4);
 
     //--//
 
@@ -145,11 +171,10 @@ struct Library_windows_devices_native_Windows_Devices_Spi_SpiConnectionSettings
 struct Library_windows_devices_native_Windows_Devices_Spi_SpiDevice
 {
     static const int FIELD_STATIC__s_SpiPrefix = 6;
-    static const int FIELD_STATIC__s_busInfo = 7;
 
-    static const int FIELD__m_deviceId = 1;
-    static const int FIELD__m_settings = 2;
-    static const int FIELD__m_syncLock = 3;
+    static const int FIELD__m_busInfo = 1;
+    static const int FIELD__m_deviceId = 2;
+    static const int FIELD__m_settings = 3;
     static const int FIELD__m_disposed = 4;
     static const int FIELD__m_mskPin = 5;
     static const int FIELD__m_misoPin = 6;

CLR/Libraries/Windows_Devices/windows_devices_native_Windows_Devices_Spi_SpiBusInfo.cpp

@@ -2,15 +2,26 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "windows_devices.h"
+#include "Windows_devices.h"
 
-HRESULT Library_windows_devices_native_Windows_Devices_Spi_SpiBusInfo::get_ChipSelectLineCount___I4( CLR_RT_StackFrame& stack )
+// [MethodImplAttribute( MethodImplOptions.InternalCall )]
+// extern internal SpiBusInfo( int busNum );
+HRESULT Library_windows_devices_native_Windows_Devices_Spi_SpiBusInfo::_ctor___VOID__I4( CLR_RT_StackFrame& stackFrame )
 {
     TINYCLR_HEADER();
 
-    CLR_RT_HeapBlock* pThis = stack.This(); FAULT_ON_NULL(pThis);
+    // Arg[0] ==> implicit this pointer
+    CLR_RT_HeapBlock* pThis = stackFrame.This();
+    FAULT_ON_NULL( pThis );
 
-	stack.SetResult_I4( static_cast<INT32>(CPU_SPI_PortsCount()) );
+    { // use scope to bypass 'Warning: transfer of control bypasses initialization of port' (or similar depending on compiler)
+        // Arg[1] ==> port
+        UINT32 port = stackFrame.ArgN( 1 ).NumericByRef().s4;
+    
+        pThis[ FIELD__MinClockFrequency_ ].NumericByRef().s4   = CPU_SPI_MinClockFrequency( port );
+        pThis[ FIELD__MaxClockFrequency_ ].NumericByRef().s4   = CPU_SPI_MaxClockFrequency( port );
+        pThis[ FIELD__ChipSelectLineCount_ ].NumericByRef().s4 = CPU_SPI_ChipSelectLineCount( port );
+    }
 
     TINYCLR_NOCLEANUP();
 }

CLR/Libraries/Windows_Devices/windows_devices_stub.cpp

@@ -60,7 +60,7 @@ HRESULT Library_windows_devices_native_Windows_Devices_Gpio_GpioPin::SetDriveMod
     TINYCLR_NOCLEANUP();
 }
 
-HRESULT Library_windows_devices_native_Windows_Devices_Spi_SpiBusInfo::get_ChipSelectLineCount___I4( CLR_RT_StackFrame& stack )
+HRESULT Library_windows_devices_native_Windows_Devices_Spi_SpiBusInfo::_ctor___VOID__I4( CLR_RT_StackFrame& stack )
 {
     TINYCLR_HEADER();
     TINYCLR_SET_AND_LEAVE(stack.NotImplementedStub());

DeviceCode/Drivers/Stubs/Processor/stubs_SPI/stubs_functions_SPI.cpp

@@ -66,4 +66,17 @@ void CPU_SPI_GetPins( UINT32 spi_mod, GPIO_PIN& msk, GPIO_PIN& miso, GPIO_PIN& m
     return;
 }
 
+UINT32 CPU_SPI_MinClockFrequency( UINT32 spi_mod )
+{
+    return 0;
+}
+
+UINT32 CPU_SPI_MaxClockFrequency( UINT32 spi_mod )
+{
+    return 0;
+}
 
+UINT32 CPU_SPI_ChipSelectLineCount( UINT32 spi_mod )
+{
+    return 0;
+}