git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1494 35acf78f-673a-0410-8e92-d51de3d6d3f4

13 files changed, 169 insertions, 23 deletions

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h b/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h
index f49b49597..568dffb11 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h
@@ -18,7 +18,7 @@
 */

 

 /*

- * Drivers configuration for the Olimex STM33-P103 proto board.

+ * STM32 drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the driver

diff --git a/demos/ARMCM3-STM32F103-GCC/mcuconf.h b/demos/ARMCM3-STM32F103-GCC/mcuconf.h
index f49b49597..568dffb11 100644
--- a/demos/ARMCM3-STM32F103-GCC/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-GCC/mcuconf.h
@@ -18,7 +18,7 @@
 */

 

 /*

- * Drivers configuration for the Olimex STM33-P103 proto board.

+ * STM32 drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the driver

diff --git a/demos/AVR-AT90CANx-GCC/halconf.h b/demos/AVR-AT90CANx-GCC/halconf.h
index c0f12c57d..58d49966f 100644
--- a/demos/AVR-AT90CANx-GCC/halconf.h
+++ b/demos/AVR-AT90CANx-GCC/halconf.h
@@ -48,7 +48,7 @@
  * @brief Enables the PAL subsystem.
  */

 #if !defined(CH_HAL_USE_PAL) || defined(__DOXYGEN__)

-#define CH_HAL_USE_PAL              TRUE

+#define CH_HAL_USE_PAL              FALSE

 #endif

 

 /*===========================================================================*/

diff --git a/demos/AVR-AT90CANx-GCC/mcuconf.h b/demos/AVR-AT90CANx-GCC/mcuconf.h
new file mode 100644
index 000000000..017289582
--- /dev/null
+++ b/demos/AVR-AT90CANx-GCC/mcuconf.h
@@ -0,0 +1,53 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT 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 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/*

+ * AVR drivers configuration.

+ * The following settings override the default settings present in

+ * the various device driver implementation headers.

+ * Note that the settings for each driver only have effect if the driver

+ * is enabled in halconf.h.

+ */

+

+/*

+ * ADC driver system settings.
+ */

+

+/*

+ * CAN driver system settings.

+ */

+

+/*

+ * MAC driver system settings.

+ */

+

+/*

+ * PWM driver system settings.

+ */

+

+/*

+ * SERIAL driver system settings.

+ */

+#define USE_AVR_USART0              FALSE

+#define USE_AVR_USART1              TRUE

+

+/*

+ * SPI driver system settings.

+ */

+#define USE_LPC214x_SPI1            TRUE

diff --git a/demos/AVR-ATmega128-GCC/halconf.h b/demos/AVR-ATmega128-GCC/halconf.h
index c0f12c57d..58d49966f 100644
--- a/demos/AVR-ATmega128-GCC/halconf.h
+++ b/demos/AVR-ATmega128-GCC/halconf.h
@@ -48,7 +48,7 @@
  * @brief Enables the PAL subsystem.
  */

 #if !defined(CH_HAL_USE_PAL) || defined(__DOXYGEN__)

-#define CH_HAL_USE_PAL              TRUE

+#define CH_HAL_USE_PAL              FALSE

 #endif

 

 /*===========================================================================*/

diff --git a/demos/AVR-ATmega128-GCC/mcuconf.h b/demos/AVR-ATmega128-GCC/mcuconf.h
new file mode 100644
index 000000000..017289582
--- /dev/null
+++ b/demos/AVR-ATmega128-GCC/mcuconf.h
@@ -0,0 +1,53 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT 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 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/*

+ * AVR drivers configuration.

+ * The following settings override the default settings present in

+ * the various device driver implementation headers.

+ * Note that the settings for each driver only have effect if the driver

+ * is enabled in halconf.h.

+ */

+

+/*

+ * ADC driver system settings.
+ */

+

+/*

+ * CAN driver system settings.

+ */

+

+/*

+ * MAC driver system settings.

+ */

+

+/*

+ * PWM driver system settings.

+ */

+

+/*

+ * SERIAL driver system settings.

+ */

+#define USE_AVR_USART0              FALSE

+#define USE_AVR_USART1              TRUE

+

+/*

+ * SPI driver system settings.

+ */

+#define USE_LPC214x_SPI1            TRUE

diff --git a/demos/GNU-Linux-GCC/halconf.h b/demos/GNU-Linux-GCC/halconf.h
index c0f12c57d..58d49966f 100644
--- a/demos/GNU-Linux-GCC/halconf.h
+++ b/demos/GNU-Linux-GCC/halconf.h
@@ -48,7 +48,7 @@
  * @brief Enables the PAL subsystem.
  */

 #if !defined(CH_HAL_USE_PAL) || defined(__DOXYGEN__)

-#define CH_HAL_USE_PAL              TRUE

+#define CH_HAL_USE_PAL              FALSE

 #endif

 

 /*===========================================================================*/

diff --git a/demos/MSP430-MSP430x1611-GCC/mcuconf.h b/demos/MSP430-MSP430x1611-GCC/mcuconf.h
new file mode 100644
index 000000000..620cdd5e2
--- /dev/null
+++ b/demos/MSP430-MSP430x1611-GCC/mcuconf.h
@@ -0,0 +1,52 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT 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 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/*

+ * MSP430 drivers configuration.

+ * The following settings override the default settings present in

+ * the various device driver implementation headers.

+ * Note that the settings for each driver only have effect if the driver

+ * is enabled in halconf.h.

+ */

+

+/*

+ * ADC driver system settings.
+ */

+

+/*

+ * CAN driver system settings.

+ */

+

+/*

+ * MAC driver system settings.

+ */

+

+/*

+ * PWM driver system settings.

+ */

+

+/*

+ * SERIAL driver system settings.

+ */

+#define USE_MSP430_USART0           TRUE

+#define USE_MSP430_USART1           FALSE

+

+/*

+ * SPI driver system settings.

+ */

diff --git a/demos/Win32-MinGW/halconf.h b/demos/Win32-MinGW/halconf.h
index c0f12c57d..58d49966f 100644
--- a/demos/Win32-MinGW/halconf.h
+++ b/demos/Win32-MinGW/halconf.h
@@ -48,7 +48,7 @@
  * @brief Enables the PAL subsystem.
  */

 #if !defined(CH_HAL_USE_PAL) || defined(__DOXYGEN__)

-#define CH_HAL_USE_PAL              TRUE

+#define CH_HAL_USE_PAL              FALSE

 #endif

 

 /*===========================================================================*/

diff --git a/os/hal/platforms/AT91SAM7/serial_lld.c b/os/hal/platforms/AT91SAM7/serial_lld.c
index d310153e6..b781b2115 100644
--- a/os/hal/platforms/AT91SAM7/serial_lld.c
+++ b/os/hal/platforms/AT91SAM7/serial_lld.c
@@ -67,7 +67,7 @@ SerialDriver SD2;
 

 /** @brief Driver default configuration.*/

 static const SerialConfig default_config = {

-  38400,

+  SERIAL_DEFAULT_BITRATE,

   AT91C_US_USMODE_NORMAL | AT91C_US_CLKS_CLOCK |

   AT91C_US_CHRL_8_BITS | AT91C_US_PAR_NONE | AT91C_US_NBSTOP_1_BIT

 };

diff --git a/os/hal/platforms/AVR/serial_lld.c b/os/hal/platforms/AVR/serial_lld.c
index cdcfa97dc..53aec65d6 100644
--- a/os/hal/platforms/AVR/serial_lld.c
+++ b/os/hal/platforms/AVR/serial_lld.c
@@ -59,7 +59,7 @@ SerialDriver SD2;
  * @brief Driver default configuration.

  */

 static const SerialConfig default_config = {

-  UBRR(DEFAULT_USART_BITRATE),

+  UBRR(SERIAL_DEFAULT_BITRATE),

   (1 << UCSZ1) | (1 << UCSZ0)

 };

 

diff --git a/os/hal/platforms/AVR/serial_lld.h b/os/hal/platforms/AVR/serial_lld.h
index 79d070635..1d06b6d79 100644
--- a/os/hal/platforms/AVR/serial_lld.h
+++ b/os/hal/platforms/AVR/serial_lld.h
@@ -38,24 +38,12 @@
 /*===========================================================================*/

 

 /**

- * @brief Default bit rate.

- * @details Configuration parameter, at startup the UARTs are configured at

- * this speed.

- * @note It is possible to use @p SetUART() in order to change the working

- *       parameters at runtime.

- */

-#if !defined(DEFAULT_USART_BITRATE) || defined(__DOXYGEN__)

-#define DEFAULT_USART_BITRATE 38400

-#endif

-

-

-/**

  * @brief USART0 driver enable switch.

  * @details If set to @p TRUE the support for USART0 is included.

  * @note The default is @p FALSE.

  */

 #if !defined(USE_AVR_USART0) || defined(__DOXYGEN__)

-#define USE_AVR_USART0 FALSE

+#define USE_AVR_USART0              TRUE

 #endif

 

 /**

@@ -64,7 +52,7 @@
  * @note The default is @p TRUE.

  */

 #if !defined(USE_AVR_USART1) || defined(__DOXYGEN__)

-#define USE_AVR_USART1 TRUE

+#define USE_AVR_USART1              TRUE

 #endif

 

 /*===========================================================================*/

diff --git a/os/hal/platforms/LPC214x/serial_lld.c b/os/hal/platforms/LPC214x/serial_lld.c
index ea198fd5c..cfc742736 100644
--- a/os/hal/platforms/LPC214x/serial_lld.c
+++ b/os/hal/platforms/LPC214x/serial_lld.c
@@ -49,7 +49,7 @@ SerialDriver SD2;
 

 /** @brief Driver default configuration.*/

 static const SerialConfig default_config = {

-  38400,

+  SERIAL_DEFAULT_BITRATE,

   LCR_WL8 | LCR_STOP1 | LCR_NOPARITY,

   FCR_TRIGGER0

 };