From: aleph <aleph@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 22 Oct 2010 13:06:52 +0000 (+0000)
Subject: sam3n spi: revert to "end of transmit" interrupt instead of "tx buffer empty",
X-Git-Tag: 2.6.0~5^2~73
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=98a8fd716b70d7bca58463785ee287f48c0783e8;p=bertos.git

sam3n spi: revert to "end of transmit" interrupt instead of "tx buffer empty",
it's slower but with the latter method it's necessary to handle both interrupt
to make flush work correctly.
Remove board specific stuff (chip select handling).  Don't allow SPI hardware
to drive chip select, better handled by the app as PIO.


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

diff --git a/bertos/cpu/cortex-m3/drv/ser_sam3.c b/bertos/cpu/cortex-m3/drv/ser_sam3.c
index 15b46dd1..0c5f8c39 100644
--- a/bertos/cpu/cortex-m3/drv/ser_sam3.c
+++ b/bertos/cpu/cortex-m3/drv/ser_sam3.c
@@ -185,13 +185,10 @@
 	#if CPU_CM3_AT91SAM3
 		#define SER_SPI0_BUS_TXINIT do { \
 			/* Disable PIO on SPI pins */ \
-			PIOA_PDR = BV(SPI0_SPCK) | BV(SPI0_MOSI) | BV(SPI0_MISO) | BV(30); \
+			PIOA_PDR = BV(SPI0_SPCK) | BV(SPI0_MOSI) | BV(SPI0_MISO); \
 			/* PIO is peripheral A */ \
 			PIOA_ABCDSR1 &= ~(BV(SPI0_SPCK) | BV(SPI0_MOSI) | BV(SPI0_MISO)); \
 			PIOA_ABCDSR2 &= ~(BV(SPI0_SPCK) | BV(SPI0_MOSI) | BV(SPI0_MISO)); \
-			/* Peripheral B for chip select for display (FIXME: move away from driver) */ \
-			PIOA_ABCDSR1 |= BV(30); \
-			PIOA_ABCDSR2 &= ~BV(30); \
 		} while (0)
 	#else
 		#define SER_SPI0_BUS_TXINIT do { \
@@ -540,7 +537,7 @@ static void spi0_init(UNUSED_ARG(struct SerialHardware *, _hw), UNUSED_ARG(struc
 	 * At reset clock division factor is set to 0, that is
 	 * *forbidden*. Set SPI clock to minimum to keep it valid.
 	 * Set all possible chip select registers in case user manually
-	 * change chip select.
+	 * change CPS field in SPI_MR.
 	 */
 	SPI0_CSR0 = BV(SPI_NCPHA) | (255 << SPI_SCBR_SHIFT);
 	SPI0_CSR1 = BV(SPI_NCPHA) | (255 << SPI_SCBR_SHIFT);
@@ -584,7 +581,7 @@ static void spi0_starttx(struct SerialHardware *_hw)
 		hw->sending = true;
 		SPI0_TDR = fifo_pop(&ser_handles[SER_SPI0]->txfifo);
 		/* Enable interrupt on tx buffer empty */
-		SPI0_IER = BV(SPI_TDRE);
+		SPI0_IER = BV(SPI_TXEMPTY);
 	}
 
 	IRQ_RESTORE(flags);
@@ -662,7 +659,7 @@ static void spi1_starttx(struct SerialHardware *_hw)
 		hw->sending = true;
 		SPI1_TDR = fifo_pop(&ser_handles[SER_SPI1]->txfifo);
 		/* Enable interrupt on tx buffer empty */
-		SPI1_IER = BV(SPI_TDRE);
+		SPI1_IER = BV(SPI_TXEMPTY);
 	}
 
 	IRQ_RESTORE(flags);
@@ -947,7 +944,7 @@ static DECLARE_ISR(spi0_irq_handler)
 	{
 		UARTDescs[SER_SPI0].sending = false;
 		/* Disable interrupt on tx buffer empty */
-		SPI0_IDR = BV(SPI_TDRE);
+		SPI0_IDR = BV(SPI_TXEMPTY);
 	}
 
 	SER_INT_ACK;
@@ -981,7 +978,7 @@ static DECLARE_ISR(spi1_irq_handler)
 	{
 		UARTDescs[SER_SPI1].sending = false;
 		/* Disable interrupt on tx buffer empty */
-		SPI1_IDR = BV(SPI_TDRE);
+		SPI1_IDR = BV(SPI_TXEMPTY);
 	}
 
 	SER_INT_ACK;