Skip to content

C++20 compatibility #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

C++20 compatibility #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed97320
fix c++20 build
Oct 22, 2025
31badb3
use __NOP() statement which includes volatile instead of __ASM("NOP")…
Oct 22, 2025
c71c222
use __NOP() statement which includes volatile instead of __ASM("NOP")…
Oct 22, 2025
814d173
Fix sli_si91x_accept return value when callback != NULL
Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/device/silabs/si91x/mcu/core/chip/src/rsi_deepsleep_soc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ void RSI_Set_Cntrls_To_M4(void)
BATT_FF->M4SS_TASS_CTRL_SET_REG_b.M4SS_CTRL_TASS_AON_DISABLE_ISOLATION_BYPASS = ENABLE;
/* M4SS controlling Power supply for TASS AON domains reset pin in bypass mode. */
M4SS_TASS_CTRL_CLR_REG = M4SS_CTRL_TASS_AON_PWR_DMN_RST_BYPASS_BIT;
for (volatile uint8_t delay = 0; delay < 10; delay++) {
__ASM("NOP");
for (uint8_t delay = 0; delay < 10; delay++) {
__NOP();
}
}
/**
Expand Down
16 changes: 8 additions & 8 deletions components/device/silabs/si91x/mcu/core/chip/src/rsi_ps_ram_func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,15 +530,15 @@ void RSI_PS_Restore_WiseAoc(void)
__set_MSP(INTERMEDIATE_SP);
/**/
M4SS_CLK_ENABLE_SET_REG1 = M4SS_STATIC_CLK_SWITCH;
__asm("nop");
__asm("nop");
__asm("nop");
__asm("nop");
__NOP();
__NOP();
__NOP();
__NOP();
M4SS_CLK_ENABLE_CLEAR_REG1 = M4SS_STATIC_CLK_SWITCH;
__asm("nop");
__asm("nop");
__asm("nop");
__asm("nop");
__NOP();
__NOP();
__NOP();
__NOP();
/*Restore the CPU context*/
RSI_PS_RestoreCpuContext();
return;
Expand Down
12 changes: 6 additions & 6 deletions components/device/silabs/si91x/mcu/drivers/peripheral_drivers/src/rsi_comparator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ rsi_error_t RSI_COMP_Enable(AUX_ADC_DAC_COMP_Type *comp, uint8_t comp_number, ui

if (enable) {
for (i = 0; i < 300; i++) {
__ASM("nop");
__NOP();
}
RSI_COMP_IntrEnableDisable(comp_number, ENABLE);
NVIC_EnableIRQ(COMP1_IRQn);
Expand All @@ -171,7 +171,7 @@ rsi_error_t RSI_COMP_Enable(AUX_ADC_DAC_COMP_Type *comp, uint8_t comp_number, ui

if (enable) {
for (i = 0; i < 300; i++) {
__ASM("nop");
__NOP();
}
RSI_COMP_IntrEnableDisable(comp_number, ENABLE);
NVIC_EnableIRQ(COMP2_IRQn);
Expand All @@ -190,7 +190,7 @@ rsi_error_t RSI_COMP_Enable(AUX_ADC_DAC_COMP_Type *comp, uint8_t comp_number, ui

if (enable) {
for (i = 0; i < 300; i++) {
__ASM("nop");
__NOP();
}
NVIC_EnableIRQ(COMP1_IRQn);
}
Expand All @@ -203,7 +203,7 @@ rsi_error_t RSI_COMP_Enable(AUX_ADC_DAC_COMP_Type *comp, uint8_t comp_number, ui

if (enable) {
for (i = 0; i < 300; i++) {
__ASM("nop");
__NOP();
}
NVIC_EnableIRQ(COMP2_IRQn);
}
Expand All @@ -219,7 +219,7 @@ rsi_error_t RSI_COMP_Enable(AUX_ADC_DAC_COMP_Type *comp, uint8_t comp_number, ui

if (enable) {
for (i = 0; i < 300; i++) {
__ASM("nop");
__NOP();
}
RSI_COMP_IntrEnableDisable(comp_number, ENABLE);
NVIC_EnableIRQ(COMP1_IRQn);
Expand All @@ -235,7 +235,7 @@ rsi_error_t RSI_COMP_Enable(AUX_ADC_DAC_COMP_Type *comp, uint8_t comp_number, ui

if (enable) {
for (i = 0; i < 300; i++) {
__ASM("nop");
__NOP();
}
RSI_COMP_IntrEnableDisable(comp_number, ENABLE);
NVIC_EnableIRQ(COMP2_IRQn);
Expand Down
2 changes: 1 addition & 1 deletion components/device/silabs/si91x/mcu/drivers/peripheral_drivers/src/rsi_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void RSI_IR_SoftwareRestart(IR_Type *pIr)
uint8_t i;
pIr->IR_CONFIG_b.SREST_IR_CORE = 1U;
for (i = 0; i < 10; i++) {
__ASM("nop");
__NOP();
}
pIr->IR_CONFIG_b.SREST_IR_CORE = 0U;
}
Expand Down
2 changes: 1 addition & 1 deletion components/device/silabs/si91x/mcu/drivers/peripheral_drivers/src/rsi_qspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,7 +1991,7 @@ void RSI_QSPI_ConfigQspiDll(spi_config_t *spi_config, qspi_reg_t *qspi_reg)
| (spi_config->spi_config_2.qspi_clk_en << 8)); // Octa_mode_enable_with_dqs
//wait till 10 clocks
while (delay) {
__ASM("nop");
__NOP();
delay--;
}

Expand Down
2 changes: 1 addition & 1 deletion components/device/silabs/si91x/mcu/drivers/peripheral_drivers/src/sl_si91x_m4_ps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ bool sli_si91x_ta_packet_initiated_to_m4(void)

// This delay is introduced to synchronize between the M4 and the NWP.
for (uint8_t delay = 0; delay < 10; delay++) {
__ASM("NOP");
__NOP();
}

// Verify if the NWP has already initiated a packet to the M4
Expand Down
2 changes: 1 addition & 1 deletion components/device/silabs/si91x/mcu/drivers/rom_driver/inc/rsi_rom_power_save.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ STATIC INLINE rsi_error_t RSI_PS_PowerStateChangePs4toPs2(ULP_MODE_T enCtxSel,
M4CLK->CLK_ENABLE_SET_REG1_b.M4SS_UM_CLK_STATIC_EN_b = 0x1;
#endif
for (uint8_t x = 0; x < 10; x++) {
__ASM("NOP");
__NOP();
}
#if !defined(SLI_SI917) && !defined(SLI_SI915)
M4CLK->CLK_ENABLE_CLR_REG1_b.M4SS_UM_CLK_STATIC_EN_b = 0x1;
Expand Down
8 changes: 4 additions & 4 deletions components/device/silabs/si91x/mcu/drivers/systemlevel/inc/rsi_power_save.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ STATIC INLINE rsi_error_t ps_power_state_change_ps4tops2(ULP_MODE_T enCtxSel,
uint8_t socLdoEnable,
uint8_t standByDc)
{
volatile int x = 0;
int x = 0;

/*return error if this function is called from PS2*/
if (M4_ULP_SLP_STATUS_REG & ULP_MODE_SWITCHED_NPSS) {
Expand All @@ -553,7 +553,7 @@ STATIC INLINE rsi_error_t ps_power_state_change_ps4tops2(ULP_MODE_T enCtxSel,

/*Avoid the junk system bus access*/
for (x = 0; x < 10; x++) {
__ASM("NOP");
__NOP();
}
/*
Indicates the status of functional switching to ULP Mode operation
Expand Down Expand Up @@ -669,7 +669,7 @@ STATIC INLINE rsi_error_t ps_power_state_change_ps2_to_Ps4(uint32_t PmuBuckTurnO
/* Wait for Status bit indicating Physical transition from PS2 to PS4*/
/*Avoid the junk system bus access*/
for (x = 0; x < 10; x++) {
__ASM("NOP");
__NOP();
}

while (M4_ULP_SLP_STATUS_REG & ULP_MODE_SWITCHED_NPSS)
Expand Down Expand Up @@ -699,7 +699,7 @@ STATIC INLINE rsi_error_t ps_power_state_change_ps2_to_Ps4(uint32_t PmuBuckTurnO
M4CLK->CLK_ENABLE_SET_REG1_b.M4SS_UM_CLK_STATIC_EN_b = 0x1;
#endif
for (x = 0; x < 200; x++) {
__ASM("NOP");
__NOP();
}
#if !defined(SLI_SI917) && !defined(SLI_SI915)
M4CLK->CLK_ENABLE_CLR_REG1_b.M4SS_UM_CLK_STATIC_EN_b = 0x1;
Expand Down
10 changes: 5 additions & 5 deletions components/device/silabs/si91x/mcu/drivers/unified_api/src/sl_si91x_psram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2021,7 +2021,7 @@ sl_psram_return_type_t sl_si91x_psram_sleep(void)

/*Make sure tHS is not violated*/

__asm("nop");
__NOP();

return PSRAM_SUCCESS;
}
Expand All @@ -2038,16 +2038,16 @@ sl_psram_return_type_t sl_si91x_psram_wakeup(void)

/*Make sure tXPHS is not violated*/

__asm("nop");
__asm("nop");
__asm("nop");
__NOP();
__NOP();
__NOP();

qspi_reg->QSPI_MANUAL_CONFIG_REG = (qspi_reg->QSPI_MANUAL_CONFIG_REG | 0x1);

/*Make sure tXHS is not violated*/

for (int i = 0; i < tXHS_MAX_COUNT; i++) {
__asm("nop");
__NOP();
}

return sl_si91x_psram_init();
Expand Down
4 changes: 2 additions & 2 deletions components/device/silabs/si91x/wireless/ahb_interface/src/sl_platform_wireless.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ void sl_si91x_trigger_sleep(SLEEP_TYPE_T sleepType,
P2P_STATUS_REG &= ~M4_is_active;
P2P_STATUS_REG;
// Adding delay to sync m4 with NWP
for (volatile uint8_t delay = 0; delay < 10; delay++) {
__ASM("NOP");
for (uint8_t delay = 0; delay < 10; delay++) {
__NOP();
}

// Checking if already NWP have triggered the packet to M4
Expand Down
2 changes: 1 addition & 1 deletion components/device/silabs/si91x/wireless/socket/src/sl_si91x_socket_utility.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ int sli_si91x_accept(int socket, struct sockaddr *addr, socklen_t *addr_len, sl_
SLI_SI91X_RETURN_IMMEDIATELY,
NULL);
SLI_SOCKET_VERIFY_STATUS_AND_RETURN(status, SL_STATUS_OK, SLI_SI91X_UNDEFINED_ERROR);
return SL_STATUS_OK;
return client_socket_id;
} else {
status = sli_si91x_send_socket_command(si91x_client_socket,
SLI_WLAN_REQ_SOCKET_ACCEPT,
Expand Down
2 changes: 1 addition & 1 deletion examples/si91x_soc/peripheral/sl_si91x_pcm_secondary/pcm_secondary_example.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void pcm_example_process_action(void)
do {
// Delay added to synchronize secondary receive with primary transmission.
for (int i = 0; i < 11000; i++) {
__asm("nop");
__NOP();
}
if (sl_si91x_pcm_receive_data(pcm_handle,
pcm_secondary_data_in,
Expand Down