From 220341765d0934143787dcdf0dfa40577059f884 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 3 Apr 2010 12:17:37 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1837
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 boards/EA_LPCXPRESSO_BB_1114/board.c | 10 ++++++++--
 boards/EA_LPCXPRESSO_BB_1114/board.h | 14 +++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'boards')

diff --git a/boards/EA_LPCXPRESSO_BB_1114/board.c b/boards/EA_LPCXPRESSO_BB_1114/board.c
index 401b0532e..79a2f790c 100644
--- a/boards/EA_LPCXPRESSO_BB_1114/board.c
+++ b/boards/EA_LPCXPRESSO_BB_1114/board.c
@@ -43,9 +43,15 @@ void hwinit1(void) {
   halInit();
 
   /*
-   * Extra, board-specific, initializations.
+   * Extra, board-specific, initializations.
+   * NOTE: PIO1_2 is associated also to the JTAG, if you need to use JTAG
+   *       you must comment that line first.
    */
-  LPC_IOCON->PIO0_7 = 0xC0;         /* Disables pull-up on LED output.      */
+  LPC_IOCON->PIO0_7 = 0xC0;             /* Disables pull-up on LED2 output. */
+  LPC_IOCON->JTAG_nTRST_PIO1_2 = 0xC1;  /* Disables pull-up on LED3B output
+                                           and makes it GPIO1_2.            */
+  LPC_IOCON->PIO1_9 = 0xC0;             /* Disables pull-up on LED3R output.*/
+  LPC_IOCON->PIO1_10 = 0xC0;            /* Disables pull-up on LED3G output.*/
 
   /*
    * ChibiOS/RT initialization.
diff --git a/boards/EA_LPCXPRESSO_BB_1114/board.h b/boards/EA_LPCXPRESSO_BB_1114/board.h
index 685ab4e64..9c0a6161c 100644
--- a/boards/EA_LPCXPRESSO_BB_1114/board.h
+++ b/boards/EA_LPCXPRESSO_BB_1114/board.h
@@ -40,13 +40,15 @@
  * GPIO 0 initial setup.
  * Bit7 - LPCxpresso LED, initially output at low level.
  */
-#define VAL_GPIO0DIR            0x00000080
+#define VAL_GPIO0DIR            PAL_PORT_BIT(GPIO0_LED2)
 #define VAL_GPIO0DATA           0x00000000
 
 /*
  * GPIO 1 initial setup.
  */
-#define VAL_GPIO1DIR            0x00000000
+#define VAL_GPIO1DIR            PAL_PORT_BIT(GPIO1_LED3B) |                 \
+                                PAL_PORT_BIT(GPIO1_LED3R) |                 \
+                                PAL_PORT_BIT(GPIO1_LED3G)
 #define VAL_GPIO1DATA           0x00000000
 
 /*
@@ -64,7 +66,13 @@
 /*
  * Pin definitions.
  */
-#define GPIO0_LED               7
+#define GPIO0_SW3               1
+#define GPIO0_LED2              7
+
+#define GPIO1_LED3B             2
+#define GPIO1_SW4               4
+#define GPIO1_LED3R             9
+#define GPIO1_LED3G             10
 
 #ifdef __cplusplus
 extern "C" {
-- 
cgit v1.2.3