esp8266: Switch to standard mp_hal_delay_us() MPHAL function.

This commit is contained in:
Paul Sokolovsky 2015-10-29 02:06:13 +03:00
parent a2e0d92eeb
commit 5699fc9d0e
4 changed files with 6 additions and 6 deletions

View File

@ -46,7 +46,7 @@ void mp_hal_feed_watchdog(void) {
//wdt_feed(); // might also work //wdt_feed(); // might also work
} }
void mp_hal_udelay(uint32_t us) { void mp_hal_delay_us(uint32_t us) {
ets_delay_us(us); ets_delay_us(us);
} }
@ -56,7 +56,7 @@ int mp_hal_stdin_rx_chr(void) {
if (c != -1) { if (c != -1) {
return c; return c;
} }
mp_hal_udelay(1); mp_hal_delay_us(1);
mp_hal_feed_watchdog(); mp_hal_feed_watchdog();
} }
} }
@ -87,7 +87,7 @@ uint32_t HAL_GetTick(void) {
} }
void HAL_Delay(uint32_t Delay) { void HAL_Delay(uint32_t Delay) {
mp_hal_udelay(Delay * 1000); mp_hal_delay_us(Delay * 1000);
} }
void mp_hal_set_interrupt_char(int c) { void mp_hal_set_interrupt_char(int c) {

View File

@ -32,7 +32,6 @@ void ets_isr_mask(unsigned);
void mp_hal_init(void); void mp_hal_init(void);
void mp_hal_feed_watchdog(void); void mp_hal_feed_watchdog(void);
void mp_hal_udelay(uint32_t);
int mp_hal_stdin_rx_chr(void); int mp_hal_stdin_rx_chr(void);
void mp_hal_stdout_tx_str(const char *str); 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(const char *str, uint32_t len);
@ -40,6 +39,7 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len);
uint32_t HAL_GetTick(void); uint32_t HAL_GetTick(void);
void HAL_Delay(uint32_t Delay); void HAL_Delay(uint32_t Delay);
void mp_hal_delay_us(uint32_t);
void mp_hal_set_interrupt_char(int c); void mp_hal_set_interrupt_char(int c);
uint32_t mp_hal_get_cpu_freq(void); uint32_t mp_hal_get_cpu_freq(void);

View File

@ -56,7 +56,7 @@ STATIC void mp_reset(void) {
void soft_reset(void) { void soft_reset(void) {
mp_hal_stdout_tx_str("PYB: soft reset\r\n"); mp_hal_stdout_tx_str("PYB: soft reset\r\n");
mp_hal_udelay(10000); // allow UART to flush output mp_hal_delay_us(10000); // allow UART to flush output
mp_reset(); mp_reset();
pyexec_event_repl_init(); pyexec_event_repl_init();
} }

View File

@ -137,7 +137,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_delay_obj, pyb_delay);
STATIC mp_obj_t pyb_udelay(mp_obj_t usec_in) { STATIC mp_obj_t pyb_udelay(mp_obj_t usec_in) {
mp_int_t usec = mp_obj_get_int(usec_in); mp_int_t usec = mp_obj_get_int(usec_in);
if (usec >= 0) { if (usec >= 0) {
mp_hal_udelay(usec); mp_hal_delay_us(usec);
} }
return mp_const_none; return mp_const_none;
} }