ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NUCLEO_xxx] Fix us_ticker issue

pull/172/head
bcostm 2014-02-18 09:34:32 +01:00
parent 636114b4d1
commit 1c2bc03f99
4 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/us_ticker.c
View File

@ -48,16 +48,10 @@ void set_compare(uint16_t count) {
} }
// Used to increment the slave counter // Used to increment the slave counter
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
static void tim_update_irq_handler(void) { static void tim_update_irq_handler(void) {
SlaveCounter++;
if (TIM_GetITStatus(TIM_MST, TIM_IT_Update) == SET) { if (TIM_GetITStatus(TIM_MST, TIM_IT_Update) == SET) {
TIM_ClearITPendingBit(TIM_MST, TIM_IT_Update); TIM_ClearITPendingBit(TIM_MST, TIM_IT_Update);
SlaveCounter++;
} }
} }
@ -118,12 +112,6 @@ void us_ticker_init(void) {
TIM_Cmd(TIM_MST, ENABLE); TIM_Cmd(TIM_MST, ENABLE);
} }
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
uint32_t us_ticker_read() { uint32_t us_ticker_read() {
uint32_t counter, counter2; uint32_t counter, counter2;
if (!us_ticker_inited) us_ticker_init(); if (!us_ticker_inited) us_ticker_init();

14
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c
View File

@ -48,16 +48,10 @@ void set_compare(uint16_t count) {
} }
// Used to increment the slave counter // Used to increment the slave counter
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
static void tim_update_irq_handler(void) { static void tim_update_irq_handler(void) {
SlaveCounter++;
if (TIM_GetITStatus(TIM_MST, TIM_IT_Update) == SET) { if (TIM_GetITStatus(TIM_MST, TIM_IT_Update) == SET) {
TIM_ClearITPendingBit(TIM_MST, TIM_IT_Update); TIM_ClearITPendingBit(TIM_MST, TIM_IT_Update);
SlaveCounter++;
} }
} }
@ -118,12 +112,6 @@ void us_ticker_init(void) {
TIM_Cmd(TIM_MST, ENABLE); TIM_Cmd(TIM_MST, ENABLE);
} }
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
uint32_t us_ticker_read() { uint32_t us_ticker_read() {
uint32_t counter, counter2; uint32_t counter, counter2;
if (!us_ticker_inited) us_ticker_init(); if (!us_ticker_inited) us_ticker_init();

14
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c
View File

@ -51,17 +51,11 @@ void set_compare(uint16_t count) {
} }
// Used to increment the slave counter // Used to increment the slave counter
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
static void tim_update_irq_handler(void) { static void tim_update_irq_handler(void) {
SlaveCounter++;
if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_UPDATE) == SET) { if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_UPDATE) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_UPDATE); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_UPDATE);
__HAL_TIM_SetCounter(&TimMasterHandle, 0); // Reset counter !!! __HAL_TIM_SetCounter(&TimMasterHandle, 0); // Reset counter !!!
SlaveCounter++;
} }
} }
@ -121,12 +115,6 @@ void us_ticker_init(void) {
HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_1); HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_1);
} }
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
uint32_t us_ticker_read() { uint32_t us_ticker_read() {
uint32_t counter, counter2; uint32_t counter, counter2;
if (!us_ticker_inited) us_ticker_init(); if (!us_ticker_inited) us_ticker_init();

12
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/us_ticker.c
View File

@ -46,12 +46,6 @@ void set_compare(uint16_t count) {
TIM_ITConfig(TIM_MST, TIM_IT_CC1, ENABLE); TIM_ITConfig(TIM_MST, TIM_IT_CC1, ENABLE);
} }
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
static void tim_update_oc_irq_handler(void) { static void tim_update_oc_irq_handler(void) {
uint16_t cval = TIM_MST->CNT; uint16_t cval = TIM_MST->CNT;
@ -110,12 +104,6 @@ void us_ticker_init(void) {
TIM_Cmd(TIM_MST, ENABLE); TIM_Cmd(TIM_MST, ENABLE);
} }
#if defined(__CC_ARM) // Keil/MDK-ARM
#pragma O0
#pragma Ospace
#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
#pragma optimize=low
#endif
uint32_t us_ticker_read() { uint32_t us_ticker_read() {
uint32_t counter, counter2; uint32_t counter, counter2;
if (!us_ticker_inited) us_ticker_init(); if (!us_ticker_inited) us_ticker_init();