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

2 files changed, 15 insertions, 15 deletions

diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c
index fb52c8f3b..31e362845 100644
--- a/demos/ARM7-AT91SAM7X-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-GCC/board.c
@@ -133,25 +133,25 @@ void hwinit1(void) {
   /*

    * LCD pins setup.

    */

-  palClearPad(IOPORT_B, PIOB_LCD_BL);

-  palSetPadMode(IOPORT_B, PIOB_LCD_BL, PAL_MODE_OUTPUT_PUSHPULL);

+  palClearPad(IOPORT2, PIOB_LCD_BL);

+  palSetPadMode(IOPORT2, PIOB_LCD_BL, PAL_MODE_OUTPUT_PUSHPULL);

 

-  palSetPad(IOPORT_A, PIOA_LCD_RESET);

-  palSetPadMode(IOPORT_A, PIOA_LCD_RESET, PAL_MODE_OUTPUT_PUSHPULL);

+  palSetPad(IOPORT1, PIOA_LCD_RESET);

+  palSetPadMode(IOPORT1, PIOA_LCD_RESET, PAL_MODE_OUTPUT_PUSHPULL);

 

   /*

    * Joystick and buttons setup.

    */

-  palSetGroupMode(IOPORT_A,

+  palSetGroupMode(IOPORT1,

                   PIOA_B1_MASK | PIOA_B2_MASK | PIOA_B3_MASK |

                   PIOA_B4_MASK | PIOA_B5_MASK,

                   PAL_MODE_INPUT);

-  palSetGroupMode(IOPORT_B, PIOB_SW1_MASK | PIOB_SW2_MASK, PAL_MODE_INPUT);

+  palSetGroupMode(IOPORT2, PIOB_SW1_MASK | PIOB_SW2_MASK, PAL_MODE_INPUT);

 

   /*

    * MMC/SD slot setup.

    */

-  palSetGroupMode(IOPORT_B,

+  palSetGroupMode(IOPORT2,

                   PIOB_MMC_WP_MASK | PIOB_MMC_CP_MASK,

                   PAL_MODE_INPUT);

 

diff --git a/demos/ARM7-AT91SAM7X-GCC/main.c b/demos/ARM7-AT91SAM7X-GCC/main.c
index d1ca61cc7..f6c297a41 100644
--- a/demos/ARM7-AT91SAM7X-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-GCC/main.c
@@ -28,9 +28,9 @@ static WORKING_AREA(waThread1, 64);
 static msg_t Thread1(void *arg) {

 

   while (TRUE) {

-    palSetPad(IOPORT_B, PIOB_LCD_BL);

+    palSetPad(IOPORT2, PIOB_LCD_BL);

     chThdSleepMilliseconds(100);

-    palClearPad(IOPORT_B, PIOB_LCD_BL);

+    palClearPad(IOPORT2, PIOB_LCD_BL);

     chThdSleepMilliseconds(900);

   }

   return 0;

@@ -43,9 +43,9 @@ static msg_t Thread1(void *arg) {
 int main(int argc, char **argv) {

 

   /*

-   * Activates the communication port 1 using the driver default configuration.

+   * Activates the serial driver 1 using the driver default configuration.

    */

-  sdStart(&COM1, NULL);

+  sdStart(&SD1, NULL);

 

   /*

    * Creates the blinker thread.

@@ -57,10 +57,10 @@ int main(int argc, char **argv) {
    */

   while (TRUE) {

     chThdSleepMilliseconds(500);

-    if (!palReadPad(IOPORT_B, PIOB_SW1))

-      sdWrite(&COM1, (uint8_t *)"Hello World!\r\n", 14);

-    if (!palReadPad(IOPORT_B, PIOB_SW2))

-      TestThread(&COM1);

+    if (!palReadPad(IOPORT2, PIOB_SW1))

+      sdWrite(&SD1, (uint8_t *)"Hello World!\r\n", 14);

+    if (!palReadPad(IOPORT2, PIOB_SW2))

+      TestThread(&SD1);

   }

 

   return 0;