stmhal: Prefix includes with py/; remove need for -I../py.

drivers/cc3000/src/ccspi.c

@@ -34,13 +34,9 @@
 
 #include <string.h>
 
-#include "stm32f4xx_hal.h"
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "pin.h"
 #include "led.h"
 #include "extint.h"

stmhal/Makefile

@@ -33,7 +33,6 @@ CROSS_COMPILE = arm-none-eabi-
 
 INC =  -I.
 INC += -I..
-INC += -I$(PY_SRC)
 INC += -I$(BUILD)
 INC += -I$(CMSIS_DIR)/inc
 INC += -I$(CMSIS_DIR)/devinc

stmhal/accel.c

@@ -29,12 +29,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "i2c.h"
 #include "accel.h"
 

stmhal/adc.c

@@ -28,13 +28,9 @@
 #include <stm32f4xx_hal.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "binary.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/binary.h"
 #include "adc.h"
 #include "pin.h"
 #include "genhdr/pins.h"

stmhal/boards/stm32f4xx_prefix.c

@@ -1,15 +1,10 @@
 // stm32f4xx_prefix.c becomes the initial portion of the generated pins file.
 
 #include <stdio.h>
-#include <stdint.h>
 
-#include "stm32f4xx_hal.h"
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "pin.h"
+#include MICROPY_HAL_H
 
 #define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
 { \

stmhal/bufhelper.c

@@ -24,10 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "bufhelper.h"
 
 void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data) {

stmhal/can.c

@@ -29,13 +29,9 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objtuple.h"
+#include "py/runtime.h"
 #include "bufhelper.h"
 #include "can.h"
 #include "pybioctl.h"

stmhal/dac.c

@@ -30,13 +30,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "parse.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "timer.h"
 #include "dac.h"
 #include "pin.h"

stmhal/diskio.c

@@ -32,11 +32,7 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include "systick.h"
 #include "rtc.h"
 #include "storage.h"

stmhal/extint.c

@@ -30,15 +30,10 @@
 
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "gc.h"
-#include "obj.h"
-#include "runtime.h"
-#include "pfenv.h"
-
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/pfenv.h"
 #include "pin.h"
 #include "extint.h"
 

stmhal/ffconf.c

@@ -26,10 +26,7 @@
 
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "ff.h"
 #include "ffconf.h"
 #include "fsusermount.h"

stmhal/file.c

@@ -27,13 +27,9 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "stream.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/stream.h"
 #include "file.h"
 #include "ff.h"
 

stmhal/fsusermount.c

@@ -24,12 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "ff.h"
 #include "fsusermount.h"
 

stmhal/gccollect.c

@@ -27,11 +27,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
+#include "py/obj.h"
+#include "py/gc.h"
 #include "gccollect.h"
 #include MICROPY_HAL_H
 

stmhal/help.c

@@ -26,11 +26,8 @@
 
 #include <stdio.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 
 STATIC const char *help_text =
 "Welcome to Micro Python!\n"

stmhal/i2c.c

@@ -27,12 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "pin.h"
 #include "genhdr/pins.h"
 #include "bufhelper.h"

stmhal/import.c

@@ -25,12 +25,8 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "lexer.h"
+#include "py/lexer.h"
 #include "ff.h"
 
 mp_import_stat_t mp_import_stat(const char *path) {

stmhal/input.c

@@ -24,13 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "readline.h"
 #include "usb.h"
 

stmhal/irq.c

@@ -24,11 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "irq.h"
 
 #include MICROPY_HAL_H

stmhal/lcd.c

@@ -28,17 +28,11 @@
 #include <string.h>
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 
 #if MICROPY_HW_HAS_LCD
 
-#include "qstr.h"
-#include "parse.h"
-#include "obj.h"
-#include "runtime.h"
-
 #include "pin.h"
 #include "genhdr/pins.h"
 #include "bufhelper.h"