From 18971eb572b7c99518833a1c32305df3068c41b3 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 15 五月 2025 16:28:58 +0800
Subject: [PATCH] 一直抢占
---
keil/include/drivers/mk_uart.c | 123 +++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 66 deletions(-)
diff --git a/keil/include/drivers/mk_uart.c b/keil/include/drivers/mk_uart.c
index d101fe8..bd0a116 100644
--- a/keil/include/drivers/mk_uart.c
+++ b/keil/include/drivers/mk_uart.c
@@ -59,55 +59,22 @@
.dma_tx_ch = DMA_CH7,
},
};
-//脪脝脰虏
-uint32_t SerialKeyPressed(uint8_t *key)//脜脨露脧脢媒戮脻脢脟路帽脢脮碌陆碌脛 MK8000脨脼赂脛
-{
- uint32_t status = uart_handle[1].base->STATUS;
- if (status & UART_STATUS_DR_MSK)
- {
- //Serial0PutString("鲁脡鹿娄陆脫脢脮ing");
- //uart_receive(UART_ID1,test_buf,10,NULL);
- *key = (uint8_t)uart_handle[1].base->RX_DATA;
- //uart_rx_fifo_clear(UART_ID1);
- return 1;
- }
- else
- {
- return 0;
- }
-}
-void SerialPutChar(uint8_t c)
-{
- while (uart_handle[0].base->TX_FL)
- {
- }
-uart_send(UART_ID1, &c, 1, NULL);
-}
-
-void Serial_PutString(uint8_t *s)
-{
- while (*s != '\0')
- {
- SerialPutChar(*s);
- s++;
- }
-}
void Serial0PutChar(uint8_t c)
- {//脜脨露脧脢媒戮脻禄潞麓忙脟酶脦陋驴脮录麓脡脧脪禄赂枚脳脰陆脷脢媒戮脻脪脩戮颅卤禄脣脥碌陆路垄脣脥录脛麓忙脝梅路垄脣脥鲁枚脠楼脕脣
- // wait TX FIFO empty
- while (uart_handle[0].base->TX_FL)
- {
- }
-uart_send(UART_ID0, &c, 1, NULL);
+{
+ // wait TX FIFO empty
+ while (uart_handle[0].base->TX_FL)
+ {
+ }
+ uart_send(UART_ID0, &c, 1, NULL);
}
void Serial0_PutString(uint8_t *s)
{
- while (*s != '\0')
- {
- Serial0PutChar(*s);
- s++;
- }
+ while (*s != '\0')
+ {
+ Serial0PutChar(*s);
+ s++;
+ }
}
static const struct UART_DIVISOR_T baud_table[] = {
{89, 6, 32}, // 1200
@@ -432,14 +399,6 @@
while (uart_handle[id].tx_count < uart_handle[id].tx_size)
{
status = uart_handle[id].base->STATUS;
- if (status & (UART_STATUS_OE_MSK | UART_STATUS_PE_MSK | UART_STATUS_FE_MSK | UART_STATUS_BI_MSK | UART_STATUS_RFE_MSK))
- {
- // TODO: user handle the error case
- uart_handle[id].base->INTR_CLR = UART_INTR_CLR_LSR_INT_CLR_MSK;
- status |= UART_ERR_LINE;
- ret = DRV_ERROR;
- break;
- }
if (uart_handle[id].base->STATUS & UART_STATUS_TFNF_MSK)
{
@@ -544,8 +503,6 @@
if (status & (UART_STATUS_OE_MSK | UART_STATUS_PE_MSK | UART_STATUS_FE_MSK | UART_STATUS_BI_MSK | UART_STATUS_RFE_MSK))
{
// TODO: user handle the error case
- // Clear error bits
- uart_handle[id].base->INTR_CLR = UART_INTR_CLR_LSR_INT_CLR_MSK;
status |= UART_ERR_LINE;
ret = DRV_ERROR;
break;
@@ -569,6 +526,33 @@
}
return ret;
+}
+
+void uart_send_over_fifo(enum UART_DEV_T id, uint8_t *tx_buf, uint32_t len)
+{
+ for (uint32_t i = 0; i < len; i++)
+ {
+ uart_handle[id].base->TX_DATA = tx_buf[i];
+ }
+}
+
+uint32_t uart_receive_from_fifo(enum UART_DEV_T id, uint8_t *rx_buf, uint32_t len)
+{
+ for (uint32_t i = 0; i < len; i++)
+ {
+ uint32_t status = uart_handle[id].base->STATUS;
+
+ if (status & UART_STATUS_RFNE_MSK)
+ {
+ rx_buf[i] = (uint8_t)uart_handle[id].base->RX_DATA;
+ }
+ else
+ {
+ return i;
+ }
+ }
+
+ return len;
}
int uart_tx_abort_dma(enum UART_DEV_T id, drv_callback_t abort_tx_callback)
@@ -747,26 +731,22 @@
void uart_irq_handler(enum UART_DEV_T id)
{
drv_callback_t usr_callback = NULL;
- uint32_t err_code = 0;
-
- // read interrupt ID
- uint8_t iid = uart_handle[id].base->INTR_STATUS & 0x0f;
+ uint32_t err_code = uart_handle[id].base->STATUS;
// If DMA is enabled, the uart interrupt handler is only used to handle the error events reported by the receiver
if (uart_handle[id].dma_en)
{
#if UART_DMA_MODE_EN
- err_code = uart_handle[id].base->STATUS;
// iid == 0xC: The precondition that the timeout event will not be triggered is that the length of
// the received data is an integer multiple of the RX FIFO level
- if ((err_code & UART_STATUS_ERROR_MSK) || (iid == 0x0C) || (iid == 0x01))
+ if (err_code & UART_STATUS_ERROR_MSK)
{
// RX err - disable interrupts
uart_handle[id].base->INTR_EN &= ~UART_INTR_EN_ELSI_MSK;
uart_handle[id].base->INTR_CLR = UART_INTR_CLR_LSR_INT_CLR_MSK;
- uart_handle[id].dma_rx_err_state = UART_ERR_LINE | iid;
+ uart_handle[id].dma_rx_err_state = UART_ERR_LINE;
usr_callback = uart_handle[id].rx_callback;
- err_code = UART_ERR_LINE | iid;
+ err_code |= UART_ERR_LINE;
// update state
uart_state_clear(id, UART_STATE_BUSY_RX);
@@ -781,13 +761,16 @@
else
{
#if UART_INT_MODE_EN
+ // read interrupt ID
+ uint8_t iid = uart_handle[id].base->INTR_STATUS & 0x0f;
+
switch (iid)
{
// modem status
case 0x0:
// clear int
uart_handle[id].base->INTR_CLR = UART_INTR_CLR_MSR_INT_CLR_MSK;
- err_code = UART_ERR_MODEM | iid;
+ err_code |= UART_ERR_MODEM;
break;
// no interrupt pending
@@ -869,16 +852,24 @@
// receiver line status
case 0x6:
- // clear int
+ // clear int (Overrun/parity/framing errors, break interrupt, or address received interrupt)
+ // RX err - disable interrupts
+ uart_handle[id].base->INTR_EN &= ~UART_INTR_EN_ELSI_MSK;
uart_handle[id].base->INTR_CLR = UART_INTR_CLR_LSR_INT_CLR_MSK;
- err_code = UART_ERR_LINE | iid;
+ usr_callback = uart_handle[id].rx_callback;
+ err_code |= UART_ERR_LINE;
+
+ uart_handle[id].rx_buff = NULL;
+ uart_handle[id].rx_callback = NULL;
+ uart_handle[id].rx_count = 0;
+ uart_handle[id].rx_size = 0;
break;
// busy detect
case 0x7:
// clear int
uart_handle[id].base->INTR_CLR = UART_INTR_CLR_BUSY_INT_CLR_MSK;
- err_code = UART_ERR_BUSY | iid;
+ err_code |= UART_ERR_BUSY;
break;
default:
--
Gitblit v1.9.3