From: zer0 Date: Fri, 7 May 2010 23:00:17 +0000 (+0200) Subject: FIFOs exported X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=853564b60131699e48f52a2c5d46db825f6b878c;p=aversive.git FIFOs exported --- diff --git a/projects/microb2010/mainboard/ax12_user.c b/projects/microb2010/mainboard/ax12_user.c index 6bb8129..880f160 100644 --- a/projects/microb2010/mainboard/ax12_user.c +++ b/projects/microb2010/mainboard/ax12_user.c @@ -89,7 +89,6 @@ #ifndef HOST_VERSION static volatile uint8_t ax12_state = AX12_STATE_READ; -extern volatile struct cirbuf g_tx_fifo[]; /* uart fifo */ static volatile uint8_t ax12_nsent = 0; /* Called by ax12 module to send a character on serial line. Count the diff --git a/projects/microb2010/mainboard/uart_config.h b/projects/microb2010/mainboard/uart_config.h index 514d1e9..dc6117a 100644 --- a/projects/microb2010/mainboard/uart_config.h +++ b/projects/microb2010/mainboard/uart_config.h @@ -1,6 +1,6 @@ -/* +/* * Copyright Droids Corporation, Microb Technology, Eirbot (2005) - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -27,66 +27,62 @@ #define UART_CONFIG_H /* - * UART1 definitions + * UART0 definitions */ -/* compile uart1 fonctions, undefine it to pass compilation */ -#define UART1_COMPILE +/* compile uart0 fonctions, undefine it to pass compilation */ +#define UART0_COMPILE -/* enable uart1 if == 1, disable if == 0 */ -#define UART1_ENABLED 1 +/* enable uart0 if == 1, disable if == 0 */ +#define UART0_ENABLED 1 -/* enable uart1 interrupts if == 1, disable if == 0 */ -#define UART1_INTERRUPT_ENABLED 1 +/* enable uart0 interrupts if == 1, disable if == 0 */ +#define UART0_INTERRUPT_ENABLED 1 -#define UART1_BAUDRATE 57600 +#define UART0_BAUDRATE 57600 -/* - * if you enable this, the maximum baudrate you can reach is - * higher, but the precision is lower. +/* + * if you enable this, the maximum baudrate you can reach is + * higher, but the precision is lower. */ -#define UART1_USE_DOUBLE_SPEED 1 - -#define UART1_RX_FIFO_SIZE 64 -#define UART1_TX_FIFO_SIZE 127 -#define UART1_NBITS 8 +#define UART0_USE_DOUBLE_SPEED 1 -#define UART1_PARITY UART_PARTITY_NONE +#define UART0_RX_FIFO_SIZE 64 +#define UART0_TX_FIFO_SIZE 64 +#define UART0_NBITS 8 -#define UART1_STOP_BIT UART_STOP_BITS_1 +#define UART0_PARITY UART_PARTITY_NONE +#define UART0_STOP_BIT UART_STOP_BITS_1 /* - * UART3 definitions + * UART1 definitions */ -/* compile uart3 fonctions, undefine it to pass compilation */ -#define UART3_COMPILE +/* compile uart1 fonctions, undefine it to pass compilation */ +#define UART1_COMPILE -/* enable uart3 if == 1, disable if == 0 */ -#define UART3_ENABLED 1 +/* enable uart1 if == 1, disable if == 0 */ +#define UART1_ENABLED 1 -/* enable uart3 interrupts if == 1, disable if == 0 */ -#define UART3_INTERRUPT_ENABLED 1 +/* enable uart1 interrupts if == 1, disable if == 0 */ +#define UART1_INTERRUPT_ENABLED 1 -#define UART3_BAUDRATE 57600 +#define UART1_BAUDRATE 57600 -/* - * if you enable this, the maximum baudrate you can reach is - * higher, but the precision is lower. +/* + * if you enable this, the maximum baudrate you can reach is + * higher, but the precision is lower. */ -#define UART3_USE_DOUBLE_SPEED 1 - -#define UART3_RX_FIFO_SIZE 64 -#define UART3_TX_FIFO_SIZE 64 -#define UART3_NBITS 8 - -#define UART3_PARITY UART_PARTITY_NONE - -#define UART3_STOP_BIT UART_STOP_BITS_1 +#define UART1_USE_DOUBLE_SPEED 1 +#define UART1_RX_FIFO_SIZE 64 +#define UART1_TX_FIFO_SIZE 127 +#define UART1_NBITS 8 +#define UART1_PARITY UART_PARTITY_NONE +#define UART1_STOP_BIT UART_STOP_BITS_1 /* .... same for uart 1, 2, 3 ... */