9 files changed, 11 insertions, 21 deletions
diff --git a/teensy/led.c b/teensy/led.c
index 500900ffce..5798f537bc 100644
--- a/teensy/led.c
+++ b/teensy/led.c
@@ -4,8 +4,8 @@
 
 #include "py/nlr.h"
 #include "py/runtime.h"
+#include "py/mphal.h"
 #include "led.h"
-#include MICROPY_HAL_H
 #include "pin.h"
 #include "genhdr/pins.h"
 
diff --git a/teensy/main.c b/teensy/main.c
index 4fa7aaab3e..c31be6e01b 100644
--- a/teensy/main.c
+++ b/teensy/main.c
@@ -9,13 +9,13 @@
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/gc.h"
+#include "py/mphal.h"
 #include "gccollect.h"
 #include "pyexec.h"
 #include "readline.h"
 #include "lexermemzip.h"
 
 #include "Arduino.h"
-#include MICROPY_HAL_H
 
 #include "servo.h"
 #include "led.h"
diff --git a/teensy/modpyb.c b/teensy/modpyb.c
index aded02263d..8429191af9 100644
--- a/teensy/modpyb.c
+++ b/teensy/modpyb.c
@@ -31,8 +31,7 @@
 
 #include "py/obj.h"
 #include "py/gc.h"
-
-#include MICROPY_HAL_H
+#include "py/mphal.h"
 
 #include "gccollect.h"
 #include "irq.h"
diff --git a/teensy/mpconfigport.h b/teensy/mpconfigport.h
index d4bfd1cd3b..4b2181cdb6 100644
--- a/teensy/mpconfigport.h
+++ b/teensy/mpconfigport.h
@@ -66,7 +66,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, uint32_t len);
 #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 
 // We have inlined IRQ functions for efficiency (they are generally
@@ -149,5 +148,5 @@ __attribute__(( always_inline )) static inline mp_uint_t disable_irq(void) {
 
 #define MICROPY_MATH_SQRT_ASM     (1)
 
-#define MICROPY_HAL_H           "teensy_hal.h"
+#define MICROPY_MPHALPORT_H     "teensy_hal.h"
 #define MICROPY_PIN_DEFS_PORT_H "pin_defs_teensy.h"
diff --git a/teensy/pin_defs_teensy.c b/teensy/pin_defs_teensy.c
index fd2476f7bc..e7af1e9697 100644
--- a/teensy/pin_defs_teensy.c
+++ b/teensy/pin_defs_teensy.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <mk20dx128.h>
 #include "py/runtime.h"
-#include MICROPY_HAL_H
+#include "py/mphal.h"
 #include "pin.h"
 
 // Returns the pin mode. This value returned by this macro should be one of:
diff --git a/teensy/teensy_hal.c b/teensy/teensy_hal.c
index 099848fb38..8996c27c97 100644
--- a/teensy/teensy_hal.c
+++ b/teensy/teensy_hal.c
@@ -2,16 +2,16 @@
 #include <string.h>
 
 #include "py/mpstate.h"
+#include "py/mphal.h"
 #include "usb.h"
 #include "uart.h"
 #include "Arduino.h"
-#include MICROPY_HAL_H
 
-uint32_t mp_hal_ticks_ms(void) {
+mp_uint_t mp_hal_ticks_ms(void) {
   return millis();
 }
 
-void mp_hal_delay_ms(uint32_t ms) {
+void mp_hal_delay_ms(mp_uint_t ms) {
   delay(ms);
 }
 
@@ -37,7 +37,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(pyb_stdio_uart) != NULL) {
         uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
     }
@@ -46,7 +46,7 @@ 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) {
+void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
     // send stdout to UART and USB CDC VCP
     if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
         uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len);
diff --git a/teensy/teensy_hal.h b/teensy/teensy_hal.h
index 24402ee84e..b00b6e4ac6 100644
--- a/teensy/teensy_hal.h
+++ b/teensy/teensy_hal.h
@@ -112,17 +112,10 @@ __attribute__(( always_inline )) static inline void __WFI(void) {
   __asm volatile ("wfi");
 }
 
-uint32_t mp_hal_ticks_ms(void);
-void mp_hal_delay_ms(uint32_t delay);
 void mp_hal_set_interrupt_char(int c);
 
 void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio);
 
-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);
-
 void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *init);
 
 #define GPIO_read_pin(gpio, pin)        (((gpio)->PDIR >> (pin)) & 1)
diff --git a/teensy/timer.c b/teensy/timer.c
index 5d6237d006..88583a09b4 100644
--- a/teensy/timer.c
+++ b/teensy/timer.c
@@ -32,7 +32,7 @@
 #include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
-#include MICROPY_HAL_H
+#include "py/mphal.h"
 #include "pin.h"
 #include "reg.h"
 #include "timer.h"
diff --git a/teensy/uart.c b/teensy/uart.c
index 1a04bb0d69..81035aed6a 100644
--- a/teensy/uart.c
+++ b/teensy/uart.c
@@ -29,7 +29,6 @@
 
 #include "py/nlr.h"
 #include "py/runtime.h"
-#include MICROPY_HAL_H
 #include "bufhelper.h"
 #include "uart.h"