diff --git a/libraries/SocketWrapper/src/MbedClient.cpp b/libraries/SocketWrapper/src/MbedClient.cpp index d678b78db..bbd9f5982 100644 --- a/libraries/SocketWrapper/src/MbedClient.cpp +++ b/libraries/SocketWrapper/src/MbedClient.cpp @@ -18,7 +18,7 @@ void arduino::MbedClient::readSocket() { uint8_t data[SOCKET_BUFFER_SIZE]; while (sock != nullptr) { - event->wait_any(0xFF, 100); + int ret = NSAPI_ERROR_WOULD_BLOCK; do { mutex->lock(); diff --git a/variants/OPTA/conf/mbed_app.json b/variants/OPTA/conf/mbed_app.json index 361a0ab94..6dc084238 100644 --- a/variants/OPTA/conf/mbed_app.json +++ b/variants/OPTA/conf/mbed_app.json @@ -21,6 +21,11 @@ "METAL_MAX_DEVICE_REGIONS=2", "RPMSG_BUFFER_SIZE=512" ] + }, + "OPTA": { + "lwip.socket-max": 8, + "lwip.tcp-socket-max": 8, + "lwip.udp-socket-max": 8 } } } diff --git a/variants/OPTA/defines.txt b/variants/OPTA/defines.txt index e2efa0d9a..443f91284 100644 --- a/variants/OPTA/defines.txt +++ b/variants/OPTA/defines.txt @@ -1,14 +1,12 @@ -DARM_MATH_CM7 -DCM4_BOOT_BY_APPLICATION --D__CMSIS_RTOS -DCOMPONENT_4343W_FS=1 -DCOMPONENT_CYW43XXX=1 -DCOMPONENT_FLASHIAP=1 -DCOMPONENT_QSPIF=1 -DCOMPONENT_WHD=1 -DCORE_CM7 --D__CORTEX_M7 -DCYW43XXX_UNBUFFERED_UART -DDEVICE_ANALOGIN=1 -DDEVICE_ANALOGOUT=1 @@ -17,8 +15,8 @@ -DDEVICE_EMAC=1 -DDEVICE_FLASH=1 -DDEVICE_I2C=1 --DDEVICE_I2C_ASYNCH=1 -DDEVICE_I2CSLAVE=1 +-DDEVICE_I2C_ASYNCH=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 @@ -33,8 +31,8 @@ -DDEVICE_SERIAL_FC=1 -DDEVICE_SLEEP=1 -DDEVICE_SPI=1 --DDEVICE_SPI_ASYNCH=1 -DDEVICE_SPISLAVE=1 +-DDEVICE_SPI_ASYNCH=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_TRNG=1 -DDEVICE_USBDEVICE=1 @@ -42,13 +40,10 @@ -DDEVICE_WATCHDOG=1 -DEXTRA_IDLE_STACK_REQUIRED -DFEATURE_BLE=1 --D__FPU_PRESENT=1 --D__MBED__=1 --DMBED_BUILD_TIMESTAMP=1751296112.1474662 --D__MBED_CMSIS_RTOS_CM --DMBED_TICKLESS -DMBEDTLS_FS_IO -DMBEDTLS_SHA1_C +-DMBED_BUILD_TIMESTAMP=1761840996.070056 +-DMBED_TICKLESS -DMETAL_INTERNAL -DMETAL_MAX_DEVICE_REGIONS=2 -DNO_ATOMIC_64_SUPPORT @@ -79,6 +74,11 @@ -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER -DVIRTIO_DRIVER_ONLY +-D__CMSIS_RTOS +-D__CORTEX_M7 +-D__FPU_PRESENT=1 +-D__MBED_CMSIS_RTOS_CM +-D__MBED__=1 -DMBED_NO_GLOBAL_USING_DIRECTIVE=1 -DCORE_MAJOR= -DCORE_MINOR= diff --git a/variants/OPTA/libs/libmbed.a b/variants/OPTA/libs/libmbed.a index bf4629098..6de5fcd50 100644 Binary files a/variants/OPTA/libs/libmbed.a and b/variants/OPTA/libs/libmbed.a differ diff --git a/variants/OPTA/linker_script.ld b/variants/OPTA/linker_script.ld index a0fdb9fcd..8941b72a6 100644 --- a/variants/OPTA/linker_script.ld +++ b/variants/OPTA/linker_script.ld @@ -94,7 +94,12 @@ SECTIONS __bss_end__ = .; _ebss = .; } > RAM - .pdm_section 0x3800FC00 (NOLOAD): { + .openamp_section (NOLOAD) : { + . = ABSOLUTE(0x38000000); + *(.resource_table) + } >RAM_D3 AT > FLASH + .pdm_section (NOLOAD) : { + . = ABSOLUTE(0x3800FC00); *(.pdm_buffer) } > RAM_D3 _dtcm_lma = __etext + SIZEOF(.data); diff --git a/variants/OPTA/mbed_config.h b/variants/OPTA/mbed_config.h index 4b6d57eaa..13916ea02 100644 --- a/variants/OPTA/mbed_config.h +++ b/variants/OPTA/mbed_config.h @@ -227,7 +227,7 @@ #define MBED_CONF_LWIP_PPP_THREAD_STACKSIZE 768 // set by library:lwip #define MBED_CONF_LWIP_PRESENT 1 // set by library:lwip #define MBED_CONF_LWIP_RAW_SOCKET_ENABLED 1 // set by application[*] -#define MBED_CONF_LWIP_SOCKET_MAX 4 // set by library:lwip +#define MBED_CONF_LWIP_SOCKET_MAX 8 // set by application[OPTA] #define MBED_CONF_LWIP_TCPIP_THREAD_PRIORITY osPriorityNormal // set by library:lwip #define MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE 1200 // set by library:lwip #define MBED_CONF_LWIP_TCP_CLOSE_TIMEOUT 1000 // set by library:lwip @@ -236,10 +236,10 @@ #define MBED_CONF_LWIP_TCP_MSS 536 // set by library:lwip #define MBED_CONF_LWIP_TCP_SERVER_MAX 4 // set by library:lwip #define MBED_CONF_LWIP_TCP_SND_BUF (2 * TCP_MSS) // set by library:lwip -#define MBED_CONF_LWIP_TCP_SOCKET_MAX 4 // set by library:lwip +#define MBED_CONF_LWIP_TCP_SOCKET_MAX 8 // set by application[OPTA] #define MBED_CONF_LWIP_TCP_SYNMAXRTX 6 // set by library:lwip #define MBED_CONF_LWIP_TCP_WND (4 * TCP_MSS) // set by library:lwip -#define MBED_CONF_LWIP_UDP_SOCKET_MAX 4 // set by library:lwip +#define MBED_CONF_LWIP_UDP_SOCKET_MAX 8 // set by application[OPTA] #define MBED_CONF_LWIP_USE_MBED_TRACE 0 // set by library:lwip #define MBED_CONF_MCR20A_PROVIDE_DEFAULT 0 // set by library:mcr20a #define MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED 0 // set by library:nanostack-libservice