aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal
diff options
context:
space:
mode:
Diffstat (limited to 'os/hal')
-rw-r--r--os/hal/platforms/STM32/stm32_dma.h32
-rw-r--r--os/hal/platforms/STM32/uart_lld.c26
-rw-r--r--os/hal/platforms/STM32/uart_lld.h18
3 files changed, 53 insertions, 23 deletions
diff --git a/os/hal/platforms/STM32/stm32_dma.h b/os/hal/platforms/STM32/stm32_dma.h
index 673fcc589..3c4e6985c 100644
--- a/os/hal/platforms/STM32/stm32_dma.h
+++ b/os/hal/platforms/STM32/stm32_dma.h
@@ -101,6 +101,38 @@ typedef struct {
#define STM32_DMA2_CH5 (STM32_DMA2->channels[4])
#endif
+#define STM32_DMA_CHANNEL_1 0
+#define STM32_DMA_CHANNEL_2 1
+#define STM32_DMA_CHANNEL_3 2
+#define STM32_DMA_CHANNEL_4 3
+#define STM32_DMA_CHANNEL_5 4
+#define STM32_DMA_CHANNEL_6 5
+#define STM32_DMA_CHANNEL_7 6
+
+/**
+ * @brief DMA channel setup.
+ * @note This macro does not change the CPAR register because that register
+ * value does not change frequently, it usually points to a peripheral
+ * data register.
+ * @note Channels are numbered from 0 to 6, use the appropriate macro
+ * as parameter.
+ */
+#define dmaSetupChannel(dmap, ch, cndtr, cmar, ccr) { \
+ stm32_dma_channel_t *dmachp = &dmap->channels[ch]; \
+ (dmachp)->CNDTR = (uint32_t)(cndtr); \
+ (dmachp)->CMAR = (uint32_t)(cmar); \
+ (dmachp)->CCR = (uint32_t)(ccr); \
+}
+
+/**
+ * @brief DMA channel disable.
+ * @note Channel's pending interrupt are cleared.
+ */
+#define dmaDisableChannel(dmap, ch) { \
+ (dmap)->channels[ch].CCR = 0; \
+ (dmap)->IFCR = 0xF << (ch); \
+}
+
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
diff --git a/os/hal/platforms/STM32/uart_lld.c b/os/hal/platforms/STM32/uart_lld.c
index 4967bb06f..f5db41c58 100644
--- a/os/hal/platforms/STM32/uart_lld.c
+++ b/os/hal/platforms/STM32/uart_lld.c
@@ -54,7 +54,7 @@ UARTDriver UARTD1;
}
#define dma_disable(dmap) { \
- (dmap)->CCR = 0; \
+ (dmap)->CCR = 0; \
}
#define dma_rx_setup(uartp, cndtr, cmar, ccr) \
@@ -84,16 +84,18 @@ static void usart_start(UARTDriver *uartp) {
USART_CR1_TE | USART_CR1_RE;
u->CR2 = uartp->ud_config->uc_cr2 | USART_CR2_LBDIE;
u->CR3 = uartp->ud_config->uc_cr3 | USART_CR3_EIE;
+
+ /* Resetting eventual pending status flags.*/
(void)u->SR; /* SR reset step 1.*/
(void)u->DR; /* SR reset step 2.*/
/* RX DMA channel preparation, circular 1 frame transfers, an interrupt is
generated for each received character.*/
- dma_rx_setup(uartp, 1, &uartp->ud_rxbuf,
- DMA_CCR1_TCIE | DMA_CCR1_TEIE | DMA_CCR1_CIRC | DMA_CCR1_EN);
+ dmaSetupChannel(uartp->ud_dmap, uartp->ud_dmarx, 1, &uartp->ud_rxbuf,
+ DMA_CCR1_TCIE | DMA_CCR1_TEIE | DMA_CCR1_CIRC | DMA_CCR1_EN);
/* TX DMA channel preparation, simply disabled.*/
- dma_disable(uartp->ud_dmatx);
+ dmaDisableChannel(uartp->ud_dmap, uartp->ud_dmatx);
}
/**
@@ -105,8 +107,8 @@ static void usart_start(UARTDriver *uartp) {
static void usart_stop(UARTDriver *uartp) {
/* Stops RX and TX DMA channels.*/
- dma_disable(uartp->ud_dmarx);
- dma_disable(uartp->ud_dmatx);
+ dmaDisableChannel(uartp->ud_dmap, uartp->ud_dmarx);
+ dmaDisableChannel(uartp->ud_dmap, uartp->ud_dmatx);
/* Stops USART operations.*/
uartp->ud_usart->CR1 = 0;
@@ -132,11 +134,9 @@ void uart_lld_init(void) {
RCC->APB2RSTR = 0;
uartObjectInit(&UARTD1);
UARTD1.ud_usart = USART1;
- UARTD1.ud_dmarx = DMA1_Channel4;
- UARTD1.ud_dmatx = DMA1_Channel5;
+ UARTD1.ud_dmarx = STM32_DMA_CHANNEL_4;
+ UARTD1.ud_dmatx = STM32_DMA_CHANNEL_5;
UARTD1.ud_dmaccr = 0;
- UARTD1.ud_dmarmsk = 0xF << (4 - 1);
- UARTD1.ud_dmatmsk = 0xF << (5 - 1);
#endif
}
@@ -166,8 +166,8 @@ void uart_lld_start(UARTDriver *uartp) {
uartp->ud_dmaccr = STM32_UART_USART1_DMA_PRIORITY << 12;
if ((uartp->ud_config->uc_cr1 & (USART_CR1_M | USART_CR1_PCE)) == USART_CR1_M)
uartp->ud_dmaccr |= DMA_CCR1_MSIZE_0 | DMA_CCR1_PSIZE_0;
- uartp->ud_dmarx->CPAR = (uint32_t)&uartp->ud_usart->DR;
- uartp->ud_dmatx->CPAR = (uint32_t)&uartp->ud_usart->DR;
+ uartp->ud_dmap->channels[uartp->ud_dmarx].CPAR = (uint32_t)&uartp->ud_usart->DR;
+ uartp->ud_dmap->channels[uartp->ud_dmatx].CPAR = (uint32_t)&uartp->ud_usart->DR;
}
uartp->ud_txstate = UART_TX_IDLE;
uartp->ud_rxstate = UART_RX_IDLE;
@@ -181,7 +181,7 @@ void uart_lld_start(UARTDriver *uartp) {
*/
void uart_lld_stop(UARTDriver *uartp) {
- if (uartp->ud_state == SD_READY) {
+ if (uartp->ud_state == UART_READY) {
usart_stop(uartp);
#if STM32_UART_USE_USART1
diff --git a/os/hal/platforms/STM32/uart_lld.h b/os/hal/platforms/STM32/uart_lld.h
index 50216608e..29cdda1ed 100644
--- a/os/hal/platforms/STM32/uart_lld.h
+++ b/os/hal/platforms/STM32/uart_lld.h
@@ -118,20 +118,18 @@ typedef struct {
/** @brief UART driver status flags.*/
uartflags_t ud_flags;
/* End of the mandatory fields.*/
- /** @brief Default receive buffer while into @p UART_RX_IDLE state.*/
- uint16_t ud_rxbuf;
/** @brief Pointer to the USART registers block.*/
USART_TypeDef *ud_usart;
- /** @brief Pointer to the receive DMA channel registers block.*/
- DMA_Channel_TypeDef *ud_dmarx;
- /** @brief Receive DMA flags mask*/
- uint32_t ud_dmarmsk;
- /** @brief Pointer to the transmit DMA channel registers block.*/
- DMA_Channel_TypeDef *ud_dmatx;
- /** @brief Transmit DMA flags mask*/
- uint32_t ud_dmatmsk;
+ /** @brief Pointer to the DMA registers block.*/
+ stm32_dma_t *ud_dmap;
/** @brief DMA priority bit mask.*/
uint32_t ud_dmaccr;
+ /** @brief Receive DMA channel.*/
+ uint8_t ud_dmarx;
+ /** @brief Transmit DMA channel.*/
+ uint8_t ud_dmatx;
+ /** @brief Default receive buffer while into @p UART_RX_IDLE state.*/
+ uint16_t ud_rxbuf;
} UARTDriver;
/*===========================================================================*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:43:14 +0000