Skip to content

Commit 16db02c

Browse files
committed
Fixed errors in CI build tests for pull request #15351
There were two simple errors when running ci tests on pull #15351. These errors were unrelated to that pull. After investigating I found two simple errors. 1. The len variable was likely a typo that should have been the function argument, ien. 2. The spinlock_t lock was defined in a section dependent on CONFIG_SERIAL_TERMIOS. However, the spinlock_t lock was used in code that did not require the SERIAL_TERMIOS config. Therefore errors resulted. imxrt_edma_s missing lock variable CI build tests noted that the variable g_edma was referencing a lock variable that did not exist in the structure. This change adds that missing lock as a spinlock_t type. Remove unused flags variable from imxrt_dmach_stop
1 parent e19e1a8 commit 16db02c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

arch/arm/src/efm32/efm32_leserial.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static void efm32_restoreuartint(struct efm32_leuart_s *priv, uint32_t ien)
326326
*/
327327

328328
flags = spin_lock_irqsave(&priv->lock);
329-
efm32_restoreuartint_nolock(priv, len);
329+
efm32_restoreuartint_nolock(priv, ien);
330330
spin_unlock_irqrestore(&priv->lock, flags);
331331
}
332332

arch/arm/src/gd32f4/gd32f4xx_serial.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ struct up_dev_s
131131
uint8_t stop_2bits; /* True: Configure with 2 stop bits instead of 1 */
132132
uint32_t tx_gpio; /* USART TX GPIO pin configuration */
133133
uint32_t rx_gpio; /* USART RX GPIO pin configuration */
134-
spinlock_t lock; /* Spinlock */
135134

136135
# ifdef CONFIG_SERIAL_IFLOWCONTROL
137136
uint32_t rts_gpio; /* UART RTS GPIO pin configuration */
@@ -171,6 +170,7 @@ struct up_dev_s
171170

172171
uint32_t ie; /* USART enabled interrupts */
173172
uint16_t sr; /* Save USART status */
173+
spinlock_t lock; /* Spinlock */
174174

175175
/* TX DMA state */
176176

arch/arm/src/imxrt/imxrt_edma.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ struct imxrt_edma_s
137137
/* These mutex protect the DMA channel and descriptor tables */
138138

139139
mutex_t chlock; /* Protects channel table */
140+
spinlock_t lock;
140141
#if CONFIG_IMXRT_EDMA_NTCD > 0
141142
sem_t dsem; /* Supports wait for free descriptors */
142143
#endif
@@ -1207,7 +1208,6 @@ int imxrt_dmach_start(DMACH_HANDLE handle, edma_callback_t callback,
12071208
void imxrt_dmach_stop(DMACH_HANDLE handle)
12081209
{
12091210
struct imxrt_dmach_s *dmach = (struct imxrt_dmach_s *)handle;
1210-
irqstate_t flags;
12111211

12121212
dmainfo("dmach: %p\n", dmach);
12131213
DEBUGASSERT(dmach != NULL);

0 commit comments

Comments
 (0)