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

6 files changed, 14 insertions, 36 deletions

diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 10eb571ae..9d44185a4 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -57,7 +57,7 @@ CSRC = ${PORTSRC} \
        ${TESTSRC} \

        ${HALSRC} \

        ${PLATFORMSRC} \

-       ${CHIBIOS}/os/io/platforms/LPC214x/lpc214x_ssp.c \

+       ${CHIBIOS}/os/hal/platforms/LPC214x/lpc214x_ssp.c \

        ${CHIBIOS}/os/various/evtimer.c \

        board.c buzzer.c mmcsd.c main.c

 

diff --git a/demos/ARM7-LPC214x-GCC/board.c b/demos/ARM7-LPC214x-GCC/board.c
index 9c4c7e335..f81d2329a 100644
--- a/demos/ARM7-LPC214x-GCC/board.c
+++ b/demos/ARM7-LPC214x-GCC/board.c
@@ -17,17 +17,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <pal.h>

-#include <serial.h>

+#include "ch.h"

+#include "hal.h"

 

-#include "vic.h"

 #include "lpc214x_ssp.h"

-

-#include "board.h"

 #include "mmcsd.h"

 #include "buzzer.h"

 

+#define VAL_TC0_PRESCALER 0

+

 /*

  * Timer 0 IRQ handling here.

  */

@@ -45,18 +43,6 @@ static CH_IRQ_HANDLER(T0IrqHandler) {
 }

 

 /*

- * Digital I/O ports static configuration as defined in @p board.h.

- */

-static const LPC214xFIOConfig config =

-{

-  VAL_PINSEL0,

-  VAL_PINSEL1,

-  VAL_PINSEL2,

-  {VAL_FIO0PIN, VAL_FIO0DIR},

-  {VAL_FIO1PIN, VAL_FIO1DIR}

-};

-

-/*

  * Early initialization code.

  * This initialization is performed just after reset before BSS and DATA

  * segments initialization.

diff --git a/demos/ARM7-LPC214x-GCC/board.h b/demos/ARM7-LPC214x-GCC/board.h
index 022383032..b66ce235d 100644
--- a/demos/ARM7-LPC214x-GCC/board.h
+++ b/demos/ARM7-LPC214x-GCC/board.h
@@ -20,8 +20,6 @@
 #ifndef _BOARD_H_

 #define _BOARD_H_

 

-#include "lpc214x.h"

-

 #define BOARD_OLIMEX_LCP_P2148

 

 /*

@@ -32,8 +30,6 @@
 #define CCLK 48000000

 #define PCLK 12000000

 

-#define VAL_TC0_PRESCALER 0

-

 /*

  * Pins configuration for Olimex LPC-P2148.

  *

diff --git a/demos/ARM7-LPC214x-GCC/buzzer.c b/demos/ARM7-LPC214x-GCC/buzzer.c
index 1d3350bb2..2e7c0bd98 100644
--- a/demos/ARM7-LPC214x-GCC/buzzer.c
+++ b/demos/ARM7-LPC214x-GCC/buzzer.c
@@ -24,10 +24,10 @@
  * The driver also generates an event when the sound is done and the buzzer

  * goes silent.

  */

-#include <ch.h>

 

-#include "lpc214x.h"

-#include "board.h"

+#include "ch.h"

+#include "hal.h"

+

 #include "buzzer.h"

 

 EventSource BuzzerSilentEventSource;

diff --git a/demos/ARM7-LPC214x-GCC/main.c b/demos/ARM7-LPC214x-GCC/main.c
index 93b6fd768..d0a69b3d7 100644
--- a/demos/ARM7-LPC214x-GCC/main.c
+++ b/demos/ARM7-LPC214x-GCC/main.c
@@ -17,15 +17,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <pal.h>

-#include <serial.h>

-#include <test.h>

+#include "ch.h"

+#include "hal.h"

+#include "test.h"

+#include "evtimer.h"

 

-#include "board.h"

 #include "mmcsd.h"

 #include "buzzer.h"

-#include "evtimer.h"

 

 #define BOTH_BUTTONS (PAL_PORT_BIT(PA_BUTTON1) | PAL_PORT_BIT(PA_BUTTON2))

 

diff --git a/demos/ARM7-LPC214x-GCC/mmcsd.c b/demos/ARM7-LPC214x-GCC/mmcsd.c
index 731f594a2..220d9c88a 100644
--- a/demos/ARM7-LPC214x-GCC/mmcsd.c
+++ b/demos/ARM7-LPC214x-GCC/mmcsd.c
@@ -17,12 +17,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <pal.h>

+#include "ch.h"

+#include "hal.h"

 

-#include "board.h"

 #include "lpc214x_ssp.h"

-

 #include "mmcsd.h"

 

 EventSource MMCInsertEventSource, MMCRemoveEventSource;