aboutsummaryrefslogtreecommitdiff
path: root/cc3200/mods
diff options
context:
space:
mode:
Diffstat (limited to 'cc3200/mods')
-rw-r--r--cc3200/mods/modnetwork.c9
-rw-r--r--cc3200/mods/modpyb.c7
-rw-r--r--cc3200/mods/moduos.c10
-rw-r--r--cc3200/mods/modusocket.c11
-rw-r--r--cc3200/mods/modutime.c8
-rw-r--r--cc3200/mods/modwlan.c11
-rw-r--r--cc3200/mods/pybadc.c2
-rw-r--r--cc3200/mods/pybextint.c7
-rw-r--r--cc3200/mods/pybi2c.c7
-rw-r--r--cc3200/mods/pybpin.c9
-rw-r--r--cc3200/mods/pybrtc.c8
-rw-r--r--cc3200/mods/pybsd.c9
-rw-r--r--cc3200/mods/pybsystick.c7
-rw-r--r--cc3200/mods/pybuart.c11
14 files changed, 31 insertions, 85 deletions
diff --git a/cc3200/mods/modnetwork.c b/cc3200/mods/modnetwork.c
index 2e100aecb..7b5ae5f00 100644
--- a/cc3200/mods/modnetwork.c
+++ b/cc3200/mods/modnetwork.c
@@ -29,17 +29,10 @@
#include <stdint.h>
#include <string.h>
-#include "mpconfig.h"
+#include "py/mpstate.h"
#include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
-#include "runtime.h"
#include "modnetwork.h"
#include "mpexception.h"
-#include "mpstate.h"
/// \module network - network configuration
///
diff --git a/cc3200/mods/modpyb.c b/cc3200/mods/modpyb.c
index 976c2bb33..80a4f74ac 100644
--- a/cc3200/mods/modpyb.c
+++ b/cc3200/mods/modpyb.c
@@ -30,14 +30,7 @@
#include <stdint.h>
#include "py/mpstate.h"
-#include "mpconfig.h"
#include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
-#include "gccollect.h"
#include "irq.h"
#include "inc/hw_types.h"
#include "inc/hw_gpio.h"
diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c
index 9058a4817..418f3608a 100644
--- a/cc3200/mods/moduos.c
+++ b/cc3200/mods/moduos.c
@@ -29,12 +29,10 @@
#include <string.h>
#include "std.h"
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
+#include "py/mpconfig.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/objtuple.h"
#include "ff.h"
#include "diskio.h"
#include "sflash_diskio.h"
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
index 7356942f2..743db53d5 100644
--- a/cc3200/mods/modusocket.c
+++ b/cc3200/mods/modusocket.c
@@ -30,18 +30,11 @@
#include <string.h>
#include "simplelink.h"
-#include "mpconfig.h"
+#include "py/mpstate.h"
#include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/runtime.h"
#include "modnetwork.h"
#include "mpexception.h"
-#include "mpstate.h"
/******************************************************************************/
// socket class
diff --git a/cc3200/mods/modutime.c b/cc3200/mods/modutime.c
index 9dae880e6..07896512d 100644
--- a/cc3200/mods/modutime.c
+++ b/cc3200/mods/modutime.c
@@ -28,12 +28,10 @@
#include <stdio.h>
#include <string.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
#include "modutime.h"
#include "inc/hw_types.h"
#include "inc/hw_ints.h"
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
index 013437a04..7f60fa174 100644
--- a/cc3200/mods/modwlan.c
+++ b/cc3200/mods/modwlan.c
@@ -29,15 +29,10 @@
#include <stdbool.h>
#include "simplelink.h"
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
#include "modnetwork.h"
#include "modwlan.h"
#include "pybioctl.h"
diff --git a/cc3200/mods/pybadc.c b/cc3200/mods/pybadc.c
index 6af2f476c..9b882c033 100644
--- a/cc3200/mods/pybadc.c
+++ b/cc3200/mods/pybadc.c
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <string.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "py/nlr.h"
#include "py/runtime.h"
diff --git a/cc3200/mods/pybextint.c b/cc3200/mods/pybextint.c
index ca0d3de73..a98dbdba7 100644
--- a/cc3200/mods/pybextint.c
+++ b/cc3200/mods/pybextint.c
@@ -29,14 +29,10 @@
#include <stddef.h>
#include <string.h>
-#include "mpconfig.h"
+#include "py/mpstate.h"
#include MICROPY_HAL_H
-#include "py/nlr.h"
-#include "misc.h"
-#include "qstr.h"
#include "py/runtime.h"
#include "py/gc.h"
-#include "py/pfenv.h"
#include "py/objlist.h"
#include "inc/hw_types.h"
#include "inc/hw_gpio.h"
@@ -49,7 +45,6 @@
#include "pybextint.h"
#include "mpexception.h"
#include "interrupt.h"
-#include "mpstate.h"
#include "cc3200_asm.h"
/// \moduleref pyb
diff --git a/cc3200/mods/pybi2c.c b/cc3200/mods/pybi2c.c
index 5d47134a6..d10fbd8e8 100644
--- a/cc3200/mods/pybi2c.c
+++ b/cc3200/mods/pybi2c.c
@@ -29,13 +29,8 @@
#include <string.h>
#include "py/mpstate.h"
-#include "mpconfig.h"
#include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
#include "bufhelper.h"
#include "inc/hw_types.h"
#include "inc/hw_i2c.h"
diff --git a/cc3200/mods/pybpin.c b/cc3200/mods/pybpin.c
index ee71ffb8d..505c2a105 100644
--- a/cc3200/mods/pybpin.c
+++ b/cc3200/mods/pybpin.c
@@ -29,13 +29,10 @@
#include <stdint.h>
#include <string.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
#include "inc/hw_types.h"
#include "inc/hw_gpio.h"
#include "inc/hw_ints.h"
diff --git a/cc3200/mods/pybrtc.c b/cc3200/mods/pybrtc.c
index 8d4383068..5d6c2a7ca 100644
--- a/cc3200/mods/pybrtc.c
+++ b/cc3200/mods/pybrtc.c
@@ -27,12 +27,10 @@
#include <stdio.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
#include "modutime.h"
#include "inc/hw_types.h"
#include "inc/hw_ints.h"
diff --git a/cc3200/mods/pybsd.c b/cc3200/mods/pybsd.c
index 7c0cd7025..40fcd340f 100644
--- a/cc3200/mods/pybsd.c
+++ b/cc3200/mods/pybsd.c
@@ -24,13 +24,10 @@
* THE SOFTWARE.
*/
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
#include "inc/hw_types.h"
#include "inc/hw_gpio.h"
#include "inc/hw_ints.h"
diff --git a/cc3200/mods/pybsystick.c b/cc3200/mods/pybsystick.c
index e934ab7dd..0bc80f5b5 100644
--- a/cc3200/mods/pybsystick.c
+++ b/cc3200/mods/pybsystick.c
@@ -25,12 +25,9 @@
* THE SOFTWARE.
*/
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
#include "irq.h"
#include "pybsystick.h"
#include "systick.h"
diff --git a/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c
index e608dcce7..651d58004 100644
--- a/cc3200/mods/pybuart.c
+++ b/cc3200/mods/pybuart.c
@@ -30,15 +30,12 @@
#include <errno.h>
#include <string.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
#include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
#include "py/objlist.h"
-#include "stream.h"
+#include "py/stream.h"
#include "inc/hw_types.h"
#include "inc/hw_ints.h"
#include "inc/hw_memmap.h"