Skip to content

Commit 2cf6dfa

Browse files
dpgeorgedpgeorge
committed
stmhal: Prefix includes with py/; remove need for -I../py.
1 parent b36be5f commit 2cf6dfa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+127
-328
lines changed

‎drivers/cc3000/src/ccspi.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@
3434

3535
#include <string.h>
3636

37-
#include "stm32f4xx_hal.h"
38-
#include "mpconfig.h"
39-
#include "nlr.h"
40-
#include "misc.h"
41-
#include "qstr.h"
42-
#include "obj.h"
43-
#include "runtime.h"
37+
#include "py/nlr.h"
38+
#include "py/obj.h"
39+
#include "py/runtime.h"
4440
#include "pin.h"
4541
#include "led.h"
4642
#include "extint.h"

‎stmhal/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ CROSS_COMPILE = arm-none-eabi-
3333

3434
INC = -I.
3535
INC += -I..
36-
INC += -I$(PY_SRC)
3736
INC += -I$(BUILD)
3837
INC += -I$(CMSIS_DIR)/inc
3938
INC += -I$(CMSIS_DIR)/devinc

‎stmhal/accel.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@
2929

3030
#include "stm32f4xx_hal.h"
3131

32-
#include "mpconfig.h"
33-
#include "nlr.h"
34-
#include "misc.h"
35-
#include "qstr.h"
36-
#include "obj.h"
37-
#include "runtime.h"
32+
#include "py/nlr.h"
33+
#include "py/runtime.h"
3834
#include "i2c.h"
3935
#include "accel.h"
4036

‎stmhal/adc.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,9 @@
2828
#include <stm32f4xx_hal.h>
2929
#include <string.h>
3030

31-
#include "mpconfig.h"
32-
#include "misc.h"
33-
#include "nlr.h"
34-
#include "qstr.h"
35-
#include "obj.h"
36-
#include "runtime.h"
37-
#include "binary.h"
31+
#include "py/nlr.h"
32+
#include "py/runtime.h"
33+
#include "py/binary.h"
3834
#include "adc.h"
3935
#include "pin.h"
4036
#include "genhdr/pins.h"

‎stmhal/boards/stm32f4xx_prefix.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
// stm32f4xx_prefix.c becomes the initial portion of the generated pins file.
22

33
#include <stdio.h>
4-
#include <stdint.h>
54

6-
#include "stm32f4xx_hal.h"
7-
8-
#include "mpconfig.h"
9-
#include "misc.h"
10-
#include "qstr.h"
11-
#include "obj.h"
5+
#include "py/obj.h"
126
#include "pin.h"
7+
#include MICROPY_HAL_H
138

149
#define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
1510
{ \

‎stmhal/bufhelper.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "mpconfig.h"
28-
#include "misc.h"
29-
#include "qstr.h"
30-
#include "obj.h"
27+
#include "py/obj.h"
3128
#include "bufhelper.h"
3229

3330
void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data) {

‎stmhal/can.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,9 @@
2929
#include <stdarg.h>
3030
#include <errno.h>
3131

32-
#include "mpconfig.h"
33-
#include "nlr.h"
34-
#include "misc.h"
35-
#include "qstr.h"
36-
#include "obj.h"
37-
#include "objtuple.h"
38-
#include "runtime.h"
32+
#include "py/nlr.h"
33+
#include "py/objtuple.h"
34+
#include "py/runtime.h"
3935
#include "bufhelper.h"
4036
#include "can.h"
4137
#include "pybioctl.h"

‎stmhal/dac.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,8 @@
3030

3131
#include "stm32f4xx_hal.h"
3232

33-
#include "mpconfig.h"
34-
#include "nlr.h"
35-
#include "misc.h"
36-
#include "qstr.h"
37-
#include "parse.h"
38-
#include "obj.h"
39-
#include "runtime.h"
33+
#include "py/nlr.h"
34+
#include "py/runtime.h"
4035
#include "timer.h"
4136
#include "dac.h"
4237
#include "pin.h"

‎stmhal/diskio.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232

3333
#include "stm32f4xx_hal.h"
3434

35-
#include "mpconfig.h"
36-
#include "misc.h"
37-
#include "qstr.h"
38-
#include "obj.h"
39-
#include "runtime.h"
35+
#include "py/runtime.h"
4036
#include "systick.h"
4137
#include "rtc.h"
4238
#include "storage.h"

‎stmhal/extint.c‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,10 @@
3030

3131
#include <stm32f4xx_hal.h>
3232

33-
#include "mpconfig.h"
34-
#include "nlr.h"
35-
#include "misc.h"
36-
#include "qstr.h"
37-
#include "gc.h"
38-
#include "obj.h"
39-
#include "runtime.h"
40-
#include "pfenv.h"
41-
33+
#include "py/nlr.h"
34+
#include "py/runtime.h"
35+
#include "py/gc.h"
36+
#include "py/pfenv.h"
4237
#include "pin.h"
4338
#include "extint.h"
4439

0 commit comments

Comments
 (0)