djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stmhal: Make CC3K object static, so it's only registered once as NIC.

Browse Source
This commit is contained in:
Damien George 2015-01-22 00:17:40 +00:00
parent 8b77e3dd2f
commit bd9c1ad601
1 changed files with 4 additions and 5 deletions

9
stmhal/modnwcc3k.c

@ -421,6 +421,8 @@ typedef struct _cc3k_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
} cc3k_obj_t; } cc3k_obj_t;
STATIC const cc3k_obj_t cc3k_obj = {{(mp_obj_type_t*)&mod_network_nic_type_cc3k}};
// \classmethod \constructor(spi, pin_cs, pin_en, pin_irq) // \classmethod \constructor(spi, pin_cs, pin_en, pin_irq)
// Initialise the CC3000 using the given SPI bus and pins and return a CC3K object. // Initialise the CC3000 using the given SPI bus and pins and return a CC3K object.
// //
@ -458,13 +460,10 @@ STATIC mp_obj_t cc3k_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw
HCI_EVNT_WLAN_ASYNC_PING_REPORT| HCI_EVNT_WLAN_ASYNC_PING_REPORT|
HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE); HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE);
cc3k_obj_t *cc3k = m_new_obj(cc3k_obj_t);
cc3k->base.type = (mp_obj_type_t*)&mod_network_nic_type_cc3k;
// register with network module // register with network module
mod_network_register_nic(cc3k); mod_network_register_nic((mp_obj_t)&cc3k_obj);
return cc3k; return (mp_obj_t)&cc3k_obj;
} }
// method connect(ssid, key=None, *, security=WPA2, bssid=None) // method connect(ssid, key=None, *, security=WPA2, bssid=None)