fix builds

Author: dhalbert

devices/airlift/common-hal/socketpool/Socket.c

@@ -50,22 +50,6 @@ static int socketpool_type_to_airlift_type(socketpool_socketpool_sock_t type) {
     }
 }
 
-// // The SOCKETPOOL_ constants are actually the same as the LWIP constants, but it's
-// // possible they might not be, so map them, just in case.
-// static socketpool_socketpool_sock_t airlift_type_to_socketpool_type(int type) {
-//     switch (type) {
-//         case SOCK_STREAM:
-//             return SOCKETPOOL_SOCK_STREAM;
-//         case SOCK_DGRAM:
-//             return SOCKETPOOL_SOCK_DGRAM;
-//         case SOCK_RAW:
-//             return SOCKETPOOL_SOCK_RAW;
-//         default:
-//             mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid %q"), MP_QSTR_type);
-//     }
-// }
-
-
 static bool _socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
     int proto,
@@ -279,8 +263,7 @@ int common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
         mp_raise_RuntimeError_varg(MP_ERROR_TEXT("%q in use"), MP_QSTR_socket);
     }
     if (self->bound) {
-        // Same as CPython.
-        mp_raise_OSError(MP_EINVAL);
+        return MP_EINVAL;
     }
 
     // Validate the host name (which might be a numeric IP string) to an IPv4 address first.
@@ -298,7 +281,7 @@ int common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
     if (memcmp(ipv4, zero_ipv4, IPV4_LENGTH) != 0 &&
         memcmp(ipv4, self_ipv4, IPV4_LENGTH) != 0) {
         // Same as CPython.
-        mp_raise_OSError(99);  // EADDRNOTAVAIL (sometimes 125!)
+        return 99;  // EADDRNOTAVAIL (sometimes 125!)
     }
     self->bound = true;
     memcpy(self->hostname, host, hostlen);

ports/raspberrypi/boards/cytron_edu_v2_pico_2w/mpconfigboard.mk

@@ -14,12 +14,12 @@ CIRCUITPY_SDCARDIO = 1
 CIRCUITPY__EVE = 1
 
 CIRCUITPY_CYW43 = 1
-CIRCUITPY_SSL = 1
+CIRCUITPY_SSL_NATIVE = 1
 CIRCUITPY_HASHLIB = 1
 CIRCUITPY_WEB_WORKFLOW = 1
 CIRCUITPY_MDNS = 1
-CIRCUITPY_SOCKETPOOL = 1
-CIRCUITPY_WIFI = 1
+CIRCUITPY_SOCKETPOOL_NATIVE = 1
+CIRCUITPY_WIFI_NATIVE = 1
 
 CFLAGS += \
     -DCYW43_PIN_WL_DYNAMIC=0 \

ports/raspberrypi/boards/studiolab_picoexpander/mpconfigboard.mk

@@ -12,12 +12,12 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 CIRCUITPY__EVE = 1
 
 CIRCUITPY_CYW43 = 1
-CIRCUITPY_SSL = 1
+CIRCUITPY_SSLNATIVE = 1
 CIRCUITPY_HASHLIB = 1
 CIRCUITPY_WEB_WORKFLOW = 1
 CIRCUITPY_MDNS = 1
-CIRCUITPY_SOCKETPOOL = 1
-CIRCUITPY_WIFI = 1
+CIRCUITPY_SOCKETPOOL_NATIVE = 1
+CIRCUITPY_WIFI_NATIVE = 1
 
 CFLAGS += \
     -DCYW43_PIN_WL_DYNAMIC=0 \

ports/raspberrypi/mpconfigport.mk

@@ -88,4 +88,4 @@ CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1
 CIRCUITPY_MESSAGE_COMPRESSION_LEVEL ?= 1
 
 # (ssl is selectively enabled but it's always the mbedtls implementation)
-CIRCUITPY_SSL_MBEDTLS = 1
+CIRCUITPY_SSL_MBEDTLS = $(CIRCUITPY_SSL_NATIVE)

ports/zephyr-cp/common-hal/socketpool/Socket.c

@@ -341,7 +341,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
     }
 }
 
-size_t common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
+int common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
     const char *host, size_t hostlen, uint32_t port) {
     // struct sockaddr_storage bind_addr;
     const char *broadcast = "<broadcast>";
@@ -381,7 +381,7 @@ size_t common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
 }
 
 void socketpool_socket_close(socketpool_socket_obj_t *self) {
-    #if CIRCUITPY_SSL
+    #if CIRCUITPY_SSL_NATIVE
     if (self->ssl_socket) {
         ssl_sslsocket_obj_t *ssl_socket = self->ssl_socket;
         self->ssl_socket = NULL;

ports/zephyr-cp/cptools/build_circuitpython.py

@@ -80,7 +80,13 @@
 }
 
 # Other flags to set when a module is enabled
-EXTRA_FLAGS = {"busio": ["BUSIO_SPI", "BUSIO_I2C"]}
+# "CIRCUITPY_" is prepended onto each.
+EXTRA_FLAGS = {
+    "busio": ["BUSIO_SPI", "BUSIO_I2C"],
+    "socketpool": ["SOCKETPOOL_NATIVE"],
+    "ssl": ["SSL_NATIVE", "SSL_MBEDTLS"],
+    "wifi": ["WIFI_NATIVE"],
+}
 
 SHARED_MODULE_AND_COMMON_HAL = ["os"]
 
@@ -291,9 +297,8 @@ async def build_circuitpython():
     circuitpython_flags.append(f"-DCIRCUITPY_USB_HOST={1 if usb_host else 0}")
     circuitpython_flags.append(f"-DCIRCUITPY_BOARD_ID='\"{board}\"'")
     circuitpython_flags.append(f"-DCIRCUITPY_TRANSLATE_OBJECT={1 if lto else 0}")
-    circuitpython_flags.append("-DINTERNAL_FLASH_FILESYSTEM")
-    circuitpython_flags.append("-DLONGINT_IMPL_MPZ")
-    circuitpython_flags.append("-DCIRCUITPY_SSL_MBEDTLS")
+    circuitpython_flags.append("-DINTERNAL_FLASH_FILESYSTEM=1")
+    circuitpython_flags.append("-DLONGINT_IMPL_MPZ=1")
     circuitpython_flags.append("-DFFCONF_H='\"lib/oofatfs/ffconf.h\"'")
     circuitpython_flags.extend(("-I", srcdir))
     circuitpython_flags.extend(("-I", builddir))