diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-26 21:03:05 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-26 21:03:05 +0000 |
| commit | 780110bd2cbfd2adae472c5fcd7e014289559204 (patch) | |
| tree | ba4ecbd1bfee8c5ec832a241d1a447f786a6ace9 /demos | |
| parent | 0ed2cd487a83caf270e9893ac42f9e37e3789e25 (diff) | |
| download | ChibiOS-780110bd2cbfd2adae472c5fcd7e014289559204.tar.gz ChibiOS-780110bd2cbfd2adae472c5fcd7e014289559204.tar.bz2 ChibiOS-780110bd2cbfd2adae472c5fcd7e014289559204.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1327 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/board.c | 4 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/board.h | 9 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-LWIP-GCC/board.c | 4 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-LWIP-GCC/board.h | 9 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-UIP-GCC/board.c | 4 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-UIP-GCC/board.h | 9 |
6 files changed, 33 insertions, 6 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c index 3faae501a..920ed7402 100644 --- a/demos/ARM7-AT91SAM7X-GCC/board.c +++ b/demos/ARM7-AT91SAM7X-GCC/board.c @@ -59,10 +59,12 @@ static CH_IRQ_HANDLER(SYSIrqHandler) { /*
* Digital I/O ports static configuration as defined in @p board.h.
*/
-static const AT91SAM7XPIOConfig config =
+static const AT91SAM7PIOConfig config =
{
{VAL_PIOA_ODSR, VAL_PIOA_OSR, VAL_PIOA_PUSR},
+#if defined(SAM7X128) || defined(SAM7X256) || defined(SAM7X512)
{VAL_PIOB_ODSR, VAL_PIOB_OSR, VAL_PIOB_PUSR}
+#endif
};
/*
diff --git a/demos/ARM7-AT91SAM7X-GCC/board.h b/demos/ARM7-AT91SAM7X-GCC/board.h index c56f50258..2cb285429 100644 --- a/demos/ARM7-AT91SAM7X-GCC/board.h +++ b/demos/ARM7-AT91SAM7X-GCC/board.h @@ -20,7 +20,14 @@ #ifndef _BOARD_H_
#define _BOARD_H_
-#include "at91lib/AT91SAM7X256.h"
+/*
+ * Select your platform by modifying the following line. + */
+#if !defined(SAM7_PLATFORM)
+#define SAM7_PLATFORM SAM7X256
+#endif
+
+#include "at91sam7.h"
#define BOARD_OLIMEX_SAM7_EX256
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/board.c b/demos/ARM7-AT91SAM7X-LWIP-GCC/board.c index e988aaa86..7f129abaa 100644 --- a/demos/ARM7-AT91SAM7X-LWIP-GCC/board.c +++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/board.c @@ -60,10 +60,12 @@ static CH_IRQ_HANDLER(SYSIrqHandler) { /*
* Digital I/O ports static configuration as defined in @p board.h.
*/
-static const AT91SAM7XPIOConfig config =
+static const AT91SAM7PIOConfig config =
{
{VAL_PIOA_ODSR, VAL_PIOA_OSR, VAL_PIOA_PUSR},
+#if defined(SAM7X128) || defined(SAM7X256) || defined(SAM7X512)
{VAL_PIOB_ODSR, VAL_PIOB_OSR, VAL_PIOB_PUSR}
+#endif
};
/*
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/board.h b/demos/ARM7-AT91SAM7X-LWIP-GCC/board.h index c56f50258..c0b428561 100644 --- a/demos/ARM7-AT91SAM7X-LWIP-GCC/board.h +++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/board.h @@ -20,7 +20,14 @@ #ifndef _BOARD_H_
#define _BOARD_H_
-#include "at91lib/AT91SAM7X256.h"
+/*
+ * Select your platform by modifying the following line.
+ */
+#if !defined(SAM7_PLATFORM)
+#define SAM7_PLATFORM SAM7X256
+#endif
+
+#include "at91sam7.h"
#define BOARD_OLIMEX_SAM7_EX256
diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/board.c b/demos/ARM7-AT91SAM7X-UIP-GCC/board.c index 9dbd5f0e4..9d0ed6e22 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/board.c +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/board.c @@ -61,10 +61,12 @@ static CH_IRQ_HANDLER(SYSIrqHandler) { /*
* Digital I/O ports static configuration as defined in @p board.h.
*/
-static const AT91SAM7XPIOConfig config =
+static const AT91SAM7PIOConfig config =
{
{VAL_PIOA_ODSR, VAL_PIOA_OSR, VAL_PIOA_PUSR},
+#if defined(SAM7X128) || defined(SAM7X256) || defined(SAM7X512)
{VAL_PIOB_ODSR, VAL_PIOB_OSR, VAL_PIOB_PUSR}
+#endif
};
/*
diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/board.h b/demos/ARM7-AT91SAM7X-UIP-GCC/board.h index c56f50258..c0b428561 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/board.h +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/board.h @@ -20,7 +20,14 @@ #ifndef _BOARD_H_
#define _BOARD_H_
-#include "at91lib/AT91SAM7X256.h"
+/*
+ * Select your platform by modifying the following line.
+ */
+#if !defined(SAM7_PLATFORM)
+#define SAM7_PLATFORM SAM7X256
+#endif
+
+#include "at91sam7.h"
#define BOARD_OLIMEX_SAM7_EX256
|