STM: optimize us_ticker

kjbracey · kjbracey · commit 7ce36706dc06 · 2019-05-20T12:37:32.000+03:00
Provide new optimizations for us_ticker and wait_us.
diff --git a/targets/TARGET_STM/TARGET_STM32F0/device.h b/targets/TARGET_STM/TARGET_STM32F0/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32f0xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32F1/device.h b/targets/TARGET_STM/TARGET_STM32F1/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32f1xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32F2/device.h b/targets/TARGET_STM/TARGET_STM32F2/device.h
@@ -36,4 +36,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32f2xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32F3/device.h b/targets/TARGET_STM/TARGET_STM32F3/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32f3xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32F4/device.h b/targets/TARGET_STM/TARGET_STM32F4/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32f4xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32F7/device.h b/targets/TARGET_STM/TARGET_STM32F7/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32f7xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device.h b/targets/TARGET_STM/TARGET_STM32H7/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32h7xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32L0/device.h b/targets/TARGET_STM/TARGET_STM32L0/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32l0xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32L1/device.h b/targets/TARGET_STM/TARGET_STM32L1/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32l1xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32L4/device.h b/targets/TARGET_STM/TARGET_STM32L4/device.h
@@ -39,4 +39,6 @@
 /*  WORKAROUND waiting for mbed-os issue 4408 to be addressed */
 #include "stm32l4xx_ll_usart.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32WB/device.h b/targets/TARGET_STM/TARGET_STM32WB/device.h
@@ -40,4 +40,6 @@
 
 #include "stm32wbxx_ll_rtc.h"
 
+#include "us_ticker_defines.h"
+
 #endif
diff --git a/targets/TARGET_STM/us_ticker.c b/targets/TARGET_STM/us_ticker.c
@@ -20,6 +20,7 @@
 #include "us_ticker_api.h"
 #include "PeripheralNames.h"
 #include "us_ticker_data.h"
+#include "us_ticker_defines.h"
 
 TIM_HandleTypeDef TimMasterHandle;
 
@@ -212,9 +213,10 @@ void us_ticker_init(void)
     HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_1);
 }
 
-uint32_t us_ticker_read()
+uint32_t (us_ticker_read)()
 {
-    return TIM_MST->CNT;
+    /* Invoke the macro */
+    return us_ticker_read();
 }
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
diff --git a/targets/TARGET_STM/us_ticker_defines.h b/targets/TARGET_STM/us_ticker_defines.h
@@ -0,0 +1,37 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_US_TICKER_DEFINES_H
+#define MBED_US_TICKER_DEFINES_H_
+
+#include "us_ticker_data.h"
+
+/* All devices have 1MHz us_ticker */
+#define US_TICKER_PERIOD_NUM    1
+#define US_TICKER_PERIOD_DEN    1
+
+#if TIM_MST_BIT_WIDTH == 16
+#define US_TICKER_MASK          0xFFFF
+#elif TIM_MST_BIT_WIDTH == 32
+#define US_TICKER_MASK          0xFFFFFFFF
+#else
+#error "Bad TIM_MST_BIT_WIDTH"
+#endif
+
+/* Macro-optimised form of us_ticker_read */
+#define us_ticker_read() (TIM_MST->CNT)
+
+#endif /* MBED_US_TICKER_DEFINES_H_ */

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include "us_ticker_api.h"`
`21`	`21`	`#include "PeripheralNames.h"`
`22`	`22`	`#include "us_ticker_data.h"`
	`23`	`+#include "us_ticker_defines.h"`
`23`	`24`
`24`	`25`	`TIM_HandleTypeDef TimMasterHandle;`
`25`	`26`
`@@ -212,9 +213,10 @@ void us_ticker_init(void)`
`212`	`213`	`HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_1);`
`213`	`214`	`}`
`214`	`215`
`215`		`-uint32_t us_ticker_read()`
	`216`	`+uint32_t (us_ticker_read)()`
`216`	`217`	`{`
`217`		`- return TIM_MST->CNT;`
	`218`	`+ /* Invoke the macro */`
	`219`	`+ return us_ticker_read();`
`218`	`220`	`}`
`219`	`221`
`220`	`222`	`void us_ticker_set_interrupt(timestamp_t timestamp)`