diff options
-rw-r--r-- | ports/esp32/esp32_nvs.c | 2 | ||||
-rw-r--r-- | ports/esp32/esp32_partition.c | 2 | ||||
-rw-r--r-- | ports/esp32/esp32_rmt.c | 2 | ||||
-rw-r--r-- | ports/esp32/machine_pin.c | 1 | ||||
-rw-r--r-- | ports/esp32/machine_timer.c | 2 | ||||
-rw-r--r-- | ports/esp32/modespnow.c | 1 | ||||
-rw-r--r-- | ports/esp32/mphalport.c | 1 | ||||
-rw-r--r-- | ports/mimxrt/tusb_port.c | 2 | ||||
-rw-r--r-- | ports/nrf/drivers/bluetooth/ble_drv.c | 2 | ||||
-rw-r--r-- | ports/nrf/drivers/bluetooth/ble_uart.c | 2 | ||||
-rw-r--r-- | ports/nrf/main.c | 2 | ||||
-rw-r--r-- | ports/nrf/modules/board/led.c | 2 | ||||
-rw-r--r-- | ports/nrf/modules/machine/rtcounter.c | 3 | ||||
-rw-r--r-- | ports/nrf/modules/ubluepy/ubluepy_scanner.c | 3 | ||||
-rw-r--r-- | ports/nrf/nrfx_log.h | 2 | ||||
-rw-r--r-- | ports/samd/fatfs_port.c | 2 | ||||
-rw-r--r-- | ports/samd/samd_soc.c | 2 | ||||
-rw-r--r-- | ports/webassembly/mphalport.c | 2 |
18 files changed, 15 insertions, 20 deletions
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c index daeec4c26..7136a08c6 100644 --- a/ports/esp32/esp32_nvs.c +++ b/ports/esp32/esp32_nvs.c @@ -28,7 +28,7 @@ #include "py/runtime.h" #include "py/mperrno.h" -#include "mphalport.h" +#include "py/mphal.h" #include "modesp32.h" #include "nvs_flash.h" #include "nvs.h" diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c index cad707dfc..55830a285 100644 --- a/ports/esp32/esp32_partition.c +++ b/ports/esp32/esp32_partition.c @@ -28,8 +28,8 @@ #include "py/runtime.h" #include "py/mperrno.h" +#include "py/mphal.h" #include "extmod/vfs.h" -#include "mphalport.h" #include "modesp32.h" #include "esp_ota_ops.h" diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c index c765a9741..6890e16bf 100644 --- a/ports/esp32/esp32_rmt.c +++ b/ports/esp32/esp32_rmt.c @@ -24,9 +24,9 @@ * THE SOFTWARE. */ +#include "py/mphal.h" #include "py/runtime.h" #include "modmachine.h" -#include "mphalport.h" #include "modesp32.h" #include "esp_task.h" diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c index 149715cf6..e48546ec0 100644 --- a/ports/esp32/machine_pin.c +++ b/ports/esp32/machine_pin.c @@ -37,7 +37,6 @@ #include "py/mphal.h" #include "extmod/modmachine.h" #include "extmod/virtpin.h" -#include "mphalport.h" #include "modmachine.h" #include "machine_pin.h" #include "machine_rtc.h" diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c index 278deb106..7758584a8 100644 --- a/ports/esp32/machine_timer.c +++ b/ports/esp32/machine_timer.c @@ -30,10 +30,10 @@ #include <stdint.h> #include <stdio.h> +#include "py/mphal.h" #include "py/obj.h" #include "py/runtime.h" #include "modmachine.h" -#include "mphalport.h" #include "hal/timer_hal.h" #include "hal/timer_ll.h" diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c index e7e51ee57..7873ff897 100644 --- a/ports/esp32/modespnow.c +++ b/ports/esp32/modespnow.c @@ -50,7 +50,6 @@ #if MICROPY_PY_ESPNOW -#include "mphalport.h" #include "modnetwork.h" #include "modespnow.h" diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c index 3f2674013..999d77dad 100644 --- a/ports/esp32/mphalport.c +++ b/ports/esp32/mphalport.c @@ -44,7 +44,6 @@ #include "shared/runtime/pyexec.h" #include "shared/tinyusb/mp_usbd.h" #include "shared/tinyusb/mp_usbd_cdc.h" -#include "mphalport.h" #include "usb.h" #include "usb_serial_jtag.h" #include "uart.h" diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c index f359d44e4..f81200e2c 100644 --- a/ports/mimxrt/tusb_port.c +++ b/ports/mimxrt/tusb_port.c @@ -25,7 +25,7 @@ */ #include "tusb.h" -#include "mphalport.h" +#include "py/mphal.h" #ifndef MICROPY_HW_USB_VID #define MICROPY_HW_USB_VID (0xf055) diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c index 4bede3852..1eb0fef52 100644 --- a/ports/nrf/drivers/bluetooth/ble_drv.c +++ b/ports/nrf/drivers/bluetooth/ble_drv.c @@ -30,13 +30,13 @@ #include <string.h> #include <stdbool.h> +#include "py/mphal.h" #include "py/runtime.h" #include "ble_drv.h" #include "nrf_sdm.h" #include "ble_gap.h" #include "ble.h" // sd_ble_uuid_encode #include "drivers/flash.h" -#include "mphalport.h" #if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c index 69f86b489..6c585b34c 100644 --- a/ports/nrf/drivers/bluetooth/ble_uart.c +++ b/ports/nrf/drivers/bluetooth/ble_uart.c @@ -29,8 +29,8 @@ #include <string.h> #include "ble_uart.h" #include "ringbuffer.h" -#include "mphalport.h" #include "shared/runtime/interrupt_char.h" +#include "py/mphal.h" #include "py/runtime.h" #if MICROPY_PY_SYS_STDFILES diff --git a/ports/nrf/main.c b/ports/nrf/main.c index 62848ba8d..29550bd77 100644 --- a/ports/nrf/main.c +++ b/ports/nrf/main.c @@ -31,6 +31,7 @@ #include "py/nlr.h" #include "py/mperrno.h" +#include "py/mphal.h" #include "py/lexer.h" #include "py/parse.h" #include "py/obj.h" @@ -53,7 +54,6 @@ #include "i2c.h" #include "adc.h" #include "rtcounter.h" -#include "mphalport.h" #if MICROPY_PY_MACHINE_HW_PWM #include "pwm.h" diff --git a/ports/nrf/modules/board/led.c b/ports/nrf/modules/board/led.c index 6c0df5652..f58d1a28c 100644 --- a/ports/nrf/modules/board/led.c +++ b/ports/nrf/modules/board/led.c @@ -25,9 +25,9 @@ * THE SOFTWARE. */ +#include "py/mphal.h" #include "py/runtime.h" -#include "mphalport.h" #include "led.h" #include "mpconfigboard.h" diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c index c1ef1b4dd..a66a635a0 100644 --- a/ports/nrf/modules/machine/rtcounter.c +++ b/ports/nrf/modules/machine/rtcounter.c @@ -25,9 +25,8 @@ * THE SOFTWARE. */ -#include "py/nlr.h" +#include "py/mphal.h" #include "py/runtime.h" -#include "mphalport.h" #include "rtcounter.h" #include "nrfx_rtc.h" #include "nrf_clock.h" diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c index 17d697b86..3f20af264 100644 --- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c +++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c @@ -25,7 +25,7 @@ */ #include <string.h> -#include "py/obj.h" +#include "py/mphal.h" #include "py/runtime.h" #include "py/objstr.h" #include "py/objlist.h" @@ -33,7 +33,6 @@ #if MICROPY_PY_UBLUEPY_CENTRAL #include "ble_drv.h" -#include "mphalport.h" static void adv_event_handler(mp_obj_t self_in, uint16_t event_id, ble_drv_adv_data_t * data) { ubluepy_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in); diff --git a/ports/nrf/nrfx_log.h b/ports/nrf/nrfx_log.h index 8710d3fc2..46f80f302 100644 --- a/ports/nrf/nrfx_log.h +++ b/ports/nrf/nrfx_log.h @@ -28,7 +28,7 @@ #define NRFX_LOG_H #include <stdio.h> -#include "mphalport.h" +#include "py/mphal.h" #include "nrfx_config.h" #define LOG_TEST_UART 1 diff --git a/ports/samd/fatfs_port.c b/ports/samd/fatfs_port.c index 91912d97d..40b64111c 100644 --- a/ports/samd/fatfs_port.c +++ b/ports/samd/fatfs_port.c @@ -25,7 +25,7 @@ * THE SOFTWARE. */ -#include "mphalport.h" +#include "py/mphal.h" #include "py/runtime.h" #include "shared/timeutils/timeutils.h" #include "lib/oofatfs/ff.h" diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c index 1c8d49d15..e78032513 100644 --- a/ports/samd/samd_soc.c +++ b/ports/samd/samd_soc.c @@ -31,12 +31,12 @@ * THE SOFTWARE. */ +#include "py/mphal.h" #include "py/runtime.h" #include "modmachine.h" #include "samd_soc.h" #include "sam.h" #include "tusb.h" -#include "mphalport.h" extern void machine_rtc_start(bool force); diff --git a/ports/webassembly/mphalport.c b/ports/webassembly/mphalport.c index 9ab47762e..3935068b9 100644 --- a/ports/webassembly/mphalport.c +++ b/ports/webassembly/mphalport.c @@ -25,8 +25,8 @@ */ #include <unistd.h> +#include "py/mphal.h" #include "library.h" -#include "mphalport.h" static void stderr_print_strn(void *env, const char *str, size_t len) { (void)env; |