From 4309cc4c0bdf4ece1b9ac57932d9f9d57f65640b Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Fri, 9 Sep 2011 15:13:06 -0400
Subject: Maple Native: Fix BOARD_NR_USED_PINS, boardUsedPins.

---
 wirish/boards/maple_native.cpp | 5 +++--
 wirish/boards/maple_native.h   | 7 +------
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'wirish')

diff --git a/wirish/boards/maple_native.cpp b/wirish/boards/maple_native.cpp
index 2617005..5e0cad3 100644
--- a/wirish/boards/maple_native.cpp
+++ b/wirish/boards/maple_native.cpp
@@ -179,10 +179,11 @@ extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
     54, 55
 };
 
-/* FIXME [0.0.12] see comment by BOARD_NR_USED_PINS in maple_native.h */
 extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
     BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
-    BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
+    BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN,
+    56, 58, 59, 61, 62, 64, 65, 67, 68, 70, 71, 73, 74, 76, 77, 78, 79, 81,
+    82, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100
 };
 
 static void initSRAMChip(void) {
diff --git a/wirish/boards/maple_native.h b/wirish/boards/maple_native.h
index 6e51653..f575bfb 100644
--- a/wirish/boards/maple_native.h
+++ b/wirish/boards/maple_native.h
@@ -70,12 +70,7 @@
 #define BOARD_NR_GPIO_PINS      106
 #define BOARD_NR_PWM_PINS       18
 #define BOARD_NR_ADC_PINS       21
-/* FIXME [0.0.12] this isn't true at all; almost all of the triple
- * header pins are used by the FSMC by default.  Fix this (and the
- * corresponding boardUsedPins definition in maple_native.cpp) by QA
- * time. */
-#define BOARD_NR_USED_PINS      7
-
+#define BOARD_NR_USED_PINS      43
 #define BOARD_JTMS_SWDIO_PIN    101
 #define BOARD_JTCK_SWCLK_PIN    102
 #define BOARD_JTDI_PIN          103
-- 
cgit v1.2.3