From c5b9bfa29f36981ff1f3ab14a10f6041aa7652c6 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Thu, 27 Jan 2011 23:41:03 -0500
Subject: Ported libmaple to the new mini prototype

---
 libmaple/gpio.c     |  3 ++-
 libmaple/libmaple.h | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'libmaple')

diff --git a/libmaple/gpio.c b/libmaple/gpio.c
index 3940837..71e5230 100644
--- a/libmaple/gpio.c
+++ b/libmaple/gpio.c
@@ -34,8 +34,9 @@ void gpio_init(void) {
     rcc_clk_enable(RCC_GPIOA);
     rcc_clk_enable(RCC_GPIOB);
     rcc_clk_enable(RCC_GPIOC);
+#if NR_GPIO_PORTS >= 4          /* Maple, but not Maple Mini */
     rcc_clk_enable(RCC_GPIOD);
-#if NR_GPIO_PORTS >= 7
+#elif NR_GPIO_PORTS >= 7        /* Maple Native (high density only) */
     rcc_clk_enable(RCC_GPIOE);
     rcc_clk_enable(RCC_GPIOF);
     rcc_clk_enable(RCC_GPIOG);
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h
index 74488ab..2a915b1 100644
--- a/libmaple/libmaple.h
+++ b/libmaple/libmaple.h
@@ -43,7 +43,7 @@
 #endif
 
 /* MCU-specific configuration */
-#ifdef MCU_STM32F103RB
+#if defined(MCU_STM32F103RB)
     /* e.g., LeafLabs Maple */
 
     /* Number of GPIO ports (GPIOA, GPIOB, etc.) */
@@ -80,8 +80,8 @@
     #define STACK_TOP     0x20000800
 
     /* Debug port settings (from ASSERT) */
-    #define ERROR_LED_PORT         GPIOA_BASE
-    #define ERROR_LED_PIN          5
+    #define ERROR_LED_PORT         GPIOB_BASE
+    #define ERROR_LED_PIN          12
     #define ERROR_USART_NUM        USART2
     #define ERROR_USART_BAUD       9600
     #define ERROR_TX_PORT          GPIOA_BASE
@@ -97,9 +97,8 @@
     #define BITBAND_SRAM_BASE  0x22000000
     #define BITBAND_PERI_REF   0x40000000
     #define BITBAND_PERI_BASE  0x42000000
-#endif
 
-#ifdef MCU_STM32F103ZE
+#elif defined(MCU_STM32F103ZE)
     /* e.g., LeafLabs Maple Native */
 
     #define NR_GPIO_PORTS             7
@@ -135,9 +134,8 @@
     #define BITBAND_SRAM_BASE  0x22000000
     #define BITBAND_PERI_REF   0x40000000
     #define BITBAND_PERI_BASE  0x42000000
-#endif
 
-#ifdef MCU_STM32F103CB
+#elif defined(MCU_STM32F103CB)
     /* e.g., LeafLabs Maple Mini */
 
     #define NR_GPIO_PORTS 3
@@ -151,7 +149,7 @@
     #define VCOM_ID_PRODUCT      0x0005
     #define USB_DISC_BANK        GPIOB_BASE
     #define USB_DISC_PIN         9
-    #define USB_CONFIG_MAX_POWER (100 >> 1) /* WTF does this mean */
+    #define USB_CONFIG_MAX_POWER (100 >> 1)
     #define RESET_DELAY          100
 
     #define USER_ADDR_ROM 0x08005000
@@ -174,12 +172,12 @@
     #define BITBAND_SRAM_BASE  0x22000000
     #define BITBAND_PERI_REF   0x40000000
     #define BITBAND_PERI_BASE  0x42000000
-#endif
 
-/* Make sure MCU-specific settings were defined */
-#ifndef NR_GPIO_PORTS
-#error "No MCU type specified. Add something like -DMCU_STM32F103RB " \
+#else
+
+#error "No MCU type specified. Add something like -DMCU_STM32F103RB "   \
        "to your compiler arguments (probably in a Makefile)."
+
 #endif
 
 /* Requires board configuration info */
-- 
cgit v1.2.3