git.droids-corp.org
/
aversive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uart: fix compilation on atmega328p
[aversive.git]
/
modules
/
comm
/
uart
/
uart.c
diff --git
a/modules/comm/uart/uart.c
b/modules/comm/uart/uart.c
index
25aa9e8
..
231d599
100644
(file)
--- a/
modules/comm/uart/uart.c
+++ b/
modules/comm/uart/uart.c
@@
-85,8
+85,14
@@
const struct regs uart_regs[UART_HW_NUM] = {
*/
#ifdef UART0_COMPILE
#ifndef SIG_UART0_DATA
*/
#ifdef UART0_COMPILE
#ifndef SIG_UART0_DATA
+#if defined(USART_UDRE_vect)
+#define SIG_UART0_DATA USART_UDRE_vect
+#elif defined(USART0_UDRE_vect)
+#define SIG_UART0_DATA USART0_UDRE_vect
+#elif defined(SIG_USART0_DATA)
#define SIG_UART0_DATA SIG_USART0_DATA
#endif
#define SIG_UART0_DATA SIG_USART0_DATA
#endif
+#endif
SIGNAL(SIG_UART0_DATA)
{
uart_send_next_char(0);
SIGNAL(SIG_UART0_DATA)
{
uart_send_next_char(0);
@@
-94,8
+100,12
@@
SIGNAL(SIG_UART0_DATA)
#endif
#ifdef UART1_COMPILE
#ifndef SIG_UART1_DATA
#endif
#ifdef UART1_COMPILE
#ifndef SIG_UART1_DATA
+#if defined(USART1_UDRE_vect)
+#define SIG_UART1_DATA USART1_UDRE_vect
+#elif defined(SIG_USART1_DATA)
#define SIG_UART1_DATA SIG_USART1_DATA
#endif
#define SIG_UART1_DATA SIG_USART1_DATA
#endif
+#endif
SIGNAL(SIG_UART1_DATA)
{
uart_send_next_char(1);
SIGNAL(SIG_UART1_DATA)
{
uart_send_next_char(1);
@@
-103,8
+113,12
@@
SIGNAL(SIG_UART1_DATA)
#endif
#ifdef UART2_COMPILE
#ifndef SIG_UART2_DATA
#endif
#ifdef UART2_COMPILE
#ifndef SIG_UART2_DATA
+#if defined(USART2_UDRE_vect)
+#define SIG_UART2_DATA USART2_UDRE_vect
+#elif defined(SIG_USART2_DATA)
#define SIG_UART2_DATA SIG_USART2_DATA
#endif
#define SIG_UART2_DATA SIG_USART2_DATA
#endif
+#endif
SIGNAL(SIG_UART2_DATA)
{
uart_send_next_char(2);
SIGNAL(SIG_UART2_DATA)
{
uart_send_next_char(2);
@@
-112,8
+126,12
@@
SIGNAL(SIG_UART2_DATA)
#endif
#ifdef UART3_COMPILE
#ifndef SIG_UART3_DATA
#endif
#ifdef UART3_COMPILE
#ifndef SIG_UART3_DATA
+#if defined(USART3_UDRE_vect)
+#define SIG_UART3_DATA USART3_UDRE_vect
+#elif defined(SIG_USART3_DATA)
#define SIG_UART3_DATA SIG_USART3_DATA
#endif
#define SIG_UART3_DATA SIG_USART3_DATA
#endif
+#endif
SIGNAL(SIG_UART3_DATA)
{
uart_send_next_char(3);
SIGNAL(SIG_UART3_DATA)
{
uart_send_next_char(3);
@@
-128,8
+146,14
@@
static void uart_recv_next_char(uint8_t num);
*/
#ifdef UART0_COMPILE
#ifndef SIG_UART0_RECV
*/
#ifdef UART0_COMPILE
#ifndef SIG_UART0_RECV
+#if defined(USART_RX_vect)
+#define SIG_UART0_RECV USART_RX_vect
+#elif defined(USART0_RX_vect)
+#define SIG_UART0_RECV USART0_RX_vect
+#elif defined(SIG_USART0_RECV)
#define SIG_UART0_RECV SIG_USART0_RECV
#endif
#define SIG_UART0_RECV SIG_USART0_RECV
#endif
+#endif
SIGNAL(SIG_UART0_RECV)
{
uart_recv_next_char(0);
SIGNAL(SIG_UART0_RECV)
{
uart_recv_next_char(0);
@@
-137,8
+161,12
@@
SIGNAL(SIG_UART0_RECV)
#endif
#ifdef UART1_COMPILE
#ifndef SIG_UART1_RECV
#endif
#ifdef UART1_COMPILE
#ifndef SIG_UART1_RECV
+#if defined(USART1_RX_vect)
+#define SIG_UART1_RECV USART1_RX_vect
+#elif defined(SIG_USART1_RECV)
#define SIG_UART1_RECV SIG_USART1_RECV
#endif
#define SIG_UART1_RECV SIG_USART1_RECV
#endif
+#endif
SIGNAL(SIG_UART1_RECV)
{
uart_recv_next_char(1);
SIGNAL(SIG_UART1_RECV)
{
uart_recv_next_char(1);
@@
-146,8
+174,12
@@
SIGNAL(SIG_UART1_RECV)
#endif
#ifdef UART2_COMPILE
#ifndef SIG_UART2_RECV
#endif
#ifdef UART2_COMPILE
#ifndef SIG_UART2_RECV
+#if defined(USART2_RX_vect)
+#define SIG_UART2_RECV USART2_RX_vect
+#elif defined(SIG_USART2_RECV)
#define SIG_UART2_RECV SIG_USART2_RECV
#endif
#define SIG_UART2_RECV SIG_USART2_RECV
#endif
+#endif
SIGNAL(SIG_UART2_RECV)
{
uart_recv_next_char(2);
SIGNAL(SIG_UART2_RECV)
{
uart_recv_next_char(2);
@@
-155,8
+187,12
@@
SIGNAL(SIG_UART2_RECV)
#endif
#ifdef UART3_COMPILE
#ifndef SIG_UART3_RECV
#endif
#ifdef UART3_COMPILE
#ifndef SIG_UART3_RECV
+#if defined(USART3_RX_vect)
+#define SIG_UART3_RECV USART3_RX_vect
+#elif defined(SIG_USART3_RECV)
#define SIG_UART3_RECV SIG_USART3_RECV
#endif
#define SIG_UART3_RECV SIG_USART3_RECV
#endif
+#endif
SIGNAL(SIG_UART3_RECV)
{
uart_recv_next_char(3);
SIGNAL(SIG_UART3_RECV)
{
uart_recv_next_char(3);