summaryrefslogtreecommitdiffstatshomepage
path: root/extmod
diff options
context:
space:
mode:
Diffstat (limited to 'extmod')
-rw-r--r--extmod/machine_pinbase.c88
-rw-r--r--extmod/machine_pinbase.h35
-rw-r--r--extmod/modbtree.c353
-rw-r--r--extmod/modlwip.c52
-rw-r--r--extmod/moduos_dupterm.c16
-rw-r--r--extmod/modussl.c8
-rw-r--r--extmod/modwebrepl.c3
-rw-r--r--extmod/modwebsocket.c3
-rw-r--r--extmod/vfs_fat.c4
-rw-r--r--extmod/vfs_fat_file.c4
-rw-r--r--extmod/virtpin.c4
11 files changed, 537 insertions, 33 deletions
diff --git a/extmod/machine_pinbase.c b/extmod/machine_pinbase.c
new file mode 100644
index 0000000000..3c1f094834
--- /dev/null
+++ b/extmod/machine_pinbase.c
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Paul Sokolovsky
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpconfig.h"
+#if MICROPY_PY_MACHINE
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "extmod/virtpin.h"
+
+// PinBase class
+
+// As this is abstract class, its instance is null.
+// But there should be an instance, as the rest of instance code
+// expects that there will be concrete object for inheritance.
+typedef struct _mp_pinbase_t {
+ mp_obj_base_t base;
+} mp_pinbase_t;
+
+STATIC const mp_obj_type_t pinbase_type;
+
+STATIC mp_pinbase_t pinbase_singleton = {
+ .base = { &pinbase_type },
+};
+
+STATIC mp_obj_t pinbase_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+ (void)type;
+ (void)n_args;
+ (void)n_kw;
+ (void)args;
+ return MP_OBJ_FROM_PTR(&pinbase_singleton);
+}
+
+mp_uint_t pinbase_ioctl(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *errcode);
+mp_uint_t pinbase_ioctl(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *errcode) {
+ (void)errcode;
+ switch (request) {
+ case MP_PIN_READ: {
+ mp_obj_t dest[2];
+ mp_load_method(obj, MP_QSTR_value, dest);
+ return mp_obj_get_int(mp_call_method_n_kw(0, 0, dest));
+ }
+ case MP_PIN_WRITE: {
+ mp_obj_t dest[3];
+ mp_load_method(obj, MP_QSTR_value, dest);
+ dest[2] = (arg == 0 ? mp_const_false : mp_const_true);
+ mp_call_method_n_kw(1, 0, dest);
+ return 0;
+ }
+ }
+ return -1;
+}
+
+STATIC const mp_pin_p_t pinbase_pin_p = {
+ .ioctl = pinbase_ioctl,
+};
+
+const mp_obj_type_t machine_pinbase_type = {
+ { &mp_type_type },
+ .name = MP_QSTR_PinBase,
+ .make_new = pinbase_make_new,
+ .protocol = &pinbase_pin_p,
+};
+
+#endif // MICROPY_PY_MACHINE
diff --git a/extmod/machine_pinbase.h b/extmod/machine_pinbase.h
new file mode 100644
index 0000000000..ece3384cc6
--- /dev/null
+++ b/extmod/machine_pinbase.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Paul Sokolovsky
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#ifndef __MICROPY_INCLUDED_EXTMOD_MACHINE_PINBASE_H__
+#define __MICROPY_INCLUDED_EXTMOD_MACHINE_PINBASE_H__
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t machine_pinbase_type;
+
+#endif // __MICROPY_INCLUDED_EXTMOD_MACHINE_PINBASE_H__
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
new file mode 100644
index 0000000000..0a0c5271c0
--- /dev/null
+++ b/extmod/modbtree.c
@@ -0,0 +1,353 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Paul Sokolovsky
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include "py/nlr.h"
+#include "py/runtime.h"
+
+#if MICROPY_PY_BTREE
+
+#include <db.h>
+#include <../../btree/btree.h>
+
+typedef struct _mp_obj_btree_t {
+ mp_obj_base_t base;
+ DB *db;
+ mp_obj_t start_key;
+ mp_obj_t end_key;
+ #define FLAG_END_KEY_INCL 1
+ #define FLAG_DESC 2
+ #define FLAG_ITER_TYPE_MASK 0xc0
+ #define FLAG_ITER_KEYS 0x40
+ #define FLAG_ITER_VALUES 0x80
+ #define FLAG_ITER_ITEMS 0xc0
+ byte flags;
+ byte next_flags;
+} mp_obj_btree_t;
+
+STATIC const mp_obj_type_t btree_type;
+
+#define CHECK_ERROR(res) \
+ if (res == RET_ERROR) { \
+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno))); \
+ }
+
+void __dbpanic(DB *db) {
+ printf("__dbpanic(%p)\n", db);
+}
+
+STATIC mp_obj_btree_t *btree_new(DB *db) {
+ mp_obj_btree_t *o = m_new_obj(mp_obj_btree_t);
+ o->base.type = &btree_type;
+ o->db = db;
+ o->start_key = mp_const_none;
+ o->end_key = mp_const_none;
+ o->next_flags = 0;
+ return o;
+}
+
+STATIC void btree_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+ (void)kind;
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+ mp_printf(print, "<btree %p>", self->db);
+}
+
+STATIC mp_obj_t btree_close(mp_obj_t self_in) {
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+ return MP_OBJ_NEW_SMALL_INT(__bt_close(self->db));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(btree_close_obj, btree_close);
+
+STATIC mp_obj_t btree_put(size_t n_args, const mp_obj_t *args) {
+ (void)n_args;
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
+ DBT key, val;
+ // Different ports may have different type sizes
+ mp_uint_t v;
+ key.data = (void*)mp_obj_str_get_data(args[1], &v);
+ key.size = v;
+ val.data = (void*)mp_obj_str_get_data(args[2], &v);
+ val.size = v;
+ return MP_OBJ_NEW_SMALL_INT(__bt_put(self->db, &key, &val, 0));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_put_obj, 3, 4, btree_put);
+
+STATIC mp_obj_t btree_get(size_t n_args, const mp_obj_t *args) {
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
+ DBT key, val;
+ // Different ports may have different type sizes
+ mp_uint_t v;
+ key.data = (void*)mp_obj_str_get_data(args[1], &v);
+ key.size = v;
+ int res = __bt_get(self->db, &key, &val, 0);
+ if (res == RET_SPECIAL) {
+ if (n_args > 2) {
+ return args[2];
+ } else {
+ return mp_const_none;
+ }
+ }
+ CHECK_ERROR(res);
+ return mp_obj_new_bytes(val.data, val.size);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_get_obj, 2, 3, btree_get);
+
+STATIC mp_obj_t btree_seq(size_t n_args, const mp_obj_t *args) {
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
+ int flags = MP_OBJ_SMALL_INT_VALUE(args[1]);
+ DBT key, val;
+ if (n_args > 2) {
+ // Different ports may have different type sizes
+ mp_uint_t v;
+ key.data = (void*)mp_obj_str_get_data(args[2], &v);
+ key.size = v;
+ }
+
+ int res = __bt_seq(self->db, &key, &val, flags);
+ if (res == RET_SPECIAL) {
+ return mp_const_none;
+ }
+
+ mp_obj_t pair_o = mp_obj_new_tuple(2, NULL);
+ mp_obj_tuple_t *pair = MP_OBJ_TO_PTR(pair_o);
+ pair->items[0] = mp_obj_new_bytes(key.data, key.size);
+ pair->items[1] = mp_obj_new_bytes(val.data, val.size);
+ return pair_o;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_seq_obj, 2, 4, btree_seq);
+
+STATIC mp_obj_t btree_init_iter(size_t n_args, const mp_obj_t *args, byte type) {
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
+ self->next_flags = type;
+ self->start_key = mp_const_none;
+ self->end_key = mp_const_none;
+ if (n_args > 1) {
+ self->start_key = args[1];
+ if (n_args > 2) {
+ self->end_key = args[2];
+ if (n_args > 3) {
+ self->next_flags = type | MP_OBJ_SMALL_INT_VALUE(args[3]);
+ }
+ }
+ }
+ return args[0];
+}
+
+STATIC mp_obj_t btree_keys(size_t n_args, const mp_obj_t *args) {
+ return btree_init_iter(n_args, args, FLAG_ITER_KEYS);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_keys_obj, 1, 4, btree_keys);
+
+STATIC mp_obj_t btree_values(size_t n_args, const mp_obj_t *args) {
+ return btree_init_iter(n_args, args, FLAG_ITER_VALUES);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_values_obj, 1, 4, btree_values);
+
+STATIC mp_obj_t btree_items(size_t n_args, const mp_obj_t *args) {
+ return btree_init_iter(n_args, args, FLAG_ITER_ITEMS);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_items_obj, 1, 4, btree_items);
+
+STATIC mp_obj_t btree_getiter(mp_obj_t self_in) {
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+ if (self->next_flags != 0) {
+ // If we're called immediately after keys(), values(), or items(),
+ // use their setup for iteration.
+ self->flags = self->next_flags;
+ self->next_flags = 0;
+ } else {
+ // Otherwise, iterate over all keys.
+ self->flags = FLAG_ITER_KEYS;
+ self->start_key = mp_const_none;
+ self->end_key = mp_const_none;
+ }
+
+ return self_in;
+}
+
+STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+ DBT key, val;
+ int res;
+ // Different ports may have different type sizes
+ mp_uint_t v;
+ bool desc = self->flags & FLAG_DESC;
+ if (self->start_key != MP_OBJ_NULL) {
+ int flags = R_FIRST;
+ if (self->start_key != mp_const_none) {
+ key.data = (void*)mp_obj_str_get_data(self->start_key, &v);
+ key.size = v;
+ flags = R_CURSOR;
+ } else if (desc) {
+ flags = R_LAST;
+ }
+ res = __bt_seq(self->db, &key, &val, flags);
+ self->start_key = MP_OBJ_NULL;
+ } else {
+ res = __bt_seq(self->db, &key, &val, desc ? R_PREV : R_NEXT);
+ }
+
+ if (res == RET_SPECIAL) {
+ return MP_OBJ_STOP_ITERATION;
+ }
+ CHECK_ERROR(res);
+
+ if (self->end_key != mp_const_none) {
+ DBT end_key;
+ end_key.data = (void*)mp_obj_str_get_data(self->end_key, &v);
+ end_key.size = v;
+ BTREE *t = self->db->internal;
+ int cmp = t->bt_cmp(&key, &end_key);
+ if (desc) {
+ cmp = -cmp;
+ }
+ if (self->flags & FLAG_END_KEY_INCL) {
+ cmp--;
+ }
+ if (cmp >= 0) {
+ self->end_key = MP_OBJ_NULL;
+ return MP_OBJ_STOP_ITERATION;
+ }
+ }
+
+ switch (self->flags & FLAG_ITER_TYPE_MASK) {
+ case FLAG_ITER_KEYS:
+ return mp_obj_new_bytes(key.data, key.size);
+ case FLAG_ITER_VALUES:
+ return mp_obj_new_bytes(val.data, val.size);
+ default: {
+ mp_obj_t pair_o = mp_obj_new_tuple(2, NULL);
+ mp_obj_tuple_t *pair = MP_OBJ_TO_PTR(pair_o);
+ pair->items[0] = mp_obj_new_bytes(key.data, key.size);
+ pair->items[1] = mp_obj_new_bytes(val.data, val.size);
+ return pair_o;
+ }
+ }
+}
+
+STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+ mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+ // Different ports may have different type sizes
+ mp_uint_t v;
+ if (value == MP_OBJ_NULL) {
+ // delete
+ DBT key;
+ key.data = (void*)mp_obj_str_get_data(index, &v);
+ key.size = v;
+ int res = __bt_delete(self->db, &key, 0);
+ if (res == RET_SPECIAL) {
+ nlr_raise(mp_obj_new_exception(&mp_type_KeyError));
+ }
+ CHECK_ERROR(res);
+ return mp_const_none;
+ } else if (value == MP_OBJ_SENTINEL) {
+ // load
+ DBT key, val;
+ key.data = (void*)mp_obj_str_get_data(index, &v);
+ key.size = v;
+ int res = __bt_get(self->db, &key, &val, 0);
+ if (res == RET_SPECIAL) {
+ nlr_raise(mp_obj_new_exception(&mp_type_KeyError));
+ }
+ CHECK_ERROR(res);
+ return mp_obj_new_bytes(val.data, val.size);
+ } else {
+ // store
+ DBT key, val;
+ key.data = (void*)mp_obj_str_get_data(index, &v);
+ key.size = v;
+ val.data = (void*)mp_obj_str_get_data(value, &v);
+ val.size = v;
+ int res = __bt_put(self->db, &key, &val, 0);
+ CHECK_ERROR(res);
+ return mp_const_none;
+ }
+}
+
+STATIC const mp_rom_map_elem_t btree_locals_dict_table[] = {
+ { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&btree_close_obj) },
+ { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&btree_get_obj) },
+ { MP_ROM_QSTR(MP_QSTR_put), MP_ROM_PTR(&btree_put_obj) },
+ { MP_ROM_QSTR(MP_QSTR_seq), MP_ROM_PTR(&btree_seq_obj) },
+ { MP_ROM_QSTR(MP_QSTR_keys), MP_ROM_PTR(&btree_keys_obj) },
+ { MP_ROM_QSTR(MP_QSTR_values), MP_ROM_PTR(&btree_values_obj) },
+ { MP_ROM_QSTR(MP_QSTR_items), MP_ROM_PTR(&btree_items_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(btree_locals_dict, btree_locals_dict_table);
+
+STATIC const mp_obj_type_t btree_type = {
+ { &mp_type_type },
+ // Save on qstr's, reuse same as for module
+ .name = MP_QSTR_btree,
+ .print = btree_print,
+ .getiter = btree_getiter,
+ .iternext = btree_iternext,
+ .subscr = btree_subscr,
+ .locals_dict = (void*)&btree_locals_dict,
+};
+
+STATIC mp_obj_t mod_btree_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+ static const mp_arg_t allowed_args[] = {
+ { MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+ };
+
+ const char *fname = NULL;
+ if (pos_args[0] != mp_const_none) {
+ fname = mp_obj_str_get_str(pos_args[0]);
+ }
+
+ struct {
+ mp_arg_val_t server_side;
+ } args;
+ mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
+ MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t*)&args);
+
+ DB *db = __bt_open(fname, /*flags*/O_CREAT | O_RDWR, /*mode*/0770, /*openinfo*/NULL, /*dflags*/0);
+ return MP_OBJ_FROM_PTR(btree_new(db));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_btree_open_obj, 1, mod_btree_open);
+
+STATIC const mp_rom_map_elem_t mp_module_btree_globals_table[] = {
+ { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_btree) },
+ { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mod_btree_open_obj) },
+ { MP_ROM_QSTR(MP_QSTR_INCL), MP_ROM_INT(FLAG_END_KEY_INCL) },
+ { MP_ROM_QSTR(MP_QSTR_DESC), MP_ROM_INT(FLAG_DESC) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_module_btree_globals, mp_module_btree_globals_table);
+
+const mp_obj_module_t mp_module_btree = {
+ .base = { &mp_type_module },
+ .name = MP_QSTR_btree,
+ .globals = (mp_obj_dict_t*)&mp_module_btree_globals,
+};
+
+#endif // MICROPY_PY_BTREE
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index cb7cc6596f..80df662647 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -239,7 +239,7 @@ typedef struct _lwip_socket_obj_t {
byte peer[4];
mp_uint_t peer_port;
mp_uint_t timeout;
- uint16_t leftover_count;
+ uint16_t recv_offset;
uint8_t domain;
uint8_t type;
@@ -354,11 +354,17 @@ STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err
socket->state = STATE_PEER_CLOSED;
exec_user_callback(socket);
return ERR_OK;
- } else if (socket->incoming.pbuf != NULL) {
- // No room in the inn, let LWIP know it's still responsible for delivery later
+ }
+
+ if (socket->incoming.pbuf == NULL) {
+ socket->incoming.pbuf = p;
+ } else {
+ #ifdef SOCKET_SINGLE_PBUF
return ERR_BUF;
+ #else
+ pbuf_cat(socket->incoming.pbuf, p);
+ #endif
}
- socket->incoming.pbuf = p;
exec_user_callback(socket);
@@ -536,22 +542,28 @@ STATIC mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
struct pbuf *p = socket->incoming.pbuf;
- if (socket->leftover_count == 0) {
- socket->leftover_count = p->tot_len;
+ mp_uint_t remaining = p->len - socket->recv_offset;
+ if (len > remaining) {
+ len = remaining;
}
- u16_t result = pbuf_copy_partial(p, buf, ((socket->leftover_count >= len) ? len : socket->leftover_count), (p->tot_len - socket->leftover_count));
- if (socket->leftover_count > len) {
- // More left over...
- socket->leftover_count -= len;
- } else {
+ memcpy(buf, (byte*)p->payload + socket->recv_offset, len);
+
+ remaining -= len;
+ if (remaining == 0) {
+ socket->incoming.pbuf = p->next;
+ // If we don't ref here, free() will free the entire chain,
+ // if we ref, it does what we need: frees 1st buf, and decrements
+ // next buf's refcount back to 1.
+ pbuf_ref(p->next);
pbuf_free(p);
- socket->incoming.pbuf = NULL;
- socket->leftover_count = 0;
+ socket->recv_offset = 0;
+ } else {
+ socket->recv_offset += len;
}
+ tcp_recved(socket->pcb.tcp, len);
- tcp_recved(socket->pcb.tcp, result);
- return (mp_uint_t) result;
+ return len;
}
/*******************************************************************************/
@@ -561,8 +573,8 @@ STATIC const mp_obj_type_t lwip_socket_type;
STATIC void lwip_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
lwip_socket_obj_t *self = self_in;
- mp_printf(print, "<socket state=%d timeout=%d incoming=%p remaining=%d>", self->state, self->timeout,
- self->incoming.pbuf, self->leftover_count);
+ mp_printf(print, "<socket state=%d timeout=%d incoming=%p off=%d>", self->state, self->timeout,
+ self->incoming.pbuf, self->recv_offset);
}
// FIXME: Only supports two arguments at present
@@ -612,7 +624,7 @@ STATIC mp_obj_t lwip_socket_make_new(const mp_obj_type_t *type, mp_uint_t n_args
socket->incoming.pbuf = NULL;
socket->timeout = -1;
socket->state = STATE_NEW;
- socket->leftover_count = 0;
+ socket->recv_offset = 0;
return socket;
}
@@ -749,7 +761,7 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
socket2->incoming.pbuf = NULL;
socket2->timeout = socket->timeout;
socket2->state = STATE_CONNECTED;
- socket2->leftover_count = 0;
+ socket2->recv_offset = 0;
socket2->callback = MP_OBJ_NULL;
tcp_arg(socket2->pcb.tcp, (void*)socket2);
tcp_err(socket2->pcb.tcp, _lwip_tcp_error);
@@ -1148,7 +1160,7 @@ STATIC const mp_obj_type_t lwip_socket_type = {
.name = MP_QSTR_socket,
.print = lwip_socket_print,
.make_new = lwip_socket_make_new,
- .stream_p = &lwip_socket_stream_p,
+ .protocol = &lwip_socket_stream_p,
.locals_dict = (mp_obj_t)&lwip_socket_locals_dict,
};
diff --git a/extmod/moduos_dupterm.c b/extmod/moduos_dupterm.c
index 4c9f9e4940..d888099dff 100644
--- a/extmod/moduos_dupterm.c
+++ b/extmod/moduos_dupterm.c
@@ -31,6 +31,7 @@
#include "py/nlr.h"
#include "py/runtime.h"
#include "py/objtuple.h"
+#include "py/objarray.h"
#include "py/stream.h"
#if MICROPY_PY_OS_DUPTERM
@@ -51,8 +52,16 @@ void mp_uos_dupterm_tx_strn(const char *str, size_t len) {
if (nlr_push(&nlr) == 0) {
mp_obj_t write_m[3];
mp_load_method(MP_STATE_PORT(term_obj), MP_QSTR_write, write_m);
- write_m[2] = mp_obj_new_bytearray_by_ref(len, (char*)str);
+
+ mp_obj_array_t *arr = MP_OBJ_TO_PTR(MP_STATE_PORT(dupterm_arr_obj));
+ void *org_items = arr->items;
+ arr->items = (void*)str;
+ arr->len = len;
+ write_m[2] = MP_STATE_PORT(dupterm_arr_obj);
mp_call_method_n_kw(1, 0, write_m);
+ arr = MP_OBJ_TO_PTR(MP_STATE_PORT(dupterm_arr_obj));
+ arr->items = org_items;
+ arr->len = 1;
nlr_pop();
} else {
mp_uos_deactivate("dupterm: Exception in write() method, deactivating: ", nlr.ret_val);
@@ -69,9 +78,12 @@ STATIC mp_obj_t mp_uos_dupterm(mp_uint_t n_args, const mp_obj_t *args) {
}
} else {
if (args[0] == mp_const_none) {
- MP_STATE_PORT(term_obj) = NULL;
+ MP_STATE_PORT(term_obj) = MP_OBJ_NULL;
} else {
MP_STATE_PORT(term_obj) = args[0];
+ if (MP_STATE_PORT(dupterm_arr_obj) == MP_OBJ_NULL) {
+ MP_STATE_PORT(dupterm_arr_obj) = mp_obj_new_bytearray(1, "");
+ }
}
return mp_const_none;
}
diff --git a/extmod/modussl.c b/extmod/modussl.c
index 567033cf48..4a3e297e1e 100644
--- a/extmod/modussl.c
+++ b/extmod/modussl.c
@@ -156,7 +156,7 @@ STATIC const mp_obj_type_t ussl_socket_type = {
.print = socket_print,
.getiter = NULL,
.iternext = NULL,
- .stream_p = &ussl_socket_stream_p,
+ .protocol = &ussl_socket_stream_p,
.locals_dict = (void*)&ussl_socket_locals_dict,
};
@@ -202,7 +202,8 @@ int mp_stream_errno;
ssize_t mp_stream_posix_write(void *sock_obj, const void *buf, size_t len) {
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)sock_obj;
- mp_uint_t out_sz = o->type->stream_p->write(o, buf, len, &mp_stream_errno);
+ const mp_stream_p_t *stream_p = o->type->protocol;
+ mp_uint_t out_sz = stream_p->write(o, buf, len, &mp_stream_errno);
if (out_sz == MP_STREAM_ERROR) {
return -1;
} else {
@@ -212,7 +213,8 @@ ssize_t mp_stream_posix_write(void *sock_obj, const void *buf, size_t len) {
ssize_t mp_stream_posix_read(void *sock_obj, void *buf, size_t len) {
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)sock_obj;
- mp_uint_t out_sz = o->type->stream_p->read(o, buf, len, &mp_stream_errno);
+ const mp_stream_p_t *stream_p = o->type->protocol;
+ mp_uint_t out_sz = stream_p->read(o, buf, len, &mp_stream_errno);
if (out_sz == MP_STREAM_ERROR) {
return -1;
} else {
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index 8ecab922aa..4f7b924e07 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -303,6 +303,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(webrepl_set_password_obj, webrepl_set_password)
STATIC const mp_map_elem_t webrepl_locals_dict_table[] = {
{ 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_write), (mp_obj_t)&mp_stream_write_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&webrepl_close_obj },
};
@@ -317,7 +318,7 @@ STATIC const mp_obj_type_t webrepl_type = {
{ &mp_type_type },
.name = MP_QSTR__webrepl,
.make_new = webrepl_make_new,
- .stream_p = &webrepl_stream_p,
+ .protocol = &webrepl_stream_p,
.locals_dict = (mp_obj_t)&webrepl_locals_dict,
};
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index fc5e29a05e..6354633af4 100644
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@@ -282,6 +282,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(websocket_close_obj, websocket_close);
STATIC const mp_map_elem_t websocket_locals_dict_table[] = {
{ 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_write), (mp_obj_t)&mp_stream_write_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ioctl), (mp_obj_t)&mp_stream_ioctl_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&websocket_close_obj },
@@ -298,7 +299,7 @@ STATIC const mp_obj_type_t websocket_type = {
{ &mp_type_type },
.name = MP_QSTR_websocket,
.make_new = websocket_make_new,
- .stream_p = &websocket_stream_p,
+ .protocol = &websocket_stream_p,
.locals_dict = (mp_obj_t)&websocket_locals_dict,
};
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index a4a81370f9..df5cbb0d62 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -186,7 +186,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
if (path_equal(path, "/")) {
// stat root directory
fno.fsize = 0;
- fno.fdate = 0;
+ fno.fdate = 0x2821; // Jan 1, 2000
fno.ftime = 0;
fno.fattrib = AM_DIR;
} else {
@@ -196,7 +196,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
if (vfs != NULL && path_equal(path, vfs->str)) {
// stat mounted device directory
fno.fsize = 0;
- fno.fdate = 0;
+ fno.fdate = 0x2821; // Jan 1, 2000
fno.ftime = 0;
fno.fattrib = AM_DIR;
res = FR_OK;
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 857cd1f470..0cd61e4605 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -259,7 +259,7 @@ const mp_obj_type_t mp_type_fileio = {
.make_new = file_obj_make_new,
.getiter = mp_identity,
.iternext = mp_stream_unbuffered_iter,
- .stream_p = &fileio_stream_p,
+ .protocol = &fileio_stream_p,
.locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
};
#endif
@@ -278,7 +278,7 @@ const mp_obj_type_t mp_type_textio = {
.make_new = file_obj_make_new,
.getiter = mp_identity,
.iternext = mp_stream_unbuffered_iter,
- .stream_p = &textio_stream_p,
+ .protocol = &textio_stream_p,
.locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
};
diff --git a/extmod/virtpin.c b/extmod/virtpin.c
index a5817ab4d0..dbfa21d669 100644
--- a/extmod/virtpin.c
+++ b/extmod/virtpin.c
@@ -28,12 +28,12 @@
int mp_virtual_pin_read(mp_obj_t pin) {
mp_obj_base_t* s = (mp_obj_base_t*)MP_OBJ_TO_PTR(pin);
- mp_pin_p_t *pin_p = (mp_pin_p_t*)s->type->stream_p;
+ mp_pin_p_t *pin_p = (mp_pin_p_t*)s->type->protocol;
return pin_p->ioctl(pin, MP_PIN_READ, 0, NULL);
}
void mp_virtual_pin_write(mp_obj_t pin, int value) {
mp_obj_base_t* s = (mp_obj_base_t*)MP_OBJ_TO_PTR(pin);
- mp_pin_p_t *pin_p = (mp_pin_p_t*)s->type->stream_p;
+ mp_pin_p_t *pin_p = (mp_pin_p_t*)s->type->protocol;
pin_p->ioctl(pin, MP_PIN_WRITE, value, NULL);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-30 07:40:12 +0000