File tree Expand file tree Collapse file tree 4 files changed +3
-51
lines changed
libraries/mbed/targets/hal/TARGET_STM Expand file tree Collapse file tree 4 files changed +3
-51
lines changed Original file line number Diff line number Diff line change @@ -48,16 +48,10 @@ void set_compare(uint16_t count) {
4848}
4949
5050// Used to increment the slave counter
51- #if defined(__CC_ARM ) // Keil/MDK-ARM
52- #pragma O0
53- #pragma Ospace
54- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
55- #pragma optimize=low
56- #endif
5751static void tim_update_irq_handler (void ) {
58- SlaveCounter ++ ;
5952 if (TIM_GetITStatus (TIM_MST , TIM_IT_Update ) == SET ) {
6053 TIM_ClearITPendingBit (TIM_MST , TIM_IT_Update );
54+ SlaveCounter ++ ;
6155 }
6256}
6357
@@ -118,12 +112,6 @@ void us_ticker_init(void) {
118112 TIM_Cmd (TIM_MST , ENABLE );
119113}
120114
121- #if defined(__CC_ARM ) // Keil/MDK-ARM
122- #pragma O0
123- #pragma Ospace
124- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
125- #pragma optimize=low
126- #endif
127115uint32_t us_ticker_read () {
128116 uint32_t counter , counter2 ;
129117 if (!us_ticker_inited ) us_ticker_init ();
Original file line number Diff line number Diff line change @@ -48,16 +48,10 @@ void set_compare(uint16_t count) {
4848}
4949
5050// Used to increment the slave counter
51- #if defined(__CC_ARM ) // Keil/MDK-ARM
52- #pragma O0
53- #pragma Ospace
54- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
55- #pragma optimize=low
56- #endif
5751static void tim_update_irq_handler (void ) {
58- SlaveCounter ++ ;
5952 if (TIM_GetITStatus (TIM_MST , TIM_IT_Update ) == SET ) {
6053 TIM_ClearITPendingBit (TIM_MST , TIM_IT_Update );
54+ SlaveCounter ++ ;
6155 }
6256}
6357
@@ -118,12 +112,6 @@ void us_ticker_init(void) {
118112 TIM_Cmd (TIM_MST , ENABLE );
119113}
120114
121- #if defined(__CC_ARM ) // Keil/MDK-ARM
122- #pragma O0
123- #pragma Ospace
124- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
125- #pragma optimize=low
126- #endif
127115uint32_t us_ticker_read () {
128116 uint32_t counter , counter2 ;
129117 if (!us_ticker_inited ) us_ticker_init ();
Original file line number Diff line number Diff line change @@ -51,17 +51,11 @@ void set_compare(uint16_t count) {
5151}
5252
5353// Used to increment the slave counter
54- #if defined(__CC_ARM ) // Keil/MDK-ARM
55- #pragma O0
56- #pragma Ospace
57- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
58- #pragma optimize=low
59- #endif
6054static void tim_update_irq_handler (void ) {
61- SlaveCounter ++ ;
6255 if (__HAL_TIM_GET_ITSTATUS (& TimMasterHandle , TIM_IT_UPDATE ) == SET ) {
6356 __HAL_TIM_CLEAR_IT (& TimMasterHandle , TIM_IT_UPDATE );
6457 __HAL_TIM_SetCounter (& TimMasterHandle , 0 ); // Reset counter !!!
58+ SlaveCounter ++ ;
6559 }
6660}
6761
@@ -121,12 +115,6 @@ void us_ticker_init(void) {
121115 HAL_TIM_OC_Start (& TimMasterHandle , TIM_CHANNEL_1 );
122116}
123117
124- #if defined(__CC_ARM ) // Keil/MDK-ARM
125- #pragma O0
126- #pragma Ospace
127- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
128- #pragma optimize=low
129- #endif
130118uint32_t us_ticker_read () {
131119 uint32_t counter , counter2 ;
132120 if (!us_ticker_inited ) us_ticker_init ();
Original file line number Diff line number Diff line change @@ -46,12 +46,6 @@ void set_compare(uint16_t count) {
4646 TIM_ITConfig (TIM_MST , TIM_IT_CC1 , ENABLE );
4747}
4848
49- #if defined(__CC_ARM ) // Keil/MDK-ARM
50- #pragma O0
51- #pragma Ospace
52- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
53- #pragma optimize=low
54- #endif
5549static void tim_update_oc_irq_handler (void ) {
5650 uint16_t cval = TIM_MST -> CNT ;
5751
@@ -110,12 +104,6 @@ void us_ticker_init(void) {
110104 TIM_Cmd (TIM_MST , ENABLE );
111105}
112106
113- #if defined(__CC_ARM ) // Keil/MDK-ARM
114- #pragma O0
115- #pragma Ospace
116- #elif defined(__IAR_SYSTEMS_ICC__ ) // IAR/EWARM
117- #pragma optimize=low
118- #endif
119107uint32_t us_ticker_read () {
120108 uint32_t counter , counter2 ;
121109 if (!us_ticker_inited ) us_ticker_init ();
You can’t perform that action at this time.
0 commit comments