diff options
| author | iabdalkader <i.abdalkader@gmail.com> | 2021-09-14 21:21:09 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-09-15 11:29:02 +1000 |
| commit | d9749f90ad6aecbebffe09a9e252a81624750ceb (patch) | |
| tree | 88cd58937fa0459a69f8169c69bd413c8a56c33c /extmod/modusocket.c | |
| parent | f9d573a4ace66b6b8991f304f4a895906fb4ad61 (diff) | |
extmod/modnetwork: Remove modnetwork socket u_state member.
To simplify the socket state.
The CC3K driver (see drivers/cc3000/inc/socket.h and src/socket.c) has
socket() returning an INT16 so there is now enough room to store it
directly in the fileno member.
Diffstat (limited to 'extmod/modusocket.c')
| -rw-r--r-- | extmod/modusocket.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/extmod/modusocket.c b/extmod/modusocket.c index fea81077c..e08f8134f 100644 --- a/extmod/modusocket.c +++ b/extmod/modusocket.c @@ -51,16 +51,17 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t s->base.type = &socket_type; s->nic = MP_OBJ_NULL; s->nic_type = NULL; - s->u_param.domain = MOD_NETWORK_AF_INET; - s->u_param.type = MOD_NETWORK_SOCK_STREAM; - s->u_param.fileno = -1; - s->u_param.bound = false; + s->domain = MOD_NETWORK_AF_INET; + s->type = MOD_NETWORK_SOCK_STREAM; + s->proto = 0; + s->bound = false; + s->fileno = -1; if (n_args >= 1) { - s->u_param.domain = mp_obj_get_int(args[0]); + s->domain = mp_obj_get_int(args[0]); if (n_args >= 2) { - s->u_param.type = mp_obj_get_int(args[1]); + s->type = mp_obj_get_int(args[1]); if (n_args >= 4) { - s->u_param.fileno = mp_obj_get_int(args[3]); + s->fileno = mp_obj_get_int(args[3]); } } } |