Commit 2cf6dfa2 authored by Damien George's avatar Damien George
Browse files

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

parent b36be5ff
...@@ -34,13 +34,9 @@ ...@@ -34,13 +34,9 @@
#include <string.h> #include <string.h>
#include "stm32f4xx_hal.h" #include "py/nlr.h"
#include "mpconfig.h" #include "py/obj.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "pin.h" #include "pin.h"
#include "led.h" #include "led.h"
#include "extint.h" #include "extint.h"
......
...@@ -33,7 +33,6 @@ CROSS_COMPILE = arm-none-eabi- ...@@ -33,7 +33,6 @@ CROSS_COMPILE = arm-none-eabi-
INC = -I. INC = -I.
INC += -I.. INC += -I..
INC += -I$(PY_SRC)
INC += -I$(BUILD) INC += -I$(BUILD)
INC += -I$(CMSIS_DIR)/inc INC += -I$(CMSIS_DIR)/inc
INC += -I$(CMSIS_DIR)/devinc INC += -I$(CMSIS_DIR)/devinc
......
...@@ -29,12 +29,8 @@ ...@@ -29,12 +29,8 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "i2c.h" #include "i2c.h"
#include "accel.h" #include "accel.h"
......
...@@ -28,13 +28,9 @@ ...@@ -28,13 +28,9 @@
#include <stm32f4xx_hal.h> #include <stm32f4xx_hal.h>
#include <string.h> #include <string.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "misc.h" #include "py/runtime.h"
#include "nlr.h" #include "py/binary.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "binary.h"
#include "adc.h" #include "adc.h"
#include "pin.h" #include "pin.h"
#include "genhdr/pins.h" #include "genhdr/pins.h"
......
// stm32f4xx_prefix.c becomes the initial portion of the generated pins file. // stm32f4xx_prefix.c becomes the initial portion of the generated pins file.
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include "stm32f4xx_hal.h" #include "py/obj.h"
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "pin.h" #include "pin.h"
#include MICROPY_HAL_H
#define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \ #define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
{ \ { \
......
...@@ -24,10 +24,7 @@ ...@@ -24,10 +24,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "mpconfig.h" #include "py/obj.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "bufhelper.h" #include "bufhelper.h"
void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data) { void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data) {
......
...@@ -29,13 +29,9 @@ ...@@ -29,13 +29,9 @@
#include <stdarg.h> #include <stdarg.h>
#include <errno.h> #include <errno.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/objtuple.h"
#include "misc.h" #include "py/runtime.h"
#include "qstr.h"
#include "obj.h"
#include "objtuple.h"
#include "runtime.h"
#include "bufhelper.h" #include "bufhelper.h"
#include "can.h" #include "can.h"
#include "pybioctl.h" #include "pybioctl.h"
......
...@@ -30,13 +30,8 @@ ...@@ -30,13 +30,8 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h"
#include "qstr.h"
#include "parse.h"
#include "obj.h"
#include "runtime.h"
#include "timer.h" #include "timer.h"
#include "dac.h" #include "dac.h"
#include "pin.h" #include "pin.h"
......
...@@ -32,11 +32,7 @@ ...@@ -32,11 +32,7 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#include "mpconfig.h" #include "py/runtime.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "systick.h" #include "systick.h"
#include "rtc.h" #include "rtc.h"
#include "storage.h" #include "storage.h"
......
...@@ -30,15 +30,10 @@ ...@@ -30,15 +30,10 @@
#include <stm32f4xx_hal.h> #include <stm32f4xx_hal.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h" #include "py/gc.h"
#include "qstr.h" #include "py/pfenv.h"
#include "gc.h"
#include "obj.h"
#include "runtime.h"
#include "pfenv.h"
#include "pin.h" #include "pin.h"
#include "extint.h" #include "extint.h"
......
...@@ -26,10 +26,7 @@ ...@@ -26,10 +26,7 @@
#include <string.h> #include <string.h>
#include "mpconfig.h" #include "py/obj.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "ff.h" #include "ff.h"
#include "ffconf.h" #include "ffconf.h"
#include "fsusermount.h" #include "fsusermount.h"
......
...@@ -27,13 +27,9 @@ ...@@ -27,13 +27,9 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h" #include "py/stream.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "stream.h"
#include "file.h" #include "file.h"
#include "ff.h" #include "ff.h"
......
...@@ -24,12 +24,8 @@ ...@@ -24,12 +24,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "mpconfig.h" #include "py/nlr.h"
#include "misc.h" #include "py/runtime.h"
#include "nlr.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "ff.h" #include "ff.h"
#include "fsusermount.h" #include "fsusermount.h"
......
...@@ -27,11 +27,8 @@ ...@@ -27,11 +27,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include "mpconfig.h" #include "py/obj.h"
#include "misc.h" #include "py/gc.h"
#include "qstr.h"
#include "obj.h"
#include "gc.h"
#include "gccollect.h" #include "gccollect.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
......
...@@ -26,11 +26,8 @@ ...@@ -26,11 +26,8 @@
#include <stdio.h> #include <stdio.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/obj.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
STATIC const char *help_text = STATIC const char *help_text =
"Welcome to Micro Python!\n" "Welcome to Micro Python!\n"
......
...@@ -27,12 +27,8 @@ ...@@ -27,12 +27,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "pin.h" #include "pin.h"
#include "genhdr/pins.h" #include "genhdr/pins.h"
#include "bufhelper.h" #include "bufhelper.h"
......
...@@ -25,12 +25,8 @@ ...@@ -25,12 +25,8 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include "mpconfig.h" #include "py/lexer.h"
#include "misc.h"
#include "qstr.h"
#include "lexer.h"
#include "ff.h" #include "ff.h"
mp_import_stat_t mp_import_stat(const char *path) { mp_import_stat_t mp_import_stat(const char *path) {
......
...@@ -24,13 +24,8 @@ ...@@ -24,13 +24,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <stdint.h> #include "py/nlr.h"
#include "py/obj.h"
#include "mpconfig.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "readline.h" #include "readline.h"
#include "usb.h" #include "usb.h"
......
...@@ -24,11 +24,8 @@ ...@@ -24,11 +24,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "mpconfig.h" #include "py/nlr.h"
#include "misc.h" #include "py/obj.h"
#include "nlr.h"
#include "qstr.h"
#include "obj.h"
#include "irq.h" #include "irq.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
......
...@@ -28,17 +28,11 @@ ...@@ -28,17 +28,11 @@
#include <string.h> #include <string.h>
#include <stm32f4xx_hal.h> #include <stm32f4xx_hal.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h"
#if MICROPY_HW_HAS_LCD #if MICROPY_HW_HAS_LCD
#include "qstr.h"
#include "parse.h"
#include "obj.h"
#include "runtime.h"
#include "pin.h" #include "pin.h"
#include "genhdr/pins.h" #include "genhdr/pins.h"
#include "bufhelper.h" #include "bufhelper.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment