diff options
Diffstat (limited to 'extmod')
| -rw-r--r-- | extmod/modlwip.c | 2 | ||||
| -rw-r--r-- | extmod/modussl.c | 8 | ||||
| -rw-r--r-- | extmod/modwebrepl.c | 2 | ||||
| -rw-r--r-- | extmod/modwebsocket.c | 2 | ||||
| -rw-r--r-- | extmod/vfs_fat_file.c | 4 | ||||
| -rw-r--r-- | extmod/virtpin.c | 4 |
6 files changed, 12 insertions, 10 deletions
diff --git a/extmod/modlwip.c b/extmod/modlwip.c index cb7cc6596f..dbee7c3d1f 100644 --- a/extmod/modlwip.c +++ b/extmod/modlwip.c @@ -1148,7 +1148,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/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..407d8fbc2c 100644 --- a/extmod/modwebrepl.c +++ b/extmod/modwebrepl.c @@ -317,7 +317,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..468a2dc0ef 100644 --- a/extmod/modwebsocket.c +++ b/extmod/modwebsocket.c @@ -298,7 +298,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_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); } |