Make us_ticker common between 16 and 32 bits counters

Author: LMESTM

targets/TARGET_STM/us_ticker_16b.c renamed to targets/TARGET_STM/us_ticker.c

@@ -18,26 +18,27 @@
 #include "PeripheralNames.h"
 #include "hal_tick.h"
 
-// A 16-bit timer is used
 #if TIM_MST_16BIT
+#define TIMER_TICKER_BIT_WIDTH 16
+#else
+#define TIMER_TICKER_BIT_WIDTH 32
+#endif
 
 TIM_HandleTypeDef TimMasterHandle;
 
-// Declare ticker as 16 bits - mbed layer takes care of mapping to 32 or 64
-// bits
 const ticker_info_t* us_ticker_get_info()
 {
     static const ticker_info_t info = {
         1000000,
-        16
+        TIMER_TICKER_BIT_WIDTH
     };
     return &info;
 }
 
 void us_ticker_init(void)
 {
-    /* NOTE: assuming thaiHAL tick has already been initialized! */
-    us_ticker_disable_interrupt();
+    /* NOTE: assuming that HAL tick has already been initialized! */
+    __HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC1);
 }
 
 uint32_t us_ticker_read()
@@ -50,7 +51,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
     // NOTE: This function must be called with interrupts disabled to keep our
     //       timer interrupt setup atomic
     // Set new output compare value
-    __HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_1, timestamp & 0xFFFF);
+    __HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_1, (uint32_t)timestamp);
     // Ensure the compare event starts clear
     __HAL_TIM_CLEAR_FLAG(&TimMasterHandle, TIM_FLAG_CC1);
     // Enable IT
@@ -59,12 +60,10 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
 
 void us_ticker_fire_interrupt(void)
 {
-    // Ensure the compare event starts clear
     __HAL_TIM_CLEAR_FLAG(&TimMasterHandle, TIM_FLAG_CC1);
     LL_TIM_GenerateEvent_CC1(TimMasterHandle.Instance);
     // Enable IT
     __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC1);
-
 }
 
 /* NOTE: must be called with interrupts disabled! */
@@ -79,4 +78,3 @@ void us_ticker_clear_interrupt(void)
     __HAL_TIM_CLEAR_FLAG(&TimMasterHandle, TIM_FLAG_CC1);
 }
 
-#endif // TIM_MST_16BIT