From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Sat, 20 Oct 2007 14:09:59 +0000 (+0000)
Subject: Fix bug in irq dispatcher. Change PIO output pin. Add serail hw struct.
X-Git-Tag: 1.0.0~322
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=449de0d2613a17913eaa2da83c4e19c4dad7b6fd;p=bertos.git

Fix bug in irq dispatcher. Change PIO output pin. Add serail hw struct.


git-svn-id: https://src.develer.com/svnoss/bertos/trunk@920 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/cpu/arm/drv/ser_at91.c b/cpu/arm/drv/ser_at91.c
index a35a90c7..2d720597 100644
--- a/cpu/arm/drv/ser_at91.c
+++ b/cpu/arm/drv/ser_at91.c
@@ -187,10 +187,10 @@ static void serirq_dispatcher(void)
 {
 	IRQ_ENTRY();
 
-	if (US0_IMR | BV(US_RXRDY))
+	if (US0_IMR & BV(US_RXRDY))
 		serirq_rx();
 
-	if (US0_IMR | BV(US_TXRDY))
+	if (US0_IMR & BV(US_TXRDY))
 		serirq_tx();
 
 	IRQ_EXIT();
@@ -217,21 +217,23 @@ static void uart0_init(
 	PMC_PCER = BV(US0_ID);
 
     /* Disable GPIO on UART tx/rx pins. */
-	PIOA_PDR = BV(PA0_RXD0_A) | BV(PA1_TXD0_A);
+	PIOA_PDR = BV(PA5_RXD1_A) | BV(PA6_TXD1_A);
 
 	/* Reset UART. */
 	US0_CR = BV(US_RSTRX) | BV(US_RSTTX);
 
+
+	/* Set serial param: mode Normal, 8bit data, 1bit stop */
+	US0_MR |= US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1;
+
 	/* Enable Tx and Rx */
 	US0_CR = BV(US_RXEN) | BV(US_TXEN);
 
-	US0_IER = BV(US_RXRDY);
+	US0_IER = BV(US_RXRDY) | BV(US_TXRDY);
 
     /* enable GPIO on UART tx/rx pins. */
-	PIOA_PER = BV(PA0_RXD0_A) | BV(PA1_TXD0_A);
+	PIOA_PER = BV(PA5_RXD1_A) | BV(PA6_TXD1_A);
 
-	/* Set serial param: mode Normal, 8bit data, 1bit stop */
-	US0_MR |= US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1;
 }
 
 static void uart0_cleanup(UNUSED_ARG(struct SerialHardware *, _hw))
@@ -332,3 +334,9 @@ static struct ArmSerial UARTDescs[SER_CNT] =
 		C99INIT(sending, false),
 	}
 };
+
+struct SerialHardware *ser_hw_getdesc(int unit)
+{
+	ASSERT(unit < SER_CNT);
+	return &UARTDescs[unit].hw;
+}