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

4 files changed, 66 insertions, 35 deletions

diff --git a/boards/GENERIC_SPC560BC/board.c b/boards/GENERIC_SPC560BC/board.c
index bfe1d14f1..f7155230f 100644
--- a/boards/GENERIC_SPC560BC/board.c
+++ b/boards/GENERIC_SPC560BC/board.c
@@ -16,18 +16,18 @@
 #include "hal.h"

 

 #if HAL_USE_PAL || defined(__DOXYGEN__)

-/* Initial setup of all defined pads, the list is terminated by a {0, 0}.*/

+/* Initial setup of all defined pads, the list is terminated by a {0, 0, 0}.*/

 static const spc_siu_init_t spc_siu_init[] = {

-  {PCR(PB, PB_LIN0_TDX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)},

-  {PCR(PB, PB_LIN0_RDX), PAL_HIGH, PAL_MODE_INPUT},

-  {PCR(PE, PE_BUTTON1),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PE, PE_BUTTON2),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PE, PE_BUTTON3),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PE, PE_BUTTON4),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PE, PE_LED1),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

-  {PCR(PE, PE_LED2),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

-  {PCR(PE, PE_LED3),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

-  {PCR(PE, PE_LED4),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_B, PB_LIN0_TDX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)},

+  {PCR(PORT_B, PB_LIN0_RDX), PAL_HIGH, PAL_MODE_INPUT},

+  {PCR(PORT_E, PE_BUTTON1),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_E, PE_BUTTON2),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_E, PE_BUTTON3),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_E, PE_BUTTON4),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_E, PE_LED1),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_E, PE_LED2),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_E, PE_LED3),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_E, PE_LED4),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

   {0, 0, 0}

 };

 

diff --git a/boards/GENERIC_SPC560P/board.c b/boards/GENERIC_SPC560P/board.c
index 2418cb941..e5d7d2a83 100644
--- a/boards/GENERIC_SPC560P/board.c
+++ b/boards/GENERIC_SPC560P/board.c
@@ -16,18 +16,18 @@
 #include "hal.h"

 

 #if HAL_USE_PAL || defined(__DOXYGEN__)

-/* Initial setup of all defined pads, the list is terminated by a {0, 0}.*/

+/* Initial setup of all defined pads, the list is terminated by a {0, 0, 0}.*/

 static const spc_siu_init_t spc_siu_init[] = {

-  {PCR(PB, PB_LIN0_TDX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)},

-  {PCR(PB, PB_LIN0_RDX), PAL_HIGH, PAL_MODE_INPUT},

-  {PCR(PD, PD_BUTTON1),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PD, PD_BUTTON2),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PD, PD_BUTTON3),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PD, PD_BUTTON4),  PAL_LOW,  PAL_MODE_INPUT},

-  {PCR(PD, PD_LED1),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

-  {PCR(PD, PD_LED2),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

-  {PCR(PD, PD_LED3),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

-  {PCR(PD, PD_LED4),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_B, PB_LIN0_TDX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)},

+  {PCR(PORT_B, PB_LIN0_RDX), PAL_HIGH, PAL_MODE_INPUT},

+  {PCR(PORT_D, PD_BUTTON1),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_D, PD_BUTTON2),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_D, PD_BUTTON3),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_D, PD_BUTTON4),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT_D, PD_LED1),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_D, PD_LED2),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_D, PD_LED3),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT_D, PD_LED4),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

   {0, 0, 0}

 };

 

diff --git a/boards/GENERIC_SPC563M/board.c b/boards/GENERIC_SPC563M/board.c
index 0edcfcdc2..5914c19e8 100644
--- a/boards/GENERIC_SPC563M/board.c
+++ b/boards/GENERIC_SPC563M/board.c
@@ -21,6 +21,30 @@
 #include "ch.h"

 #include "hal.h"

 

+#if HAL_USE_PAL || defined(__DOXYGEN__)

+/* Initial setup of all defined pads, the list is terminated by a {0, 0, 0}.*/

+static const spc_siu_init_t spc_siu_init[] = {

+  {PCR(PORT4,  P4_ESCI_A_TX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)},

+  {PCR(PORT4,  P4_ESCI_A_RX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)},

+  {PCR(PORT11, P11_BUTTON1),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT11, P11_BUTTON2),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT11, P11_BUTTON3),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT11, P11_BUTTON4),  PAL_LOW,  PAL_MODE_INPUT},

+  {PCR(PORT11, P11_LED1),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT11, P11_LED2),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT11, P11_LED3),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {PCR(PORT11, P11_LED4),     PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL},

+  {0, 0, 0}

+};

+

+/**

+ * @brief   PAL setup.

+ */

+const PALConfig pal_default_config = {

+  spc_siu_init

+};

+#endif

+

 /*

  * Early initialization code.

  * This initialization must be performed just after stack setup and before

@@ -36,6 +60,7 @@ void __early_init(void) {
  */

 void boardInit(void) {

 

+#if 0

   /*

    * Various initialization (temporary code).

    */

@@ -49,4 +74,5 @@ void boardInit(void) {
   SIU.PCR[GPIO_BUTTON4].R  = 0x0100;                /* IBE.                 */

   SIU.PCR[GPIO_SCI_A_TX].R = 0x0500;                /* Primary | IBE.       */

   SIU.PCR[GPIO_SCI_A_RX].R = 0x0500;                /* Primary | IBE.       */

+#endif

 }

diff --git a/boards/GENERIC_SPC563M/board.h b/boards/GENERIC_SPC563M/board.h
index 6b63c3abf..6c85c76f7 100644
--- a/boards/GENERIC_SPC563M/board.h
+++ b/boards/GENERIC_SPC563M/board.h
@@ -29,30 +29,35 @@
  * Board identifiers.

  */

 #define BOARD_GENERIC_SPC563M

-#define BOARD_NAME "Generic SPC563M"

+#define BOARD_NAME                  "Generic SPC563M"

 

 /*

  * Board frequencies.

  */

-#if !defined(EXTCLK)

-#define EXTCLK          8000000

+#if !defined(SPC5_XOSC_CLK)

+#define SPC5_XOSC_CLK               8000000

 #endif

 

 /*

  * I/O definitions.

  */

-#define GPIO_SCI_A_TX   89

-#define GPIO_SCI_A_RX   90

+#define P4_ESCI_A_TX                9

+#define P4_ESCI_A_RX                10

 

-#define GPIO_BUTTON1    179

-#define GPIO_BUTTON2    181

-#define GPIO_BUTTON3    183

-#define GPIO_BUTTON4    187

+#define P11_BUTTON1                 3

+#define P11_BUTTON2                 5

+#define P11_BUTTON3                 7

+#define P11_BUTTON4                 9

 

-#define GPIO_LED1       188

-#define GPIO_LED2       189

-#define GPIO_LED3       190

-#define GPIO_LED4       191

+#define P11_LED1                    12

+#define P11_LED2                    13

+#define P11_LED3                    14

+#define P11_LED4                    15

+

+/*

+ * Support macros.

+ */

+#define PCR(port, pin)  (((port) * 16) + (pin))

 

 #if !defined(_FROM_ASM_)

 #ifdef __cplusplus