diff options
Diffstat (limited to 'esp8266')
| -rw-r--r-- | esp8266/esp_mphal.h | 6 | ||||
| -rw-r--r-- | esp8266/main.c | 2 | ||||
| -rw-r--r-- | esp8266/modesp.c | 1 | ||||
| -rw-r--r-- | esp8266/modpyb.c | 2 | ||||
| -rw-r--r-- | esp8266/modpybadc.c | 1 | ||||
| -rw-r--r-- | esp8266/modpybrtc.c | 1 | ||||
| -rw-r--r-- | esp8266/modutime.c | 2 | ||||
| -rw-r--r-- | esp8266/mpconfigport.h | 3 |
8 files changed, 4 insertions, 14 deletions
diff --git a/esp8266/esp_mphal.h b/esp8266/esp_mphal.h index e3ba0c4fac..dc6a79f2ba 100644 --- a/esp8266/esp_mphal.h +++ b/esp8266/esp_mphal.h @@ -32,13 +32,7 @@ void ets_isr_mask(unsigned); void mp_hal_init(void); void mp_hal_feed_watchdog(void); -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); -uint32_t mp_hal_ticks_ms(void); -void mp_hal_delay_ms(uint32_t delay); void mp_hal_delay_us(uint32_t); void mp_hal_set_interrupt_char(int c); uint32_t mp_hal_get_cpu_freq(void); diff --git a/esp8266/main.c b/esp8266/main.c index 18fd2bd64a..0d8b3723ca 100644 --- a/esp8266/main.c +++ b/esp8266/main.c @@ -33,10 +33,10 @@ #include "py/runtime.h" #include "py/stackctrl.h" #include "py/frozenmod.h" +#include "py/mphal.h" #include "py/gc.h" #include "pyexec.h" #include "gccollect.h" -#include MICROPY_HAL_H #include "user_interface.h" STATIC char heap[16384]; diff --git a/esp8266/modesp.c b/esp8266/modesp.c index 5e7d5fb138..4e46b7ae1d 100644 --- a/esp8266/modesp.c +++ b/esp8266/modesp.c @@ -32,7 +32,6 @@ #include "py/obj.h" #include "py/gc.h" #include "py/runtime.h" -#include MICROPY_HAL_H #include "netutils.h" #include "queue.h" #include "user_interface.h" diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c index c5c24c07d1..36a9d6bf2a 100644 --- a/esp8266/modpyb.c +++ b/esp8266/modpyb.c @@ -29,9 +29,9 @@ #include "py/nlr.h" #include "py/obj.h" #include "py/gc.h" +#include "py/mphal.h" #include "gccollect.h" #include "pyexec.h" -#include MICROPY_HAL_H #include "user_interface.h" #include "modpyb.h" diff --git a/esp8266/modpybadc.c b/esp8266/modpybadc.c index b4dfa67283..ade63dfb34 100644 --- a/esp8266/modpybadc.c +++ b/esp8266/modpybadc.c @@ -30,7 +30,6 @@ #include "py/nlr.h" #include "py/obj.h" #include "py/runtime.h" -#include MICROPY_HAL_H #include "user_interface.h" const mp_obj_type_t pyb_adc_type; diff --git a/esp8266/modpybrtc.c b/esp8266/modpybrtc.c index 260894881d..1156216cc0 100644 --- a/esp8266/modpybrtc.c +++ b/esp8266/modpybrtc.c @@ -30,7 +30,6 @@ #include "py/nlr.h" #include "py/obj.h" #include "py/runtime.h" -#include MICROPY_HAL_H #include "timeutils.h" #include "user_interface.h" #include "modpyb.h" diff --git a/esp8266/modutime.c b/esp8266/modutime.c index 241d3ccf7d..5c55833c33 100644 --- a/esp8266/modutime.c +++ b/esp8266/modutime.c @@ -32,7 +32,7 @@ #include "py/obj.h" #include "py/gc.h" #include "py/runtime.h" -#include MICROPY_HAL_H +#include "py/mphal.h" #include "modpyb.h" #include "modpybrtc.h" #include "timeutils.h" diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h index 6635d260cb..3cc2d9ad5f 100644 --- a/esp8266/mpconfigport.h +++ b/esp8266/mpconfigport.h @@ -54,7 +54,6 @@ typedef void *machine_ptr_t; // must be of pointer size typedef const void *machine_const_ptr_t; // must be of pointer size typedef long mp_off_t; -void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len); #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len) // extra built in names to add to the global namespace @@ -94,7 +93,7 @@ extern const struct _mp_obj_module_t uos_module; // board specifics -#define MICROPY_HAL_H "esp_mphal.h" +#define MICROPY_MPHALPORT_H "esp_mphal.h" #define MICROPY_HW_BOARD_NAME "ESP module" #define MICROPY_HW_MCU_NAME "ESP8266" #define MICROPY_PY_SYS_PLATFORM "ESP8266" |