ports: Include py/mphal.h instead of mphalport.h.
The `mphalport.h` header should not be included directly, rather `py/mphal.h` should be used. Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
parent
c2eebe0609
commit
d50e36e7e4
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "py/mperrno.h"
|
#include "py/mperrno.h"
|
||||||
#include "mphalport.h"
|
#include "py/mphal.h"
|
||||||
#include "modesp32.h"
|
#include "modesp32.h"
|
||||||
#include "nvs_flash.h"
|
#include "nvs_flash.h"
|
||||||
#include "nvs.h"
|
#include "nvs.h"
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "py/mperrno.h"
|
#include "py/mperrno.h"
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "extmod/vfs.h"
|
#include "extmod/vfs.h"
|
||||||
#include "mphalport.h"
|
|
||||||
#include "modesp32.h"
|
#include "modesp32.h"
|
||||||
#include "esp_ota_ops.h"
|
#include "esp_ota_ops.h"
|
||||||
|
|
||||||
|
|
|
@ -24,9 +24,9 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "modmachine.h"
|
#include "modmachine.h"
|
||||||
#include "mphalport.h"
|
|
||||||
#include "modesp32.h"
|
#include "modesp32.h"
|
||||||
|
|
||||||
#include "esp_task.h"
|
#include "esp_task.h"
|
||||||
|
|
|
@ -37,7 +37,6 @@
|
||||||
#include "py/mphal.h"
|
#include "py/mphal.h"
|
||||||
#include "extmod/modmachine.h"
|
#include "extmod/modmachine.h"
|
||||||
#include "extmod/virtpin.h"
|
#include "extmod/virtpin.h"
|
||||||
#include "mphalport.h"
|
|
||||||
#include "modmachine.h"
|
#include "modmachine.h"
|
||||||
#include "machine_pin.h"
|
#include "machine_pin.h"
|
||||||
#include "machine_rtc.h"
|
#include "machine_rtc.h"
|
||||||
|
|
|
@ -30,10 +30,10 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "py/obj.h"
|
#include "py/obj.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "modmachine.h"
|
#include "modmachine.h"
|
||||||
#include "mphalport.h"
|
|
||||||
|
|
||||||
#include "hal/timer_hal.h"
|
#include "hal/timer_hal.h"
|
||||||
#include "hal/timer_ll.h"
|
#include "hal/timer_ll.h"
|
||||||
|
|
|
@ -50,7 +50,6 @@
|
||||||
|
|
||||||
#if MICROPY_PY_ESPNOW
|
#if MICROPY_PY_ESPNOW
|
||||||
|
|
||||||
#include "mphalport.h"
|
|
||||||
#include "modnetwork.h"
|
#include "modnetwork.h"
|
||||||
#include "modespnow.h"
|
#include "modespnow.h"
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
#include "shared/runtime/pyexec.h"
|
#include "shared/runtime/pyexec.h"
|
||||||
#include "shared/tinyusb/mp_usbd.h"
|
#include "shared/tinyusb/mp_usbd.h"
|
||||||
#include "shared/tinyusb/mp_usbd_cdc.h"
|
#include "shared/tinyusb/mp_usbd_cdc.h"
|
||||||
#include "mphalport.h"
|
|
||||||
#include "usb.h"
|
#include "usb.h"
|
||||||
#include "usb_serial_jtag.h"
|
#include "usb_serial_jtag.h"
|
||||||
#include "uart.h"
|
#include "uart.h"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tusb.h"
|
#include "tusb.h"
|
||||||
#include "mphalport.h"
|
#include "py/mphal.h"
|
||||||
|
|
||||||
#ifndef MICROPY_HW_USB_VID
|
#ifndef MICROPY_HW_USB_VID
|
||||||
#define MICROPY_HW_USB_VID (0xf055)
|
#define MICROPY_HW_USB_VID (0xf055)
|
||||||
|
|
|
@ -30,13 +30,13 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "ble_drv.h"
|
#include "ble_drv.h"
|
||||||
#include "nrf_sdm.h"
|
#include "nrf_sdm.h"
|
||||||
#include "ble_gap.h"
|
#include "ble_gap.h"
|
||||||
#include "ble.h" // sd_ble_uuid_encode
|
#include "ble.h" // sd_ble_uuid_encode
|
||||||
#include "drivers/flash.h"
|
#include "drivers/flash.h"
|
||||||
#include "mphalport.h"
|
|
||||||
|
|
||||||
|
|
||||||
#if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
|
#if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "ble_uart.h"
|
#include "ble_uart.h"
|
||||||
#include "ringbuffer.h"
|
#include "ringbuffer.h"
|
||||||
#include "mphalport.h"
|
|
||||||
#include "shared/runtime/interrupt_char.h"
|
#include "shared/runtime/interrupt_char.h"
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
|
|
||||||
#if MICROPY_PY_SYS_STDFILES
|
#if MICROPY_PY_SYS_STDFILES
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
|
|
||||||
#include "py/nlr.h"
|
#include "py/nlr.h"
|
||||||
#include "py/mperrno.h"
|
#include "py/mperrno.h"
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "py/lexer.h"
|
#include "py/lexer.h"
|
||||||
#include "py/parse.h"
|
#include "py/parse.h"
|
||||||
#include "py/obj.h"
|
#include "py/obj.h"
|
||||||
|
@ -53,7 +54,6 @@
|
||||||
#include "i2c.h"
|
#include "i2c.h"
|
||||||
#include "adc.h"
|
#include "adc.h"
|
||||||
#include "rtcounter.h"
|
#include "rtcounter.h"
|
||||||
#include "mphalport.h"
|
|
||||||
|
|
||||||
#if MICROPY_PY_MACHINE_HW_PWM
|
#if MICROPY_PY_MACHINE_HW_PWM
|
||||||
#include "pwm.h"
|
#include "pwm.h"
|
||||||
|
|
|
@ -25,9 +25,9 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
|
|
||||||
#include "mphalport.h"
|
|
||||||
#include "led.h"
|
#include "led.h"
|
||||||
#include "mpconfigboard.h"
|
#include "mpconfigboard.h"
|
||||||
|
|
||||||
|
|
|
@ -25,9 +25,8 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "py/nlr.h"
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "mphalport.h"
|
|
||||||
#include "rtcounter.h"
|
#include "rtcounter.h"
|
||||||
#include "nrfx_rtc.h"
|
#include "nrfx_rtc.h"
|
||||||
#include "nrf_clock.h"
|
#include "nrf_clock.h"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "py/obj.h"
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "py/objstr.h"
|
#include "py/objstr.h"
|
||||||
#include "py/objlist.h"
|
#include "py/objlist.h"
|
||||||
|
@ -33,7 +33,6 @@
|
||||||
#if MICROPY_PY_UBLUEPY_CENTRAL
|
#if MICROPY_PY_UBLUEPY_CENTRAL
|
||||||
|
|
||||||
#include "ble_drv.h"
|
#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) {
|
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);
|
ubluepy_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#define NRFX_LOG_H
|
#define NRFX_LOG_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "mphalport.h"
|
#include "py/mphal.h"
|
||||||
#include "nrfx_config.h"
|
#include "nrfx_config.h"
|
||||||
|
|
||||||
#define LOG_TEST_UART 1
|
#define LOG_TEST_UART 1
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mphalport.h"
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "shared/timeutils/timeutils.h"
|
#include "shared/timeutils/timeutils.h"
|
||||||
#include "lib/oofatfs/ff.h"
|
#include "lib/oofatfs/ff.h"
|
||||||
|
|
|
@ -31,12 +31,12 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "py/runtime.h"
|
#include "py/runtime.h"
|
||||||
#include "modmachine.h"
|
#include "modmachine.h"
|
||||||
#include "samd_soc.h"
|
#include "samd_soc.h"
|
||||||
#include "sam.h"
|
#include "sam.h"
|
||||||
#include "tusb.h"
|
#include "tusb.h"
|
||||||
#include "mphalport.h"
|
|
||||||
|
|
||||||
extern void machine_rtc_start(bool force);
|
extern void machine_rtc_start(bool force);
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include "py/mphal.h"
|
||||||
#include "library.h"
|
#include "library.h"
|
||||||
#include "mphalport.h"
|
|
||||||
|
|
||||||
static void stderr_print_strn(void *env, const char *str, size_t len) {
|
static void stderr_print_strn(void *env, const char *str, size_t len) {
|
||||||
(void)env;
|
(void)env;
|
||||||
|
|
Loading…
Reference in New Issue