revise some network-related function uses in other ports

Author: dhalbert

devices/airlift/common-hal/wifi/Radio.c

@@ -467,7 +467,7 @@ size_t wifi_radio_send_command_get_response(wifi_radio_obj_t *self, uint8_t cmd,
 }
 
 
-static bool wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t mac[MAC_ADDRESS_LENGTH]) {
+bool wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t *mac) {
     const uint8_t ignored = 0xFF;
     const uint8_t *params[1] = { &ignored };
     size_t param_lengths[1] = { 1 };

ports/espressif/common-hal/wifi/Radio.c

@@ -115,9 +115,14 @@ void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *host
     esp_netif_set_hostname(self->ap_netif, hostname);
 }
 
+bool wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t *mac) {
+    esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
+    return true;
+}
+
 mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self) {
     uint8_t mac[MAC_ADDRESS_LENGTH];
-    esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
+    wifi_radio_get_mac_address(self, mac);
     return mp_obj_new_bytes(mac, MAC_ADDRESS_LENGTH);
 }
 

ports/raspberrypi/common-hal/socketpool/SocketPool.c

@@ -10,7 +10,7 @@
 #include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
 #include "shared-bindings/wifi/__init__.h"
-#include "shared-bindings/ipaddress/__init__.h"
+#include "shared-bindings/ipaddress/IPv4Address.h"
 
 #include "lwip/dns.h"
 #include "lwip/inet.h"

ports/raspberrypi/common-hal/wifi/Radio.c

@@ -50,11 +50,12 @@ NORETURN static void ro_attribute(qstr attr) {
     mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q is read-only for this board"), attr);
 }
 
-const char *common_hal_wifi_radio_get_version(wifi_radio_obj_t *self) {
-    return "cyw43-driver "
-           MP_STRINGIFY(CYW43_VERSION_MAJOR) "."
-           MP_STRINGIFY(CYW43_VERSION_MINOR) "."
-           MP_STRINGIFY(CYW43_VERSION_MICRO);
+mp_obj_t common_hal_wifi_radio_get_version(wifi_radio_obj_t *self) {
+    return mp_obj_new_str_from_cstr(
+        "cyw43-driver "
+        MP_STRINGIFY(CYW43_VERSION_MAJOR) "."
+        MP_STRINGIFY(CYW43_VERSION_MINOR) "."
+        MP_STRINGIFY(CYW43_VERSION_MICRO));
 }
 
 bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self) {
@@ -85,8 +86,9 @@ void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *host
     netif_set_hostname(NETIF_AP, self->hostname);
 }
 
-void wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t *mac) {
+bool wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t *mac) {
     memcpy(mac, cyw43_state.mac, MAC_ADDRESS_LENGTH);
+    return true;
 }
 
 mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self) {

shared-bindings/wifi/Radio.h

@@ -132,3 +132,4 @@ extern void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_ob
 extern void common_hal_wifi_radio_set_ipv4_address_ap(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway);
 
 extern mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout);
+extern bool wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t *mac);