diff --git a/examples/lighting-app/silabs/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp index bce7b06cb5cb07..297094e31ffef4 100644 --- a/examples/lighting-app/silabs/src/AppTask.cpp +++ b/examples/lighting-app/silabs/src/AppTask.cpp @@ -40,7 +40,7 @@ #include -#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)) +#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC)) #define LIGHT_LED 1 #else #define LIGHT_LED 0 diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp index c98882f30aba96..6940fe4f5338e3 100644 --- a/examples/platform/silabs/BaseApplication.cpp +++ b/examples/platform/silabs/BaseApplication.cpp @@ -82,7 +82,7 @@ #define APP_EVENT_QUEUE_SIZE 10 #define EXAMPLE_VENDOR_ID 0xcafe -#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))) +#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC))) #define SYSTEM_STATE_LED 0 #endif // ENABLE_WSTK_LEDS #define APP_FUNCTION_BUTTON 0 @@ -104,7 +104,7 @@ TimerHandle_t sLightTimer; TaskHandle_t sAppTaskHandle; QueueHandle_t sAppEventQueue; -#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))) +#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC))) LEDWidget sStatusLED; #endif // ENABLE_WSTK_LEDS @@ -270,7 +270,7 @@ CHIP_ERROR BaseApplication::Init() ConfigurationMgr().LogDeviceConfig(); OutputQrCode(true /*refreshLCD at init*/); -#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))) +#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC))) LEDWidget::InitGpio(); sStatusLED.Init(SYSTEM_STATE_LED); #endif // ENABLE_WSTK_LEDS @@ -321,7 +321,7 @@ void BaseApplication::FunctionEventHandler(AppEvent * aEvent) bool BaseApplication::ActivateStatusLedPatterns() { bool isPatternSet = false; -#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))) +#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC))) #ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER if (gIdentify.mActive) { @@ -427,7 +427,7 @@ void BaseApplication::LightEventHandler() #endif // CHIP_CONFIG_ENABLE_ICD_SERVER #if defined(ENABLE_WSTK_LEDS) -#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)) +#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC)) // Update the status LED if factory reset has not been initiated. // // If system has "full connectivity", keep the LED On constantly. @@ -563,7 +563,7 @@ void BaseApplication::StartFactoryResetSequence() StartStatusLEDTimer(); #endif // CHIP_CONFIG_ENABLE_ICD_SERVER -#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))) +#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC))) // Turn off all LEDs before starting blink to make sure blink is // co-ordinated. sStatusLED.Set(false); @@ -596,7 +596,7 @@ void BaseApplication::StartStatusLEDTimer() void BaseApplication::StopStatusLEDTimer() { -#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))) +#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SLI_917_SOC))) sStatusLED.Set(false); #endif // ENABLE_WSTK_LEDS diff --git a/examples/platform/silabs/FreeRTOSConfig.h b/examples/platform/silabs/FreeRTOSConfig.h index 478dfa10be547f..cbe77b0637a222 100644 --- a/examples/platform/silabs/FreeRTOSConfig.h +++ b/examples/platform/silabs/FreeRTOSConfig.h @@ -107,7 +107,7 @@ extern "C" { #include -#ifdef SIWX_917 +#ifdef SLI_917_SOC #include "si91x_device.h" extern uint32_t SystemCoreClock; #else // For EFR32 @@ -169,23 +169,23 @@ extern uint32_t SystemCoreClock; #define configTIMER_QUEUE_LENGTH (10) #define configTIMER_TASK_STACK_DEPTH (1024) -#ifdef SIWX_917 +#ifdef SLI_917_SOC #ifdef __NVIC_PRIO_BITS #undef __NVIC_PRIO_BITS #endif #define configPRIO_BITS 6 /* 6 priority levels. */ -#endif // SIWX_917 +#endif // SLI_917_SOC /* Interrupt priorities used by the kernel port layer itself. These are generic to all Cortex-M ports, and do not rely on any particular library functions. */ #define configKERNEL_INTERRUPT_PRIORITY (255) /* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!! See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ -#ifdef SIWX_917 +#ifdef SLI_917_SOC #define configMAX_SYSCALL_INTERRUPT_PRIORITY 20 #else #define configMAX_SYSCALL_INTERRUPT_PRIORITY 48 -#endif // SIWX_917 +#endif // SLI_917_SOC #define configENABLE_FPU 0 #define configENABLE_MPU 0 @@ -232,11 +232,11 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ #ifndef configTOTAL_HEAP_SIZE #ifdef SL_WIFI #ifdef DIC_ENABLE -#ifdef SIWX_917 +#ifdef SLI_917_SOC #define configTOTAL_HEAP_SIZE ((size_t) ((75 + EXTRA_HEAP_k) * 1024)) #else #define configTOTAL_HEAP_SIZE ((size_t) ((68 + EXTRA_HEAP_k) * 1024)) -#endif // SIWX_917 +#endif // SLI_917_SOC #else #define configTOTAL_HEAP_SIZE ((size_t) ((42 + EXTRA_HEAP_k) * 1024)) #endif // DIC diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp index 32bf04cf0e0f7b..5a98f09612d761 100644 --- a/examples/platform/silabs/MatterConfig.cpp +++ b/examples/platform/silabs/MatterConfig.cpp @@ -42,9 +42,9 @@ #include "MemMonitoring.h" #endif -#ifdef SIWX_917 +#ifdef SLI_917_SOC #include "wfx_rsi.h" -#endif /* SIWX_917 */ +#endif /* SLI_917_SOC */ using namespace ::chip; using namespace ::chip::Inet; @@ -53,7 +53,7 @@ using namespace ::chip::DeviceLayer; #include // If building with the EFR32-provided crypto backend, we can use the // opaque keystore -#if CHIP_CRYPTO_PLATFORM && !(defined(SIWX_917)) +#if CHIP_CRYPTO_PLATFORM && !(defined(SLI_917_SOC)) #include static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeystore; #endif @@ -229,7 +229,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName) initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate; #endif // SILABS_TEST_EVENT_TRIGGER_ENABLED -#if CHIP_CRYPTO_PLATFORM && !(defined(SIWX_917)) +#if CHIP_CRYPTO_PLATFORM && !(defined(SLI_917_SOC)) // When building with EFR32 crypto, use the opaque key store // instead of the default (insecure) one. gOperationalKeystore.Init(); @@ -289,13 +289,13 @@ CHIP_ERROR SilabsMatterConfig::InitWiFi(void) #endif // SL_WFX_USE_SECURE_LINK #endif /* WF200_WIFI */ -#ifdef SIWX_917 +#ifdef SLI_917_SOC sl_status_t status; if ((status = wfx_wifi_rsi_init()) != SL_STATUS_OK) { ReturnErrorOnFailure((CHIP_ERROR) status); } -#endif // SIWX_917 +#endif // SLI_917_SOC return CHIP_NO_ERROR; } @@ -306,7 +306,7 @@ CHIP_ERROR SilabsMatterConfig::InitWiFi(void) // ================================================================================ extern "C" void vApplicationIdleHook(void) { -#if SIWX_917 && CHIP_CONFIG_ENABLE_ICD_SERVER +#if SLI_917_SOC && CHIP_CONFIG_ENABLE_ICD_SERVER sl_wfx_host_si91x_sleep_wakeup(); #endif } diff --git a/examples/platform/silabs/OTAConfig.cpp b/examples/platform/silabs/OTAConfig.cpp index 6305af08e628b5..4c22627a70d32d 100644 --- a/examples/platform/silabs/OTAConfig.cpp +++ b/examples/platform/silabs/OTAConfig.cpp @@ -20,7 +20,7 @@ #include "silabs_utils.h" #include -#ifndef SIWX_917 +#ifndef SLI_917_SOC #include "application_properties.h" @@ -75,7 +75,7 @@ __attribute__((used)) ApplicationProperties_t sl_app_properties = { .longTokenSectionAddress = NULL, }; #endif // SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT -#endif // SIWX_917 +#endif // SLI_917_SOC // Global OTA objects chip::DefaultOTARequestor gRequestorCore; diff --git a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c index 6ac1d92f5ab966..45fac7e38adace 100644 --- a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c +++ b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c @@ -41,7 +41,7 @@ #include "ble_config.h" -#if SL_ICD_ENABLED +#if SL_ICD_ENABLED && SLI_917_SOC #include "rsi_rom_power_save.h" #include "sl_si91x_button_pin_config.h" #include "sl_si91x_driver.h" @@ -50,7 +50,7 @@ // TODO: should be removed once we are getting the press interrupt for button 0 with sleep #define BUTTON_PRESSED 1 bool btn0_pressed = false; -#endif // SL_ICD_ENABLED +#endif // SL_ICD_ENABLED && SLI_917_SOC #include "dhcp_client.h" #include "sl_wifi.h" @@ -63,8 +63,10 @@ bool btn0_pressed = false; #define ADV_MULTIPROBE 1 #define ADV_SCAN_PERIODICITY 10 +#if SLI_917_SOC #include "sl_si91x_trng.h" #define TRNGKEY_SIZE 4 +#endif // SLI_917_SOC struct wfx_rsi wfx_rsi; @@ -213,6 +215,7 @@ sl_status_t join_callback_handler(sl_wifi_event_t event, char * result, uint32_t #if SL_ICD_ENABLED +#if SLI_917_SOC /****************************************************************** * @fn sl_wfx_host_si91x_sleep_wakeup() * @brief @@ -247,6 +250,7 @@ void sl_wfx_host_si91x_sleep_wakeup() } } } +#endif // SLI_917_SOC /****************************************************************** * @fn wfx_rsi_power_save() @@ -693,7 +697,7 @@ void wfx_rsi_task(void * arg) #ifdef SL_WFX_CONFIG_SCAN | WFX_EVT_SCAN #endif /* SL_WFX_CONFIG_SCAN */ - | 0, + , pdTRUE, /* Clear the bits */ pdFALSE, /* Wait for any bit */ pdMS_TO_TICKS(250)); /* 250 mSec */ diff --git a/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp b/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp index d442f520debcbc..473e85375269bb 100644 --- a/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp +++ b/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp @@ -101,7 +101,7 @@ class DeviceAttestationCredsSilabs : public DeviceAttestationCredentialsProvider if (SilabsConfig::ConfigValueExists(SilabsConfig::kConfigKey_Creds_KeyId)) { // Provisioned DAC key -#ifdef SIWX_917 +#ifdef SLI_917_SOC return CHIP_ERROR_NOT_IMPLEMENTED; #else uint32_t key_id = SILABS_CREDENTIALS_DAC_KEY_ID; diff --git a/examples/platform/silabs/display/demo-ui.c b/examples/platform/silabs/display/demo-ui.c index bccde3e3eaa449..df6080004378d1 100644 --- a/examples/platform/silabs/display/demo-ui.c +++ b/examples/platform/silabs/display/demo-ui.c @@ -25,9 +25,9 @@ #include "glib.h" #include "sl_component_catalog.h" #include "sl_memlcd.h" -#if SL_WIFI && !SIWX_917 +#if SL_WIFI && !SLI_917_SOC #include "spi_multiplex.h" -#endif // SL_WIFI && !SIWX_917 +#endif // SL_WIFI && !SLI_917_SOC #include #include @@ -106,9 +106,9 @@ void demoUIInit(GLIB_Context_t * context) sl_status_t updateDisplay(void) { sl_status_t status = SL_STATUS_OK; -#if SIWX_917 && SL_ICD_ENABLED && DISPLAY_ENABLED +#if SLI_917_SOC && SL_ICD_ENABLED && DISPLAY_ENABLED sl_memlcd_post_wakeup_init(); -#endif // SIWX_917 && SL_ICD_ENABLED && DISPLAY_ENABLED +#endif // SLI_917_SOC && SL_ICD_ENABLED && DISPLAY_ENABLED #if SL_LCDCTRL_MUX status = sl_wfx_host_pre_lcd_spi_transfer(); if (status != SL_STATUS_OK) diff --git a/examples/platform/silabs/display/lcd.cpp b/examples/platform/silabs/display/lcd.cpp index 43a134f923e24c..dbf59d69260172 100644 --- a/examples/platform/silabs/display/lcd.cpp +++ b/examples/platform/silabs/display/lcd.cpp @@ -25,7 +25,7 @@ #include "dmd.h" #include "glib.h" -#if (SIWX_917) +#if (SLI_917_SOC) #include "rsi_chip.h" #endif @@ -66,7 +66,7 @@ CHIP_ERROR SilabsLCD::Init(uint8_t * name, bool initialState) } /* Enable the memory lcd */ -#if (SIWX_917) +#if (SLI_917_SOC) RSI_NPSSGPIO_InputBufferEn(SL_BOARD_ENABLE_DISPLAY_PIN, 1U); RSI_NPSSGPIO_SetPinMux(SL_BOARD_ENABLE_DISPLAY_PIN, 0); RSI_NPSSGPIO_SetDir(SL_BOARD_ENABLE_DISPLAY_PIN, 0); diff --git a/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c index f7a40551fdc5b5..cf6d1940eb66d9 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c +++ b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c @@ -38,7 +38,7 @@ #include "wfx_host_events.h" #include "wfx_rsi.h" -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) #include "sl_board_configuration.h" #include "sl_rsi_utility.h" @@ -61,7 +61,7 @@ void rsi_gpio_irq_cb(uint8_t irqnum) { if (irqnum != SL_WFX_HOST_PINOUT_SPI_IRQ) return; -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) sl_si91x_host_set_bus_event(NCP_HOST_BUS_RX_EVENT); #else GPIO_IntClear(1 << SL_WFX_HOST_PINOUT_SPI_IRQ); diff --git a/examples/thermostat/silabs/src/ThermostatUI.cpp b/examples/thermostat/silabs/src/ThermostatUI.cpp index 77184151e1d1d3..1e99f52429235c 100644 --- a/examples/thermostat/silabs/src/ThermostatUI.cpp +++ b/examples/thermostat/silabs/src/ThermostatUI.cpp @@ -25,7 +25,7 @@ #include "glib.h" #include "lcd.h" -#if SL_WIFI && !defined(SIWX_917) +#if SL_WIFI && !defined(SLI_917_SOC) // Only needed for wifi NCP devices #include "spi_multiplex.h" #endif // SL_WIFI diff --git a/src/platform/silabs/KeyValueStoreManagerImpl.cpp b/src/platform/silabs/KeyValueStoreManagerImpl.cpp index 5dbeba3e35edcd..2a49d22727531b 100644 --- a/src/platform/silabs/KeyValueStoreManagerImpl.cpp +++ b/src/platform/silabs/KeyValueStoreManagerImpl.cpp @@ -164,7 +164,7 @@ void KeyValueStoreManagerImpl::ScheduleKeyMapSave(void) During commissioning, the key map will be modified multiples times subsequently. Commit the key map in nvm once it as stabilized. */ -#if SIWX_917 && CHIP_CONFIG_ENABLE_ICD_SERVER +#if SLI_917_SOC && CHIP_CONFIG_ENABLE_ICD_SERVER // TODO: Remove this when RTC timer is added MATTER-2705 SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_KvsStringKeyMap, reinterpret_cast(mKvsKeyMap), sizeof(mKvsKeyMap)); @@ -172,7 +172,7 @@ void KeyValueStoreManagerImpl::ScheduleKeyMapSave(void) SystemLayer().StartTimer( std::chrono::duration_cast(System::Clock::Seconds32(SILABS_KVS_SAVE_DELAY_SECONDS)), KeyValueStoreManagerImpl::OnScheduledKeyMapSave, NULL); -#endif // defined(SIWX_917) && CHIP_CONFIG_ENABLE_ICD_SERVER +#endif // defined(SLI_917_SOC) && CHIP_CONFIG_ENABLE_ICD_SERVER } CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size, diff --git a/src/platform/silabs/SilabsConfig.cpp b/src/platform/silabs/SilabsConfig.cpp index f98ced75a3e1d8..1c4f31825ff3c7 100644 --- a/src/platform/silabs/SilabsConfig.cpp +++ b/src/platform/silabs/SilabsConfig.cpp @@ -33,7 +33,7 @@ #include #include -#ifndef SIWX_917 // 917soc/wifi-sdk implements the same nvm3 lock/unlock mechanism and it currently can't be overide. +#ifndef SLI_917_SOC // 917soc/wifi-sdk implements the same nvm3 lock/unlock mechanism and it currently can't be overide. #include #include // Substitute the GSDK weak nvm3_lockBegin and nvm3_lockEnd @@ -58,7 +58,7 @@ void nvm3_lockEnd(void) VerifyOrDie(nvm3_Sem != NULL); xSemaphoreGive(nvm3_Sem); } -#endif // !SIWX_917 +#endif // !SLI_917_SOC namespace chip { namespace DeviceLayer { @@ -78,9 +78,9 @@ CHIP_ERROR SilabsConfig::Init() void SilabsConfig::DeInit() { -#ifndef SIWX_917 +#ifndef SLI_917_SOC vSemaphoreDelete(nvm3_Sem); -#endif // !SIWX_917 +#endif // !SLI_917_SOC nvm3_close(nvm3_defaultHandle); } diff --git a/src/platform/silabs/efr32/wifi/ethernetif.cpp b/src/platform/silabs/efr32/wifi/ethernetif.cpp index 3dbd1b85b3ef9a..cd18684c72eebd 100644 --- a/src/platform/silabs/efr32/wifi/ethernetif.cpp +++ b/src/platform/silabs/efr32/wifi/ethernetif.cpp @@ -31,7 +31,7 @@ #include "FreeRTOS.h" #include "event_groups.h" #include "task.h" -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) #ifdef __cplusplus extern "C" { #endif @@ -46,7 +46,7 @@ extern "C" { #ifdef __cplusplus } #endif -#endif // (SIWX_917 | EXP_BOARD) +#endif // (SLI_917_SOC | EXP_BOARD) #endif // WF200_WIFI #include "wfx_host_events.h" @@ -349,7 +349,7 @@ static SemaphoreHandle_t ethout_sem; ******************************************************************************/ static err_t low_level_output(struct netif * netif, struct pbuf * p) { -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) sl_wifi_buffer_t * buffer; sl_si91x_packet_t * packet; sl_status_t status = SL_STATUS_OK; @@ -385,7 +385,7 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p) return ERR_IF; } /* Confirm if packet is allocated */ -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) status = sl_si91x_allocate_command_buffer(&buffer, (void **) &packet, sizeof(sl_si91x_packet_t) + framelength, SL_WIFI_ALLOCATE_COMMAND_BUFFER_WAIT_TIME_MS); VERIFY_STATUS_AND_RETURN(status); @@ -393,18 +393,18 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p) #else // RS9116 packet = wfx_rsi_alloc_pkt(); if (!packet) -#endif // SIWX_917 +#endif // SLI_917_SOC { SILABS_LOG("EN-RSI:No buf"); xSemaphoreGive(ethout_sem); -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) return SL_STATUS_ALLOCATION_FAILED; } memset(packet->desc, 0, sizeof(packet->desc)); #else // RS9116 return ERR_IF; } -#endif // SIWX_917 +#endif // SLI_917_SOC #ifdef WIFI_DEBUG_ENABLED uint8_t * b = (uint8_t *) p->payload; SILABS_LOG("EN-RSI: Out [%02x:%02x:%02x:%02x:%02x:%02x][%02x:%02x:%02x:%02x:%02x:%02x]type=%02x%02x", b[0], b[1], b[2], b[3], @@ -428,7 +428,7 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p) /* forward the generated packet to RSI to * send the data over wifi network */ -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) packet->length = framelength & 0xFFF; packet->command = RSI_SEND_RAW_DATA; if (sl_si91x_driver_send_data_packet(SI91X_WLAN_CMD_QUEUE, buffer, 1000)) @@ -452,7 +452,7 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p) return ERR_OK; } -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) /***************************************************************************** * @fn void sl_si91x_host_process_data_frame(uint8_t *buf, int len) * @brief diff --git a/src/platform/silabs/efr32/wifi/wfx_host_events.h b/src/platform/silabs/efr32/wifi/wfx_host_events.h index c9f451f8ac063a..d6faabf6fad7bc 100644 --- a/src/platform/silabs/efr32/wifi/wfx_host_events.h +++ b/src/platform/silabs/efr32/wifi/wfx_host_events.h @@ -98,7 +98,7 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s #include "wfx_msgs.h" -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) #include "sl_si91x_types.h" #include "sl_status.h" #include "sl_wifi_constants.h" @@ -361,7 +361,7 @@ void wfx_ip_changed_notify(int got_ip); #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */ void wfx_ipv6_notify(int got_ip); -#if !(SIWX_917 | EXP_BOARD) +#if !(SLI_917_SOC | EXP_BOARD) void * wfx_rsi_alloc_pkt(void); #endif @@ -386,7 +386,7 @@ void sl_wfx_host_gpio_init(void); sl_status_t sl_wfx_host_process_event(sl_wfx_generic_message_t * event_payload); #endif -#if (SIWX_917 | EXP_BOARD) +#if (SLI_917_SOC | EXP_BOARD) void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin); sl_status_t sl_si91x_driver_send_data_packet(sl_si91x_queue_type_t queue_type, sl_wifi_buffer_t * buffer, uint32_t wait_time); sl_status_t sl_si91x_allocate_command_buffer(sl_wifi_buffer_t ** host_buffer, void ** buffer, uint32_t requested_buffer_size, diff --git a/src/platform/silabs/rs911x/BLEManagerImpl.cpp b/src/platform/silabs/rs911x/BLEManagerImpl.cpp index d7e79f59dc8318..dcdee89ea498f8 100644 --- a/src/platform/silabs/rs911x/BLEManagerImpl.cpp +++ b/src/platform/silabs/rs911x/BLEManagerImpl.cpp @@ -28,7 +28,7 @@ #include "cmsis_os2.h" #include -#ifndef SIWX_917 +#ifndef SLI_917_SOC #include "rail.h" #endif #include @@ -42,7 +42,7 @@ extern "C" { #include "wfx_host_events.h" #include "wfx_rsi.h" #include "wfx_sl_ble_init.h" -#if !(SIWX_917 | EXP_BOARD) +#if !(SLI_917_SOC | EXP_BOARD) #include #endif #include @@ -58,11 +58,11 @@ extern "C" { #include #include -#ifdef SIWX_917 +#ifdef SLI_917_SOC extern "C" { #include "sl_si91x_trng.h" } -#endif // SIWX_917 +#endif // SLI_917_SOC #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING #include @@ -85,7 +85,7 @@ using namespace ::chip::DeviceLayer::Internal; void sl_ble_init() { uint8_t randomAddrBLE[RSI_BLE_ADDR_LENGTH] = { 0 }; -#if SIWX_917 +#if SLI_917_SOC sl_status_t sl_status; //! Get Random number of desired length sl_status = sl_si91x_trng_get_random_num((uint32_t *) randomAddrBLE, RSI_BLE_ADDR_LENGTH); @@ -100,7 +100,7 @@ void sl_ble_init() #else uint64_t randomAddr = chip::Crypto::GetRandU64(); memcpy(randomAddrBLE, &randomAddr, RSI_BLE_ADDR_LENGTH); -#endif // SIWX_917 +#endif // SLI_917_SOC // registering the GAP callback functions rsi_ble_gap_register_callbacks(NULL, NULL, rsi_ble_on_disconnect_event, NULL, NULL, NULL, rsi_ble_on_enhance_conn_status_event, diff --git a/src/platform/silabs/rs911x/wfx_sl_ble_init.h b/src/platform/silabs/rs911x/wfx_sl_ble_init.h index 26ee258300c5de..e1b01e7366eeae 100644 --- a/src/platform/silabs/rs911x/wfx_sl_ble_init.h +++ b/src/platform/silabs/rs911x/wfx_sl_ble_init.h @@ -42,7 +42,7 @@ #include #include #include -#if !(SIWX_917 | EXP_BOARD) +#if !(SLI_917_SOC | EXP_BOARD) #include #include #include diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni index 0853c0304a8b61..df932af97f1baa 100644 --- a/third_party/silabs/SiWx917_sdk.gni +++ b/third_party/silabs/SiWx917_sdk.gni @@ -171,8 +171,7 @@ template("siwx917_sdk") { "__HEAP_SIZE=0", "PLATFORM_HEADER=\"platform-header.h\"", "USE_NVM3=1", - "SIWX_917=1", - "CHIP_9117=1", + "SLI_917_SOC=1", "SLI_SI91X_ENABLE_BLE=1", "SL_SI91X_ENABLE_LITTLE_ENDIAN=1", "TINYCRYPT_PRIMITIVES", @@ -183,7 +182,6 @@ template("siwx917_sdk") { "SLI_SI91X_MCU_ENABLE_FLASH_BASED_EXECUTION=1", "SL_WIFI_COMPONENT_INCLUDED=1", "SLI_SI917=1", - "SI917=1", "ROMDRIVER_PRESENT=1", "SL_CATALOG_FREERTOS_KERNEL_PRESENT=1", "SLI_SI91X_MCU_CONFIG_RADIO_BOARD_BASE_VER=1", @@ -203,7 +201,6 @@ template("siwx917_sdk") { "ENABLE_DEBUG_MODULE=1", "SI91X_SYSRTC_PRESENT=1", "TA_DEEP_SLEEP_COMMON_FLASH=1", - "SI917_SOC=1", "SI91X_PLATFORM=1", "SL_NET_COMPONENT_INCLUDED=1", "SRAM_BASE=0x0cUL",