aboutsummaryrefslogtreecommitdiff
path: root/cc3200/hal
diff options
context:
space:
mode:
authorPaul Sokolovsky2015-10-29 20:38:44 +0300
committerPaul Sokolovsky2015-10-29 20:38:44 +0300
commitf4decdc4a3ef7c14f7b50d361c52736bbf8ddc34 (patch)
tree20acc428d59150da5de8d0ec7402626f9cd18b0f /cc3200/hal
parenteb099b9893e896300241050a2c3ed272c3890d70 (diff)
cc3200: Switch from HAL_Delay() to mp_hal_delay_ms().
Diffstat (limited to 'cc3200/hal')
-rw-r--r--cc3200/hal/cc3200_hal.c4
-rw-r--r--cc3200/hal/cc3200_hal.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c
index b29c0fee0..d5a564e17 100644
--- a/cc3200/hal/cc3200_hal.c
+++ b/cc3200/hal/cc3200_hal.c
@@ -108,7 +108,7 @@ uint32_t HAL_GetTick(void) {
return HAL_tickCount;
}
-void HAL_Delay(uint32_t delay) {
+void mp_hal_delay_ms(uint32_t delay) {
// only if we are not within interrupt context and interrupts are enabled
if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0 && query_irq() == IRQ_STATE_ENABLED) {
#ifdef USE_FREERTOS
@@ -193,7 +193,7 @@ int mp_hal_stdin_rx_chr(void) {
}
}
}
- HAL_Delay(1);
+ mp_hal_delay_ms(1);
}
}
diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h
index 21be524d3..c6bafb388 100644
--- a/cc3200/hal/cc3200_hal.h
+++ b/cc3200/hal/cc3200_hal.h
@@ -63,7 +63,7 @@ extern void HAL_SystemInit (void);
extern void HAL_SystemDeInit (void);
extern void HAL_IncrementTick(void);
extern uint32_t HAL_GetTick(void);
-extern void HAL_Delay(uint32_t delay);
+extern void mp_hal_delay_ms(uint32_t delay);
extern NORETURN void mp_hal_raise(int errno);
extern void mp_hal_set_interrupt_char (int c);