X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser_avr.c;h=8a31159ecef085373c1f2f8c6840b8564bb67ef9;hb=43268c92c3e0cd4fe8997aabcfc908715f258631;hp=e7513590143820ddaab6898bffd5bb0f6b3435fe;hpb=86cf322544e9546782ee25606ccd2f1dbb50c39b;p=bertos.git diff --git a/drv/ser_avr.c b/drv/ser_avr.c index e7513590..8a31159e 100755 --- a/drv/ser_avr.c +++ b/drv/ser_avr.c @@ -38,6 +38,18 @@ /*#* *#* $Log$ + *#* Revision 1.18 2004/12/08 08:03:48 bernie + *#* Doxygen fixes. + *#* + *#* Revision 1.17 2004/10/19 07:52:35 bernie + *#* Reset parity bits before overwriting them (Fixed by batt in project_ks). + *#* + *#* Revision 1.16 2004/10/03 18:45:48 bernie + *#* Convert to new-style config macros; Allow compiling with a C++ compiler (mostly). + *#* + *#* Revision 1.15 2004/09/14 21:05:36 bernie + *#* Use debug.h instead of kdebug.h; Use new AVR pin names; Spelling fixes. + *#* *#* Revision 1.14 2004/09/06 21:50:00 bernie *#* Spelling fixes. *#* @@ -81,11 +93,12 @@ #include "config.h" #include "hw.h" /* Required for bus macros overrides */ -#include +#include #include #include #include +#include /*! @@ -181,6 +194,9 @@ * * The default is no action. */ + #ifdef __doxygen__ + #define SER_UART0_BUS_TXOFF + #endif #endif #ifndef SER_UART1_BUS_TXINIT @@ -213,6 +229,9 @@ * * \see SER_UART0_BUS_TXOFF */ + #ifdef __doxygen__ + #define SER_UART1_BUS_TXOFF + #endif #endif /*\}*/ @@ -220,14 +239,14 @@ /* SPI port and pin configuration */ #define SPI_PORT PORTB #define SPI_DDR DDRB -#define SPI_SCK_BIT PORTB1 -#define SPI_MOSI_BIT PORTB2 -#define SPI_MISO_BIT PORTB3 +#define SPI_SCK_BIT PB1 +#define SPI_MOSI_BIT PB2 +#define SPI_MISO_BIT PB3 -/* USART registers definitions */ -#if defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__) +/* USART register definitions */ +#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 #define AVR_HAS_UART1 1 -#elif defined(__AVR_ATmega8__) +#elif CPU_AVR_ATMEGA8 #define AVR_HAS_UART1 0 #define UCSR0A UCSRA #define UCSR0B UCSRB @@ -237,7 +256,7 @@ #define UBRR0H UBRRH #define SIG_UART0_DATA SIG_UART_DATA #define SIG_UART0_RECV SIG_UART_RECV -#elif defined(__AVR_ATmega103__) +#elif CPU_AVR_ATMEGA103 #define AVR_HAS_UART1 0 #define UCSR0B UCR #define UDR0 UDR @@ -305,12 +324,11 @@ struct AvrSerial /* - * These are to trick GCC into *not* using - * absolute addressing mode when accessing - * ser_handles, which is very expensive. + * These are to trick GCC into *not* using absolute addressing mode + * when accessing ser_handles, which is very expensive. * - * Accessing through these pointers generates - * much shorter (and hopefully faster) code. + * Accessing through these pointers generates much shorter + * (and hopefully faster) code. */ struct Serial *ser_uart0 = &ser_handles[SER_UART0]; #if AVR_HAS_UART1 @@ -339,10 +357,9 @@ static void uart0_enabletxirq(struct SerialHardware *_hw) struct AvrSerial *hw = (struct AvrSerial *)_hw; /* - * WARNING: racy code here! The tx interrupt - * sets hw->sending to false when it runs with - * an empty fifo. The order of the statements - * in the if-block matters. + * WARNING: racy code here! The tx interrupt sets hw->sending to false + * when it runs with an empty fifo. The order of statements in the + * if-block matters. */ if (!hw->sending) { @@ -366,8 +383,8 @@ static void uart0_setbaudrate(UNUSED(struct SerialHardware *, _hw), unsigned lon static void uart0_setparity(UNUSED(struct SerialHardware *, _hw), int parity) { -#ifndef __AVR_ATmega103__ - UCSR0C |= (parity) << UPM0; +#if !CPU_AVR_ATMEGA103 + UCSR0C = (UCSR0C & ~(BV(UPM1) | BV(UPM0))) | ((parity) << UPM0); #endif } @@ -415,7 +432,7 @@ static void uart1_setbaudrate(UNUSED(struct SerialHardware *, _hw), unsigned lon static void uart1_setparity(UNUSED(struct SerialHardware *, _hw), int parity) { - UCSR1C |= (parity) << UPM0; + UCSR1C = (UCSR1C & ~(BV(UPM1) | BV(UPM0))) | ((parity) << UPM0); } #endif // AVR_HAS_UART1 @@ -476,72 +493,81 @@ static void spi_setparity(UNUSED(struct SerialHardware *, _hw), UNUSED(int, pari } +// FIXME: move into compiler.h? Ditch? +#if COMPILER_C99 + #define C99INIT(name,val) .name = val +#elif defined(__GNUC__) + #define C99INIT(name,val) name: val +#else + #warning No designated initializers, double check your code + #define C99INIT(name,val) (val) +#endif /* * High-level interface data structures */ static const struct SerialHardwareVT UART0_VT = { - .init = uart0_init, - .cleanup = uart0_cleanup, - .setbaudrate = uart0_setbaudrate, - .setparity = uart0_setparity, - .enabletxirq = uart0_enabletxirq, + C99INIT(init, uart0_init), + C99INIT(cleanup, uart0_cleanup), + C99INIT(setbaudrate, uart0_setbaudrate), + C99INIT(setparity, uart0_setparity), + C99INIT(enabletxirq, uart0_enabletxirq), }; #if AVR_HAS_UART1 static const struct SerialHardwareVT UART1_VT = { - .init = uart1_init, - .cleanup = uart1_cleanup, - .setbaudrate = uart1_setbaudrate, - .setparity = uart1_setparity, - .enabletxirq = uart1_enabletxirq, + C99INIT(init, uart1_init), + C99INIT(cleanup, uart1_cleanup), + C99INIT(setbaudrate, uart1_setbaudrate), + C99INIT(setparity, uart1_setparity), + C99INIT(enabletxirq, uart1_enabletxirq), }; #endif // AVR_HAS_UART1 static const struct SerialHardwareVT SPI_VT = { - .init = spi_init, - .cleanup = spi_cleanup, - .setbaudrate = spi_setbaudrate, - .setparity = spi_setparity, - .enabletxirq = spi_starttx, + C99INIT(init, spi_init), + C99INIT(cleanup, spi_cleanup), + C99INIT(setbaudrate, spi_setbaudrate), + C99INIT(setparity, spi_setparity), + C99INIT(enabletxirq, spi_starttx), }; static struct AvrSerial UARTDescs[SER_CNT] = { { - .hw = { - .table = &UART0_VT, - .txbuffer = uart0_txbuffer, - .rxbuffer = uart0_rxbuffer, - .txbuffer_size = CONFIG_UART0_TXBUFSIZE, - .rxbuffer_size = CONFIG_UART0_RXBUFSIZE, + C99INIT(hw, /**/) { + C99INIT(table, &UART0_VT), + C99INIT(txbuffer, uart0_txbuffer), + C99INIT(rxbuffer, uart0_rxbuffer), + C99INIT(txbuffer_size, sizeof(uart0_txbuffer)), + C99INIT(rxbuffer_size, sizeof(uart0_rxbuffer)), }, - .sending = false, + C99INIT(sending, false), }, #if AVR_HAS_UART1 { - .hw = { - .table = &UART1_VT, - .txbuffer = uart1_txbuffer, - .rxbuffer = uart1_rxbuffer, - .txbuffer_size = CONFIG_UART1_TXBUFSIZE, - .rxbuffer_size = CONFIG_UART1_RXBUFSIZE, + C99INIT(hw, /**/) { + C99INIT(table, &UART1_VT), + C99INIT(txbuffer, uart1_txbuffer), + C99INIT(rxbuffer, uart1_rxbuffer), + C99INIT(txbuffer_size, sizeof(uart1_txbuffer)), + C99INIT(rxbuffer_size, sizeof(uart1_rxbuffer)), }, - .sending = false, + C99INIT(sending, false), }, #endif { - .hw = { - .table = &SPI_VT, - .txbuffer = spi_txbuffer, - .rxbuffer = spi_rxbuffer, - .txbuffer_size = CONFIG_SPI_TXBUFSIZE, - .rxbuffer_size = CONFIG_SPI_RXBUFSIZE, + C99INIT(hw, /**/) { + C99INIT(table, &SPI_VT), + C99INIT(txbuffer, spi_txbuffer), + C99INIT(rxbuffer, spi_rxbuffer), + C99INIT(txbuffer_size, sizeof(spi_txbuffer)), + C99INIT(rxbuffer_size, sizeof(spi_rxbuffer)), }, - .sending = false, + C99INIT(sending, false), } }; @@ -552,7 +578,6 @@ struct SerialHardware* ser_hw_getdesc(int unit) } - /* * Interrupt handlers */ @@ -706,7 +731,7 @@ SIGNAL(SIG_UART1_TRANS) * Serial 0 RX complete interrupt handler. * * This handler is interruptible. - * Interrupt are re-enabled as soon as recv complete interrupt is + * Interrupt are reenabled as soon as recv complete interrupt is * disabled. Using INTERRUPT() is troublesome when the serial * is heavily loaded, because an interrupt could be retriggered * when executing the handler prologue before RXCIE is disabled. @@ -746,7 +771,7 @@ SIGNAL(SIG_UART0_RECV) #endif } - /* Re-enable receive complete int */ + /* Reenable receive complete int */ //DISABLE_INTS; //UCSR0B |= BV(RXCIE); @@ -760,7 +785,7 @@ SIGNAL(SIG_UART0_RECV) * Serial 1 RX complete interrupt handler. * * This handler is interruptible. - * Interrupt are re-enabled as soon as recv complete interrupt is + * Interrupt are reenabled as soon as recv complete interrupt is * disabled. Using INTERRUPT() is troublesome when the serial * is heavily loaded, because an interrupt could be retriggered * when executing the handler prologue before RXCIE is disabled.