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

5 files changed, 26 insertions, 28 deletions

diff --git a/demos/ARM7-LPC214x-GCC-minimal/board.c b/demos/ARM7-LPC214x-GCC-minimal/board.c
index a06b24291..2e56028cc 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/board.c
+++ b/demos/ARM7-LPC214x-GCC-minimal/board.c
@@ -18,6 +18,7 @@
 */

 

 #include <ch.h>

+#include <pal.h>

 

 #include "lpc214x.h"

 #include "vic.h"

@@ -103,11 +104,11 @@ void hwinit0(void) {
   PINSEL0 = VAL_PINSEL0;

   PINSEL1 = VAL_PINSEL1;

   PINSEL2 = VAL_PINSEL2;

-  ioport_init_lld();

-  ioport_lpc214x_set_direction_lld(IOPORT_A, VAL_FIO0DIR);

-  ioport_write_lld(IOPORT_A, 0xFFFFFFFF);

-  ioport_lpc214x_set_direction_lld(IOPORT_B, VAL_FIO1DIR);

-  ioport_write_lld(IOPORT_B, 0xFFFFFFFF);

+  palInit();

+  pal_lld_lpc214x_set_direction(IOPORT_A, VAL_FIO0DIR);

+  palWritePort(IOPORT_A, 0xFFFFFFFF);

+  pal_lld_lpc214x_set_direction(IOPORT_B, VAL_FIO1DIR);

+  palWritePort(IOPORT_B, 0xFFFFFFFF);

 }

 

 /*

diff --git a/demos/ARM7-LPC214x-GCC-minimal/board.h b/demos/ARM7-LPC214x-GCC-minimal/board.h
index 3cdc2a9af..8cee52946 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/board.h
+++ b/demos/ARM7-LPC214x-GCC-minimal/board.h
@@ -24,10 +24,6 @@
 #include "lpc214x.h"

 #endif

 

-#ifndef _IOPORTS_LLD_H_

-#include "ioports.h"

-#endif

-

 #define BOARD_OLIMEX_LCP_P2148

 

 /*

@@ -69,16 +65,16 @@
 #define VAL_FIO0DIR 0xB0703C00

 #define VAL_FIO1DIR 0x00000000

 

-#define PA_LED1         IOPORT_BIT(10)

-#define PA_LED2         IOPORT_BIT(11)

-#define PA_BUZZ1        IOPORT_BIT(12)

-#define PA_BUZZ2        IOPORT_BIT(13)

-#define PA_BSL          IOPORT_BIT(14)

-#define PA_BUTTON1      IOPORT_BIT(15)

-#define PA_BUTTON2      IOPORT_BIT(16)

-#define PA_SSEL1        IOPORT_BIT(20)

-#define PA_WP1          IOPORT_BIT(24)

-#define PA_CP1          IOPORT_BIT(25)

-#define PA_LEDUSB       IOPORT_BIT(31)

+#define PA_LED1         10

+#define PA_LED2         11

+#define PA_BUZZ1        12

+#define PA_BUZZ2        13

+#define PA_BSL          14

+#define PA_BUTTON1      15

+#define PA_BUTTON2      16

+#define PA_SSEL1        20

+#define PA_WP1          24

+#define PA_CP1          25

+#define PA_LEDUSB       31

 

 #endif /* _BOARD_H_ */

diff --git a/demos/ARM7-LPC214x-GCC-minimal/main.c b/demos/ARM7-LPC214x-GCC-minimal/main.c
index 60035ffb7..83d192b91 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/main.c
+++ b/demos/ARM7-LPC214x-GCC-minimal/main.c
@@ -18,6 +18,7 @@
 */

 

 #include <ch.h>

+#include <pal.h>

 

 #include "board.h"

 

@@ -28,13 +29,13 @@ static WORKING_AREA(waThread1, 128);
 static msg_t Thread1(void *arg) {

 

   while (TRUE) {

-    chPortClear(IOPORT_A, PA_LED2);

+    palClearPort(IOPORT_A, PAL_PORT_BIT(PA_LED2));

     chThdSleepMilliseconds(200);

-    chPortSet(IOPORT_A, PA_LED1 | PA_LED2);

+    palSetPort(IOPORT_A, PAL_PORT_BIT(PA_LED1) | PAL_PORT_BIT(PA_LED2));

     chThdSleepMilliseconds(800);

-    chPortClear(IOPORT_A, PA_LED1);

+    palClearPort(IOPORT_A, PAL_PORT_BIT(PA_LED1));

     chThdSleepMilliseconds(200);

-    chPortSet(IOPORT_A, PA_LED1 | PA_LED2);

+    palSetPort(IOPORT_A, PAL_PORT_BIT(PA_LED1) | PAL_PORT_BIT(PA_LED2));

     chThdSleepMilliseconds(800);

   }

   return 0;

@@ -47,9 +48,9 @@ static WORKING_AREA(waThread2, 128);
 static msg_t Thread2(void *arg) {

 

   while (TRUE) {

-    chPortClear(IOPORT_A, PA_LEDUSB);

+    palClearPad(IOPORT_A, PA_LEDUSB);

     chThdSleepMilliseconds(200);

-    chPortSet(IOPORT_A, PA_LEDUSB);

+    palSetPad(IOPORT_A, PA_LEDUSB);

     chThdSleepMilliseconds(300);

   }

   return 0;

diff --git a/ports/ARM7-LPC214x/pal_lld.h b/ports/ARM7-LPC214x/pal_lld.h
index ce56f9562..00a159fe6 100644
--- a/ports/ARM7-LPC214x/pal_lld.h
+++ b/ports/ARM7-LPC214x/pal_lld.h
@@ -18,7 +18,7 @@
 */

 

 /**

- * @file ports/ARM7-LPC214x/ioports_lld.h

+ * @file ports/ARM7-LPC214x/pal_lld.h

  * @brief LPC214x FIO low level driver

  * @addtogroup LPC214x_PAL

  * @{

diff --git a/ports/ARM7-LPC214x/port.dox b/ports/ARM7-LPC214x/port.dox
index 69d8d6198..953b9095c 100644
--- a/ports/ARM7-LPC214x/port.dox
+++ b/ports/ARM7-LPC214x/port.dox
@@ -46,7 +46,7 @@
 /** @} */

 

 /**

- * @defgroup LPC214x_IOPORTS I/O Ports Support

+ * @defgroup LPC214x_PAL I/O Ports Support

  * @brief I/O Ports peripherals support.

  * @details This module supports the LPC214x FIO controller. The controller

  * supports the following features (see @ref PAL):