summaryrefslogtreecommitdiff
path: root/cc3200
diff options
context:
space:
mode:
authorSebastian Plamauer <oeplse@gmail.com>2016-10-31 20:18:39 +0100
committerScott Shawcroft <scott.shawcroft@gmail.com>2016-12-19 13:03:50 -0800
commit1598e44231a9ea2dbf20f487fcd05ded90e80d9a (patch)
tree2020360e16b0a59b3207838274b5159ac9fe3b73 /cc3200
parentaf17b64a58a421342ebad876b81ab68b91c13473 (diff)
atmel-samd: Add preliminary support for UART
Diffstat (limited to 'cc3200')
-rw-r--r--cc3200/mods/modwlan.c3
-rw-r--r--cc3200/mods/pybuart.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
index 4b3dd4ec3..7381ebb17 100644
--- a/cc3200/mods/modwlan.c
+++ b/cc3200/mods/modwlan.c
@@ -29,6 +29,7 @@
#include "std.h"
#include "simplelink.h"
+#include "py/ioctl.h"
#include "py/mpconfig.h"
#include "py/obj.h"
#include "py/objstr.h"
@@ -45,7 +46,6 @@
#include "modnetwork.h"
#include "modusocket.h"
#include "modwlan.h"
-#include "pybioctl.h"
#include "pybrtc.h"
#include "debug.h"
#if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
@@ -1511,4 +1511,3 @@ int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t
}
return ret;
}
-
diff --git a/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c
index 493522f83..c2f32cc3e 100644
--- a/cc3200/mods/pybuart.c
+++ b/cc3200/mods/pybuart.c
@@ -46,7 +46,7 @@
#include "uart.h"
#include "pybuart.h"
#include "mpirq.h"
-#include "pybioctl.h"
+#include "py/ioctl.h"
#include "pybsleep.h"
#include "mpexception.h"
#include "py/mpstate.h"