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

6 files changed, 234 insertions, 42 deletions

diff --git a/demos/ARM7-AT91SAM7X-GCC/halconf.h b/demos/ARM7-AT91SAM7X-GCC/halconf.h
index b7b320a58..c0f12c57d 100644
--- a/demos/ARM7-AT91SAM7X-GCC/halconf.h
+++ b/demos/ARM7-AT91SAM7X-GCC/halconf.h
@@ -38,7 +38,7 @@
  * settings file. This file can be used to include platform specific

  * header files or to override the low level drivers settings.
  */

-/*#include "mcuconf.h"*/

+#include "mcuconf.h"

 

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

 /* PAL driver related settings.                                              */

@@ -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              TRUE

 #endif

 

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

@@ -59,7 +59,7 @@
  * @brief Enables the ADC subsystem.

  */

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

-#define CH_HAL_USE_ADC                  FALSE

+#define CH_HAL_USE_ADC              FALSE

 #endif

 

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

@@ -70,7 +70,7 @@
  * @brief Enables the CAN subsystem.

  */

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

-#define CH_HAL_USE_CAN                  FALSE

+#define CH_HAL_USE_CAN              FALSE

 #endif

 

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

@@ -81,7 +81,7 @@
  * @brief Enables the MAC subsystem.

  */

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

-#define CH_HAL_USE_MAC                  FALSE

+#define CH_HAL_USE_MAC              FALSE

 #endif

 

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

@@ -92,7 +92,7 @@
  * @brief Enables the PWM subsystem.

  */

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

-#define CH_HAL_USE_PWM                  FALSE

+#define CH_HAL_USE_PWM              FALSE

 #endif

 

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

@@ -103,9 +103,15 @@
  * @brief Enables the SERIAL subsystem.

  */

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

-#define CH_HAL_USE_SERIAL               TRUE

+#define CH_HAL_USE_SERIAL           TRUE

 #endif

 

+/*

+ * Default SERIAL settings overrides (uncomment to override).

+ */

+/*#define SERIAL_DEFAULT_BITRATE      38400*/

+/*#define SERIAL_BUFFERS_SIZE         64*/

+

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

 /* SPI driver related settings.                                              */

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

@@ -114,13 +120,13 @@
  * @brief Enables the SPI subsystem.

  */

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

-#define CH_HAL_USE_SPI                  FALSE

+#define CH_HAL_USE_SPI              FALSE

 #endif

 

 /*

  * Default SPI settings overrides (uncomment to override).
  */

-/*#define SPI_USE_MUTUAL_EXCLUSION        TRUE*/

+/*#define SPI_USE_MUTUAL_EXCLUSION    TRUE*/

 

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

 /* MMC_SPI driver related settings.                                          */

@@ -130,16 +136,16 @@
  * @brief Enables the MMC_SPI subsystem.

  */

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

-#define CH_HAL_USE_MMC_SPI              FALSE

+#define CH_HAL_USE_MMC_SPI          FALSE

 #endif

 

 /*

  * Default MMC_SPI settings overrides (uncomment to override).

  */

-/*#define MMC_SECTOR_SIZE                 512*/

-/*#define MMC_NICE_WAITING                TRUE*/

-/*#define MMC_POLLING_INTERVAL            10*/

-/*#define MMC_POLLING_DELAY               10*/

+/*#define MMC_SECTOR_SIZE             512*/

+/*#define MMC_NICE_WAITING            TRUE*/

+/*#define MMC_POLLING_INTERVAL        10*/

+/*#define MMC_POLLING_DELAY           10*/

 

 #endif /* _HALCONF_H_ */

 

diff --git a/demos/ARM7-AT91SAM7X-GCC/mcuconf.h b/demos/ARM7-AT91SAM7X-GCC/mcuconf.h
new file mode 100644
index 000000000..9e9fdc225
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-GCC/mcuconf.h
@@ -0,0 +1,58 @@
+/*

+    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/>.

+*/

+

+/*

+ * AT91SAM7 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.

+ */

+#define MAC_TRANSMIT_BUFFERS        2

+#define MAC_RECEIVE_BUFFERS         2

+#define MAC_BUFFERS_SIZE            1518

+#define EMAC_INTERRUPT_PRIORITY     (AT91C_AIC_PRIOR_HIGHEST - 3)

+

+/*

+ * PWM driver system settings.

+ */

+

+/*

+ * SERIAL driver system settings.

+ */

+#define USE_SAM7_USART0             TRUE

+#define USE_SAM7_USART1             TRUE

+#define SAM7_USART0_PRIORITY        (AT91C_AIC_PRIOR_HIGHEST - 2)

+#define SAM7_USART1_PRIORITY        (AT91C_AIC_PRIOR_HIGHEST - 2)

+

+/*

+ * SPI driver system settings.

+ */

diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/halconf.h b/demos/ARM7-AT91SAM7X-LWIP-GCC/halconf.h
index 06f5de243..0b5015496 100644
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/halconf.h
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/halconf.h
@@ -38,7 +38,7 @@
  * settings file. This file can be used to include platform specific

  * header files or to override the low level drivers settings.
  */

-/*#include "mcuconf.h"*/

+#include "mcuconf.h"

 

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

 /* PAL driver related settings.                                              */

@@ -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              TRUE

 #endif

 

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

@@ -59,7 +59,7 @@
  * @brief Enables the ADC subsystem.

  */

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

-#define CH_HAL_USE_ADC                  FALSE

+#define CH_HAL_USE_ADC              FALSE

 #endif

 

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

@@ -70,7 +70,7 @@
  * @brief Enables the CAN subsystem.

  */

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

-#define CH_HAL_USE_CAN                  FALSE

+#define CH_HAL_USE_CAN              FALSE

 #endif

 

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

@@ -81,7 +81,7 @@
  * @brief Enables the MAC subsystem.

  */

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

-#define CH_HAL_USE_MAC                  TRUE

+#define CH_HAL_USE_MAC              TRUE

 #endif

 

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

@@ -92,7 +92,7 @@
  * @brief Enables the PWM subsystem.

  */

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

-#define CH_HAL_USE_PWM                  FALSE

+#define CH_HAL_USE_PWM              FALSE

 #endif

 

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

@@ -103,9 +103,15 @@
  * @brief Enables the SERIAL subsystem.

  */

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

-#define CH_HAL_USE_SERIAL               TRUE

+#define CH_HAL_USE_SERIAL           TRUE

 #endif

 

+/*

+ * Default SERIAL settings overrides (uncomment to override).

+ */

+/*#define SERIAL_DEFAULT_BITRATE      38400*/

+/*#define SERIAL_BUFFERS_SIZE         64*/

+

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

 /* SPI driver related settings.                                              */

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

@@ -114,13 +120,13 @@
  * @brief Enables the SPI subsystem.

  */

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

-#define CH_HAL_USE_SPI                  FALSE

+#define CH_HAL_USE_SPI              FALSE

 #endif

 

 /*

  * Default SPI settings overrides (uncomment to override).
  */

-/*#define SPI_USE_MUTUAL_EXCLUSION        TRUE*/

+/*#define SPI_USE_MUTUAL_EXCLUSION    TRUE*/

 

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

 /* MMC_SPI driver related settings.                                          */

@@ -130,16 +136,16 @@
  * @brief Enables the MMC_SPI subsystem.

  */

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

-#define CH_HAL_USE_MMC_SPI              FALSE

+#define CH_HAL_USE_MMC_SPI          FALSE

 #endif

 

 /*

  * Default MMC_SPI settings overrides (uncomment to override).

  */

-/*#define MMC_SECTOR_SIZE                 512*/

-/*#define MMC_NICE_WAITING                TRUE*/

-/*#define MMC_POLLING_INTERVAL            10*/

-/*#define MMC_POLLING_DELAY               10*/

+/*#define MMC_SECTOR_SIZE             512*/

+/*#define MMC_NICE_WAITING            TRUE*/

+/*#define MMC_POLLING_INTERVAL        10*/

+/*#define MMC_POLLING_DELAY           10*/

 

 #endif /* _HALCONF_H_ */

 

diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/mcuconf.h b/demos/ARM7-AT91SAM7X-LWIP-GCC/mcuconf.h
new file mode 100644
index 000000000..9e9fdc225
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/mcuconf.h
@@ -0,0 +1,58 @@
+/*

+    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/>.

+*/

+

+/*

+ * AT91SAM7 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.

+ */

+#define MAC_TRANSMIT_BUFFERS        2

+#define MAC_RECEIVE_BUFFERS         2

+#define MAC_BUFFERS_SIZE            1518

+#define EMAC_INTERRUPT_PRIORITY     (AT91C_AIC_PRIOR_HIGHEST - 3)

+

+/*

+ * PWM driver system settings.

+ */

+

+/*

+ * SERIAL driver system settings.

+ */

+#define USE_SAM7_USART0             TRUE

+#define USE_SAM7_USART1             TRUE

+#define SAM7_USART0_PRIORITY        (AT91C_AIC_PRIOR_HIGHEST - 2)

+#define SAM7_USART1_PRIORITY        (AT91C_AIC_PRIOR_HIGHEST - 2)

+

+/*

+ * SPI driver system settings.

+ */

diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/halconf.h b/demos/ARM7-AT91SAM7X-UIP-GCC/halconf.h
index 06f5de243..0b5015496 100644
--- a/demos/ARM7-AT91SAM7X-UIP-GCC/halconf.h
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/halconf.h
@@ -38,7 +38,7 @@
  * settings file. This file can be used to include platform specific

  * header files or to override the low level drivers settings.
  */

-/*#include "mcuconf.h"*/

+#include "mcuconf.h"

 

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

 /* PAL driver related settings.                                              */

@@ -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              TRUE

 #endif

 

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

@@ -59,7 +59,7 @@
  * @brief Enables the ADC subsystem.

  */

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

-#define CH_HAL_USE_ADC                  FALSE

+#define CH_HAL_USE_ADC              FALSE

 #endif

 

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

@@ -70,7 +70,7 @@
  * @brief Enables the CAN subsystem.

  */

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

-#define CH_HAL_USE_CAN                  FALSE

+#define CH_HAL_USE_CAN              FALSE

 #endif

 

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

@@ -81,7 +81,7 @@
  * @brief Enables the MAC subsystem.

  */

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

-#define CH_HAL_USE_MAC                  TRUE

+#define CH_HAL_USE_MAC              TRUE

 #endif

 

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

@@ -92,7 +92,7 @@
  * @brief Enables the PWM subsystem.

  */

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

-#define CH_HAL_USE_PWM                  FALSE

+#define CH_HAL_USE_PWM              FALSE

 #endif

 

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

@@ -103,9 +103,15 @@
  * @brief Enables the SERIAL subsystem.

  */

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

-#define CH_HAL_USE_SERIAL               TRUE

+#define CH_HAL_USE_SERIAL           TRUE

 #endif

 

+/*

+ * Default SERIAL settings overrides (uncomment to override).

+ */

+/*#define SERIAL_DEFAULT_BITRATE      38400*/

+/*#define SERIAL_BUFFERS_SIZE         64*/

+

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

 /* SPI driver related settings.                                              */

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

@@ -114,13 +120,13 @@
  * @brief Enables the SPI subsystem.

  */

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

-#define CH_HAL_USE_SPI                  FALSE

+#define CH_HAL_USE_SPI              FALSE

 #endif

 

 /*

  * Default SPI settings overrides (uncomment to override).
  */

-/*#define SPI_USE_MUTUAL_EXCLUSION        TRUE*/

+/*#define SPI_USE_MUTUAL_EXCLUSION    TRUE*/

 

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

 /* MMC_SPI driver related settings.                                          */

@@ -130,16 +136,16 @@
  * @brief Enables the MMC_SPI subsystem.

  */

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

-#define CH_HAL_USE_MMC_SPI              FALSE

+#define CH_HAL_USE_MMC_SPI          FALSE

 #endif

 

 /*

  * Default MMC_SPI settings overrides (uncomment to override).

  */

-/*#define MMC_SECTOR_SIZE                 512*/

-/*#define MMC_NICE_WAITING                TRUE*/

-/*#define MMC_POLLING_INTERVAL            10*/

-/*#define MMC_POLLING_DELAY               10*/

+/*#define MMC_SECTOR_SIZE             512*/

+/*#define MMC_NICE_WAITING            TRUE*/

+/*#define MMC_POLLING_INTERVAL        10*/

+/*#define MMC_POLLING_DELAY           10*/

 

 #endif /* _HALCONF_H_ */

 

diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/mcuconf.h b/demos/ARM7-AT91SAM7X-UIP-GCC/mcuconf.h
new file mode 100644
index 000000000..9e9fdc225
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/mcuconf.h
@@ -0,0 +1,58 @@
+/*

+    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/>.

+*/

+

+/*

+ * AT91SAM7 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.

+ */

+#define MAC_TRANSMIT_BUFFERS        2

+#define MAC_RECEIVE_BUFFERS         2

+#define MAC_BUFFERS_SIZE            1518

+#define EMAC_INTERRUPT_PRIORITY     (AT91C_AIC_PRIOR_HIGHEST - 3)

+

+/*

+ * PWM driver system settings.

+ */

+

+/*

+ * SERIAL driver system settings.

+ */

+#define USE_SAM7_USART0             TRUE

+#define USE_SAM7_USART1             TRUE

+#define SAM7_USART0_PRIORITY        (AT91C_AIC_PRIOR_HIGHEST - 2)

+#define SAM7_USART1_PRIORITY        (AT91C_AIC_PRIOR_HIGHEST - 2)

+

+/*

+ * SPI driver system settings.

+ */