diff options
| author | Damien George | 2015-10-30 23:03:58 +0000 |
|---|---|---|
| committer | Paul Sokolovsky | 2015-10-31 19:14:30 +0300 |
| commit | 731f359292c0e2630873df1a19c5baac7287024f (patch) | |
| tree | 3aef09fd15b82baa9fff7c72fe3bc7e05a869614 /cc3200/hal | |
| parent | 0bd3f3291d3ea0252a91653a1edcbfa83d524834 (diff) | |
all: Add py/mphal.h and use it in all ports.
py/mphal.h contains declarations for generic mp_hal_XXX functions, such
as stdio and delay/ticks, which ports should provide definitions for. A
port will also provide mphalport.h with further HAL declarations.
Diffstat (limited to 'cc3200/hal')
| -rw-r--r-- | cc3200/hal/cc3200_hal.c | 10 | ||||
| -rw-r--r-- | cc3200/hal/cc3200_hal.h | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c index e5ac4f088..f0987ae9d 100644 --- a/cc3200/hal/cc3200_hal.c +++ b/cc3200/hal/cc3200_hal.c @@ -34,7 +34,7 @@ #include "py/mpstate.h" -#include MICROPY_HAL_H +#include "py/mphal.h" #include "py/runtime.h" #include "py/objstr.h" #include "inc/hw_types.h" @@ -104,11 +104,11 @@ void HAL_IncrementTick(void) { HAL_tickCount++; } -uint32_t mp_hal_ticks_ms(void) { +mp_uint_t mp_hal_ticks_ms(void) { return HAL_tickCount; } -void mp_hal_delay_ms(uint32_t delay) { +void mp_hal_delay_ms(mp_uint_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 @@ -140,7 +140,7 @@ void mp_hal_stdout_tx_str(const char *str) { mp_hal_stdout_tx_strn(str, strlen(str)); } -void mp_hal_stdout_tx_strn(const char *str, uint32_t len) { +void mp_hal_stdout_tx_strn(const char *str, size_t len) { if (MP_STATE_PORT(os_term_dup_obj)) { if (MP_OBJ_IS_TYPE(MP_STATE_PORT(os_term_dup_obj)->stream_o, &pyb_uart_type)) { uart_tx_strn(MP_STATE_PORT(os_term_dup_obj)->stream_o, str, len); @@ -153,7 +153,7 @@ void mp_hal_stdout_tx_strn(const char *str, uint32_t len) { telnet_tx_strn(str, len); } -void mp_hal_stdout_tx_strn_cooked (const char *str, uint32_t len) { +void mp_hal_stdout_tx_strn_cooked (const char *str, size_t len) { int32_t nslen = 0; const char *_str = str; diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h index c0dc9ebef..054d5035a 100644 --- a/cc3200/hal/cc3200_hal.h +++ b/cc3200/hal/cc3200_hal.h @@ -62,14 +62,7 @@ extern void HAL_SystemInit (void); extern void HAL_SystemDeInit (void); extern void HAL_IncrementTick(void); -extern uint32_t mp_hal_ticks_ms(void); -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); -int mp_hal_stdin_rx_chr(void); -void mp_hal_stdout_tx_str(const char *str); -void mp_hal_stdout_tx_strn(const char *str, uint32_t len); -void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len); - #endif /* CC3200_LAUNCHXL_HAL_CC3200_HAL_H_ */ |