diff options
| -rw-r--r-- | ports/cc3200/mods/modnetwork.h | 7 | ||||
| -rw-r--r-- | ports/cc3200/mods/modwlan.c | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/ports/cc3200/mods/modnetwork.h b/ports/cc3200/mods/modnetwork.h index c15a6467f..9bc2c71c2 100644 --- a/ports/cc3200/mods/modnetwork.h +++ b/ports/cc3200/mods/modnetwork.h @@ -35,11 +35,6 @@ /****************************************************************************** DEFINE TYPES ******************************************************************************/ -typedef struct _mod_network_nic_type_t { - // Ensure that this struct is big enough to hold any type size. - mp_obj_full_type_t base; -} mod_network_nic_type_t; - typedef struct _mod_network_socket_base_t { union { struct { @@ -64,7 +59,7 @@ typedef struct _mod_network_socket_obj_t { /****************************************************************************** EXPORTED DATA ******************************************************************************/ -extern const mod_network_nic_type_t mod_network_nic_type_wlan; +extern const mp_obj_type_t mod_network_nic_type_wlan; /****************************************************************************** DECLARE FUNCTIONS diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c index 6cf1cbee4..ca18b3482 100644 --- a/ports/cc3200/mods/modwlan.c +++ b/ports/cc3200/mods/modwlan.c @@ -1285,18 +1285,14 @@ STATIC const mp_rom_map_elem_t wlan_locals_dict_table[] = { }; STATIC MP_DEFINE_CONST_DICT(wlan_locals_dict, wlan_locals_dict_table); -STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE( - mod_network_nic_type_wlan_base, +MP_DEFINE_CONST_OBJ_TYPE( + mod_network_nic_type_wlan, MP_QSTR_WLAN, MP_TYPE_FLAG_NONE, make_new, wlan_make_new, locals_dict, &wlan_locals_dict ); -const mod_network_nic_type_t mod_network_nic_type_wlan = { - .base = mod_network_nic_type_wlan_base, -}; - STATIC const mp_irq_methods_t wlan_irq_methods = { .init = wlan_irq, .enable = wlan_lpds_irq_enable, |