X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser_avr.c;h=aa239de4af9f038426fca84fccfbcc7b0c25c013;hb=86ca446c6d5113066d6c16e602acff01aee5ae29;hp=37facaa2f7e39366a55a8275a4cd23470ae42890;hpb=b0ee5db10d096ef0ec5c303be1cef92bd8464d34;p=bertos.git

diff --git a/drv/ser_avr.c b/drv/ser_avr.c
index 37facaa2..aa239de4 100755
--- a/drv/ser_avr.c
+++ b/drv/ser_avr.c
@@ -38,6 +38,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.24  2005/01/14 00:49:16  aleph
+ *#* Rename callbacks; SerialHardwareVT.txSending: New callback; Add SPI_BUS macros.
+ *#*
+ *#* Revision 1.23  2005/01/11 18:09:07  aleph
+ *#* Add ATmega8 SPI port definitions; Fix transmit complete IRQ bug; add strobe macros to uart1 and spi
+ *#*
+ *#* Revision 1.22  2004/12/31 17:47:45  bernie
+ *#* Rename UNUSED() to UNUSED_ARG().
+ *#*
+ *#* Revision 1.21  2004/12/13 12:07:06  bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
  *#* Revision 1.20  2004/12/13 11:51:43  bernie
  *#* Fix a latent bug with reentrant serial IRQs.
  *#*
@@ -242,12 +254,52 @@
 /*\}*/
 
 
+/*!
+ * \name Overridable SPI hooks
+ *
+ * These can be redefined in hw.h to implement
+ * special bus policies such as slave select pin handling, etc.
+ *
+ * \{
+ */
+#ifndef SER_SPI_BUS_TXINIT
+	/*!
+	 * \def SER_SPI_BUS_TXINIT
+	 *
+	 * Default TXINIT macro - invoked in spi_init()
+	 * The default is no action.
+	 */
+	#define SER_SPI_BUS_TXINIT
+#endif
+
+#ifndef SER_SPI_BUS_TXCLOSE
+	/*!
+	 * \def SER_SPI_BUS_TXCLOSE
+	 *
+	 * Invoked after the last character has been transmitted.
+	 * The default is no action.
+	 */
+	#define SER_SPI_BUS_TXCLOSE
+#endif
+/*\}*/
+
+
 /* SPI port and pin configuration */
-#define SPI_PORT      PORTB
-#define SPI_DDR       DDRB
-#define SPI_SCK_BIT   PB1
-#define SPI_MOSI_BIT  PB2
-#define SPI_MISO_BIT  PB3
+#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA103
+	#define SPI_PORT      PORTB
+	#define SPI_DDR       DDRB
+	#define SPI_SCK_BIT   PB1
+	#define SPI_MOSI_BIT  PB2
+	#define SPI_MISO_BIT  PB3
+#elif CPU_AVR_ATMEGA8
+	#define SPI_PORT      PORTB
+	#define SPI_DDR       DDRB
+	#define SPI_SCK_BIT   PB5
+	#define SPI_MOSI_BIT  PB3
+	#define SPI_MISO_BIT  PB4
+#else
+	#error Unknown architecture
+#endif
 
 /* USART register definitions */
 #if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
@@ -262,6 +314,7 @@
 	#define UBRR0H UBRRH
 	#define SIG_UART0_DATA SIG_UART_DATA
 	#define SIG_UART0_RECV SIG_UART_RECV
+	#define SIG_UART0_TRANS SIG_UART_TRANS
 #elif CPU_AVR_ATMEGA103
 	#define AVR_HAS_UART1 0
 	#define UCSR0B UCR
@@ -270,6 +323,7 @@
 	#define UBRR0L UBRR
 	#define SIG_UART0_DATA SIG_UART_DATA
 	#define SIG_UART0_RECV SIG_UART_RECV
+	#define SIG_UART0_TRANS SIG_UART_TRANS
 #else
 	#error Unknown architecture
 #endif
@@ -347,13 +401,16 @@ struct Serial *ser_spi = &ser_handles[SER_SPI];
 /*
  * Callbacks
  */
-static void uart0_init(UNUSED(struct SerialHardware *, _hw), UNUSED(struct Serial *, ser))
+static void uart0_init(
+	UNUSED_ARG(struct SerialHardware *, _hw),
+	UNUSED_ARG(struct Serial *, ser))
 {
 	SER_UART0_BUS_TXINIT;
 	RTS_ON;
+	SER_STROBE_INIT;
 }
 
-static void uart0_cleanup(UNUSED(struct SerialHardware *, _hw))
+static void uart0_cleanup(UNUSED_ARG(struct SerialHardware *, _hw))
 {
 	UCSR0B = 0;
 }
@@ -374,7 +431,7 @@ static void uart0_enabletxirq(struct SerialHardware *_hw)
 	}
 }
 
-static void uart0_setbaudrate(UNUSED(struct SerialHardware *, _hw), unsigned long rate)
+static void uart0_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate)
 {
 	/* Compute baud-rate period */
 	uint16_t period = (((CLOCK_FREQ / 16UL) + (rate / 2)) / rate) - 1;
@@ -387,7 +444,7 @@ static void uart0_setbaudrate(UNUSED(struct SerialHardware *, _hw), unsigned lon
 	//DB(kprintf("uart0_setbaudrate(rate=%lu): period=%d\n", rate, period);)
 }
 
-static void uart0_setparity(UNUSED(struct SerialHardware *, _hw), int parity)
+static void uart0_setparity(UNUSED_ARG(struct SerialHardware *, _hw), int parity)
 {
 #if !CPU_AVR_ATMEGA103
 	UCSR0C = (UCSR0C & ~(BV(UPM1) | BV(UPM0))) | ((parity) << UPM0);
@@ -396,14 +453,16 @@ static void uart0_setparity(UNUSED(struct SerialHardware *, _hw), int parity)
 
 #if AVR_HAS_UART1
 
-static void uart1_init(UNUSED(struct SerialHardware *, _hw), UNUSED(struct Serial *, ser))
+static void uart1_init(
+	UNUSED_ARG(struct SerialHardware *, _hw),
+	UNUSED_ARG(struct Serial *, ser))
 {
 	SER_UART1_BUS_TXINIT;
 	RTS_ON;
 	SER_STROBE_INIT;
 }
 
-static void uart1_cleanup(UNUSED(struct SerialHardware *, _hw))
+static void uart1_cleanup(UNUSED_ARG(struct SerialHardware *, _hw))
 {
 	UCSR1B = 0;
 }
@@ -425,7 +484,7 @@ static void uart1_enabletxirq(struct SerialHardware *_hw)
 	}
 }
 
-static void uart1_setbaudrate(UNUSED(struct SerialHardware *, _hw), unsigned long rate)
+static void uart1_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate)
 {
 	/* Compute baud-rate period */
 	uint16_t period = (((CLOCK_FREQ / 16UL) + (rate / 2)) / rate) - 1;
@@ -436,14 +495,14 @@ static void uart1_setbaudrate(UNUSED(struct SerialHardware *, _hw), unsigned lon
 	//DB(kprintf("uart1_setbaudrate(rate=%ld): period=%d\n", rate, period);)
 }
 
-static void uart1_setparity(UNUSED(struct SerialHardware *, _hw), int parity)
+static void uart1_setparity(UNUSED_ARG(struct SerialHardware *, _hw), int parity)
 {
 	UCSR1C = (UCSR1C & ~(BV(UPM1) | BV(UPM0))) | ((parity) << UPM0);
 }
 
 #endif // AVR_HAS_UART1
 
-static void spi_init(UNUSED(struct SerialHardware *, _hw), UNUSED(struct Serial *, ser))
+static void spi_init(UNUSED_ARG(struct SerialHardware *, _hw), UNUSED_ARG(struct Serial *, ser))
 {
 	/*
 	 * Set MOSI and SCK ports out, MISO in.
@@ -462,11 +521,18 @@ static void spi_init(UNUSED(struct SerialHardware *, _hw), UNUSED(struct Serial
 	SPI_DDR &= ~BV(SPI_MISO_BIT);
 	/* Enable SPI, IRQ on, Master, CPU_CLOCK/16 */
 	SPCR = BV(SPE) | BV(SPIE) | BV(MSTR) | BV(SPR0);
+
+	SER_SPI_BUS_TXINIT;
+
+	SER_STROBE_INIT;
 }
 
-static void spi_cleanup(UNUSED(struct SerialHardware *, _hw))
+static void spi_cleanup(UNUSED_ARG(struct SerialHardware *, _hw))
 {
 	SPCR = 0;
+
+	SER_SPI_BUS_TXCLOSE;
+
 	/* Set all pins as inputs */
 	SPI_DDR &= ~(BV(SPI_MISO_BIT) | BV(SPI_MOSI_BIT) | BV(SPI_SCK_BIT));
 }
@@ -476,7 +542,7 @@ static void spi_starttx(struct SerialHardware *_hw)
 	struct AvrSerial *hw = (struct AvrSerial *)_hw;
 
 	cpuflags_t flags;
-	DISABLE_IRQSAVE(flags);
+	IRQ_SAVE_DISABLE(flags);
 
 	/* Send data only if the SPI is not already transmitting */
 	if (!hw->sending && !fifo_isempty(&ser_spi->txfifo))
@@ -485,19 +551,28 @@ static void spi_starttx(struct SerialHardware *_hw)
 		SPDR = fifo_pop(&ser_spi->txfifo);
 	}
 
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 }
 
-static void spi_setbaudrate(UNUSED(struct SerialHardware *, _hw), UNUSED(unsigned long, rate))
+static void spi_setbaudrate(
+	UNUSED_ARG(struct SerialHardware *, _hw),
+	UNUSED_ARG(unsigned long, rate))
 {
 	// nop
 }
 
-static void spi_setparity(UNUSED(struct SerialHardware *, _hw), UNUSED(int, parity))
+static void spi_setparity(UNUSED_ARG(struct SerialHardware *, _hw), UNUSED_ARG(int, parity))
 {
 	// nop
 }
 
+static bool tx_sending(struct SerialHardware* _hw)
+{
+	struct AvrSerial *hw = (struct AvrSerial *)_hw;
+	return hw->sending;
+}
+
+
 
 // FIXME: move into compiler.h?  Ditch?
 #if COMPILER_C99
@@ -516,9 +591,10 @@ static const struct SerialHardwareVT UART0_VT =
 {
 	C99INIT(init, uart0_init),
 	C99INIT(cleanup, uart0_cleanup),
-	C99INIT(setbaudrate, uart0_setbaudrate),
-	C99INIT(setparity, uart0_setparity),
-	C99INIT(enabletxirq, uart0_enabletxirq),
+	C99INIT(setBaudrate, uart0_setbaudrate),
+	C99INIT(setParity, uart0_setparity),
+	C99INIT(txStart, uart0_enabletxirq),
+	C99INIT(txSending, tx_sending),
 };
 
 #if AVR_HAS_UART1
@@ -526,9 +602,10 @@ static const struct SerialHardwareVT UART1_VT =
 {
 	C99INIT(init, uart1_init),
 	C99INIT(cleanup, uart1_cleanup),
-	C99INIT(setbaudrate, uart1_setbaudrate),
-	C99INIT(setparity, uart1_setparity),
-	C99INIT(enabletxirq, uart1_enabletxirq),
+	C99INIT(setBaudrate, uart1_setbaudrate),
+	C99INIT(setParity, uart1_setparity),
+	C99INIT(txStart, uart1_enabletxirq),
+	C99INIT(txSending, tx_sending),
 };
 #endif // AVR_HAS_UART1
 
@@ -536,9 +613,10 @@ static const struct SerialHardwareVT SPI_VT =
 {
 	C99INIT(init, spi_init),
 	C99INIT(cleanup, spi_cleanup),
-	C99INIT(setbaudrate, spi_setbaudrate),
-	C99INIT(setparity, spi_setparity),
-	C99INIT(enabletxirq, spi_starttx),
+	C99INIT(setBaudrate, spi_setbaudrate),
+	C99INIT(setParity, spi_setparity),
+	C99INIT(txStart, spi_starttx),
+	C99INIT(txSending, tx_sending),
 };
 
 static struct AvrSerial UARTDescs[SER_CNT] =
@@ -841,6 +919,8 @@ SIGNAL(SIG_UART1_RECV)
  */
 SIGNAL(SIG_SPI)
 {
+	SER_STROBE_ON;
+
 	/* Read incoming byte. */
 	if (!fifo_isfull(&ser_spi->rxfifo))
 		fifo_push(&ser_spi->rxfifo, SPDR);
@@ -855,4 +935,6 @@ SIGNAL(SIG_SPI)
 		SPDR = fifo_pop(&ser_spi->txfifo);
 	else
 		UARTDescs[SER_SPI].sending = false;
+
+	SER_STROBE_OFF;
 }