Merge pull request #208 from adafruit/merge-v1.9.2

Merge MicroPython v1.9.2

10 files changed, 144 insertions, 285 deletions

diff --git a/zephyr/Makefile b/zephyr/Makefile
index 9e8cb31d0..5840cc47e 100644
--- a/zephyr/Makefile
+++ b/zephyr/Makefile
@@ -8,7 +8,7 @@
 # To build a "minimal" configuration, use "make-minimal" wrapper.
 
 BOARD ?= qemu_x86
-CONF_FILE = prj.conf
+CONF_FILE = prj_$(BOARD)_merged.conf
 OUTDIR_PREFIX = $(BOARD)
 
 # Default heap size is 16KB, which is on conservative side, to let
@@ -17,15 +17,20 @@ OUTDIR_PREFIX = $(BOARD)
 MICROPY_HEAP_SIZE = 16384
 FROZEN_DIR = scripts
 
+# Default target
+all:
+
 # Zephyr (generated) config files - must be defined before include below
 Z_EXPORTS = outdir/$(OUTDIR_PREFIX)/Makefile.export
+ifneq ($(MAKECMDGOALS), clean)
 include $(Z_EXPORTS)
+endif
 
 include ../py/mkenv.mk
-include ../py/py.mk
+include $(TOP)/py/py.mk
 
 INC += -I.
-INC += -I..
+INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(ZEPHYR_BASE)/net/ip
 INC += -I$(ZEPHYR_BASE)/net/ip/contiki
@@ -54,14 +59,14 @@ OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 CFLAGS = $(KBUILD_CFLAGS) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \
 	 -std=gnu99 -fomit-frame-pointer -DNDEBUG -DMICROPY_HEAP_SIZE=$(MICROPY_HEAP_SIZE) $(CFLAGS_EXTRA) $(INC)
 
-include ../py/mkrules.mk
+include $(TOP)/py/mkrules.mk
 
+# We use single target here ($(Z_EXPORTS)) for simplicity, but actually
+# number of things get generated here: 'initconfig' generates C header for
+# Kconfig configuration, 'outputexports' generates make environment with CC,
+# etc., and 'lib' generates other headers which may be included by zephyr.h,
+# e.g. DTS-related.
 $(Z_EXPORTS): $(CONF_FILE)
-	# We use single target here ($(Z_EXPORTS)) for simplicity, but actually
-	# number of things get generated here: 'initconfig' generates C header for
-	# Kconfig configuration, 'outputexports' generates make environment with CC,
-	# etc., and 'lib' generates other headers which may be included by zephyr.h,
-	# e.g. DTS-related.
 	$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) CONF_FILE=$(CONF_FILE) initconfig outputexports lib
 
 GENERIC_TARGETS = all zephyr run qemu qemugdb flash debug debugserver
@@ -84,15 +89,17 @@ build/genhdr/qstr.i.last: | $(Z_EXPORTS)
 # If we recreate libmicropython, also cause zephyr.bin relink
 LIBMICROPYTHON_EXTRA_CMD = -$(RM) -f outdir/$(OUTDIR_PREFIX)/zephyr.lnk
 
-# Clean Zephyr things too
-clean: z_clean
+# MicroPython's global clean cleans everything, fast
+CLEAN_EXTRA = outdir
 
+# Clean Zephyr things in Zephyr way
 z_clean:
 	$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) clean
 
-.PHONY: prj.conf
-prj.conf: prj_base.conf
+# This rule is for prj_$(BOARD)_merged.conf, not $(CONF_FILE), which
+# can be overriden
+prj_$(BOARD)_merged.conf: prj_base.conf prj_$(BOARD).conf
 	$(PYTHON) makeprj.py prj_base.conf prj_$(BOARD).conf $@
 
 test:
-	cd ../tests && ./run-tests --target minimal --device "execpty:make -C ../zephyr run BOARD=$(BOARD) QEMU_PTY=1"
+	cd $(TOP)/tests && ./run-tests --target minimal --device "execpty:make -C ../zephyr run BOARD=$(BOARD) QEMU_PTY=1"
diff --git a/zephyr/machine_pin.c b/zephyr/machine_pin.c
index 38971399c..0e2efcd95 100644
--- a/zephyr/machine_pin.c
+++ b/zephyr/machine_pin.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -170,18 +170,18 @@ STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return -1;
 }
 
-STATIC const mp_map_elem_t machine_pin_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     // instance methods
-    { MP_OBJ_NEW_QSTR(MP_QSTR_init),    (mp_obj_t)&machine_pin_init_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_value),   (mp_obj_t)&machine_pin_value_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_off),     (mp_obj_t)&machine_pin_off_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_on),      (mp_obj_t)&machine_pin_on_obj },
+    { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off),     MP_ROM_PTR(&machine_pin_off_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on),      MP_ROM_PTR(&machine_pin_on_obj) },
 
     // class constants
-    { MP_OBJ_NEW_QSTR(MP_QSTR_IN),        MP_OBJ_NEW_SMALL_INT(GPIO_DIR_IN) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_OUT),       MP_OBJ_NEW_SMALL_INT(GPIO_DIR_OUT) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_UP),   MP_OBJ_NEW_SMALL_INT(GPIO_PUD_PULL_UP) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(GPIO_PUD_PULL_DOWN) },
+    { MP_ROM_QSTR(MP_QSTR_IN),        MP_ROM_INT(GPIO_DIR_IN) },
+    { MP_ROM_QSTR(MP_QSTR_OUT),       MP_ROM_INT(GPIO_DIR_OUT) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP),   MP_ROM_INT(GPIO_PUD_PULL_UP) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PUD_PULL_DOWN) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
diff --git a/zephyr/modmachine.h b/zephyr/modmachine.h
index 596c59b17..84e4d10a8 100644
--- a/zephyr/modmachine.h
+++ b/zephyr/modmachine.h
@@ -1,5 +1,5 @@
-#ifndef __MICROPY_INCLUDED_ZEPHYR_MODMACHINE_H__
-#define __MICROPY_INCLUDED_ZEPHYR_MODMACHINE_H__
+#ifndef MICROPY_INCLUDED_ZEPHYR_MODMACHINE_H
+#define MICROPY_INCLUDED_ZEPHYR_MODMACHINE_H
 
 #include "py/obj.h"
 
@@ -13,4 +13,4 @@ typedef struct _machine_pin_obj_t {
     uint32_t pin;
 } machine_pin_obj_t;
 
-#endif // __MICROPY_INCLUDED_ZEPHYR_MODMACHINE_H__
+#endif // MICROPY_INCLUDED_ZEPHYR_MODMACHINE_H
diff --git a/zephyr/modusocket.c b/zephyr/modusocket.c
index cec0eec7c..e021c3a44 100644
--- a/zephyr/modusocket.c
+++ b/zephyr/modusocket.c
@@ -37,6 +37,9 @@
 #include <net/net_context.h>
 #include <net/net_pkt.h>
 #include <net/dns_resolve.h>
+#ifdef CONFIG_NET_SOCKETS
+#include <net/socket.h>
+#endif
 
 #define DEBUG_PRINT 0
 #if DEBUG_PRINT // print debugging info
@@ -47,11 +50,7 @@
 
 typedef struct _socket_obj_t {
     mp_obj_base_t base;
-    struct net_context *ctx;
-    union {
-        struct k_fifo recv_q;
-        struct k_fifo accept_q;
-    };
+    int ctx;
 
     #define STATE_NEW 0
     #define STATE_CONNECTING 1
@@ -62,42 +61,13 @@ typedef struct _socket_obj_t {
 
 STATIC const mp_obj_type_t socket_type;
 
-// k_fifo extended API
-
-static inline void *_k_fifo_peek_head(struct k_fifo *fifo)
-{
-#if KERNEL_VERSION_NUMBER < 0x010763 /* 1.7.99 */
-    return sys_slist_peek_head(&fifo->data_q);
-#else
-    return sys_slist_peek_head(&fifo->_queue.data_q);
-#endif
-}
-
-static inline void *_k_fifo_peek_tail(struct k_fifo *fifo)
-{
-#if KERNEL_VERSION_NUMBER < 0x010763 /* 1.7.99 */
-    return sys_slist_peek_tail(&fifo->data_q);
-#else
-    return sys_slist_peek_tail(&fifo->_queue.data_q);
-#endif
-}
-
-static inline void _k_fifo_wait_non_empty(struct k_fifo *fifo, int32_t timeout)
-{
-    struct k_poll_event events[] = {
-        K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_FIFO_DATA_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, fifo),
-    };
-
-    k_poll(events, MP_ARRAY_SIZE(events), timeout);
-    DEBUG_printf("poll res: %d\n", events[0].state);
-}
-
 // Helper functions
 
 #define RAISE_ERRNO(x) { int _err = x; if (_err < 0) mp_raise_OSError(-_err); }
+#define RAISE_SOCK_ERRNO(x) { if ((int)(x) == -1) mp_raise_OSError(errno); }
 
 STATIC void socket_check_closed(socket_obj_t *socket) {
-    if (socket->ctx == NULL) {
+    if (socket->ctx == -1) {
         // already closed
         mp_raise_OSError(EBADF);
     }
@@ -109,7 +79,7 @@ STATIC void parse_inet_addr(socket_obj_t *socket, mp_obj_t addr_in, struct socka
 
     mp_obj_t *addr_items;
     mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
-    sockaddr_in->sin_family = net_context_get_family(socket->ctx);
+    sockaddr_in->sin_family = net_context_get_family((void*)socket->ctx);
     RAISE_ERRNO(net_addr_pton(sockaddr_in->sin_family, mp_obj_str_get_str(addr_items[0]), &sockaddr_in->sin_addr));
     sockaddr_in->sin_port = htons(mp_obj_get_int(addr_items[1]));
 }
@@ -118,8 +88,8 @@ STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
     // We employ the fact that port and address offsets are the same for IPv4 & IPv6
     struct sockaddr_in6 *sockaddr_in6 = (struct sockaddr_in6*)addr;
     char buf[40];
-    net_addr_ntop(addr->family, &sockaddr_in6->sin6_addr, buf, sizeof(buf));
-    mp_obj_tuple_t *tuple = mp_obj_new_tuple(addr->family == AF_INET ? 2 : 4, NULL);
+    net_addr_ntop(addr->sa_family, &sockaddr_in6->sin6_addr, buf, sizeof(buf));
+    mp_obj_tuple_t *tuple = mp_obj_new_tuple(addr->sa_family == AF_INET ? 2 : 4, NULL);
 
     tuple->items[0] = mp_obj_new_str(buf, strlen(buf), false);
     // We employ the fact that port offset is the same for IPv4 & IPv6
@@ -127,7 +97,7 @@ STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
     //tuple->items[1] = mp_obj_new_int(ntohs(((struct sockaddr_in*)addr)->sin_port));
     tuple->items[1] = port;
 
-    if (addr->family == AF_INET6) {
+    if (addr->sa_family == AF_INET6) {
         tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0); // flow_info
         tuple->items[3] = MP_OBJ_NEW_SMALL_INT(sockaddr_in6->sin6_scope_id);
     }
@@ -135,78 +105,9 @@ STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
     return MP_OBJ_FROM_PTR(tuple);
 }
 
-// Copy data from Zephyr net_buf chain into linear buffer.
-// We don't use net_pkt_read(), because it's weird (e.g., we'd like to
-// free processed data fragment ASAP, while net_pkt_read() holds onto
-// the whole fragment chain to do its deeds, and that's minor comparing
-// to the fact that it copies data byte by byte).
-static char *net_pkt_gather(struct net_pkt *pkt, char *to, unsigned max_len) {
-    struct net_buf *tmp = pkt->frags;
-
-    while (tmp && max_len) {
-        unsigned len = tmp->len;
-        if (len > max_len) {
-            len = max_len;
-        }
-        memcpy(to, tmp->data, len);
-        to += len;
-        max_len -= len;
-        tmp = net_pkt_frag_del(pkt, NULL, tmp);
-    }
-
-    return to;
-}
-
-// Callback for incoming packets.
-static void sock_received_cb(struct net_context *context, struct net_pkt *pkt, int status, void *user_data) {
-    socket_obj_t *socket = (socket_obj_t*)user_data;
-    DEBUG_printf("recv cb: context: %p, status: %d, pkt: %p", context, status, pkt);
-    if (pkt) {
-        DEBUG_printf(" (appdatalen=%d), token: %p", pkt->appdatalen, net_pkt_token(pkt));
-    }
-    DEBUG_printf("\n");
-    #if DEBUG_PRINT > 1
-    net_pkt_print_frags(pkt);
-    #endif
-
-    // if net_buf == NULL, EOF
-    if (pkt == NULL) {
-        struct net_pkt *last_pkt = _k_fifo_peek_tail(&socket->recv_q);
-        if (last_pkt == NULL) {
-            socket->state = STATE_PEER_CLOSED;
-            k_fifo_cancel_wait(&socket->recv_q);
-            DEBUG_printf("Marked socket %p as peer-closed\n", socket);
-        } else {
-            // We abuse "buf_sent" flag to store EOF flag
-            net_pkt_set_sent(last_pkt, true);
-            DEBUG_printf("Set EOF flag on %p\n", last_pkt);
-        }
-        return;
-    }
-
-    // Make sure that "EOF flag" is not set
-    net_pkt_set_sent(pkt, false);
-
-    // We don't care about packet header, so get rid of it asap
-    unsigned header_len = net_pkt_appdata(pkt) - pkt->frags->data;
-    net_buf_pull(pkt->frags, header_len);
-
-    k_fifo_put(&socket->recv_q, pkt);
-}
-
-// Callback for incoming connections.
-static void sock_accepted_cb(struct net_context *new_ctx, struct sockaddr *addr, socklen_t addrlen, int status, void *user_data) {
-    socket_obj_t *socket = (socket_obj_t*)user_data;
-    DEBUG_printf("accept cb: context: %p, status: %d, new ctx: %p\n", socket->ctx, status, new_ctx);
-    DEBUG_printf("new_ctx ref_cnt: %d\n", new_ctx->refcount);
-
-    k_fifo_put(&socket->accept_q, new_ctx);
-}
-
 socket_obj_t *socket_new(void) {
     socket_obj_t *socket = m_new_obj_with_finaliser(socket_obj_t);
     socket->base.type = (mp_obj_t)&socket_type;
-    k_fifo_init(&socket->recv_q);
     socket->state = STATE_NEW;
     return socket;
 }
@@ -215,10 +116,10 @@ socket_obj_t *socket_new(void) {
 
 STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     socket_obj_t *self = self_in;
-    if (self->ctx == NULL) {
+    if (self->ctx == -1) {
         mp_printf(print, "<socket NULL>");
     } else {
-        struct net_context *ctx = self->ctx;
+        struct net_context *ctx = (void*)self->ctx;
         mp_printf(print, "<socket %p type=%d>", ctx, net_context_get_type(ctx));
     }
 }
@@ -249,7 +150,8 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         }
     }
 
-    RAISE_ERRNO(net_context_get(family, socktype, proto, &socket->ctx));
+    socket->ctx = zsock_socket(family, socktype, proto);
+    RAISE_SOCK_ERRNO(socket->ctx);
 
     return MP_OBJ_FROM_PTR(socket);
 }
@@ -261,14 +163,9 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     struct sockaddr sockaddr;
     parse_inet_addr(socket, addr_in, &sockaddr);
 
-    RAISE_ERRNO(net_context_bind(socket->ctx, &sockaddr, sizeof(sockaddr)));
-    // For DGRAM socket, we expect to receive packets after call to bind(),
-    // but for STREAM socket, next expected operation is listen(), which
-    // doesn't work if recv callback is set.
-    if (net_context_get_type(socket->ctx) == SOCK_DGRAM) {
-        DEBUG_printf("Setting recv cb after bind\n");
-        RAISE_ERRNO(net_context_recv(socket->ctx, sock_received_cb, K_NO_WAIT, socket));
-    }
+    int res = zsock_bind(socket->ctx, &sockaddr, sizeof(sockaddr));
+    RAISE_SOCK_ERRNO(res);
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
@@ -280,9 +177,9 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     struct sockaddr sockaddr;
     parse_inet_addr(socket, addr_in, &sockaddr);
 
-    RAISE_ERRNO(net_context_connect(socket->ctx, &sockaddr, sizeof(sockaddr), NULL, K_FOREVER, NULL));
-    DEBUG_printf("Setting recv cb after connect()\n");
-    RAISE_ERRNO(net_context_recv(socket->ctx, sock_received_cb, K_NO_WAIT, socket));
+    int res = zsock_connect(socket->ctx, &sockaddr, sizeof(sockaddr));
+    RAISE_SOCK_ERRNO(res);
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
@@ -292,8 +189,9 @@ STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
     socket_check_closed(socket);
 
     mp_int_t backlog = mp_obj_get_int(backlog_in);
-    RAISE_ERRNO(net_context_listen(socket->ctx, backlog));
-    RAISE_ERRNO(net_context_accept(socket->ctx, sock_accepted_cb, K_NO_WAIT, socket));
+    int res = zsock_listen(socket->ctx, backlog);
+    RAISE_SOCK_ERRNO(res);
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen);
@@ -302,14 +200,12 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     socket_obj_t *socket = self_in;
     socket_check_closed(socket);
 
-    struct net_context *ctx = k_fifo_get(&socket->accept_q, K_FOREVER);
-    // Was overwritten by fifo
-    ctx->refcount = 1;
+    struct sockaddr sockaddr;
+    socklen_t addrlen = sizeof(sockaddr);
+    int ctx = zsock_accept(socket->ctx, &sockaddr, &addrlen);
 
     socket_obj_t *socket2 = socket_new();
     socket2->ctx = ctx;
-    DEBUG_printf("Setting recv cb after accept()\n");
-    RAISE_ERRNO(net_context_recv(ctx, sock_received_cb, K_NO_WAIT, socket2));
 
     mp_obj_tuple_t *client = mp_obj_new_tuple(2, NULL);
     client->items[0] = MP_OBJ_FROM_PTR(socket2);
@@ -322,28 +218,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 
 STATIC mp_uint_t sock_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     socket_obj_t *socket = self_in;
-    if (socket->ctx == NULL) {
+    if (socket->ctx == -1) {
         // already closed
         *errcode = EBADF;
         return MP_STREAM_ERROR;
     }
 
-    struct net_pkt *send_pkt = net_pkt_get_tx(socket->ctx, K_FOREVER);
-
-    unsigned len = net_if_get_mtu(net_context_get_iface(socket->ctx));
-    // Arbitrary value to account for protocol headers
-    len -= 64;
-    if (len > size) {
-        len = size;
-    }
-
-    // TODO: Return value of 0 is a hard case (as we wait forever, should
-    // not happen).
-    len = net_pkt_append(send_pkt, len, buf, K_FOREVER);
-
-    int err = net_context_send(send_pkt, /*cb*/NULL, K_FOREVER, NULL, NULL);
-    if (err < 0) {
-        *errcode = -err;
+    ssize_t len = zsock_send(socket->ctx, buf, size, 0);
+    if (len == -1) {
+        *errcode = errno;
         return MP_STREAM_ERROR;
     }
 
@@ -364,81 +247,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
 
 STATIC mp_uint_t sock_read(mp_obj_t self_in, void *buf, mp_uint_t max_len, int *errcode) {
     socket_obj_t *socket = self_in;
-    if (socket->ctx == NULL) {
+    if (socket->ctx == -1) {
         // already closed
         *errcode = EBADF;
         return MP_STREAM_ERROR;
     }
 
-    enum net_sock_type sock_type = net_context_get_type(socket->ctx);
-    unsigned recv_len;
-
-    if (sock_type == SOCK_DGRAM) {
-
-        struct net_pkt *pkt = k_fifo_get(&socket->recv_q, K_FOREVER);
-
-        recv_len = net_pkt_appdatalen(pkt);
-        DEBUG_printf("recv: pkt=%p, appdatalen: %d\n", pkt, recv_len);
-
-        if (recv_len > max_len) {
-            recv_len = max_len;
-        }
-
-        net_pkt_gather(pkt, buf, recv_len);
-        net_pkt_unref(pkt);
-
-    } else if (sock_type == SOCK_STREAM) {
-
-        do {
-
-            if (socket->state == STATE_PEER_CLOSED) {
-                return 0;
-            }
-
-            _k_fifo_wait_non_empty(&socket->recv_q, K_FOREVER);
-            struct net_pkt *pkt = _k_fifo_peek_head(&socket->recv_q);
-            if (pkt == NULL) {
-                DEBUG_printf("TCP recv: NULL return from fifo\n");
-                continue;
-            }
-
-            DEBUG_printf("TCP recv: cur_pkt: %p\n", pkt);
-
-            struct net_buf *frag = pkt->frags;
-            if (frag == NULL) {
-                printf("net_pkt has empty fragments on start!\n");
-                assert(0);
-            }
-
-            unsigned frag_len = frag->len;
-            recv_len = frag_len;
-            if (recv_len > max_len) {
-                recv_len = max_len;
-            }
-            DEBUG_printf("%d data bytes in head frag, going to read %d\n", frag_len, recv_len);
-
-            memcpy(buf, frag->data, recv_len);
-
-            if (recv_len != frag_len) {
-                net_buf_pull(frag, recv_len);
-            } else {
-                frag = net_pkt_frag_del(pkt, NULL, frag);
-                if (frag == NULL) {
-                    DEBUG_printf("Finished processing pkt %p\n", pkt);
-                    // Drop head packet from queue
-                    k_fifo_get(&socket->recv_q, K_NO_WAIT);
-
-                    // If "sent" flag was set, it's last packet and we reached EOF
-                    if (net_pkt_sent(pkt)) {
-                        socket->state = STATE_PEER_CLOSED;
-                    }
-                    net_pkt_unref(pkt);
-                }
-            }
-        // Keep repeating while we're getting empty fragments
-        // Zephyr IP stack appears to have fed empty net_buf's with empty
-        // frags for various TCP control packets - in previous versions.
-        } while (recv_len == 0);
+    ssize_t recv_len = zsock_recv(socket->ctx, buf, max_len, 0);
+    if (recv_len == -1) {
+        *errcode = errno;
+        return MP_STREAM_ERROR;
     }
 
     return recv_len;
@@ -483,30 +301,31 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_mak
 
 STATIC mp_obj_t socket_close(mp_obj_t self_in) {
     socket_obj_t *socket = self_in;
-    if (socket->ctx != NULL) {
-        RAISE_ERRNO(net_context_put(socket->ctx));
-        socket->ctx = NULL;
+    if (socket->ctx != -1) {
+        int res = zsock_close(socket->ctx);
+        RAISE_SOCK_ERRNO(res);
+        socket->ctx = -1;
     }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_close_obj, socket_close);
 
-STATIC const mp_map_elem_t socket_locals_dict_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___del__), (mp_obj_t)&socket_close_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&socket_close_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_bind), (mp_obj_t)&socket_bind_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_connect), (mp_obj_t)&socket_connect_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_listen), (mp_obj_t)&socket_listen_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_accept), (mp_obj_t)&socket_accept_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&socket_send_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_recv), (mp_obj_t)&socket_recv_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_setsockopt), (mp_obj_t)&socket_setsockopt_obj },
-
-    { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_readinto), (mp_obj_t)&mp_stream_readinto_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj},
-    { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_makefile), (mp_obj_t)&socket_makefile_obj },
+STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&socket_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&socket_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bind), MP_ROM_PTR(&socket_bind_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&socket_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listen), MP_ROM_PTR(&socket_listen_obj) },
+    { MP_ROM_QSTR(MP_QSTR_accept), MP_ROM_PTR(&socket_accept_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&socket_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&socket_recv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socket_setsockopt_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_makefile), MP_ROM_PTR(&socket_makefile_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
@@ -610,22 +429,22 @@ STATIC mp_obj_t pkt_get_info(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(pkt_get_info_obj, pkt_get_info);
 
-STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usocket) },
+STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usocket) },
     // objects
-    { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&socket_type },
+    { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
     // class constants
-    { MP_OBJ_NEW_QSTR(MP_QSTR_AF_INET), MP_OBJ_NEW_SMALL_INT(AF_INET) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_AF_INET6), MP_OBJ_NEW_SMALL_INT(AF_INET6) },
+    { MP_ROM_QSTR(MP_QSTR_AF_INET), MP_ROM_INT(AF_INET) },
+    { MP_ROM_QSTR(MP_QSTR_AF_INET6), MP_ROM_INT(AF_INET6) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_STREAM), MP_OBJ_NEW_SMALL_INT(SOCK_STREAM) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_DGRAM), MP_OBJ_NEW_SMALL_INT(SOCK_DGRAM) },
+    { MP_ROM_QSTR(MP_QSTR_SOCK_STREAM), MP_ROM_INT(SOCK_STREAM) },
+    { MP_ROM_QSTR(MP_QSTR_SOCK_DGRAM), MP_ROM_INT(SOCK_DGRAM) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SOL_SOCKET), MP_OBJ_NEW_SMALL_INT(1) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SO_REUSEADDR), MP_OBJ_NEW_SMALL_INT(2) },
+    { MP_ROM_QSTR(MP_QSTR_SOL_SOCKET), MP_ROM_INT(1) },
+    { MP_ROM_QSTR(MP_QSTR_SO_REUSEADDR), MP_ROM_INT(2) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_getaddrinfo), (mp_obj_t)&mod_getaddrinfo_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_pkt_get_info), (mp_obj_t)&pkt_get_info_obj },
+    { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&mod_getaddrinfo_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pkt_get_info), MP_ROM_PTR(&pkt_get_info_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
diff --git a/zephyr/modutime.c b/zephyr/modutime.c
index 0c268046a..a5d32fe66 100644
--- a/zephyr/modutime.c
+++ b/zephyr/modutime.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/zephyr/modzephyr.c b/zephyr/modzephyr.c
index 4bac5c970..265fc882d 100644
--- a/zephyr/modzephyr.c
+++ b/zephyr/modzephyr.c
@@ -28,6 +28,7 @@
 #if MICROPY_PY_ZEPHYR
 
 #include <zephyr.h>
+#include <misc/stack.h>
 
 #include "py/runtime.h"
 
@@ -36,9 +37,38 @@ STATIC mp_obj_t mod_is_preempt_thread(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_is_preempt_thread_obj, mod_is_preempt_thread);
 
+STATIC mp_obj_t mod_current_tid(void) {
+    return MP_OBJ_NEW_SMALL_INT(k_current_get());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_current_tid_obj, mod_current_tid);
+
+STATIC mp_obj_t mod_stacks_analyze(void) {
+    k_call_stacks_analyze();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_stacks_analyze_obj, mod_stacks_analyze);
+
+#ifdef CONFIG_NET_SHELL
+
+//int net_shell_cmd_iface(int argc, char *argv[]);
+
+STATIC mp_obj_t mod_shell_net_iface(void) {
+    net_shell_cmd_iface(0, NULL);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_shell_net_iface_obj, mod_shell_net_iface);
+
+#endif // CONFIG_NET_SHELL
+
 STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zephyr) },
     { MP_ROM_QSTR(MP_QSTR_is_preempt_thread), MP_ROM_PTR(&mod_is_preempt_thread_obj) },
+    { MP_ROM_QSTR(MP_QSTR_current_tid), MP_ROM_PTR(&mod_current_tid_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stacks_analyze), MP_ROM_PTR(&mod_stacks_analyze_obj) },
+
+    #ifdef CONFIG_NET_SHELL
+    { MP_ROM_QSTR(MP_QSTR_shell_net_iface), MP_ROM_PTR(&mod_shell_net_iface_obj) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
diff --git a/zephyr/mpconfigport.h b/zephyr/mpconfigport.h
index 2f2526779..7ff05f45a 100644
--- a/zephyr/mpconfigport.h
+++ b/zephyr/mpconfigport.h
@@ -98,9 +98,6 @@
 
 typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
-
-typedef void *machine_ptr_t; // must be of pointer size
-typedef const void *machine_const_ptr_t; // must be of pointer size
 typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
@@ -115,7 +112,7 @@ extern const struct _mp_obj_module_t mp_module_zephyr;
 
 #if MICROPY_PY_USOCKET
 #define MICROPY_PY_USOCKET_DEF { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
-#define MICROPY_PY_USOCKET_WEAK_DEF { MP_OBJ_NEW_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_usocket) },
+#define MICROPY_PY_USOCKET_WEAK_DEF { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_usocket) },
 #else
 #define MICROPY_PY_USOCKET_DEF
 #define MICROPY_PY_USOCKET_WEAK_DEF
@@ -134,13 +131,13 @@ extern const struct _mp_obj_module_t mp_module_zephyr;
 #endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
+    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     MICROPY_PY_USOCKET_DEF \
     MICROPY_PY_UTIME_DEF \
     MICROPY_PY_ZEPHYR_DEF \
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_time) }, \
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_time) }, \
     MICROPY_PY_USOCKET_WEAK_DEF \
 
 // extra built in names to add to the global namespace
diff --git a/zephyr/mpconfigport_minimal.h b/zephyr/mpconfigport_minimal.h
index 772335c0a..f0e57d756 100644
--- a/zephyr/mpconfigport_minimal.h
+++ b/zephyr/mpconfigport_minimal.h
@@ -80,9 +80,6 @@
 
 typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
-
-typedef void *machine_ptr_t; // must be of pointer size
-typedef const void *machine_const_ptr_t; // must be of pointer size
 typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
diff --git a/zephyr/prj_96b_carbon.conf b/zephyr/prj_96b_carbon.conf
index 3e41e2532..40b57e69c 100644
--- a/zephyr/prj_96b_carbon.conf
+++ b/zephyr/prj_96b_carbon.conf
@@ -1,2 +1,2 @@
 # TODO: Enable networking
-CONFIG_NETWORKING=n
+CONFIG_NETWORKING=y
diff --git a/zephyr/prj_base.conf b/zephyr/prj_base.conf
index 4346f20bf..c3ba2812f 100644
--- a/zephyr/prj_base.conf
+++ b/zephyr/prj_base.conf
@@ -14,6 +14,7 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
+CONFIG_NET_SOCKETS=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_NBUF_RX_COUNT=5
 
@@ -23,9 +24,17 @@ CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=2
 CONFIG_DNS_SERVER_IP_ADDRESSES=y
 CONFIG_DNS_SERVER1="192.0.2.2"
 
+# Diagnostics and debugging
+
+# Required for zephyr.stack_analyze()
+CONFIG_INIT_STACKS=y
+
 # Required for usocket.pkt_get_info()
 CONFIG_NET_BUF_POOL_USAGE=y
 
+# Required for usocket.shell_*()
+#CONFIG_NET_SHELL=y
+
 # Uncomment to enable "INFO" level net_buf logging
 #CONFIG_NET_LOG=y
 #CONFIG_NET_DEBUG_NET_BUF=y