Rework CPU GPIO (#2144)

nanoframework · Nov 5, 2021 · 716f09f · 716f09f
1 parent 9e62b9b
commit 716f09f
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 102 deletions.
diff --git a/src/PAL/Include/CPU_GPIO_decl.h b/src/PAL/Include/CPU_GPIO_decl.h
@@ -7,11 +7,6 @@
 #ifndef DRIVERS_GPIO_DECL_H
 #define DRIVERS_GPIO_DECL_H
 
-#if defined(__GNUC__)
-#define __int64 long long
-#endif
-typedef unsigned __int64 CLR_UINT64;
-
 #define GPIO_PIN_NONE 0xFFFFFFFF
 
 #define GPIO_ATTRIBUTE_NONE        0x00
@@ -117,7 +112,7 @@ bool CPU_GPIO_EnableOutputPin(GPIO_PIN Pin, GpioPinValue InitialState, GpioPinDr
 //
 bool CPU_GPIO_EnableInputPin(
     GPIO_PIN pinNumber,
-    CLR_UINT64 debounceTimeMilliseconds,
+    uint32_t debounceTimeMilliseconds,
     GPIO_INTERRUPT_SERVICE_ROUTINE pin_ISR,
     void *isr_Param,
     GPIO_INT_EDGE intEdge,
@@ -154,7 +149,7 @@ int32_t CPU_GPIO_GetPinCount();
 
 // Get / Set the pin debounce time in millisecs
 uint32_t CPU_GPIO_GetPinDebounce(GPIO_PIN Pin);
-bool CPU_GPIO_SetPinDebounce(GPIO_PIN pinNumber, CLR_UINT64 debounceTimeMilliseconds);
+bool CPU_GPIO_SetPinDebounce(GPIO_PIN pinNumber, uint32_t debounceTimeMilliseconds);
 
 // Validate pin and set drive mode
 // return true if pin ok

diff --git a/src/System.Device.Gpio/sys_dev_gpio_native_System_Device_Gpio_GpioPin.cpp b/src/System.Device.Gpio/sys_dev_gpio_native_System_Device_Gpio_GpioPin.cpp
@@ -158,7 +158,7 @@ HRESULT Library_sys_dev_gpio_native_System_Device_Gpio_GpioPin::NativeSetDebounc
         // developer note:
         // the following call will FAIL if the pin hasn't been previously setup as input
         // that's OK because the debounce timeout will be eventually set when the pin is configured
-        CPU_GPIO_SetPinDebounce(pinNumber, debounceTimeoutMilsec);
+        CPU_GPIO_SetPinDebounce(pinNumber, (uint32_t)debounceTimeoutMilsec);
     }
     NANOCLR_NOCLEANUP();
 }
@@ -239,7 +239,7 @@ HRESULT Library_sys_dev_gpio_native_System_Device_Gpio_GpioPin::ExtractDebounceT
         CLR_INT64 *debounceValue = Library_corlib_native_System_TimeSpan::GetValuePtr(timeSpanValue);
         FAULT_ON_NULL(debounceValue);
 
-        value = *(CLR_UINT64 *)debounceValue / TIME_CONVERSION__TO_MILLISECONDS;
+        value = (CLR_UINT64)(*debounceValue / TIME_CONVERSION__TO_MILLISECONDS);
     }
     NANOCLR_NOCLEANUP();
 }
@@ -270,7 +270,7 @@ HRESULT Library_sys_dev_gpio_native_System_Device_Gpio_GpioPin::SetPinMode(
 
         validPin = CPU_GPIO_EnableInputPin(
             pinNumber,
-            debounceTimeoutMilsec,
+            (uint32_t)debounceTimeoutMilsec,
             callbacksRegistered ? Gpio_Interupt_ISR : NULL,
             NULL,
             GPIO_INT_EDGE_BOTH,

diff --git a/src/Windows.Devices.Gpio/win_dev_gpio_native_Windows_Devices_Gpio_GpioPin.cpp b/src/Windows.Devices.Gpio/win_dev_gpio_native_Windows_Devices_Gpio_GpioPin.cpp
@@ -148,7 +148,7 @@ HRESULT Library_win_dev_gpio_native_Windows_Devices_Gpio_GpioPin::
 
             validPin = CPU_GPIO_EnableInputPin(
                 pinNumber,
-                debounceTimeoutMilsec,
+                (uint32_t)debounceTimeoutMilsec,
                 callbacksRegistered ? Gpio_Interupt_ISR : NULL,
                 NULL,
                 GPIO_INT_EDGE_BOTH,
@@ -195,7 +195,7 @@ HRESULT Library_win_dev_gpio_native_Windows_Devices_Gpio_GpioPin::NativeSetDebou
         // developer note:
         // the following call will FAIL if the pin hasn't been previously setup as input
         // that's OK because the debounce timeout will be eventually set when the pin is configured
-        CPU_GPIO_SetPinDebounce(pinNumber, debounceTimeoutMilsec);
+        CPU_GPIO_SetPinDebounce(pinNumber, (uint32_t)debounceTimeoutMilsec);
     }
     NANOCLR_NOCLEANUP();
 }
@@ -273,7 +273,7 @@ HRESULT Library_win_dev_gpio_native_Windows_Devices_Gpio_GpioPin::ExtractDebounc
         CLR_INT64 *debounceValue = Library_corlib_native_System_TimeSpan::GetValuePtr(timeSpanValue);
         FAULT_ON_NULL(debounceValue);
 
-        value = *(CLR_UINT64 *)debounceValue / TIME_CONVERSION__TO_MILLISECONDS;
+        value = (CLR_UINT64)(*debounceValue / TIME_CONVERSION__TO_MILLISECONDS);
     }
     NANOCLR_NOCLEANUP();
 }
diff --git a/targets/ChibiOS/_nanoCLR/Windows.Devices.Gpio/cpu_gpio.cpp b/targets/ChibiOS/_nanoCLR/Windows.Devices.Gpio/cpu_gpio.cpp
@@ -252,7 +252,7 @@ void CPU_GPIO_TogglePinState(GPIO_PIN pinNumber)
 
 bool CPU_GPIO_EnableInputPin(
     GPIO_PIN pinNumber,
-    CLR_UINT64 debounceTimeMilliseconds,
+    uint32_t debounceTimeMilliseconds,
     GPIO_INTERRUPT_SERVICE_ROUTINE pinISR,
     void *isrParam,
     GPIO_INT_EDGE intEdge,
@@ -291,7 +291,7 @@ bool CPU_GPIO_EnableInputPin(
         pState->isrPtr = pinISR;
         pState->mode = intEdge;
         pState->param = (void *)isrParam;
-        pState->debounceMs = (uint32_t)(debounceTimeMilliseconds);
+        pState->debounceMs = debounceTimeMilliseconds;
 
         switch (intEdge)
         {
@@ -437,12 +437,12 @@ uint32_t CPU_GPIO_GetPinDebounce(GPIO_PIN pinNumber)
     return 0;
 }
 
-bool CPU_GPIO_SetPinDebounce(GPIO_PIN pinNumber, CLR_UINT64 debounceTimeMilliseconds)
+bool CPU_GPIO_SetPinDebounce(GPIO_PIN pinNumber, uint32_t debounceTimeMilliseconds)
 {
     gpio_input_state *ptr = GetInputState(pinNumber);
     if (ptr)
     {
-        ptr->debounceMs = (uint32_t)(debounceTimeMilliseconds);
+        ptr->debounceMs = debounceTimeMilliseconds;
         return true;
     }
     return false;

diff --git a/targets/ESP32/_IDF/sdkconfig.default b/targets/ESP32/_IDF/sdkconfig.default
@@ -498,7 +498,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default.esp32 b/targets/ESP32/_IDF/sdkconfig.default.esp32
@@ -581,7 +581,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default.esp32s2 b/targets/ESP32/_IDF/sdkconfig.default.esp32s2
@@ -599,7 +599,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default_ble _rev3.esp32 b/targets/ESP32/_IDF/sdkconfig.default_ble _rev3.esp32
@@ -597,7 +597,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default_ble.esp32 b/targets/ESP32/_IDF/sdkconfig.default_ble.esp32
@@ -594,7 +594,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32 b/targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32
@@ -564,7 +564,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32 b/targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32
@@ -565,7 +565,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default_pico b/targets/ESP32/_IDF/sdkconfig.default_pico
@@ -564,7 +564,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0

diff --git a/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32 b/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32
@@ -593,7 +593,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0