From c5314cdb9fd0c2b69083fd608dfafd4d1c5cdb3d Mon Sep 17 00:00:00 2001 From: batt Date: Mon, 20 Apr 2009 10:37:07 +0000 Subject: [PATCH] Fix more serial driver configurations. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2571 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cfg/cfg_ser.h | 84 ++++++++++++++++++++++------- examples/at91sam7s/cfg/cfg_ser.h | 6 --- examples/randpool/appconfig.h | 6 --- examples/triface/boot/cfg/cfg_ser.h | 3 -- examples/triface/cfg/cfg_ser.h | 3 -- 5 files changed, 65 insertions(+), 37 deletions(-) diff --git a/bertos/cfg/cfg_ser.h b/bertos/cfg/cfg_ser.h index 2adb55ea..4fc85e37 100644 --- a/bertos/cfg/cfg_ser.h +++ b/bertos/cfg/cfg_ser.h @@ -46,22 +46,41 @@ * Edit these define for your project. */ -/// [bytes] Size of the outbound FIFO buffer for port 0. $WIZ$ type = "int" +/** + * Size of the outbound FIFO buffer for port 0 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + */ #define CONFIG_UART0_TXBUFSIZE 32 -/// [bytes] Size of the inbound FIFO buffer for port 0. $WIZ$ type = "int" +/** + * Size of the inbound FIFO buffer for port 0 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + */ #define CONFIG_UART0_RXBUFSIZE 32 -/// [bytes] Size of the outbound FIFO buffer for port 1. $WIZ$ type = "int" +/** + * Size of the outbound FIFO buffer for port 1 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + * $WIZ$ supports = "at91 and not atmega8 and not atmega168 and not atmega32" + */ #define CONFIG_UART1_TXBUFSIZE 32 -/// [bytes] Size of the inbound FIFO buffer for port 1. $WIZ$ type = "int" +/** + * Size of the inbound FIFO buffer for port 1 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + * $WIZ$ supports = "at91 and not atmega8 and not atmega168 and not atmega32" + */ #define CONFIG_UART1_RXBUFSIZE 32 /** * [bytes] Size of the outbound FIFO buffer for SPI port. * $WIZ$ type = "int" + * $WIZ$ min = "2" * $WIZ$ supports = "avr" */ #define CONFIG_SPI_TXBUFSIZE 32 @@ -69,20 +88,41 @@ /** * [bytes] Size of the inbound FIFO buffer for SPI port. * $WIZ$ type = "int" + * $WIZ$ min = "2" * $WIZ$ supports = "avr" */ #define CONFIG_SPI_RXBUFSIZE 32 -/// [bytes] Size of the outbound FIFO buffer for SPI port 0. $WIZ$ type = "int" +/** + * Size of the outbound FIFO buffer for SPI port 0 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + * $WIZ$ supports = "at91" + */ #define CONFIG_SPI0_TXBUFSIZE 32 -/// [bytes] Size of the inbound FIFO buffer for SPI port 0. $WIZ$ type = "int" +/** + * Size of the inbound FIFO buffer for SPI port 0 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + * $WIZ$ supports = "at91" + */ #define CONFIG_SPI0_RXBUFSIZE 32 -/// [bytes] Size of the outbound FIFO buffer for SPI port 1. $WIZ$ type = "int" +/** + * Size of the outbound FIFO buffer for SPI port 1 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + * $WIZ$ supports = "at91" + */ #define CONFIG_SPI1_TXBUFSIZE 32 -/// [bytes] Size of the inbound FIFO buffer for SPI port 1. $WIZ$ type = "int" +/** + * Size of the inbound FIFO buffer for SPI port 1 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = "2" + * $WIZ$ supports = "at91" + */ #define CONFIG_SPI1_RXBUFSIZE 32 /** @@ -118,25 +158,31 @@ */ #define CONFIG_SPI_CLOCK_PHASE SPI_SAMPLE_ON_FIRST_EDGE -/// Default transmit timeout (ms). Set to -1 to disable timeout support. $WIZ$ type = "int" +/** + * Default transmit timeout (ms). Set to -1 to disable timeout support. + * $WIZ$ type = "int" + * $WIZ$ min = "-1" + */ #define CONFIG_SER_TXTIMEOUT -1 -/// Default receive timeout (ms). Set to -1 to disable timeout support. $WIZ$ type = "int" +/** + * Default receive timeout (ms). Set to -1 to disable timeout support. + * $WIZ$ type = "int" + * $WIZ$ min = "-1" + */ #define CONFIG_SER_RXTIMEOUT -1 /// Use RTS/CTS handshake. $WIZ$ type = "boolean" #define CONFIG_SER_HWHANDSHAKE 0 -/// Default baud rate (set to 0 to disable). $WIZ$ type = "boolean" -#define CONFIG_SER_DEFBAUDRATE 0 - -/// Enable ser_gets() and ser_gets_echo(). $WIZ$ type = "boolean" -#define CONFIG_SER_GETS 0 - -/// Enable second serial port in emulator. $WIZ$ type = "boolean" -#define CONFIG_EMUL_UART1 0 +/** + * Default baud rate for all serial ports (set to 0 to disable). + * $WIZ$ type = "int" + * $WIZ$ min = "0" + */ +#define CONFIG_SER_DEFBAUDRATE 0UL -/// For serial debug. $WIZ$ type = "boolean" +/// Enable strobe pin for serial debug. $WIZ$ type = "boolean" #define CONFIG_SER_STROBE 0 #endif /* CFG_SER_H */ diff --git a/examples/at91sam7s/cfg/cfg_ser.h b/examples/at91sam7s/cfg/cfg_ser.h index b9820e85..27b14c3e 100644 --- a/examples/at91sam7s/cfg/cfg_ser.h +++ b/examples/at91sam7s/cfg/cfg_ser.h @@ -101,12 +101,6 @@ /// Default baud rate (set to 0 to disable). #define CONFIG_SER_DEFBAUDRATE 0 -/// Enable ser_gets() and ser_gets_echo(). -#define CONFIG_SER_GETS 0 - -/// Enable second serial port in emulator. -#define CONFIG_EMUL_UART1 0 - /// For serial debug. #define CONFIG_SER_STROBE 0 diff --git a/examples/randpool/appconfig.h b/examples/randpool/appconfig.h index fa502407..dab944d1 100644 --- a/examples/randpool/appconfig.h +++ b/examples/randpool/appconfig.h @@ -199,12 +199,6 @@ /** Default baud rate (set to 0 to disable) */ #define CONFIG_SER_DEFBAUDRATE 0 - /** Enable ser_gets() and ser_gets_echo() */ - #define CONFIG_SER_GETS 0 - - /** Enable second serial port in emulator. */ - #define CONFIG_EMUL_UART1 0 - #define CONFIG_SER_STROBE 0 /*\}*/ diff --git a/examples/triface/boot/cfg/cfg_ser.h b/examples/triface/boot/cfg/cfg_ser.h index 8951ad14..1f60c55a 100644 --- a/examples/triface/boot/cfg/cfg_ser.h +++ b/examples/triface/boot/cfg/cfg_ser.h @@ -102,9 +102,6 @@ /// Default baud rate (set to 0 to disable). #define CONFIG_SER_DEFBAUDRATE 0 -/// Enable second serial port in emulator. -#define CONFIG_EMUL_UART1 0 - /// For serial debug. #define CONFIG_SER_STROBE 0 diff --git a/examples/triface/cfg/cfg_ser.h b/examples/triface/cfg/cfg_ser.h index cd8987c2..d65e64aa 100644 --- a/examples/triface/cfg/cfg_ser.h +++ b/examples/triface/cfg/cfg_ser.h @@ -108,9 +108,6 @@ /// Default baud rate (set to 0 to disable). #define CONFIG_SER_DEFBAUDRATE 0 -/// Enable second serial port in emulator. -#define CONFIG_EMUL_UART1 0 - /// For serial debug. #define CONFIG_SER_STROBE 0 -- 2.25.1