From 66fd3e4a7b79f81ea66c87f7607fa463bc8def15 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky
Date: Fri, 13 Nov 2015 15:44:26 +0200
Subject: unix: Use standard mphalport.h header.

This also unbreaks "make minimal".
---
 unix/mpconfigport.h |  2 --
 unix/mphalport.h    | 37 +++++++++++++++++++++++++++++++++++++
 unix/unix_mphal.h   | 36 ------------------------------------
 3 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100644 unix/mphalport.h
 delete mode 100644 unix/unix_mphal.h

diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index a6bd98a72..e55eb2cec 100644
--- a/unix/mpconfigport.h
+++ b/unix/mpconfigport.h
@@ -224,8 +224,6 @@ extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj;
     mp_obj_t keyboard_interrupt_obj; \
     void *mmap_region_head; \
 
-#define MICROPY_MPHALPORT_H "unix_mphal.h"
-
 // We need to provide a declaration/definition of alloca()
 #ifdef __FreeBSD__
 #include <stdlib.h>
diff --git a/unix/mphalport.h b/unix/mphalport.h
new file mode 100644
index 000000000..98bbadbda
--- /dev/null
+++ b/unix/mphalport.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <unistd.h>
+
+#ifndef CHAR_CTRL_C
+#define CHAR_CTRL_C (3)
+#endif
+
+void mp_hal_set_interrupt_char(char c);
+
+void mp_hal_stdio_mode_raw(void);
+void mp_hal_stdio_mode_orig(void);
+
+static inline void mp_hal_delay_ms(mp_uint_t ms) { usleep((ms) * 1000); }
diff --git a/unix/unix_mphal.h b/unix/unix_mphal.h
deleted file mode 100644
index 8961722db..000000000
--- a/unix/unix_mphal.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef CHAR_CTRL_C
-#define CHAR_CTRL_C (3)
-#endif
-
-void mp_hal_set_interrupt_char(char c);
-
-void mp_hal_stdio_mode_raw(void);
-void mp_hal_stdio_mode_orig(void);
-
-static inline void mp_hal_delay_ms(mp_uint_t ms) { usleep((ms) * 1000); }
-- 
cgit v1.2.3