diff options
Diffstat (limited to 'extmod')
| -rw-r--r-- | extmod/extmod.cmake | 3 | ||||
| -rw-r--r-- | extmod/modnetwork.c | 42 | ||||
| -rw-r--r-- | extmod/modnetwork.h | 8 | ||||
| -rw-r--r-- | extmod/network_cyw43.c | 10 |
4 files changed, 62 insertions, 1 deletions
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake index ed7d16d1b..2a19a0e85 100644 --- a/extmod/extmod.cmake +++ b/extmod/extmod.cmake @@ -37,6 +37,9 @@ set(MICROPY_SOURCE_EXTMOD ${MICROPY_EXTMOD_DIR}/moduwebsocket.c ${MICROPY_EXTMOD_DIR}/moduzlib.c ${MICROPY_EXTMOD_DIR}/modwebrepl.c + ${MICROPY_EXTMOD_DIR}/network_cyw43.c + ${MICROPY_EXTMOD_DIR}/network_ninaw10.c + ${MICROPY_EXTMOD_DIR}/network_wiznet5k.c ${MICROPY_EXTMOD_DIR}/uos_dupterm.c ${MICROPY_EXTMOD_DIR}/utime_mphal.c ${MICROPY_EXTMOD_DIR}/vfs.c diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c index d5c8f83ea..0431e5f41 100644 --- a/extmod/modnetwork.c +++ b/extmod/modnetwork.c @@ -54,6 +54,14 @@ /// /// This module provides network drivers and routing configuration. +char mod_network_country_code[2] = "XX"; + +#ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT +#error "MICROPY_PY_NETWORK_HOSTNAME_DEFAULT must be set in mpconfigport.h or mpconfigboard.h" +#endif + +char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN] = MICROPY_PY_NETWORK_HOSTNAME_DEFAULT; + void mod_network_init(void) { mp_obj_list_init(&MP_STATE_PORT(mod_network_nic_list), 0); } @@ -89,9 +97,43 @@ STATIC mp_obj_t network_route(void) { } STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_route_obj, network_route); +STATIC mp_obj_t network_country(size_t n_args, const mp_obj_t *args) { + if (n_args == 0) { + return mp_obj_new_str(mod_network_country_code, 2); + } else { + size_t len; + const char *str = mp_obj_str_get_data(args[0], &len); + if (len != 2) { + mp_raise_ValueError(NULL); + } + mod_network_country_code[0] = str[0]; + mod_network_country_code[1] = str[1]; + return mp_const_none; + } +} +// TODO: Non-static to allow backwards-compatible pyb.country. +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj, 0, 1, network_country); + +STATIC mp_obj_t network_hostname(size_t n_args, const mp_obj_t *args) { + if (n_args == 0) { + return mp_obj_new_str(mod_network_hostname, strlen(mod_network_hostname)); + } else { + size_t len; + const char *str = mp_obj_str_get_data(args[0], &len); + if (len >= MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) { + mp_raise_ValueError(NULL); + } + strcpy(mod_network_hostname, str); + return mp_const_none; + } +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_hostname_obj, 0, 1, network_hostname); + STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) }, { MP_ROM_QSTR(MP_QSTR_route), MP_ROM_PTR(&network_route_obj) }, + { MP_ROM_QSTR(MP_QSTR_country), MP_ROM_PTR(&mod_network_country_obj) }, + { MP_ROM_QSTR(MP_QSTR_hostname), MP_ROM_PTR(&mod_network_hostname_obj) }, // Defined per port in mpconfigport.h MICROPY_PORT_NETWORK_INTERFACES diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h index a28ec6e42..0ef612d10 100644 --- a/extmod/modnetwork.h +++ b/extmod/modnetwork.h @@ -52,6 +52,14 @@ #define MOD_NETWORK_SS_CONNECTED (2) #define MOD_NETWORK_SS_CLOSED (3) +extern char mod_network_country_code[2]; + +#ifndef MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN +#define MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN (16) +#endif + +extern char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN]; + #if MICROPY_PY_LWIP struct netif; void mod_network_lwip_init(void); diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c index 90d964a67..95901eadd 100644 --- a/extmod/network_cyw43.c +++ b/extmod/network_cyw43.c @@ -38,6 +38,7 @@ #if MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER #include "lib/cyw43-driver/src/cyw43.h" +#include "lib/cyw43-driver/src/cyw43_country.h" #else #include "drivers/cyw43/cyw43.h" #endif @@ -119,14 +120,21 @@ STATIC mp_obj_t network_cyw43_deinit(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_deinit_obj, network_cyw43_deinit); +#if !MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER +// TODO: The old driver expects this to be available at link time. +char pyb_country_code[2]; +#endif + STATIC mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) { network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]); if (n_args == 1) { return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf)); } else { #if MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER - cyw43_wifi_set_up(self->cyw, self->itf, mp_obj_is_true(args[1]), MICROPY_CYW43_COUNTRY); + uint32_t country = CYW43_COUNTRY(mod_network_country_code[0], mod_network_country_code[1], 0); + cyw43_wifi_set_up(self->cyw, self->itf, mp_obj_is_true(args[1]), country); #else + memcpy(pyb_country_code, mod_network_country_code, sizeof(pyb_country_code)); cyw43_wifi_set_up(self->cyw, self->itf, mp_obj_is_true(args[1])); #endif return mp_const_none; |