From 002d504648842f8eadf45d5dd1dad53964b55d9c Mon Sep 17 00:00:00 2001 From: bouni Date: Mon, 8 Sep 2014 12:46:08 +0200 Subject: [PATCH 1/4] Added 9-bit frame support for AVR based boards to Hardware Serial --- .../avr/cores/arduino/HardwareSerial.cpp | 109 +++++++++++++----- .../avr/cores/arduino/HardwareSerial.h | 73 +++++++----- .../avr/cores/arduino/HardwareSerial0.cpp | 4 +- .../avr/cores/arduino/HardwareSerial1.cpp | 28 +++-- .../avr/cores/arduino/HardwareSerial2.cpp | 32 ++++- .../avr/cores/arduino/HardwareSerial3.cpp | 32 ++++- .../cores/arduino/HardwareSerial_private.h | 42 +++++-- 7 files changed, 225 insertions(+), 95 deletions(-) diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp index 29a336649e4..6f686778789 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp @@ -82,10 +82,25 @@ void HardwareSerial::_tx_udr_empty_irq(void) { // If interrupts are enabled, there must be more data in the output // buffer. Send the next byte - unsigned char c = _tx_buffer[_tx_buffer_tail]; - _tx_buffer_tail = (_tx_buffer_tail + 1) % SERIAL_TX_BUFFER_SIZE; + + if(bit_is_set(*_ucsrb, UCSZ02)) { + // If Uart is configured for 9 bit mode + unsigned char mb = _tx_buffer[_tx_buffer_tail]; + unsigned char c = _tx_buffer[_tx_buffer_tail + 1]; + _tx_buffer_tail = (_tx_buffer_tail + 2) % SERIAL_TX_BUFFER_SIZE; + if(mb & 0x01) { + sbi(*_ucsrb, TXB80); + } else { + cbi(*_ucsrb, TXB80); + } + *_udr = c; + } else { + // UART is configured for 5 to 8 bit modes + unsigned char c = _tx_buffer[_tx_buffer_tail]; + _tx_buffer_tail = (_tx_buffer_tail + 1) % SERIAL_TX_BUFFER_SIZE; - *_udr = c; + *_udr = c; + } // clear the TXC bit -- "can be cleared by writing a one to its bit // location". This makes sure flush() won't return until the bytes @@ -100,7 +115,7 @@ void HardwareSerial::_tx_udr_empty_irq(void) // Public Methods ////////////////////////////////////////////////////////////// -void HardwareSerial::begin(unsigned long baud, byte config) +void HardwareSerial::begin(unsigned long baud, uint16_t config) { // Try u2x mode first uint16_t baud_setting = (F_CPU / 4 / baud - 1) / 2; @@ -117,7 +132,7 @@ void HardwareSerial::begin(unsigned long baud, byte config) baud_setting = (F_CPU / 8 / baud - 1) / 2; } - // assign the baud_setting, a.k.a. ubrr (USART Baud Rate Register) + // assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register) *_ubrrh = baud_setting >> 8; *_ubrrl = baud_setting; @@ -127,8 +142,12 @@ void HardwareSerial::begin(unsigned long baud, byte config) #if defined(__AVR_ATmega8__) config |= 0x80; // select UCSRC register (shared with UBRRH) #endif - *_ucsrc = config; - + + if(config & 0x100) { + sbi(*_ucsrb, UCSZ02); + } + *_ucsrc = (uint8_t) config; + sbi(*_ucsrb, RXEN0); sbi(*_ucsrb, TXEN0); sbi(*_ucsrb, RXCIE0); @@ -152,7 +171,15 @@ void HardwareSerial::end() int HardwareSerial::available(void) { - return (int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_RX_BUFFER_SIZE; + unsigned int a = (unsigned int) (SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_RX_BUFFER_SIZE; + if(bit_is_set(*_ucsrb, UCSZ02)) { + // If Uart is in 9 bit mode return only the half, because we use two bytes per 9 bit "byte". + return a / 2; + } + else { + // For 5 - 8 bit modes simply return the number + return a; + } } int HardwareSerial::peek(void) @@ -160,7 +187,12 @@ int HardwareSerial::peek(void) if (_rx_buffer_head == _rx_buffer_tail) { return -1; } else { - return _rx_buffer[_rx_buffer_tail]; + if(bit_is_set(*_ucsrb, UCSZ02)) { + // If Uart is in 9 bit mode read two bytes and merge them + return (_rx_buffer[_rx_buffer_tail] << 8) | _rx_buffer[_rx_buffer_tail + 1 % SERIAL_RX_BUFFER_SIZE]; + } else { + return _rx_buffer[_rx_buffer_tail]; + } } } @@ -170,27 +202,20 @@ int HardwareSerial::read(void) if (_rx_buffer_head == _rx_buffer_tail) { return -1; } else { - unsigned char c = _rx_buffer[_rx_buffer_tail]; - _rx_buffer_tail = (rx_buffer_index_t)(_rx_buffer_tail + 1) % SERIAL_RX_BUFFER_SIZE; - return c; + if(bit_is_set(*_ucsrb, UCSZ02)) { + // If Uart is in 9 bit mode read two bytes and merge them + unsigned char mb = _rx_buffer[_rx_buffer_tail]; + unsigned char c = _rx_buffer[_rx_buffer_tail + 1]; + _rx_buffer_tail = (rx_buffer_index_t)(_rx_buffer_tail + 2) % SERIAL_RX_BUFFER_SIZE; + return ((mb << 8) | c); + } else { + unsigned char c = _rx_buffer[_rx_buffer_tail]; + _rx_buffer_tail = (rx_buffer_index_t)(_rx_buffer_tail + 1) % SERIAL_RX_BUFFER_SIZE; + return c; + } } } -int HardwareSerial::availableForWrite(void) -{ -#if (SERIAL_TX_BUFFER_SIZE>256) - uint8_t oldSREG = SREG; - cli(); -#endif - tx_buffer_index_t head = _tx_buffer_head; - tx_buffer_index_t tail = _tx_buffer_tail; -#if (SERIAL_TX_BUFFER_SIZE>256) - SREG = oldSREG; -#endif - if (head >= tail) return SERIAL_TX_BUFFER_SIZE - 1 - head + tail; - return tail - head - 1; -} - void HardwareSerial::flush() { // If we have never written a byte, no need to flush. This special @@ -211,19 +236,33 @@ void HardwareSerial::flush() // the hardware finished tranmission (TXC is set). } -size_t HardwareSerial::write(uint8_t c) +size_t HardwareSerial::write(uint16_t c) { // If the buffer and the data register is empty, just write the byte // to the data register and be done. This shortcut helps // significantly improve the effective datarate at high (> // 500kbit/s) bitrates, where interrupt overhead becomes a slowdown. if (_tx_buffer_head == _tx_buffer_tail && bit_is_set(*_ucsra, UDRE0)) { - *_udr = c; + if(bit_is_set(*_ucsrb, UCSZ02)) { + // in 9 bit mode set TXB8 bit if necessary + if(c & 0x100) { + sbi(*_ucsrb, TXB80); + } else { + cbi(*_ucsrb, TXB80); + } + } + *_udr = (uint8_t) c; sbi(*_ucsra, TXC0); return 1; } - tx_buffer_index_t i = (_tx_buffer_head + 1) % SERIAL_TX_BUFFER_SIZE; - + + tx_buffer_index_t i; + + if(bit_is_set(*_ucsrb, UCSZ02)) { + i = ((_tx_buffer_head + 2) % SERIAL_TX_BUFFER_SIZE); + } else { + i = ((_tx_buffer_head + 1) % SERIAL_TX_BUFFER_SIZE); + } // If the output buffer is full, there's nothing for it other than to // wait for the interrupt handler to empty it a bit while (i == _tx_buffer_tail) { @@ -239,7 +278,13 @@ size_t HardwareSerial::write(uint8_t c) } } - _tx_buffer[_tx_buffer_head] = c; + + if(bit_is_set(*_ucsrb, UCSZ02)) { + _tx_buffer[_tx_buffer_head] = (uint8_t) (c >> 8) & 0x01; + _tx_buffer[_tx_buffer_head + 1] = (uint8_t) c; + } else { + _tx_buffer[_tx_buffer_head] = (uint8_t) c; + } _tx_buffer_head = i; sbi(*_ucsrb, UDRIE0); diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial.h b/hardware/arduino/avr/cores/arduino/HardwareSerial.h index 935934b195c..c4c07069a4b 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial.h +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial.h @@ -53,30 +53,41 @@ typedef uint8_t rx_buffer_index_t; #endif // Define config for Serial.begin(baud, config); -#define SERIAL_5N1 0x00 -#define SERIAL_6N1 0x02 -#define SERIAL_7N1 0x04 -#define SERIAL_8N1 0x06 -#define SERIAL_5N2 0x08 -#define SERIAL_6N2 0x0A -#define SERIAL_7N2 0x0C -#define SERIAL_8N2 0x0E -#define SERIAL_5E1 0x20 -#define SERIAL_6E1 0x22 -#define SERIAL_7E1 0x24 -#define SERIAL_8E1 0x26 -#define SERIAL_5E2 0x28 -#define SERIAL_6E2 0x2A -#define SERIAL_7E2 0x2C -#define SERIAL_8E2 0x2E -#define SERIAL_5O1 0x30 -#define SERIAL_6O1 0x32 -#define SERIAL_7O1 0x34 -#define SERIAL_8O1 0x36 -#define SERIAL_5O2 0x38 -#define SERIAL_6O2 0x3A -#define SERIAL_7O2 0x3C -#define SERIAL_8O2 0x3E +#define SERIAL_5N1 0x000 //0b000000000 +#define SERIAL_6N1 0x002 //0b000000010 +#define SERIAL_7N1 0x004 //0b000000100 +#define SERIAL_8N1 0x006 //0b000000110 +#define SERIAL_9N1 0x106 //0b100000110 + +#define SERIAL_5N2 0x008 //0b000001000 +#define SERIAL_6N2 0x00A //0b000001010 +#define SERIAL_7N2 0x00C //0b000001100 +#define SERIAL_8N2 0x00E //0b000001110 +#define SERIAL_9N2 0x10E //0b100001110 + +#define SERIAL_5E1 0x020 //0b000100000 +#define SERIAL_6E1 0x022 //0b000100010 +#define SERIAL_7E1 0x024 //0b000100100 +#define SERIAL_8E1 0x026 //0b000100110 +#define SERIAL_9E1 0x126 //0b100100110 + +#define SERIAL_5E2 0x028 //0b000101000 +#define SERIAL_6E2 0x02A //0b000101010 +#define SERIAL_7E2 0x02C //0b000101100 +#define SERIAL_8E2 0x02E //0b000101110 +#define SERIAL_9E2 0x12E //0b100101110 + +#define SERIAL_5O1 0x030 //0b000110000 +#define SERIAL_6O1 0x032 //0b000110010 +#define SERIAL_7O1 0x034 //0b000110100 +#define SERIAL_8O1 0x036 //0b000110110 +#define SERIAL_9O1 0x136 //0b100110110 + +#define SERIAL_5O2 0x038 //0b000111000 +#define SERIAL_6O2 0x03A //0b000111010 +#define SERIAL_7O2 0x03C //0b000111100 +#define SERIAL_8O2 0x03E //0b000111110 +#define SERIAL_9O2 0x13E //0b100111110 class HardwareSerial : public Stream { @@ -107,18 +118,18 @@ class HardwareSerial : public Stream volatile uint8_t *ucsra, volatile uint8_t *ucsrb, volatile uint8_t *ucsrc, volatile uint8_t *udr); void begin(unsigned long baud) { begin(baud, SERIAL_8N1); } - void begin(unsigned long, uint8_t); + void begin(unsigned long, uint16_t); void end(); virtual int available(void); virtual int peek(void); virtual int read(void); - int availableForWrite(void); virtual void flush(void); - virtual size_t write(uint8_t); - inline size_t write(unsigned long n) { return write((uint8_t)n); } - inline size_t write(long n) { return write((uint8_t)n); } - inline size_t write(unsigned int n) { return write((uint8_t)n); } - inline size_t write(int n) { return write((uint8_t)n); } + virtual size_t write(uint16_t); + inline size_t write(unsigned long n) { return write((uint16_t)n); } + inline size_t write(long n) { return write((uint16_t)n); } + inline size_t write(int n) { return write((uint16_t)n); } + inline size_t write(int8_t n) { return write((uint16_t)n); } + inline size_t write(uint8_t n) { return write((uint16_t)n); } using Print::write; // pull in write(str) and write(buf, size) from Print operator bool() { return true; } diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp index 1146eebab62..67495ad1812 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp @@ -43,7 +43,7 @@ #elif defined(USART_RXC_vect) ISR(USART_RXC_vect) // ATmega8 #else - #error "Don't know what the Data Received vector is called for Serial" + #error "Don't know what the Data Received vector is called for the first UART" #endif { Serial._rx_complete_irq(); @@ -58,7 +58,7 @@ ISR(USART0_UDRE_vect) #elif defined(USART_UDRE_vect) ISR(USART_UDRE_vect) #else - #error "Don't know what the Data Register Empty vector is called for Serial" + #error "Don't know what the Data Register Empty vector is called for the first UART" #endif { Serial._tx_udr_empty_irq(); diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp index 19625e235d8..ec076e7ec90 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp @@ -36,29 +36,39 @@ #if defined(HAVE_HWSERIAL1) -#if defined(UART1_RX_vect) -ISR(UART1_RX_vect) +#if defined(USART_RX_vect) + ISR(USART_RX_vect) #elif defined(USART1_RX_vect) -ISR(USART1_RX_vect) + ISR(USART1_RX_vect) +#elif defined(USART_RXC_vect) + ISR(USART_RXC_vect) // ATmega8 #else -#error "Don't know what the Data Register Empty vector is called for Serial1" + #error "Don't know what the Data Received vector is called for the first UART" #endif -{ - Serial1._rx_complete_irq(); -} + { + Serial1._rx_complete_irq(); + } #if defined(UART1_UDRE_vect) ISR(UART1_UDRE_vect) +#elif defined(UART_UDRE_vect) +ISR(UART_UDRE_vect) #elif defined(USART1_UDRE_vect) ISR(USART1_UDRE_vect) +#elif defined(USART_UDRE_vect) +ISR(USART_UDRE_vect) #else -#error "Don't know what the Data Register Empty vector is called for Serial1" + #error "Don't know what the Data Register Empty vector is called for the first UART" #endif { Serial1._tx_udr_empty_irq(); } -HardwareSerial Serial1(&UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1); +#if defined(UBRRH) && defined(UBRRL) + HardwareSerial Serial1(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR); +#else + HardwareSerial Serial1(&UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1); +#endif // Function that can be weakly referenced by serialEventRun to prevent // pulling in this file if it's not otherwise used. diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp index fd334ae15b0..e700770c44c 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp @@ -36,17 +36,39 @@ #if defined(HAVE_HWSERIAL2) -ISR(USART2_RX_vect) -{ - Serial2._rx_complete_irq(); -} +#if defined(USART_RX_vect) + ISR(USART_RX_vect) +#elif defined(USART2_RX_vect) + ISR(USART2_RX_vect) +#elif defined(USART_RXC_vect) + ISR(USART_RXC_vect) // ATmega8 +#else + #error "Don't know what the Data Received vector is called for the first UART" +#endif + { + Serial2._rx_complete_irq(); + } +#if defined(UART2_UDRE_vect) +ISR(UART2_UDRE_vect) +#elif defined(UART_UDRE_vect) +ISR(UART_UDRE_vect) +#elif defined(USART2_UDRE_vect) ISR(USART2_UDRE_vect) +#elif defined(USART_UDRE_vect) +ISR(USART_UDRE_vect) +#else + #error "Don't know what the Data Register Empty vector is called for the first UART" +#endif { Serial2._tx_udr_empty_irq(); } -HardwareSerial Serial2(&UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2); +#if defined(UBRRH) && defined(UBRRL) + HardwareSerial Serial2(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR); +#else + HardwareSerial Serial2(&UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2); +#endif // Function that can be weakly referenced by serialEventRun to prevent // pulling in this file if it's not otherwise used. diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp index a68095b37cb..300c4bdf6dc 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp @@ -36,17 +36,39 @@ #if defined(HAVE_HWSERIAL3) -ISR(USART3_RX_vect) -{ - Serial3._rx_complete_irq(); -} +#if defined(USART_RX_vect) + ISR(USART_RX_vect) +#elif defined(USART3_RX_vect) + ISR(USART3_RX_vect) +#elif defined(USART_RXC_vect) + ISR(USART_RXC_vect) // ATmega8 +#else + #error "Don't know what the Data Received vector is called for the first UART" +#endif + { + Serial3._rx_complete_irq(); + } +#if defined(UART3_UDRE_vect) +ISR(UART3_UDRE_vect) +#elif defined(UART_UDRE_vect) +ISR(UART_UDRE_vect) +#elif defined(USART3_UDRE_vect) ISR(USART3_UDRE_vect) +#elif defined(USART_UDRE_vect) +ISR(USART_UDRE_vect) +#else + #error "Don't know what the Data Register Empty vector is called for the first UART" +#endif { Serial3._tx_udr_empty_irq(); } -HardwareSerial Serial3(&UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3); +#if defined(UBRRH) && defined(UBRRL) + HardwareSerial Serial3(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR); +#else + HardwareSerial Serial3(&UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3); +#endif // Function that can be weakly referenced by serialEventRun to prevent // pulling in this file if it's not otherwise used. diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h b/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h index 761a5e559cd..ea98e4bc5e0 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h @@ -34,11 +34,6 @@ // slower. #if !defined(TXC0) #if defined(TXC) -// Some chips like ATmega8 don't have UPE, only PE. The other bits are -// named as expected. -#if !defined(UPE) && defined(PE) -#define UPE PE -#endif // On ATmega8, the uart and its bits are not numbered, so there is no TXC0 etc. #define TXC0 TXC #define RXEN0 RXEN @@ -48,6 +43,9 @@ #define U2X0 U2X #define UPE0 UPE #define UDRE0 UDRE +#define UCSZ02 UCSZ2 +#define TXB80 TXB8 +#define RXB80 RXB8 #elif defined(TXC1) // Some devices have uart1 but no uart0 #define TXC0 TXC1 @@ -58,6 +56,9 @@ #define U2X0 U2X1 #define UPE0 UPE1 #define UDRE0 UDRE1 +#define UCSZ02 UCSZ12 +#define TXB80 TXB81 +#define RXB80 RXB81 #else #error No UART found in HardwareSerial.cpp #endif @@ -68,17 +69,17 @@ // changed for future hardware. #if defined(TXC1) && (TXC1 != TXC0 || RXEN1 != RXEN0 || RXCIE1 != RXCIE0 || \ UDRIE1 != UDRIE0 || U2X1 != U2X0 || UPE1 != UPE0 || \ - UDRE1 != UDRE0) + UDRE1 != UDRE0 || UCSZ12 != UCSZ02 || TXB81 != TXB80 || RXB81 != RXB80) #error "Not all bit positions for UART1 are the same as for UART0" #endif #if defined(TXC2) && (TXC2 != TXC0 || RXEN2 != RXEN0 || RXCIE2 != RXCIE0 || \ UDRIE2 != UDRIE0 || U2X2 != U2X0 || UPE2 != UPE0 || \ - UDRE2 != UDRE0) + UDRE2 != UDRE0 || UCSZ22 != UCSZ02 || TXB82 != TXB80 || RXB82 != RXB80) #error "Not all bit positions for UART2 are the same as for UART0" #endif #if defined(TXC3) && (TXC3 != TXC0 || RXEN3 != RXEN0 || RXCIE3 != RXCIE0 || \ UDRIE3 != UDRIE0 || U3X3 != U3X0 || UPE3 != UPE0 || \ - UDRE3 != UDRE0) + UDRE3 != UDRE0 || UCSZ32 != UCSZ02 || TXB83 != TXB80 || TXB83 != TXB80) #error "Not all bit positions for UART3 are the same as for UART0" #endif @@ -103,15 +104,34 @@ void HardwareSerial::_rx_complete_irq(void) if (bit_is_clear(*_ucsra, UPE0)) { // No Parity error, read byte and store it in the buffer if there is // room - unsigned char c = *_udr; - rx_buffer_index_t i = (unsigned int)(_rx_buffer_head + 1) % SERIAL_RX_BUFFER_SIZE; + rx_buffer_index_t i; + unsigned char mb; + unsigned char c; + + if(bit_is_set(*_ucsrb, UCSZ02)) { + // If Uart is configured for 9 bit mode + i = (unsigned int)(_rx_buffer_head + 2) % SERIAL_RX_BUFFER_SIZE; + mb = (*_ucsrb >> RXB80) & 0x01; + c = *_udr; + } else { + // UART is configured for 5 to 8 bit modes + i = (unsigned int)(_rx_buffer_head + 1) % SERIAL_RX_BUFFER_SIZE; + c = *_udr; + } // if we should be storing the received character into the location // just before the tail (meaning that the head would advance to the // current location of the tail), we're about to overflow the buffer // and so we don't write the character or advance the head. if (i != _rx_buffer_tail) { - _rx_buffer[_rx_buffer_head] = c; + if(bit_is_set(*_ucsrb, UCSZ02)) { + // If Uart is configured for 9 bit mode + _rx_buffer[_rx_buffer_head] = mb; + _rx_buffer[_rx_buffer_head + 1] = c; + } else { + // UART is configured for 5 to 8 bit modes + _rx_buffer[_rx_buffer_head] = c; + } _rx_buffer_head = i; } } else { From 7d2dd94ebae975da0b74b08ee418424623a4ad20 Mon Sep 17 00:00:00 2001 From: bouni Date: Mon, 8 Sep 2014 12:47:08 +0200 Subject: [PATCH 2/4] Added 9-bit frame support for SAM based boards to Hardware Serial --- .../sam/cores/arduino/HardwareSerial.h | 41 +++++++++++++++++++ .../arduino/sam/cores/arduino/RingBuffer.cpp | 2 +- .../arduino/sam/cores/arduino/RingBuffer.h | 4 +- .../arduino/sam/cores/arduino/UARTClass.cpp | 7 +++- .../arduino/sam/cores/arduino/UARTClass.h | 2 + .../arduino/sam/cores/arduino/USARTClass.cpp | 6 +-- .../arduino/sam/cores/arduino/USARTClass.h | 39 ++++-------------- 7 files changed, 63 insertions(+), 38 deletions(-) diff --git a/hardware/arduino/sam/cores/arduino/HardwareSerial.h b/hardware/arduino/sam/cores/arduino/HardwareSerial.h index 5674e57aa1e..e9f125ff587 100644 --- a/hardware/arduino/sam/cores/arduino/HardwareSerial.h +++ b/hardware/arduino/sam/cores/arduino/HardwareSerial.h @@ -23,6 +23,47 @@ #include "Stream.h" +// Define config for Serial.begin(baud, config); +#define SERIAL_5N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_6N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_7N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_8N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_9N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_MODE9 | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) + +#define SERIAL_5N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_6N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_7N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_8N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_9N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_MODE9 | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) + +#define SERIAL_5E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_6E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_7E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_8E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_9E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_MODE9 | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) + + +#define SERIAL_5E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_6E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_7E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_8E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_9E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_MODE9 | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) + + +#define SERIAL_5O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_6O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_7O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_8O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_9O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_MODE9 | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) + + +#define SERIAL_5O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_6O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_7O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_8O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) +#define SERIAL_9O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_MODE9 | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) + + class HardwareSerial : public Stream { public: diff --git a/hardware/arduino/sam/cores/arduino/RingBuffer.cpp b/hardware/arduino/sam/cores/arduino/RingBuffer.cpp index f0b3ed1dff1..ba4d79f63d1 100644 --- a/hardware/arduino/sam/cores/arduino/RingBuffer.cpp +++ b/hardware/arduino/sam/cores/arduino/RingBuffer.cpp @@ -26,7 +26,7 @@ RingBuffer::RingBuffer( void ) _iTail=0 ; } -void RingBuffer::store_char( uint8_t c ) +void RingBuffer::store_char( uint16_t c ) { int i = (uint32_t)(_iHead + 1) % SERIAL_BUFFER_SIZE ; diff --git a/hardware/arduino/sam/cores/arduino/RingBuffer.h b/hardware/arduino/sam/cores/arduino/RingBuffer.h index 28309df459c..5a8bbfaff61 100644 --- a/hardware/arduino/sam/cores/arduino/RingBuffer.h +++ b/hardware/arduino/sam/cores/arduino/RingBuffer.h @@ -30,13 +30,13 @@ class RingBuffer { public: - uint8_t _aucBuffer[SERIAL_BUFFER_SIZE] ; + uint16_t _aucBuffer[SERIAL_BUFFER_SIZE] ; int _iHead ; int _iTail ; public: RingBuffer( void ) ; - void store_char( uint8_t c ) ; + void store_char( uint16_t c ) ; } ; #endif /* _RING_BUFFER_ */ diff --git a/hardware/arduino/sam/cores/arduino/UARTClass.cpp b/hardware/arduino/sam/cores/arduino/UARTClass.cpp index 16188b128a4..e03c8e9bb86 100644 --- a/hardware/arduino/sam/cores/arduino/UARTClass.cpp +++ b/hardware/arduino/sam/cores/arduino/UARTClass.cpp @@ -35,6 +35,11 @@ UARTClass::UARTClass( Uart* pUart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* p // Public Methods ////////////////////////////////////////////////////////////// void UARTClass::begin( const uint32_t dwBaudRate ) +{ + begin( dwBaudRate, SERIAL_8N1 ); +} + +void UARTClass::begin( const uint32_t dwBaudRate, const uint32_t config ) { // Configure PMC pmc_enable_periph_clk( _dwId ) ; @@ -46,7 +51,7 @@ void UARTClass::begin( const uint32_t dwBaudRate ) _pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS ; // Configure mode - _pUart->UART_MR = UART_MR_PAR_NO | UART_MR_CHMODE_NORMAL ; + _pUart->UART_MR = config; // Configure baudrate (asynchronous, no oversampling) _pUart->UART_BRGR = (SystemCoreClock / dwBaudRate) >> 4 ; diff --git a/hardware/arduino/sam/cores/arduino/UARTClass.h b/hardware/arduino/sam/cores/arduino/UARTClass.h index 5836f2e62bd..ec8aed180eb 100644 --- a/hardware/arduino/sam/cores/arduino/UARTClass.h +++ b/hardware/arduino/sam/cores/arduino/UARTClass.h @@ -25,6 +25,7 @@ // Includes Atmel CMSIS #include + class UARTClass : public HardwareSerial { protected: @@ -39,6 +40,7 @@ class UARTClass : public HardwareSerial UARTClass( Uart* pUart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer ) ; void begin( const uint32_t dwBaudRate ) ; + void begin( const uint32_t dwBaudRate , const uint32_t config ) ; void end( void ) ; int available( void ) ; int peek( void ) ; diff --git a/hardware/arduino/sam/cores/arduino/USARTClass.cpp b/hardware/arduino/sam/cores/arduino/USARTClass.cpp index d950c50c9af..b28dc166b1c 100644 --- a/hardware/arduino/sam/cores/arduino/USARTClass.cpp +++ b/hardware/arduino/sam/cores/arduino/USARTClass.cpp @@ -101,7 +101,7 @@ int USARTClass::read( void ) if ( _rx_buffer->_iHead == _rx_buffer->_iTail ) return -1 ; - uint8_t uc = _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ; + uint16_t uc = _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ; _rx_buffer->_iTail = (unsigned int)(_rx_buffer->_iTail + 1) % SERIAL_BUFFER_SIZE ; return uc ; } @@ -113,14 +113,14 @@ void USARTClass::flush( void ) ; } -size_t USARTClass::write( const uint8_t uc_data ) +size_t USARTClass::write( const uint16_t uc_data ) { // Check if the transmitter is ready while ((_pUsart->US_CSR & US_CSR_TXRDY) != US_CSR_TXRDY) ; // Send character - _pUsart->US_THR = uc_data ; + _pUsart->US_THR = uc_data & 0x1FF; return 1; } diff --git a/hardware/arduino/sam/cores/arduino/USARTClass.h b/hardware/arduino/sam/cores/arduino/USARTClass.h index 9082cc6c2ab..45e608887b5 100644 --- a/hardware/arduino/sam/cores/arduino/USARTClass.h +++ b/hardware/arduino/sam/cores/arduino/USARTClass.h @@ -25,36 +25,7 @@ // Includes Atmel CMSIS #include -// Define config for Serial.begin(baud, config); -#define SERIAL_5N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_6N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_7N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_8N1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) - -#define SERIAL_5N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_6N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_7N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_8N2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_NO | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) - -#define SERIAL_5E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_6E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_7E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_8E1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) - -#define SERIAL_5E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_6E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_7E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_8E2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_EVEN | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) - -#define SERIAL_5O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_6O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_7O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_8O1 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL) - -#define SERIAL_5O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_5_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_6O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_6_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_7O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_7_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) -#define SERIAL_8O2 (US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_ODD | US_MR_NBSTOP_2_BIT | US_MR_CHMODE_NORMAL) + class USARTClass : public HardwareSerial { @@ -76,7 +47,13 @@ class USARTClass : public HardwareSerial int peek( void ) ; int read( void ) ; void flush( void ) ; - size_t write( const uint8_t c ) ; + size_t write( const uint16_t c ) ; + inline size_t write( const unsigned int c ) { return write( (const uint16_t) c ); } + inline size_t write( const int c ) { return write( (const uint16_t) c ); } + inline size_t write( const uint8_t c ) { return write( (const uint16_t) c ); } + inline size_t write( const int8_t c ) { return write( (const uint16_t) c ); } + inline size_t write( const unsigned long c ) { return write( (const uint16_t) c ); } + inline size_t write( const long c ) { return write( (const uint16_t) c ); } void IrqHandler( void ) ; From 92635db4820f0ce0163703ce9d15b35c894f3ca5 Mon Sep 17 00:00:00 2001 From: bouni Date: Thu, 11 Sep 2014 09:07:25 +0200 Subject: [PATCH 3/4] fixed issues with old file versions used for changes --- .../avr/cores/arduino/HardwareSerial.cpp | 35 +++++++++++++------ .../avr/cores/arduino/HardwareSerial0.cpp | 4 +-- .../avr/cores/arduino/HardwareSerial1.cpp | 28 +++++---------- .../avr/cores/arduino/HardwareSerial2.cpp | 32 +++-------------- .../avr/cores/arduino/HardwareSerial3.cpp | 32 +++-------------- .../cores/arduino/HardwareSerial_private.h | 5 +++ 6 files changed, 51 insertions(+), 85 deletions(-) diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp index 6f686778789..682833cea83 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp @@ -85,15 +85,15 @@ void HardwareSerial::_tx_udr_empty_irq(void) if(bit_is_set(*_ucsrb, UCSZ02)) { // If Uart is configured for 9 bit mode - unsigned char mb = _tx_buffer[_tx_buffer_tail]; - unsigned char c = _tx_buffer[_tx_buffer_tail + 1]; - _tx_buffer_tail = (_tx_buffer_tail + 2) % SERIAL_TX_BUFFER_SIZE; - if(mb & 0x01) { - sbi(*_ucsrb, TXB80); - } else { - cbi(*_ucsrb, TXB80); - } - *_udr = c; + unsigned char mb = _tx_buffer[_tx_buffer_tail]; + unsigned char c = _tx_buffer[_tx_buffer_tail + 1]; + _tx_buffer_tail = (_tx_buffer_tail + 2) % SERIAL_TX_BUFFER_SIZE; + if(mb & 0x01) { + sbi(*_ucsrb, TXB80); + } else { + cbi(*_ucsrb, TXB80); + } + *_udr = c; } else { // UART is configured for 5 to 8 bit modes unsigned char c = _tx_buffer[_tx_buffer_tail]; @@ -132,7 +132,7 @@ void HardwareSerial::begin(unsigned long baud, uint16_t config) baud_setting = (F_CPU / 8 / baud - 1) / 2; } - // assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register) + // assign the baud_setting, a.k.a. ubrr (USART Baud Rate Register) *_ubrrh = baud_setting >> 8; *_ubrrl = baud_setting; @@ -216,6 +216,21 @@ int HardwareSerial::read(void) } } +int HardwareSerial::availableForWrite(void) +{ +#if (SERIAL_TX_BUFFER_SIZE>256) + uint8_t oldSREG = SREG; + cli(); +#endif + tx_buffer_index_t head = _tx_buffer_head; + tx_buffer_index_t tail = _tx_buffer_tail; +#if (SERIAL_TX_BUFFER_SIZE>256) + SREG = oldSREG; +#endif + if (head >= tail) return SERIAL_TX_BUFFER_SIZE - 1 - head + tail; + return tail - head - 1; +} + void HardwareSerial::flush() { // If we have never written a byte, no need to flush. This special diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp index 67495ad1812..1146eebab62 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial0.cpp @@ -43,7 +43,7 @@ #elif defined(USART_RXC_vect) ISR(USART_RXC_vect) // ATmega8 #else - #error "Don't know what the Data Received vector is called for the first UART" + #error "Don't know what the Data Received vector is called for Serial" #endif { Serial._rx_complete_irq(); @@ -58,7 +58,7 @@ ISR(USART0_UDRE_vect) #elif defined(USART_UDRE_vect) ISR(USART_UDRE_vect) #else - #error "Don't know what the Data Register Empty vector is called for the first UART" + #error "Don't know what the Data Register Empty vector is called for Serial" #endif { Serial._tx_udr_empty_irq(); diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp index ec076e7ec90..19625e235d8 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial1.cpp @@ -36,39 +36,29 @@ #if defined(HAVE_HWSERIAL1) -#if defined(USART_RX_vect) - ISR(USART_RX_vect) +#if defined(UART1_RX_vect) +ISR(UART1_RX_vect) #elif defined(USART1_RX_vect) - ISR(USART1_RX_vect) -#elif defined(USART_RXC_vect) - ISR(USART_RXC_vect) // ATmega8 +ISR(USART1_RX_vect) #else - #error "Don't know what the Data Received vector is called for the first UART" +#error "Don't know what the Data Register Empty vector is called for Serial1" #endif - { - Serial1._rx_complete_irq(); - } +{ + Serial1._rx_complete_irq(); +} #if defined(UART1_UDRE_vect) ISR(UART1_UDRE_vect) -#elif defined(UART_UDRE_vect) -ISR(UART_UDRE_vect) #elif defined(USART1_UDRE_vect) ISR(USART1_UDRE_vect) -#elif defined(USART_UDRE_vect) -ISR(USART_UDRE_vect) #else - #error "Don't know what the Data Register Empty vector is called for the first UART" +#error "Don't know what the Data Register Empty vector is called for Serial1" #endif { Serial1._tx_udr_empty_irq(); } -#if defined(UBRRH) && defined(UBRRL) - HardwareSerial Serial1(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR); -#else - HardwareSerial Serial1(&UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1); -#endif +HardwareSerial Serial1(&UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1); // Function that can be weakly referenced by serialEventRun to prevent // pulling in this file if it's not otherwise used. diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp index e700770c44c..fd334ae15b0 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial2.cpp @@ -36,39 +36,17 @@ #if defined(HAVE_HWSERIAL2) -#if defined(USART_RX_vect) - ISR(USART_RX_vect) -#elif defined(USART2_RX_vect) - ISR(USART2_RX_vect) -#elif defined(USART_RXC_vect) - ISR(USART_RXC_vect) // ATmega8 -#else - #error "Don't know what the Data Received vector is called for the first UART" -#endif - { - Serial2._rx_complete_irq(); - } +ISR(USART2_RX_vect) +{ + Serial2._rx_complete_irq(); +} -#if defined(UART2_UDRE_vect) -ISR(UART2_UDRE_vect) -#elif defined(UART_UDRE_vect) -ISR(UART_UDRE_vect) -#elif defined(USART2_UDRE_vect) ISR(USART2_UDRE_vect) -#elif defined(USART_UDRE_vect) -ISR(USART_UDRE_vect) -#else - #error "Don't know what the Data Register Empty vector is called for the first UART" -#endif { Serial2._tx_udr_empty_irq(); } -#if defined(UBRRH) && defined(UBRRL) - HardwareSerial Serial2(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR); -#else - HardwareSerial Serial2(&UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2); -#endif +HardwareSerial Serial2(&UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2); // Function that can be weakly referenced by serialEventRun to prevent // pulling in this file if it's not otherwise used. diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp index 300c4bdf6dc..a68095b37cb 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial3.cpp @@ -36,39 +36,17 @@ #if defined(HAVE_HWSERIAL3) -#if defined(USART_RX_vect) - ISR(USART_RX_vect) -#elif defined(USART3_RX_vect) - ISR(USART3_RX_vect) -#elif defined(USART_RXC_vect) - ISR(USART_RXC_vect) // ATmega8 -#else - #error "Don't know what the Data Received vector is called for the first UART" -#endif - { - Serial3._rx_complete_irq(); - } +ISR(USART3_RX_vect) +{ + Serial3._rx_complete_irq(); +} -#if defined(UART3_UDRE_vect) -ISR(UART3_UDRE_vect) -#elif defined(UART_UDRE_vect) -ISR(UART_UDRE_vect) -#elif defined(USART3_UDRE_vect) ISR(USART3_UDRE_vect) -#elif defined(USART_UDRE_vect) -ISR(USART_UDRE_vect) -#else - #error "Don't know what the Data Register Empty vector is called for the first UART" -#endif { Serial3._tx_udr_empty_irq(); } -#if defined(UBRRH) && defined(UBRRL) - HardwareSerial Serial3(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR); -#else - HardwareSerial Serial3(&UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3); -#endif +HardwareSerial Serial3(&UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3); // Function that can be weakly referenced by serialEventRun to prevent // pulling in this file if it's not otherwise used. diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h b/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h index ea98e4bc5e0..59b1ab68a13 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial_private.h @@ -34,6 +34,11 @@ // slower. #if !defined(TXC0) #if defined(TXC) +// Some chips like ATmega8 don't have UPE, only PE. The other bits are +// named as expected. +#if !defined(UPE) && defined(PE) +#define UPE PE +#endif // On ATmega8, the uart and its bits are not numbered, so there is no TXC0 etc. #define TXC0 TXC #define RXEN0 RXEN From df074f0094b52c87438b98a11020a5c5d2961366 Mon Sep 17 00:00:00 2001 From: bouni Date: Thu, 11 Sep 2014 09:20:39 +0200 Subject: [PATCH 4/4] fixed missing definition of availableForWrite --- hardware/arduino/avr/cores/arduino/HardwareSerial.h | 1 + 1 file changed, 1 insertion(+) diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial.h b/hardware/arduino/avr/cores/arduino/HardwareSerial.h index c4c07069a4b..6d1dc6bae5e 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial.h +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial.h @@ -123,6 +123,7 @@ class HardwareSerial : public Stream virtual int available(void); virtual int peek(void); virtual int read(void); + int availableForWrite(void); virtual void flush(void); virtual size_t write(uint16_t); inline size_t write(unsigned long n) { return write((uint16_t)n); }