Skip to content
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

{bp-15353} fix compile error #15375

Merged
merged 1 commit into from
Dec 28, 2024
Merged

{bp-15353} fix compile error #15375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion arch/arm/src/efm32/efm32_leserial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ static void efm32_restoreuartint(struct efm32_leuart_s *priv, uint32_t ien)
*/

flags = spin_lock_irqsave(&priv->lock);
efm32_restoreuartint_nolock(priv, len);
efm32_restoreuartint_nolock(priv, ien);
spin_unlock_irqrestore(&priv->lock, flags);
}

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/gd32f4/gd32f4xx_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ struct up_dev_s
uint8_t stop_2bits; /* True: Configure with 2 stop bits instead of 1 */
uint32_t tx_gpio; /* USART TX GPIO pin configuration */
uint32_t rx_gpio; /* USART RX GPIO pin configuration */
spinlock_t lock; /* Spinlock */

# ifdef CONFIG_SERIAL_IFLOWCONTROL
uint32_t rts_gpio; /* UART RTS GPIO pin configuration */
Expand Down Expand Up @@ -159,6 +158,7 @@ struct up_dev_s
const uint8_t stop_2bits; /* True: Configure with 2 stop bits instead of 1 */
const uint32_t tx_gpio; /* USART TX GPIO pin configuration */
const uint32_t rx_gpio; /* USART RX GPIO pin configuration */
spinlock_t lock; /* Spinlock */

# ifdef CONFIG_SERIAL_IFLOWCONTROL
const uint32_t rts_gpio; /* UART RTS GPIO pin configuration */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/imxrt/imxrt_edma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ struct imxrt_edma_s
/* This array describes each DMA channel */

struct imxrt_dmach_s dmach[IMXRT_EDMA_NCHANNELS];
spinlock_t lock; /* Spinlock */
};

/****************************************************************************
Expand Down Expand Up @@ -1207,7 +1208,6 @@ int imxrt_dmach_start(DMACH_HANDLE handle, edma_callback_t callback,
void imxrt_dmach_stop(DMACH_HANDLE handle)
{
struct imxrt_dmach_s *dmach = (struct imxrt_dmach_s *)handle;
irqstate_t flags;

dmainfo("dmach: %p\n", dmach);
DEBUGASSERT(dmach != NULL);
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/src/stm32u5/stm32_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ static struct stm32_serial_s g_lpuart1priv =
.rs485_dir_polarity = true,
# endif
# endif
.lock = = SP_UNLOCKED,
.lock = SP_UNLOCKED,
};
#endif

Expand Down Expand Up @@ -561,7 +561,7 @@ static struct stm32_serial_s g_usart1priv =
.rs485_dir_polarity = true,
# endif
# endif
.lock = = SP_UNLOCKED,
.lock = SP_UNLOCKED,
};
#endif

Expand Down Expand Up @@ -623,7 +623,7 @@ static struct stm32_serial_s g_usart2priv =
.rs485_dir_polarity = true,
# endif
# endif
.lock = = SP_UNLOCKED,
.lock = SP_UNLOCKED,
};
#endif

Expand Down Expand Up @@ -685,7 +685,7 @@ static struct stm32_serial_s g_usart3priv =
.rs485_dir_polarity = true,
# endif
# endif
.lock = = SP_UNLOCKED,
.lock = SP_UNLOCKED,
};
#endif

Expand Down Expand Up @@ -747,7 +747,7 @@ static struct stm32_serial_s g_uart4priv =
.rs485_dir_polarity = true,
# endif
# endif
.lock = = SP_UNLOCKED,
.lock = SP_UNLOCKED,
};
#endif

Expand Down Expand Up @@ -809,7 +809,7 @@ static struct stm32_serial_s g_uart5priv =
.rs485_dir_polarity = true,
# endif
# endif
.lock = = SP_UNLOCKED,
.lock = SP_UNLOCKED,
};
#endif

Expand Down
Loading