diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-04-13 10:53:48 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-04-13 10:53:48 +0000 |
| commit | 9e2c8595c8c07d14a2238019a33e00bc08928c92 (patch) | |
| tree | 691dc10ee1a14c7af0272069c3d0094bbca236b7 /ports | |
| parent | 18030639fb09e63627c975186896426a2d9c97de (diff) | |
| download | ChibiOS-9e2c8595c8c07d14a2238019a33e00bc08928c92.tar.gz ChibiOS-9e2c8595c8c07d14a2238019a33e00bc08928c92.tar.bz2 ChibiOS-9e2c8595c8c07d14a2238019a33e00bc08928c92.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@262 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ARM7-AT91SAM7X/sam7x_serial.c | 2 | ||||
| -rw-r--r-- | ports/ARMCM3-STM32F103/stm32_serial.c | 27 | ||||
| -rw-r--r-- | ports/ARMCM3-STM32F103/stm32_serial.h | 8 |
3 files changed, 30 insertions, 7 deletions
diff --git a/ports/ARM7-AT91SAM7X/sam7x_serial.c b/ports/ARM7-AT91SAM7X/sam7x_serial.c index 2fad3c380..c401be168 100644 --- a/ports/ARM7-AT91SAM7X/sam7x_serial.c +++ b/ports/ARM7-AT91SAM7X/sam7x_serial.c @@ -51,7 +51,7 @@ static void SetError(AT91_REG csr, FullDuplexDriver *com) { static void ServeInterrupt(AT91PS_USART u, FullDuplexDriver *com) {
if (u->US_CSR & AT91C_US_RXRDY)
- chFDDIncomingDataI(com, u->US_RHR);
+ chFDDIncomingDataI(com, u->US_RHR);
if (u->US_CSR & AT91C_US_TXRDY) {
msg_t b = chFDDRequestDataI(com);
if (b < Q_OK)
diff --git a/ports/ARMCM3-STM32F103/stm32_serial.c b/ports/ARMCM3-STM32F103/stm32_serial.c index 87dc70b85..a6150d79d 100644 --- a/ports/ARMCM3-STM32F103/stm32_serial.c +++ b/ports/ARMCM3-STM32F103/stm32_serial.c @@ -51,10 +51,30 @@ static void SetError(uint16_t sr, FullDuplexDriver *com) { sts |= SD_FRAMING_ERROR;
if (sr & SR_LBD)
sts |= SD_BREAK_DETECTED;
+ chSysLock();
chFDDAddFlagsI(com, sts);
+ chSysUnlock();
}
static void ServeInterrupt(USART_TypeDef *u, FullDuplexDriver *com) {
+ uint16_t sr = u->SR;
+
+ if (sr & (SR_ORE | SR_FE | SR_PE | SR_LBD))
+ SetError(sr, com);
+ if (sr & SR_RXNE) {
+ chSysLock();
+ chFDDIncomingDataI(com, u->DR);
+ chSysUnlock();
+ }
+ if (sr & SR_TXE) {
+ chSysLock();
+ msg_t b = chFDDRequestDataI(com);
+ chSysUnlock();
+ if (b < Q_OK)
+ u->CR1 &= ~CR1_TXEIE;
+ else
+ u->DR = b;
+ }
}
#ifdef USE_USART1
@@ -150,15 +170,18 @@ void SetUSARTI(USART_TypeDef *u, uint32_t speed, uint16_t cr1, */
void InitSerial(uint32_t prio1, uint32_t prio2, uint32_t prio3) {
- /* I/O queues setup.*/
#ifdef USE_USART1
chFDDInit(&COM1, ib1, sizeof ib1, NULL, ob1, sizeof ob1, OutNotify1);
+ SetUSARTI(USART1, 38400, 0, CR2_STOP1_BITS | CR2_LINEN, 0);
#endif
+
#ifdef USE_USART2
chFDDInit(&COM2, ib2, sizeof ib2, NULL, ob2, sizeof ob2, OutNotify2);
+ SetUSARTI(USART2, 38400, 0, CR2_STOP1_BITS | CR2_LINEN, 0);
#endif
+
#ifdef USE_USART3
chFDDInit(&COM3, ib3, sizeof ib3, NULL, ob3, sizeof ob3, OutNotify3);
+ SetUSARTI(USART3, 38400, 0, CR2_STOP1_BITS | CR2_LINEN, 0);
#endif
-
}
diff --git a/ports/ARMCM3-STM32F103/stm32_serial.h b/ports/ARMCM3-STM32F103/stm32_serial.h index 0d05c7f12..d14270a52 100644 --- a/ports/ARMCM3-STM32F103/stm32_serial.h +++ b/ports/ARMCM3-STM32F103/stm32_serial.h @@ -67,10 +67,10 @@ #define CR2_CPOL (1 << 10)
#define CR2_CLKEN (1 << 11)
#define CR2_STOP_MASK (3 << 12)
-#define CR2_STOP1_BITS (0 << 12
-#define CR2_STOP0P5_BITS (1 << 12
-#define CR2_STOP2_BITS (2 << 12
-#define CR2_STOP1P5_BITS (3 << 12
+#define CR2_STOP1_BITS (0 << 12)
+#define CR2_STOP0P5_BITS (1 << 12)
+#define CR2_STOP2_BITS (2 << 12)
+#define CR2_STOP1P5_BITS (3 << 12)
#define CR2_LINEN (1 << 14)
#define CR3_EIE (1 << 0)
|