diff options
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/ARM7-LPC214x-GCC-minimal/Makefile | 1 | ||||
| -rw-r--r-- | demos/ARM7-LPC214x-GCC-minimal/board.c | 28 | ||||
| -rw-r--r-- | demos/ARM7-LPC214x-GCC-minimal/board.h | 2 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F103-GCC/board.c | 8 |
4 files changed, 27 insertions, 12 deletions
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile index 2ea142e81..a00eb9c65 100644 --- a/demos/ARM7-LPC214x-GCC-minimal/Makefile +++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile @@ -50,6 +50,7 @@ include ../../src/kernel.mk # setting.
CSRC = ../../ports/ARM7/chcore.c \
../../ports/ARM7-LPC214x/vic.c \
+ ../../ports/ARM7-LPC214x/pal_lld.c \
${KERNSRC} \
board.c main.c
diff --git a/demos/ARM7-LPC214x-GCC-minimal/board.c b/demos/ARM7-LPC214x-GCC-minimal/board.c index 2e56028cc..980626ab5 100644 --- a/demos/ARM7-LPC214x-GCC-minimal/board.c +++ b/demos/ARM7-LPC214x-GCC-minimal/board.c @@ -59,6 +59,18 @@ 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.
@@ -101,14 +113,14 @@ void hwinit0(void) { /*
* I/O pins configuration.
*/
- PINSEL0 = VAL_PINSEL0;
- PINSEL1 = VAL_PINSEL1;
- PINSEL2 = VAL_PINSEL2;
- 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);
+// PINSEL0 = VAL_PINSEL0;
+// PINSEL1 = VAL_PINSEL1;
+// PINSEL2 = VAL_PINSEL2;
+ palInit(&config);
+// 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 fee4baa61..ab4aa76f6 100644 --- a/demos/ARM7-LPC214x-GCC-minimal/board.h +++ b/demos/ARM7-LPC214x-GCC-minimal/board.h @@ -64,6 +64,8 @@ #define VAL_PINSEL2 0x00000004
#define VAL_FIO0DIR 0xB0703C00
#define VAL_FIO1DIR 0x00000000
+#define VAL_FIO0PIN 0x00000000
+#define VAL_FIO1PIN 0x00000000
#define PA_LED1 10
#define PA_LED2 11
diff --git a/demos/ARMCM3-STM32F103-GCC/board.c b/demos/ARMCM3-STM32F103-GCC/board.c index 34349b827..0f6c5be6b 100644 --- a/demos/ARMCM3-STM32F103-GCC/board.c +++ b/demos/ARMCM3-STM32F103-GCC/board.c @@ -29,10 +29,10 @@ */
static const STM32GPIOConfig config =
{
- {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
- {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
- {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
- {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
+ {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
+ {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
+ {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
+ {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
};
/*
|