5 files changed, 12 insertions, 22 deletions
diff --git a/pic16bit/main.c b/pic16bit/main.c
index 9b993fda90..ad6f9e3644 100644
--- a/pic16bit/main.c
+++ b/pic16bit/main.c
@@ -32,9 +32,9 @@
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/gc.h"
+#include "py/mphal.h"
 #include "pyexec.h"
 #include "readline.h"
-#include MICROPY_HAL_H
 #include "board.h"
 #include "modpyb.h"
 
@@ -59,7 +59,7 @@ soft_reset:
     led_state(1, 0);
     led_state(2, 0);
     led_state(3, 1);
-    mp_hal_milli_delay(150);
+    mp_hal_delay_ms(150);
     led_state(3, 0);
 
     // init MicroPython runtime
diff --git a/pic16bit/modpyb.c b/pic16bit/modpyb.c
index f632d94433..f59163a697 100644
--- a/pic16bit/modpyb.c
+++ b/pic16bit/modpyb.c
@@ -27,17 +27,17 @@
 #include <stdio.h>
 
 #include "py/obj.h"
-#include MICROPY_HAL_H
+#include "py/mphal.h"
 #include "modpyb.h"
 
 STATIC mp_obj_t pyb_millis(void) {
-    return MP_OBJ_NEW_SMALL_INT(mp_hal_get_milliseconds());
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms());
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_millis_obj, pyb_millis);
 
 STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
     uint32_t startMillis = mp_obj_get_int(start);
-    uint32_t currMillis = mp_hal_get_milliseconds();
+    uint32_t currMillis = mp_hal_ticks_ms();
     return MP_OBJ_NEW_SMALL_INT((currMillis - startMillis) & 0x1fff);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
@@ -45,7 +45,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
 STATIC mp_obj_t pyb_delay(mp_obj_t ms_in) {
     mp_int_t ms = mp_obj_get_int(ms_in);
     if (ms >= 0) {
-        mp_hal_milli_delay(ms);
+        mp_hal_delay_ms(ms);
     }
     return mp_const_none;
 }
diff --git a/pic16bit/mpconfigport.h b/pic16bit/mpconfigport.h
index d58401a905..e5cb666fcc 100644
--- a/pic16bit/mpconfigport.h
+++ b/pic16bit/mpconfigport.h
@@ -86,7 +86,6 @@ typedef void *machine_ptr_t; // must be pointer size
 typedef const void *machine_const_ptr_t; // must be pointer size
 typedef int 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 builtin names to add to the global namespace
@@ -108,6 +107,6 @@ extern const struct _mp_obj_module_t pyb_module;
     char *readline_hist[8]; \
     mp_obj_t keyboard_interrupt_obj; \
 
-#define MICROPY_HAL_H "pic16bit_mphal.h"
+#define MICROPY_MPHALPORT_H "pic16bit_mphal.h"
 #define MICROPY_HW_BOARD_NAME "dsPICSK"
 #define MICROPY_HW_MCU_NAME "dsPIC33"
diff --git a/pic16bit/pic16bit_mphal.c b/pic16bit/pic16bit_mphal.c
index dccea76594..557b1e0dad 100644
--- a/pic16bit/pic16bit_mphal.c
+++ b/pic16bit/pic16bit_mphal.c
@@ -25,7 +25,7 @@
  */
 
 #include <string.h>
-#include "pic16bit_mphal.h"
+#include "py/mphal.h"
 #include "board.h"
 
 static int interrupt_char;
@@ -34,12 +34,12 @@ void mp_hal_init(void) {
     MP_STATE_PORT(keyboard_interrupt_obj) = mp_obj_new_exception(&mp_type_KeyboardInterrupt);
 }
 
-mp_uint_t mp_hal_get_milliseconds(void) {
+mp_uint_t mp_hal_ticks_ms(void) {
     // TODO
     return 0;
 }
 
-void mp_hal_milli_delay(mp_uint_t ms) {
+void mp_hal_delay_ms(mp_uint_t ms) {
     // tuned for fixed CPU frequency
     for (int i = ms; i > 0; i--) {
         for (volatile int j = 0; j < 5000; j++) {
@@ -63,13 +63,13 @@ 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, mp_uint_t len) {
+void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     for (; len > 0; --len) {
         uart_tx_char(*str++);
     }
 }
 
-void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
+void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
     for (; len > 0; --len) {
         if (*str == '\n') {
             uart_tx_char('\r');
diff --git a/pic16bit/pic16bit_mphal.h b/pic16bit/pic16bit_mphal.h
index 8dde61f7fa..a858f7e0fd 100644
--- a/pic16bit/pic16bit_mphal.h
+++ b/pic16bit/pic16bit_mphal.h
@@ -26,19 +26,10 @@
 #ifndef __MICROPY_INCLUDED_PIC16BIT_PIC16BIT_MPHAL_H__
 #define __MICROPY_INCLUDED_PIC16BIT_PIC16BIT_MPHAL_H__
 
-#define HAL_GetTick mp_hal_get_milliseconds
-
 #include "py/mpstate.h"
 
 void mp_hal_init(void);
 
-mp_uint_t mp_hal_get_milliseconds(void);
-void mp_hal_milli_delay(mp_uint_t ms);
-
 void mp_hal_set_interrupt_char(int c);
-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, mp_uint_t len);
-void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len);
 
 #endif // __MICROPY_INCLUDED_PIC16BIT_PIC16BIT_MPHAL_H__