From 0a6a19cf7625c0badb3bae30ad23605b39883357 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 25 Aug 2010 18:21:51 -0400
Subject: MEMORY_TARGET not MAPLE_TARGET

---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b1858c7..7c51450 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := sketch
 
 BOARD ?= maple
-MAPLE_TARGET ?= flash
+MEMORY_TARGET ?= flash
 
 # Useful paths
 SRCROOT := $(dir)
@@ -28,15 +28,15 @@ VENDOR_ID  := 1EAF
 PRODUCT_ID := 0003
 
 # Some target specific things
-ifeq ($(MAPLE_TARGET), ram)
+ifeq ($(MEMORY_TARGET), ram)
    VECT_BASE_ADDR := VECT_TAB_RAM
    LDSCRIPT := ram.ld
 endif
-ifeq ($(MAPLE_TARGET), flash)
+ifeq ($(MEMORY_TARGET), flash)
    LDSCRIPT := flash.ld
    VECT_BASE_ADDR := VECT_TAB_FLASH
 endif
-ifeq ($(MAPLE_TARGET), jtag)
+ifeq ($(MEMORY_TARGET), jtag)
    LDSCRIPT := jtag.ld
    VECT_BASE_ADDR := VECT_TAB_BASE
 endif
@@ -71,7 +71,7 @@ install: $(BUILD_PATH)/$(BOARD).bin
 # Force a rebuild if the maple target changed
 PREV_BUILD_TYPE = $(shell cat $(BUILD_PATH)/build-type 2>/dev/null)
 build-check:
-ifneq ($(PREV_BUILD_TYPE), $(MAPLE_TARGET))
+ifneq ($(PREV_BUILD_TYPE), $(MEMORY_TARGET))
 	$(shell rm -rf $(BUILD_PATH))
 endif
 
@@ -84,11 +84,11 @@ help:
 	@echo ""
 	@echo "  libmaple Makefile help"
 	@echo "  ----------------------"
-	@echo "  Compile targets (default MAPLE_TARGET=flash):"
+	@echo "  Compile targets (default MEMORY_TARGET=flash):"
 	@echo "      ram:    Compile sketch code to ram"
 	@echo "      flash:  Compile sketch code to flash"
 	@echo "      jtag:   Compile sketch code to jtag"
-	@echo "      sketch: Compile sketch code to target MAPLE_TARGET"
+	@echo "      sketch: Compile sketch code to target MEMORY_TARGET"
 	@echo "  "
 	@echo "  Programming targets:"
 	@echo "      install:  Upload code to target"
@@ -115,10 +115,10 @@ ctags:
 	@echo "Made tags file for VIM code browsing"
 
 ram:
-	@$(MAKE) MAPLE_TARGET=ram --no-print-directory sketch
+	@$(MAKE) MEMORY_TARGET=ram --no-print-directory sketch
 
 flash:
-	@$(MAKE) MAPLE_TARGET=flash --no-print-directory sketch
+	@$(MAKE) MEMORY_TARGET=flash --no-print-directory sketch
 
 jtag:
-	@$(MAKE) MAPLE_TARGET=jtag --no-print-directory sketch
+	@$(MAKE) MEMORY_TARGET=jtag --no-print-directory sketch
-- 
cgit v1.2.3


From 12c351d0561d1f9d4e017bbd3f847906f93b0df7 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 25 Aug 2010 22:57:46 -0400
Subject: inital portability work

---
 Makefile                    |  5 +--
 libmaple/adc.h              | 37 ++++++++++----------
 libmaple/board_maple.h      | 82 +++++++++++++++++++++++++++++++++++++++++++++
 libmaple/exti.h             |  8 +++--
 libmaple/gpio.c             |  5 +++
 libmaple/gpio.h             |  3 ++
 libmaple/libmaple.h         | 18 ++++++++++
 libmaple/nvic.c             |  8 +++--
 libmaple/nvic.h             | 13 +++----
 libmaple/rcc.c              | 51 +++++-----------------------
 libmaple/rcc.h              | 75 ++++++++++++++++++++++++++++++++++-------
 libmaple/spi.h              |  1 +
 libmaple/syscalls.c         |  7 ----
 libmaple/timers.c           | 38 +++++++++++++++++++++
 libmaple/timers.h           | 16 +++++++++
 libmaple/usart.c            | 35 +++++++++++++++++++
 libmaple/usart.h            |  3 ++
 libmaple/usb/descriptors.h  |  2 +-
 libmaple/usb/usb_config.h   |  6 ----
 libmaple/usb/usb_hardware.h |  1 -
 libmaple/util.c             | 11 +-----
 libmaple/util.h             |  6 ----
 notes/portable.txt          | 69 ++++++++++++++++++++++++++++++++++++++
 wirish/wirish.h             |  6 ----
 24 files changed, 383 insertions(+), 123 deletions(-)
 create mode 100644 libmaple/board_maple.h
 create mode 100644 notes/portable.txt

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7c51450..1a905e8 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,9 @@ LIBMAPLE_PATH := libmaple
 
 # Useful variables
 GLOBAL_CFLAGS    := -Os -g -mcpu=cortex-m3 -mthumb -march=armv7-m -nostdlib \
-                    -ffunction-sections -fdata-sections -Wl,--gc-sections
-GLOBAL_CXXFLAGS := -fno-rtti -fno-exceptions -Wall
+                    -ffunction-sections -fdata-sections -Wl,--gc-sections \
+					-DBOARD_$(BOARD)
+GLOBAL_CXXFLAGS := -fno-rtti -fno-exceptions -Wall -DBOARD_$(BOARD)
 
 
 LDDIR    := support/ld
diff --git a/libmaple/adc.h b/libmaple/adc.h
index 11aa5f6..f98a5f2 100644
--- a/libmaple/adc.h
+++ b/libmaple/adc.h
@@ -43,29 +43,32 @@ extern "C"{
  *
  * Need to up the sample time if otherwise... see datasheet */
 
-/* We'll only use ADC1 for now...  */
-#define ADC_BASE                 0x40012400
-#define ADC_SR                   *(volatile uint32*)(ADC_BASE + 0)
-#define ADC_CR1                  *(volatile uint32*)(ADC_BASE + 0x4)
-#define ADC_CR2                  *(volatile uint32*)(ADC_BASE + 0x8)
-#define ADC_SMPR1                *(volatile uint32*)(ADC_BASE + 0xC)
-#define ADC_SMPR2                *(volatile uint32*)(ADC_BASE + 0x10)
-#define ADC_SQR1                 *(volatile uint32*)(ADC_BASE + 0x2C)
-#define ADC_SQR3                 *(volatile uint32*)(ADC_BASE + 0x34)
-#define ADC_DR                   *(volatile uint32*)(ADC_BASE + 0x4C)
+/* TODO: We'll only use ADC1 for now...  */
+#define ADC1_BASE                 0x40012400
+#define ADC2_BASE                 0x40012400
+#define ADC3_BASE                 0x40012400
+
+#define ADC_SR                   *(volatile uint32*)(ADC1_BASE + 0)
+#define ADC_CR1                  *(volatile uint32*)(ADC1_BASE + 0x4)
+#define ADC_CR2                  *(volatile uint32*)(ADC1_BASE + 0x8)
+#define ADC_SMPR1                *(volatile uint32*)(ADC1_BASE + 0xC)
+#define ADC_SMPR2                *(volatile uint32*)(ADC1_BASE + 0x10)
+#define ADC_SQR1                 *(volatile uint32*)(ADC1_BASE + 0x2C)
+#define ADC_SQR3                 *(volatile uint32*)(ADC1_BASE + 0x34)
+#define ADC_DR                   *(volatile uint32*)(ADC1_BASE + 0x4C)
 
 #define CR2_EXTSEL_SWSTART       (0xE << 16)
 #define CR2_RSTCAL               (BIT(3))
 #define CR2_EXTTRIG              (BIT(20))
 
 /* Bit banded bits  */
-#define CR2_ADON_BIT             *(volatile uint32*)(BITBAND_PERI(ADC_BASE+0x8, 0))
-#define CR2_CAL_BIT              *(volatile uint32*)(BITBAND_PERI(ADC_BASE+0x8, 2))
-#define CR2_RSTCAL_BIT           *(volatile uint32*)(BITBAND_PERI(ADC_BASE+0x8, 3))
-#define CR2_SWSTART_BIT          *(volatile uint32*)(BITBAND_PERI(ADC_BASE+0x8 + 2, 6))
-#define SR_EOC_BIT               *(volatile uint32*)(BITBAND_PERI(ADC_BASE+0, 1))
+#define CR2_ADON_BIT             *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8, 0))
+#define CR2_CAL_BIT              *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8, 2))
+#define CR2_RSTCAL_BIT           *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8, 3))
+#define CR2_SWSTART_BIT          *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8 + 2, 6))
+#define SR_EOC_BIT               *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0, 1))
 
-#define NR_ANALOG_PINS           29
+// NR_ANALOG_PINS is board specific
 
 /* Initialize ADC1 to do one-shot conversions  */
 void adc_init(void);
@@ -88,8 +91,6 @@ static inline int adc_read(int channel) {
     return ADC_DR;
 }
 
-
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
diff --git a/libmaple/board_maple.h b/libmaple/board_maple.h
new file mode 100644
index 0000000..3cbf638
--- /dev/null
+++ b/libmaple/board_maple.h
@@ -0,0 +1,82 @@
+/* *****************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Bryan Newbold.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * ****************************************************************************/
+
+// Board-specific settings file, included from libmaple.h based on the BOARD
+// environment variable.
+
+// See ../notes/portability.txt for more information
+
+#ifndef _BOARD_MAPLE_H_
+#define _BOARD_MAPLE_H_
+
+// ------------------------------------------------------------------------
+// Some settings probably need to be changed for every board
+
+// Number of GPIO ports (GPIOA, GPIOB, etc), definately used
+#define NR_GPIO_PORTS             4
+
+// Number of timer devices ports, definately used
+#define NR_TIMERS                 4
+
+// Total number of GPIO pins
+#define NR_MAPLE_PINS             39
+
+// Number of ADC pins. Not actually used?
+#define NR_ANALOG_PINS            29
+
+// USB Identifier numbers
+// Descriptor strings must be modified by hand in usb/descriptors.c for now
+#define VCOM_ID_VENDOR    0x1EAF
+#define VCOM_ID_PRODUCT   0x0004
+#define USB_CONFIG_MAX_POWER      (100 >> 1)
+#define RESET_DELAY               (100)
+
+// Where to put usercode (based on space reserved for bootloader)
+#define USER_ADDR_ROM 0x08005000
+#define USER_ADDR_RAM 0x20000C00
+#define STACK_TOP     0x20000800
+
+// Debug port settings (from ASSERT)
+#define ERROR_LED_PORT         GPIOA_BASE
+#define ERROR_LED_PIN          5
+#define ERROR_USART_NUM        2
+#define ERROR_USART_BAUD       9600
+#define ERROR_TX_PIN           2
+#define ERROR_TX_PORT          GPIOA_BASE
+
+// ------------------------------------------------------------------------
+// Some settings are probably stable across the entire STM32 line
+
+// Just in case, most boards have at least some memory
+#ifndef RAMSIZE
+#  define RAMSIZE             (caddr_t)0x50000
+#endif
+
+#define BITBAND_SRAM_REF   0x20000000
+#define BITBAND_SRAM_BASE  0x22000000
+#define BITBAND_PERI_REF   0x40000000
+#define BITBAND_PERI_BASE  0x42000000
+
+#endif
+
diff --git a/libmaple/exti.h b/libmaple/exti.h
index fdba184..2832e24 100644
--- a/libmaple/exti.h
+++ b/libmaple/exti.h
@@ -94,12 +94,11 @@
  * EXTI[5-9] -> EXT9_5
  * EXTI[10-15] -> EXT15_10
  *
- *
  * */
 
-#define NR_EXTI_CHANNELS         16
-#define NR_EXTI_PORTS             4
 #define NR_EXTI_MODES             3
+#define NR_EXTI_CHANNELS         16
+#define NR_EXTI_PORTS            NR_GPIO_PORTS       // board specific
 
 #define EXTI_IMR        0x40010400                   // Interrupt mask register
 #define EXTI_EMR        (EXTI_IMR + 0x04)            // Event mask register
@@ -139,6 +138,9 @@
 #define EXTI_CONFIG_PORTB 1
 #define EXTI_CONFIG_PORTC 2
 #define EXTI_CONFIG_PORTD 3
+#define EXTI_CONFIG_PORTE 4     // Native only
+#define EXTI_CONFIG_PORTF 5     // Native only
+#define EXTI_CONFIG_PORTG 6     // Native only
 
 
 #ifdef __cplusplus
diff --git a/libmaple/gpio.c b/libmaple/gpio.c
index 3e05bd0..c5bb450 100644
--- a/libmaple/gpio.c
+++ b/libmaple/gpio.c
@@ -37,6 +37,11 @@ void gpio_init(void) {
    rcc_clk_enable(RCC_GPIOB);
    rcc_clk_enable(RCC_GPIOC);
    rcc_clk_enable(RCC_GPIOD);
+   #if NR_GPIO_PORTS >= 7
+   rcc_clk_enable(RCC_GPIOE);
+   rcc_clk_enable(RCC_GPIOF);
+   rcc_clk_enable(RCC_GPIOG);
+   #endif
    rcc_clk_enable(RCC_AFIO);
 }
 
diff --git a/libmaple/gpio.h b/libmaple/gpio.h
index 74320e6..d1d0050 100644
--- a/libmaple/gpio.h
+++ b/libmaple/gpio.h
@@ -48,6 +48,9 @@
 #define GPIOB_BASE               (GPIO_Port*)0x40010C00
 #define GPIOC_BASE               (GPIO_Port*)0x40011000
 #define GPIOD_BASE               (GPIO_Port*)0x40011400
+#define GPIOE_BASE               (GPIO_Port*)0x40011800 // High-density devices only
+#define GPIOF_BASE               (GPIO_Port*)0x40011C00 // High-density devices only
+#define GPIOG_BASE               (GPIO_Port*)0x40012000 // High-density devices only
 
 #define GPIO_SPEED_50MHZ            (0x3)
 
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h
index 5360b51..cf5802c 100644
--- a/libmaple/libmaple.h
+++ b/libmaple/libmaple.h
@@ -32,6 +32,24 @@
 #define _LIBMAPLE_H_
 
 #include "libmaple_types.h"
+
+// General configuration
+#define MAPLE_DEBUG 0
+
+#ifdef BOARD_maple
+   #include "board_maple.h"
+#endif
+/*
+#ifdef BOARD_maple-native
+   #include "board_maple_native.h"
+#endif
+
+#ifdef BOARD_maple-mini
+   #include "board_maple_mini.h"
+#endif
+*/
+
+// Requires board configuration info
 #include "util.h"
 
 #endif
diff --git a/libmaple/nvic.c b/libmaple/nvic.c
index 56b9940..7aef26d 100644
--- a/libmaple/nvic.c
+++ b/libmaple/nvic.c
@@ -44,8 +44,10 @@ void nvic_set_vector_table(uint32 addr, uint32 offset) {
 void nvic_irq_enable(uint32 n) {
     if (n < 32) {
         REG_SET_BIT(NVIC_ISER0, n);
-    } else {
+    } else if(n < 64) {
         REG_SET_BIT(NVIC_ISER1, n - 32);
+    } else {
+        REG_SET_BIT(NVIC_ISER2, n - 64);
     }
 }
 
@@ -56,8 +58,10 @@ void nvic_irq_enable(uint32 n) {
 void nvic_irq_disable(uint32 n) {
     if (n < 32) {
         REG_SET_BIT(NVIC_ICER0, n);
-    } else {
+    } else if(n < 64) {
         REG_SET_BIT(NVIC_ICER1, n - 32);
+    } else {
+        REG_SET_BIT(NVIC_ICER2, n - 64);
     }
 }
 
diff --git a/libmaple/nvic.h b/libmaple/nvic.h
index d256610..a24086a 100644
--- a/libmaple/nvic.h
+++ b/libmaple/nvic.h
@@ -38,13 +38,13 @@
 #define NVIC_ISER0          0xE000E100
 #define NVIC_ISER1          0xE000E104
 #define NVIC_ISER2          0xE000E108
-#define NVIC_ISER3          0xE000E10C
+#define NVIC_ISER3          0xE000E10C  // Non existant?
 
 /* NVIC Interrupt Clear registers  */
 #define NVIC_ICER0          0xE000E180
 #define NVIC_ICER1          0xE000E184
 #define NVIC_ICER2          0xE000E188
-#define NVIC_ICER3          0xE000E18C
+#define NVIC_ICER3          0xE000E18C  // Non existant?
 
 /* System control registers  */
 #define SCB_VTOR            0xE000ED08  // Vector table offset register
@@ -52,10 +52,6 @@
 #define NVIC_VectTab_RAM             ((u32)0x20000000)
 #define NVIC_VectTab_FLASH           ((u32)0x08000000)
 
-/* Where to put code  */
-#define USER_ADDR_ROM 0x08005000
-#define USER_ADDR_RAM 0x20000C00
-
 #ifdef __cplusplus
 extern "C"{
 #endif
@@ -65,9 +61,14 @@ enum {
    NVIC_TIMER2  = 28,
    NVIC_TIMER3  = 29,
    NVIC_TIMER4  = 30,
+   NVIC_TIMER5  = 50,   // high density only (Maple Native)
+   NVIC_TIMER6  = 54,   // high density only (Maple Native)
+   NVIC_TIMER7  = 55,   // high density only (Maple Native)
    NVIC_USART1  = 37,
    NVIC_USART2  = 38,
    NVIC_USART3  = 39,
+   NVIC_USART4  = 52,   // high density only (Maple Native)
+   NVIC_USART5  = 53,   // high density only (Maple Native)
 };
 
 
diff --git a/libmaple/rcc.c b/libmaple/rcc.c
index ab62025..4ac6629 100644
--- a/libmaple/rcc.c
+++ b/libmaple/rcc.c
@@ -31,48 +31,6 @@
 #include "flash.h"
 #include "rcc.h"
 
-/* registers  */
-#define RCC_BASE               0x40021000
-#define RCC_CR                 (RCC_BASE + 0x0)
-#define RCC_CFGR               (RCC_BASE + 0x4)
-#define RCC_CIR                (RCC_BASE + 0x8)
-#define RCC_APB2RSTR           (RCC_BASE + 0xC)
-#define RCC_APB1RSTR           (RCC_BASE + 0x10)
-#define RCC_AHBENR             (RCC_BASE + 0x14)
-#define RCC_APB2ENR            (RCC_BASE + 0x18)
-#define RCC_APB1ENR            (RCC_BASE + 0x1C)
-#define RCC_BDCR               (RCC_BASE + 0x20)
-#define RCC_CSR                (RCC_BASE + 0x24)
-#define RCC_AHBSTR             (RCC_BASE + 0x28)
-#define RCC_CFGR2              (RCC_BASE + 0x2C)
-
-#define RCC_CFGR_USBPRE        (0x1 << 22)
-#define RCC_CFGR_ADCPRE        (0x3 << 14)
-#define RCC_CFGR_PPRE1         (0x7 << 8)
-#define RCC_CFGR_PPRE2         (0x7 << 11)
-#define RCC_CFGR_HPRE          (0xF << 4)
-#define RCC_CFGR_PLLSRC        (0x1 << 16)
-
-#define RCC_CFGR_SWS           (0x3 << 2)
-#define RCC_CFGR_SWS_PLL       (0x2 << 2)
-#define RCC_CFGR_SWS_HSE       (0x1 << 2)
-
-#define RCC_CFGR_SW            (0x3 << 0)
-#define RCC_CFGR_SW_PLL        (0x2 << 0)
-#define RCC_CFGR_SW_HSE        (0x1 << 0)
-
-/* CR status bits  */
-#define RCC_CR_HSEON           (0x1 << 16)
-#define RCC_CR_HSERDY          (0x1 << 17)
-#define RCC_CR_PLLON           (0x1 << 24)
-#define RCC_CR_PLLRDY          (0x1 << 25)
-
-#define RCC_WRITE_CFGR(val)    __write(RCC_CFGR, val)
-#define RCC_READ_CFGR()        __read(RCC_CFGR)
-
-#define RCC_WRITE_CR(val)      __write(RCC_CR, val)
-#define RCC_READ_CR()          __read(RCC_CR)
-
 enum {
    APB1,
    APB2,
@@ -90,15 +48,24 @@ static const struct rcc_dev_info rcc_dev_table[] = {
    [RCC_GPIOB]  = { .clk_domain = APB2, .line_num = 3 },
    [RCC_GPIOC]  = { .clk_domain = APB2, .line_num = 4 },
    [RCC_GPIOD]  = { .clk_domain = APB2, .line_num = 5 },
+   [RCC_GPIOE]  = { .clk_domain = APB2, .line_num = 6 }, // High-density devices only
+   [RCC_GPIOF]  = { .clk_domain = APB2, .line_num = 7 }, // High-density devices only
+   [RCC_GPIOG]  = { .clk_domain = APB2, .line_num = 8 }, // High-density devices only
    [RCC_AFIO]   = { .clk_domain = APB2, .line_num = 0 },
    [RCC_ADC1]   = { .clk_domain = APB2, .line_num = 9 },
+   [RCC_ADC2]   = { .clk_domain = APB2, .line_num = 10 },
    [RCC_USART1] = { .clk_domain = APB2, .line_num = 14 },
    [RCC_USART2] = { .clk_domain = APB1, .line_num = 17 },
    [RCC_USART3] = { .clk_domain = APB1, .line_num = 18 },
+   [RCC_USART4] = { .clk_domain = APB1, .line_num = 19 },  // High-density devices only
+   [RCC_USART5] = { .clk_domain = APB1, .line_num = 20 },  // High-density devices only
    [RCC_TIMER1] = { .clk_domain = APB2, .line_num = 11 },
    [RCC_TIMER2] = { .clk_domain = APB1, .line_num = 0 },
    [RCC_TIMER3] = { .clk_domain = APB1, .line_num = 1 },
    [RCC_TIMER4] = { .clk_domain = APB1, .line_num = 2 },
+   [RCC_TIMER5] = { .clk_domain = APB1, .line_num = 3 },   // High-density devices only
+   [RCC_TIMER6] = { .clk_domain = APB1, .line_num = 4 },   // High-density devices only
+   [RCC_TIMER7] = { .clk_domain = APB1, .line_num = 5 },   // High-density devices only
    [RCC_SPI1]   = { .clk_domain = APB2, .line_num = 12 },
    [RCC_SPI2]   = { .clk_domain = APB1, .line_num = 14 },
 };
diff --git a/libmaple/rcc.h b/libmaple/rcc.h
index e6a28ea..b369f25 100644
--- a/libmaple/rcc.h
+++ b/libmaple/rcc.h
@@ -29,6 +29,48 @@
 #ifndef _RCC_H_
 #define _RCC_H_
 
+/* registers  */
+#define RCC_BASE               0x40021000
+#define RCC_CR                 (RCC_BASE + 0x0)
+#define RCC_CFGR               (RCC_BASE + 0x4)
+#define RCC_CIR                (RCC_BASE + 0x8)
+#define RCC_APB2RSTR           (RCC_BASE + 0xC)
+#define RCC_APB1RSTR           (RCC_BASE + 0x10)
+#define RCC_AHBENR             (RCC_BASE + 0x14)
+#define RCC_APB2ENR            (RCC_BASE + 0x18)
+#define RCC_APB1ENR            (RCC_BASE + 0x1C)
+#define RCC_BDCR               (RCC_BASE + 0x20)
+#define RCC_CSR                (RCC_BASE + 0x24)
+#define RCC_AHBSTR             (RCC_BASE + 0x28)
+#define RCC_CFGR2              (RCC_BASE + 0x2C)
+
+#define RCC_CFGR_USBPRE        (0x1 << 22)
+#define RCC_CFGR_ADCPRE        (0x3 << 14)
+#define RCC_CFGR_PPRE1         (0x7 << 8)
+#define RCC_CFGR_PPRE2         (0x7 << 11)
+#define RCC_CFGR_HPRE          (0xF << 4)
+#define RCC_CFGR_PLLSRC        (0x1 << 16)
+
+#define RCC_CFGR_SWS           (0x3 << 2)
+#define RCC_CFGR_SWS_PLL       (0x2 << 2)
+#define RCC_CFGR_SWS_HSE       (0x1 << 2)
+
+#define RCC_CFGR_SW            (0x3 << 0)
+#define RCC_CFGR_SW_PLL        (0x2 << 0)
+#define RCC_CFGR_SW_HSE        (0x1 << 0)
+
+/* CR status bits  */
+#define RCC_CR_HSEON           (0x1 << 16)
+#define RCC_CR_HSERDY          (0x1 << 17)
+#define RCC_CR_PLLON           (0x1 << 24)
+#define RCC_CR_PLLRDY          (0x1 << 25)
+
+#define RCC_WRITE_CFGR(val)    __write(RCC_CFGR, val)
+#define RCC_READ_CFGR()        __read(RCC_CFGR)
+
+#define RCC_WRITE_CR(val)      __write(RCC_CR, val)
+#define RCC_READ_CR()          __read(RCC_CR)
+
 /* sysclk source  */
 #define RCC_CLKSRC_HSI                          (0x0)
 #define RCC_CLKSRC_HSE                          (0x1)
@@ -87,36 +129,44 @@
 #define RCC_PLLMUL_15                           (0xD << 18)
 #define RCC_PLLMUL_16                           (0xE << 18)
 
-/* device numbers  */
+
+/* prescalers */
+enum {
+   RCC_PRESCALER_AHB,
+   RCC_PRESCALER_APB1,
+   RCC_PRESCALER_APB2,
+   RCC_PRESCALER_USB,
+   RCC_PRESCALER_ADC
+};
+
+// RCC Devices
 enum {
    RCC_GPIOA,
    RCC_GPIOB,
    RCC_GPIOC,
    RCC_GPIOD,
+   RCC_GPIOE,       // High-density devices only (Maple Native)
+   RCC_GPIOF,       // High-density devices only (Maple Native)
+   RCC_GPIOG,       // High-density devices only (Maple Native)
    RCC_AFIO,
    RCC_ADC1,
+   RCC_ADC2,
    RCC_USART1,
    RCC_USART2,
    RCC_USART3,
-   RCC_USART4,
-   RCC_USART5,
+   RCC_USART4,      // High-density devices only (Maple Native)
+   RCC_USART5,      // High-density devices only (Maple Native)
    RCC_TIMER1,
    RCC_TIMER2,
    RCC_TIMER3,
    RCC_TIMER4,
+   RCC_TIMER5,      // High-density devices only (Maple Native)
+   RCC_TIMER6,      // High-density devices only (Maple Native)
+   RCC_TIMER7,      // High-density devices only (Maple Native)
    RCC_SPI1,
    RCC_SPI2,
 };
 
-/* prescalers */
-enum {
-   RCC_PRESCALER_AHB,
-   RCC_PRESCALER_APB1,
-   RCC_PRESCALER_APB2,
-   RCC_PRESCALER_USB,
-   RCC_PRESCALER_ADC
-};
-
 
 void rcc_clk_init(uint32 sysclk_src, uint32 pll_src, uint32 pll_mul);
 void rcc_clk_enable(uint32 dev);
@@ -125,4 +175,3 @@ void rcc_set_prescaler(uint32 prescaler, uint32 divider);
 
 #endif
 
-
diff --git a/libmaple/spi.h b/libmaple/spi.h
index 25c2c6b..742c1d0 100644
--- a/libmaple/spi.h
+++ b/libmaple/spi.h
@@ -36,6 +36,7 @@ extern "C" {
 /* peripheral addresses */
 #define SPI1_BASE                   0x40013000
 #define SPI2_BASE                   0x40003800
+#define SPI3_BASE                   0x40003C00
 
 /* baud rate prescaler bits */
 #define CR1_BR                      0x00000038
diff --git a/libmaple/syscalls.c b/libmaple/syscalls.c
index 63ebb1e..ec271a2 100644
--- a/libmaple/syscalls.c
+++ b/libmaple/syscalls.c
@@ -28,13 +28,6 @@
 /* _end is set in the linker command file */
 extern caddr_t _end;
 
-/* just in case, most boards have at least some memory */
-#ifndef RAMSIZE
-#  define RAMSIZE             (caddr_t)0x50000
-#endif
-
-#define STACK_TOP 0x20000800
-
 void uart_send(const char*str);
 
 /*
diff --git a/libmaple/timers.c b/libmaple/timers.c
index 6e6653c..6fa2848 100644
--- a/libmaple/timers.c
+++ b/libmaple/timers.c
@@ -28,6 +28,8 @@
  *  @brief General timer routines
  */
 
+// TODO: actually support timer5 and timer8
+
 #include "libmaple.h"
 #include "rcc.h"
 #include "nvic.h"
@@ -82,6 +84,10 @@ volatile static voidFuncPtr timer1_handlers[4];
 volatile static voidFuncPtr timer2_handlers[4];
 volatile static voidFuncPtr timer3_handlers[4];
 volatile static voidFuncPtr timer4_handlers[4];
+#if NR_TIMERS >= 8
+volatile static voidFuncPtr timer5_handlers[4]; // High-density devices only
+volatile static voidFuncPtr timer8_handlers[4]; // High-density devices only
+#endif
 
 // This function should probably be rewriten to take (timer_num, mode) and have
 // prescaler set elsewhere. The mode can be passed through to set_mode at the 
@@ -110,6 +116,20 @@ void timer_init(uint8 timer_num, uint16 prescale) {
         timer = (Timer*)TIMER4_BASE;
         rcc_clk_enable(RCC_TIMER4);
         break;
+    #if NR_TIMERS >= 8
+    case 5:
+        timer = (Timer*)TIMER5_BASE;
+        rcc_clk_enable(RCC_TIMER5);
+        break;
+    case 8:
+        timer = (Timer*)TIMER8_BASE;
+        rcc_clk_enable(RCC_TIMER8);
+        is_advanced = 1;
+        break;
+    #endif
+    default:
+        ASSERT(0);
+        return;
     }
 
     timer->CR1 = ARPE;        // No clock division
@@ -172,6 +192,9 @@ void timer_pause(uint8 timer_num) {
     case 4:
         timer = (Timer*)TIMER4_BASE;
         break;
+    default:
+        ASSERT(0);
+        return;
     }
     timer->CR1 &= ~(0x0001);    // CEN
 }
@@ -194,6 +217,9 @@ void timer_resume(uint8 timer_num) {
     case 4:
         timer = (Timer*)TIMER4_BASE;
         break;
+    default:
+        ASSERT(0);
+        return;
     }
     timer->CR1 |= 0x0001;    // CEN
 }
@@ -218,6 +244,9 @@ ASSERT(timer_num > 0 && timer_num <= 4);
     case 4:
         timer = (Timer*)TIMER4_BASE;
         break;
+    default:
+        ASSERT(0);
+        return;
     }
     timer->CNT = value;
 }
@@ -241,6 +270,9 @@ uint16 timer_get_count(uint8 timer_num) {
     case 4:
         timer = (Timer*)TIMER4_BASE;
         break;
+    default:
+        ASSERT(0);
+        return;
     }
     return timer->CNT;
 }
@@ -263,6 +295,9 @@ void timer_set_prescaler(uint8 timer_num, uint16 prescale) {
     case 4:
         timer = (Timer*)TIMER4_BASE;
         break;
+    default:
+        ASSERT(0);
+        return;
     }
     timer->PSC = prescale;
 }
@@ -286,6 +321,9 @@ void timer_set_reload(uint8 timer_num, uint16 max_reload) {
     case 4:
         timer = (Timer*)TIMER4_BASE;
         break;
+    default:
+        ASSERT(0);
+        return;
     }
     timer->ARR = max_reload;
 }
diff --git a/libmaple/timers.h b/libmaple/timers.h
index c48ef42..c49a00e 100644
--- a/libmaple/timers.h
+++ b/libmaple/timers.h
@@ -89,6 +89,10 @@ typedef volatile uint32* TimerCCR;
 #define TIMER2_BASE        0x40000000
 #define TIMER3_BASE        0x40000400
 #define TIMER4_BASE        0x40000800
+#define TIMER5_BASE        0x40000C00   // High-density devices only (Maple Native)
+#define TIMER6_BASE        0x40001000   // High-density devices only (Maple Native)
+#define TIMER7_BASE        0x40001400   // High-density devices only (Maple Native)
+#define TIMER8_BASE        0x40013400   // High-density devices only (Maple Native)
 
 #define ARPE               BIT(7)                // Auto-reload preload enable
 #define NOT_A_TIMER        0
@@ -116,6 +120,18 @@ typedef volatile uint32* TimerCCR;
 #define TIMER4_CH3_CCR     (TimerCCR)(TIMER4_BASE + 0x3C)
 #define TIMER4_CH4_CCR     (TimerCCR)(TIMER4_BASE + 0x40)
 
+// Timer5 and Timer8 are in high-density devices only (such as Maple Native).
+// Timer6 and Timer7 in these devices have no output compare pins.
+
+#define TIMER5_CH1_CCR     (TimerCCR)(TIMER5_BASE + 0x34)
+#define TIMER5_CH2_CCR     (TimerCCR)(TIMER5_BASE + 0x38)
+#define TIMER5_CH3_CCR     (TimerCCR)(TIMER5_BASE + 0x3C)
+#define TIMER5_CH4_CCR     (TimerCCR)(TIMER5_BASE + 0x40)
+
+#define TIMER8_CH1_CCR     (TimerCCR)(TIMER8_BASE + 0x34)
+#define TIMER8_CH2_CCR     (TimerCCR)(TIMER8_BASE + 0x38)
+#define TIMER8_CH3_CCR     (TimerCCR)(TIMER8_BASE + 0x3C)
+#define TIMER8_CH4_CCR     (TimerCCR)(TIMER8_BASE + 0x40)
 
 #define TIMER_DISABLED          0
 #define TIMER_PWM               1
diff --git a/libmaple/usart.c b/libmaple/usart.c
index 296a1fb..d08d3cf 100644
--- a/libmaple/usart.c
+++ b/libmaple/usart.c
@@ -36,6 +36,8 @@
 #define USART1_BASE         0x40013800
 #define USART2_BASE         0x40004400
 #define USART3_BASE         0x40004800
+#define UART4_BASE          0x40004C00  // High-density devices only (Maple Native)
+#define UART5_BASE          0x40005000  // High-density devices only (Maple Native)
 
 #define USART_UE            BIT(13)
 #define USART_M             BIT(12)
@@ -61,6 +63,18 @@ struct usart_dev usart_dev_table[] = {
       .rcc_dev_num = RCC_USART3,
       .nvic_dev_num = NVIC_USART3
    },
+   #if NR_USART >= 5
+   [UART4] = {
+      .base = (usart_port*)UART4_BASE,
+      .rcc_dev_num = RCC_UART4,
+      .nvic_dev_num = NVIC_UART4
+   },
+   [UART5] = {
+      .base = (usart_port*)UART5_BASE,
+      .rcc_dev_num = RCC_UART5,
+      .nvic_dev_num = NVIC_UART5
+   },
+   #endif
 };
 
 /* usart interrupt handlers  */
@@ -75,6 +89,14 @@ void USART2_IRQHandler(void) {
 void USART3_IRQHandler(void) {
     rb_insert(&usart_dev_table[USART3].rb, (uint8)(((usart_port*)(USART3_BASE))->DR));
 }
+#if NR_USART >= 5
+void UART4_IRQHandler(void) {
+    rb_insert(&usart_dev_table[UART4].rb, (uint8)(((usart_port*)(UART4_BASE))->DR));
+}
+void UART5_IRQHandler(void) {
+    rb_insert(&usart_dev_table[UART5].rb, (uint8)(((usart_port*)(UART5_BASE))->DR));
+}
+#endif
 
 /**
  *  @brief Enable a USART in single buffer transmission mode, multibuffer
@@ -83,6 +105,7 @@ void USART3_IRQHandler(void) {
  *  @param baud Baud rate to be set at
  */
 void usart_init(uint8 usart_num, uint32 baud) {
+    ASSERT(usart_num <= NR_USART);
     usart_port *port;
     ring_buffer *ring_buf;
 
@@ -121,6 +144,18 @@ void usart_init(uint8 usart_num, uint32 baud) {
     port->CR1 |= USART_UE;
 }
 
+/**
+ *  @brief Turn off all USARTs.
+ */
+void usart_disable_all() {
+    usart_disable(1);
+    usart_disable(2);
+    usart_disable(3);
+    #if NR_USART >= 5
+    usart_disable(4);
+    usart_disable(5);
+    #endif
+}
 
 /**
  *  @brief Turn off a USART.
diff --git a/libmaple/usart.h b/libmaple/usart.h
index beffa89..2bc472f 100644
--- a/libmaple/usart.h
+++ b/libmaple/usart.h
@@ -42,6 +42,8 @@ enum {
    USART1,
    USART2,
    USART3,
+   UART4,
+   UART5,
 };
 
 /* peripheral register struct  */
@@ -113,6 +115,7 @@ static inline void usart_reset_rx(uint8 usart_num) {
 
 void usart_init(uint8 usart_num, uint32 baud);
 void usart_disable(uint8 usart_num);
+void usart_disable_all();
 void usart_putstr(uint8 usart_num, const char*);
 void usart_putudec(uint8 usart_num, uint32 val);
 
diff --git a/libmaple/usb/descriptors.h b/libmaple/usb/descriptors.h
index 1efe8c1..6652942 100644
--- a/libmaple/usb/descriptors.h
+++ b/libmaple/usb/descriptors.h
@@ -16,7 +16,7 @@
 #define USB_DEVICE_SUBCLASS_CDC           0x00
 
 #define USB_CONFIG_ATTR_BUSPOWERED        0b10000000
-#define USB_CONFIG_ATTR_SELF_POWERED       0b11000000
+#define USB_CONFIG_ATTR_SELF_POWERED      0b11000000
 
 #define EP_TYPE_INTERRUPT                 0x03
 #define EP_TYPE_BULK                      0x02
diff --git a/libmaple/usb/usb_config.h b/libmaple/usb/usb_config.h
index 06c81ff..3aa01d5 100644
--- a/libmaple/usb/usb_config.h
+++ b/libmaple/usb/usb_config.h
@@ -5,12 +5,6 @@
 
 #include "usb_lib.h"
 
-#define VCOM_ID_VENDOR    0x1EAF
-#define VCOM_ID_PRODUCT   0x0004
-
-#define USB_CONFIG_MAX_POWER      (100 >> 1)
-#define RESET_DELAY               (100)
-
 /* choose addresses to give endpoints the max 64 byte buffers */
 #define USB_BTABLE_ADDRESS        0x00
 #define VCOM_CTRL_EPNUM           0x00
diff --git a/libmaple/usb/usb_hardware.h b/libmaple/usb/usb_hardware.h
index 208fa3a..e4a26b4 100644
--- a/libmaple/usb/usb_hardware.h
+++ b/libmaple/usb/usb_hardware.h
@@ -30,7 +30,6 @@
 /* macro'd register and peripheral definitions */
 #define EXC_RETURN 0xFFFFFFF9
 #define DEFAULT_CPSR 0x61000000
-#define STACK_TOP 0x20005000
 
 #define RCC   ((u32)0x40021000)
 #define FLASH ((u32)0x40022000)
diff --git a/libmaple/util.c b/libmaple/util.c
index 36173ee..08e29fc 100644
--- a/libmaple/util.c
+++ b/libmaple/util.c
@@ -36,13 +36,6 @@
 #include "adc.h"
 #include "timers.h"
 
-#define ERROR_LED_PORT         GPIOA_BASE
-#define ERROR_LED_PIN          5
-#define ERROR_USART_NUM        2
-#define ERROR_USART_BAUD       9600
-#define ERROR_TX_PIN           2
-#define ERROR_TX_PORT          GPIOA_BASE
-
 /* Error assert + fade */
 void _fail(const char* file, int line, const char* exp) {
     int32  slope   = 1;
@@ -60,9 +53,7 @@ void _fail(const char* file, int line, const char* exp) {
     adc_disable();
 
     /* Turn off all usarts  */
-    usart_disable(1);
-    usart_disable(2);
-    usart_disable(3);
+    usart_disable_all();
 
     /* Initialize the error usart */
     gpio_set_mode(ERROR_TX_PORT, ERROR_TX_PIN, GPIO_MODE_AF_OUTPUT_PP);
diff --git a/libmaple/util.h b/libmaple/util.h
index c336e21..053731a 100644
--- a/libmaple/util.h
+++ b/libmaple/util.h
@@ -32,8 +32,6 @@
 #ifndef _UTIL_H_
 #define _UTIL_H_
 
-#define MAPLE_DEBUG 0
-
 #define BIT(shift)                     (1 << (shift))
 #define BIT_MASK_SHIFT(mask, shift)    ((mask) << (shift))
 
@@ -41,11 +39,7 @@
 #define GET_BITS(x, m, n) ((((uint32)x) << (31 - (n))) >> ((31 - (n)) + (m)))
 
 /* Bit-banding macros  */
-#define BITBAND_SRAM_REF   0x20000000
-#define BITBAND_SRAM_BASE  0x22000000
 #define BITBAND_SRAM(a,b) ((BITBAND_SRAM_BASE + (a-BITBAND_SRAM_REF)*32 + (b*4)))  // Convert SRAM address
-#define BITBAND_PERI_REF   0x40000000
-#define BITBAND_PERI_BASE  0x42000000
 #define BITBAND_PERI(a,b) ((BITBAND_PERI_BASE + (a-BITBAND_PERI_REF)*32 + (b*4)))  // Convert PERI address
 
 #define REG_SET(reg, val)               (*(volatile uint32*)(reg)  = (val))
diff --git a/notes/portable.txt b/notes/portable.txt
new file mode 100644
index 0000000..a6dcb40
--- /dev/null
+++ b/notes/portable.txt
@@ -0,0 +1,69 @@
+
+Disclaimer text:  // High-density devices only (Maple Native)
+
+
+Board portability is implemented by adding a header file to ./libmaple with the
+name of the BOARD target, and then editing libmaple.h to add this file as an
+option.
+
+A pin maple file should be added to ./notes describing the pin numbering
+
+Files to check by hand:
+#   adc.c
+#   adc.h
+#   exc.c
+#   exti.c
+#   exti.h
+#   flash.c
+#   flash.h
+#   gpio.c
+#   gpio.h
+#   libmaple_types.h
+#   nvic.c
+#   nvic.h
+#   rcc.c
+#   rcc.h
+#   ring_buffer.h
+#   rules.mk
+#   spi.c
+-   spi.h
+#   syscalls.c
+#   systick.c
+#   systick.h
+#   timers.c
+#   timers.h
+#   usart.c
+#   usart.h
+#   util.c
+#   util.h
+#   libmaple.h
+#   usb/*
+#   wirish/*
+
+
+ADC Notes:
+    only using ADC1?
+    untested
+
+EXTI Notes:
+    need to update huge table in comments?
+    untested
+
+NVIC Notes:
+    I don't think NVIC_ISER3 and NVIC_ICER3 actually exist?
+    Only CANBUS and USB OTG use interrupts above #63, but I updated the nvic code anyways
+
+RCC Notes:
+    Added some clock stuff to all boards even though they aren't usable... blah.
+
+SPI Notes:
+    SPI3 is only in XL chips so didn't really handle that
+
+TIMER Notes:
+    High-density devices add an advanced timer (TIMER8) and another normal one (TIMER5).
+    TIMER6 and TIMER7 are much less useful.
+    There is some partial progress towards adding timer5/timer8 functionality,
+    but not much. This should probably all be rewritten.
+
+USART Notes:
+    The USART/UART nomeclature is a little mixed up.
diff --git a/wirish/wirish.h b/wirish/wirish.h
index 13ff313..431e529 100644
--- a/wirish/wirish.h
+++ b/wirish/wirish.h
@@ -51,9 +51,6 @@
 extern "C"{
 #endif
 
-#define MAPLE 1
-#define NR_MAPLE_PINS   39 // temporary
-
 /* Arduino wiring macros and bit defines  */
 #define HIGH 0x1
 #define LOW  0x0
@@ -64,9 +61,6 @@ extern "C"{
 #define LSBFIRST 0
 #define MSBFIRST 1
 
-#define USER_ADDR_ROM 0x08005000
-#define USER_ADDR_RAM 0x20000C00
-
 #define lowByte(w)                       ((w) & 0xff)
 #define highByte(w)                      ((w) >> 8)
 #define bitRead(value, bit)              (((value) >> (bit)) & 0x01)
-- 
cgit v1.2.3


From 695f0dc4baa1bf682eec0226dc5632a9200174f1 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 31 Aug 2010 15:21:09 -0400
Subject: MCU-specific, not BOARD-specific

---
 Makefile               | 22 ++++++++++----
 libmaple/board_maple.h | 82 --------------------------------------------------
 libmaple/libmaple.h    | 58 +++++++++++++++++++++++++++++------
 3 files changed, 65 insertions(+), 97 deletions(-)
 delete mode 100644 libmaple/board_maple.h

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1a905e8..862d5b1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,20 @@
 BOARD ?= maple
 MEMORY_TARGET ?= flash
 
+# USB ID for DFU upload
+VENDOR_ID  := 1EAF
+PRODUCT_ID := 0003
+
+# Guess the MCU based on the BOARD (can be overridden )
+ifeq ($(BOARD), maple)
+   MCU := STM32F103RB
+   PRODUCT_ID := 0003
+endif
+ifeq ($(BOARD), maple-native)
+   MCU := STM32F103ZE
+   PRODUCT_ID := 0003
+endif
+
 # Useful paths
 SRCROOT := $(dir)
 BUILD_PATH = build
@@ -11,8 +25,8 @@ LIBMAPLE_PATH := libmaple
 # Useful variables
 GLOBAL_CFLAGS    := -Os -g -mcpu=cortex-m3 -mthumb -march=armv7-m -nostdlib \
                     -ffunction-sections -fdata-sections -Wl,--gc-sections \
-					-DBOARD_$(BOARD)
-GLOBAL_CXXFLAGS := -fno-rtti -fno-exceptions -Wall -DBOARD_$(BOARD)
+					-DBOARD_$(BOARD) -DMCU_$(MCU)
+GLOBAL_CXXFLAGS := -fno-rtti -fno-exceptions -Wall -DBOARD_$(BOARD) -DMCU_$(MCU)
 
 
 LDDIR    := support/ld
@@ -24,10 +38,6 @@ LDFLAGS  = -T$(LDDIR)/$(LDSCRIPT) -L$(LDDIR)    \
 include support/make/build-rules.mk
 include support/make/build-templates.mk
 
-# Maple USB id
-VENDOR_ID  := 1EAF
-PRODUCT_ID := 0003
-
 # Some target specific things
 ifeq ($(MEMORY_TARGET), ram)
    VECT_BASE_ADDR := VECT_TAB_RAM
diff --git a/libmaple/board_maple.h b/libmaple/board_maple.h
deleted file mode 100644
index 3cbf638..0000000
--- a/libmaple/board_maple.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* *****************************************************************************
- * The MIT License
- *
- * Copyright (c) 2010 Bryan Newbold.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ****************************************************************************/
-
-// Board-specific settings file, included from libmaple.h based on the BOARD
-// environment variable.
-
-// See ../notes/portability.txt for more information
-
-#ifndef _BOARD_MAPLE_H_
-#define _BOARD_MAPLE_H_
-
-// ------------------------------------------------------------------------
-// Some settings probably need to be changed for every board
-
-// Number of GPIO ports (GPIOA, GPIOB, etc), definately used
-#define NR_GPIO_PORTS             4
-
-// Number of timer devices ports, definately used
-#define NR_TIMERS                 4
-
-// Total number of GPIO pins
-#define NR_MAPLE_PINS             39
-
-// Number of ADC pins. Not actually used?
-#define NR_ANALOG_PINS            29
-
-// USB Identifier numbers
-// Descriptor strings must be modified by hand in usb/descriptors.c for now
-#define VCOM_ID_VENDOR    0x1EAF
-#define VCOM_ID_PRODUCT   0x0004
-#define USB_CONFIG_MAX_POWER      (100 >> 1)
-#define RESET_DELAY               (100)
-
-// Where to put usercode (based on space reserved for bootloader)
-#define USER_ADDR_ROM 0x08005000
-#define USER_ADDR_RAM 0x20000C00
-#define STACK_TOP     0x20000800
-
-// Debug port settings (from ASSERT)
-#define ERROR_LED_PORT         GPIOA_BASE
-#define ERROR_LED_PIN          5
-#define ERROR_USART_NUM        2
-#define ERROR_USART_BAUD       9600
-#define ERROR_TX_PIN           2
-#define ERROR_TX_PORT          GPIOA_BASE
-
-// ------------------------------------------------------------------------
-// Some settings are probably stable across the entire STM32 line
-
-// Just in case, most boards have at least some memory
-#ifndef RAMSIZE
-#  define RAMSIZE             (caddr_t)0x50000
-#endif
-
-#define BITBAND_SRAM_REF   0x20000000
-#define BITBAND_SRAM_BASE  0x22000000
-#define BITBAND_PERI_REF   0x40000000
-#define BITBAND_PERI_BASE  0x42000000
-
-#endif
-
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h
index cf5802c..ce0d630 100644
--- a/libmaple/libmaple.h
+++ b/libmaple/libmaple.h
@@ -36,18 +36,58 @@
 // General configuration
 #define MAPLE_DEBUG 0
 
-#ifdef BOARD_maple
-   #include "board_maple.h"
-#endif
-/*
-#ifdef BOARD_maple-native
-   #include "board_maple_native.h"
+// MCU-specific configuration
+#ifdef MCU_STM32F103RB  // eg, LeafLabs Maple
+
+    // Number of GPIO ports (GPIOA, GPIOB, etc), definately used
+    #define NR_GPIO_PORTS             4
+
+    // Number of timer devices ports, definately used
+    #define NR_TIMERS                 4
+
+    // Total number of GPIO pins
+    #define NR_MAPLE_PINS             39
+
+    // Number of ADC pins. Not actually used?
+    #define NR_ANALOG_PINS            29
+
+    // USB Identifier numbers
+    // Descriptor strings must be modified by hand in usb/descriptors.c for now
+    #define VCOM_ID_VENDOR    0x1EAF
+    #define VCOM_ID_PRODUCT   0x0004
+    #define USB_CONFIG_MAX_POWER      (100 >> 1)
+    #define RESET_DELAY               (100)
+
+    // Where to put usercode (based on space reserved for bootloader)
+    #define USER_ADDR_ROM 0x08005000
+    #define USER_ADDR_RAM 0x20000C00
+    #define STACK_TOP     0x20000800
+
+    // Debug port settings (from ASSERT)
+    #define ERROR_LED_PORT         GPIOA_BASE
+    #define ERROR_LED_PIN          5
+    #define ERROR_USART_NUM        2
+    #define ERROR_USART_BAUD       9600
+    #define ERROR_TX_PIN           2
+    #define ERROR_TX_PORT          GPIOA_BASE
+
+    // Just in case, most boards have at least some memory
+    #ifndef RAMSIZE
+    #  define RAMSIZE             (caddr_t)0x50000
+    #endif
+
+    // Bitbanded Memory sections
+    #define BITBAND_SRAM_REF   0x20000000
+    #define BITBAND_SRAM_BASE  0x22000000
+    #define BITBAND_PERI_REF   0x40000000
+    #define BITBAND_PERI_BASE  0x42000000
 #endif
 
-#ifdef BOARD_maple-mini
-   #include "board_maple_mini.h"
+// Make sure MCU-specific settings were defined
+#ifndef NR_GPIO_PORTS
+#error Error: No MCU type specified. Add something like -DMCU_STM32F103RB \
+       to your compiler arguments (probably in a Makefile).
 #endif
-*/
 
 // Requires board configuration info
 #include "util.h"
-- 
cgit v1.2.3


From e03d58f4dab4176514924baa3a1ff430bf5819b8 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 31 Aug 2010 17:17:57 -0400
Subject: Further wirish portability progress

Sort of ugly changes. Compiles but untested.
---
 Makefile                       |  3 +-
 libmaple/gpio.h                | 14 +++---
 libmaple/libmaple.h            | 49 +++++++++++++++++++--
 libmaple/rcc.c                 |  1 +
 libmaple/rcc.h                 |  1 +
 notes/portable.txt             | 33 +++++++++++++-
 wirish/HardwareTimer.cpp       | 39 +++++++++++++++--
 wirish/HardwareTimer.h         | 14 ++++++
 wirish/boards.h                | 99 ++++++++++++++++++++++++++++++++++--------
 wirish/comm/HardwareSerial.cpp |  1 +
 wirish/comm/HardwareSerial.h   |  1 +
 wirish/time.c                  |  1 +
 wirish/time.h                  |  4 +-
 wirish/wirish.c                | 12 +++--
 wirish/wirish.h                |  2 +-
 wirish/wirish_analog.c         |  3 +-
 16 files changed, 236 insertions(+), 41 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 862d5b1..28cd4f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 .DEFAULT_GOAL := sketch
 
+# Valid BOARDs: maple, maple_native, ...
 BOARD ?= maple
 MEMORY_TARGET ?= flash
 
@@ -12,7 +13,7 @@ ifeq ($(BOARD), maple)
    MCU := STM32F103RB
    PRODUCT_ID := 0003
 endif
-ifeq ($(BOARD), maple-native)
+ifeq ($(BOARD), maple_native)
    MCU := STM32F103ZE
    PRODUCT_ID := 0003
 endif
diff --git a/libmaple/gpio.h b/libmaple/gpio.h
index d1d0050..9099c9b 100644
--- a/libmaple/gpio.h
+++ b/libmaple/gpio.h
@@ -44,13 +44,13 @@
  * - After reset, the alternate functions are not active and IO prts
  * are set to Input Floating mode */
 
-#define GPIOA_BASE               (GPIO_Port*)0x40010800
-#define GPIOB_BASE               (GPIO_Port*)0x40010C00
-#define GPIOC_BASE               (GPIO_Port*)0x40011000
-#define GPIOD_BASE               (GPIO_Port*)0x40011400
-#define GPIOE_BASE               (GPIO_Port*)0x40011800 // High-density devices only
-#define GPIOF_BASE               (GPIO_Port*)0x40011C00 // High-density devices only
-#define GPIOG_BASE               (GPIO_Port*)0x40012000 // High-density devices only
+#define GPIOA_BASE    (GPIO_Port*)0x40010800
+#define GPIOB_BASE    (GPIO_Port*)0x40010C00
+#define GPIOC_BASE    (GPIO_Port*)0x40011000
+#define GPIOD_BASE    (GPIO_Port*)0x40011400
+#define GPIOE_BASE    (GPIO_Port*)0x40011800 // High-density devices only
+#define GPIOF_BASE    (GPIO_Port*)0x40011C00 // High-density devices only
+#define GPIOG_BASE    (GPIO_Port*)0x40012000 // High-density devices only
 
 #define GPIO_SPEED_50MHZ            (0x3)
 
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h
index 1fd0785..a481e63 100644
--- a/libmaple/libmaple.h
+++ b/libmaple/libmaple.h
@@ -48,9 +48,6 @@
     // Number of timer devices ports, definately used
     #define NR_TIMERS                 4
 
-    // Number of ADC pins. Not actually used?
-    #define NR_ANALOG_PINS            29
-
     // Has an FSMC bus?
     //#define HAS_FSMC          // Maple does not
 
@@ -86,6 +83,52 @@
     #define BITBAND_PERI_BASE  0x42000000
 #endif
 
+#ifdef MCU_STM32F103ZE  // eg, LeafLabs Maple Native
+
+    // Number of GPIO ports (GPIOA, GPIOB, etc), definately used
+    #define NR_GPIO_PORTS             7
+
+    // Total number of GPIO pins
+    #define NR_GPIO_PINS             63
+
+    // Number of timer devices ports, definately used
+    #define NR_TIMERS                 8
+
+    // Has an FSMC bus?
+    #define HAS_FSMC
+
+    // USB Identifier numbers
+    // Descriptor strings must be modified by hand in usb/descriptors.c for now
+    #define VCOM_ID_VENDOR    0x1EAF
+    #define VCOM_ID_PRODUCT   0x0004
+    #define USB_CONFIG_MAX_POWER      (100 >> 1)
+    #define RESET_DELAY               (100)
+
+    // Where to put usercode (based on space reserved for bootloader)
+    #define USER_ADDR_ROM 0x08005000
+    #define USER_ADDR_RAM 0x20000C00
+    #define STACK_TOP     0x20000800
+
+    // Debug port settings (from ASSERT)
+    #define ERROR_LED_PORT         GPIOA_BASE
+    #define ERROR_LED_PIN          5
+    #define ERROR_USART_NUM        2
+    #define ERROR_USART_BAUD       9600
+    #define ERROR_TX_PIN           2
+    #define ERROR_TX_PORT          GPIOA_BASE
+
+    // Just in case, most boards have at least some memory
+    #ifndef RAMSIZE
+    #  define RAMSIZE             (caddr_t)0x50000
+    #endif
+
+    // Bitbanded Memory sections
+    #define BITBAND_SRAM_REF   0x20000000
+    #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 Error: No MCU type specified. Add something like -DMCU_STM32F103RB \
diff --git a/libmaple/rcc.c b/libmaple/rcc.c
index 4ac6629..848f59e 100644
--- a/libmaple/rcc.c
+++ b/libmaple/rcc.c
@@ -66,6 +66,7 @@ static const struct rcc_dev_info rcc_dev_table[] = {
    [RCC_TIMER5] = { .clk_domain = APB1, .line_num = 3 },   // High-density devices only
    [RCC_TIMER6] = { .clk_domain = APB1, .line_num = 4 },   // High-density devices only
    [RCC_TIMER7] = { .clk_domain = APB1, .line_num = 5 },   // High-density devices only
+   [RCC_TIMER8] = { .clk_domain = APB2, .line_num = 13 },   // High-density devices only
    [RCC_SPI1]   = { .clk_domain = APB2, .line_num = 12 },
    [RCC_SPI2]   = { .clk_domain = APB1, .line_num = 14 },
 };
diff --git a/libmaple/rcc.h b/libmaple/rcc.h
index b369f25..3f55b4f 100644
--- a/libmaple/rcc.h
+++ b/libmaple/rcc.h
@@ -163,6 +163,7 @@ enum {
    RCC_TIMER5,      // High-density devices only (Maple Native)
    RCC_TIMER6,      // High-density devices only (Maple Native)
    RCC_TIMER7,      // High-density devices only (Maple Native)
+   RCC_TIMER8,      // High-density devices only (Maple Native)
    RCC_SPI1,
    RCC_SPI2,
 };
diff --git a/notes/portable.txt b/notes/portable.txt
index a6dcb40..69952d7 100644
--- a/notes/portable.txt
+++ b/notes/portable.txt
@@ -38,7 +38,36 @@ Files to check by hand:
 #   util.h
 #   libmaple.h
 #   usb/*
-#   wirish/*
+
+wirish/:
+#   bits.h
+#   boards.h
+#   cxxabi-compat.cpp
+#   ext_interrupts.c
+#   ext_interrupts.h
+#   HardwareTimer.cpp
+#   HardwareTimer.h
+#   io.h
+#   main.cxx
+#   Print.cpp
+#   Print.h
+#   pwm.c
+#   pwm.h
+#   rules.mk
+#   time.c
+#   time.h
+#   usb_serial.cpp
+#   usb_serial.h
+#   wirish_analog.c
+#   wirish.c
+#   wirish_digital.c
+#   wirish.h
+#   wirish_math.cpp
+#   wirish_math.h
+#   wirish_shift.c
+#   WProgram.h
+-   comm/
+
 
 
 ADC Notes:
@@ -64,6 +93,8 @@ TIMER Notes:
     TIMER6 and TIMER7 are much less useful.
     There is some partial progress towards adding timer5/timer8 functionality,
     but not much. This should probably all be rewritten.
+    The wirish timer implementation should be refactored to use pin numbers.
 
 USART Notes:
     The USART/UART nomeclature is a little mixed up.
+    TODO: portability of HardwareSerial, HardwareSPI
diff --git a/wirish/HardwareTimer.cpp b/wirish/HardwareTimer.cpp
index 3c8e9f4..5675948 100644
--- a/wirish/HardwareTimer.cpp
+++ b/wirish/HardwareTimer.cpp
@@ -32,10 +32,7 @@
 #include "HardwareTimer.h"
 
 HardwareTimer::HardwareTimer(uint8 timerNum) {
-    ASSERT(timerNum == 1 ||
-           timerNum == 2 ||
-           timerNum == 3 ||
-           timerNum == 4);
+    ASSERT(timerNum < NR_TIMERS);
     this->timerNum = timerNum;
     // Need to remember over flow for bounds checking
     this->overflow = 0xFFFF;
@@ -141,9 +138,43 @@ void HardwareTimer::detachCompare3Interrupt(void) {
 void HardwareTimer::detachCompare4Interrupt(void) {
     timer_detach_interrupt(this->timerNum,4);
 }
+#if NR_TIMERS >= 8
+void HardwareTimer::setChannel5Mode(uint8 mode) {
+    timer_set_mode(this->timerNum,5,mode);
+}
+void HardwareTimer::setChannel8Mode(uint8 mode) {
+    timer_set_mode(this->timerNum,8,mode);
+}
+void HardwareTimer::setCompare5(uint16 val) {
+    if(val > this->overflow)
+        val = this->overflow;
+    timer_set_compare_value(this->timerNum,5,val);
+}
+void HardwareTimer::setCompare8(uint16 val) {
+    if(val > this->overflow)
+        val = this->overflow;
+    timer_set_compare_value(this->timerNum,8,val);
+}
+void HardwareTimer::attachCompare5Interrupt(voidFuncPtr handler) {
+    timer_attach_interrupt(this->timerNum,5,handler);
+}
+void HardwareTimer::attachCompare8Interrupt(voidFuncPtr handler) {
+    timer_attach_interrupt(this->timerNum,8,handler);
+}
+void HardwareTimer::detachCompare5Interrupt(void) {
+    timer_detach_interrupt(this->timerNum,5);
+}
+void HardwareTimer::detachCompare8Interrupt(void) {
+    timer_detach_interrupt(this->timerNum,8);
+}
+#endif
 
 HardwareTimer Timer1(1);
 HardwareTimer Timer2(2);
 HardwareTimer Timer3(3);
 HardwareTimer Timer4(4);
+#if NR_TIMERS >= 8
+HardwareTimer Timer5(5);    // High-density devices only
+HardwareTimer Timer8(8);    // High-density devices only
+#endif
 
diff --git a/wirish/HardwareTimer.h b/wirish/HardwareTimer.h
index c79f54f..3f986e4 100644
--- a/wirish/HardwareTimer.h
+++ b/wirish/HardwareTimer.h
@@ -62,12 +62,26 @@ class HardwareTimer {
         void detachCompare2Interrupt(void);
         void detachCompare3Interrupt(void);
         void detachCompare4Interrupt(void);
+        #if NR_TIMERS >= 8
+        void setChannel5Mode(uint8 mode);
+        void setChannel8Mode(uint8 mode);
+        void setCompare5(uint16 val); // truncates to overflow
+        void setCompare8(uint16 val); // truncates to overflow
+        void attachCompare5Interrupt(voidFuncPtr handler);
+        void attachCompare8Interrupt(voidFuncPtr handler);
+        void detachCompare5Interrupt(void);
+        void detachCompare8Interrupt(void);
+        #endif
 };
 
 extern HardwareTimer Timer1;
 extern HardwareTimer Timer2;
 extern HardwareTimer Timer3;
 extern HardwareTimer Timer4;
+#if NR_TIMERS >= 8
+extern HardwareTimer Timer5;
+extern HardwareTimer Timer8;
+#endif
 
 #endif
 
diff --git a/wirish/boards.h b/wirish/boards.h
index 6e24c51..035868a 100644
--- a/wirish/boards.h
+++ b/wirish/boards.h
@@ -39,26 +39,21 @@
 extern "C"{
 #endif
 
-// Set of all possible digital pin names
+// Set of all possible digital pin names; not all boards have all these
 enum {
     D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, D13, D14, D15, D16,
     D17, D18, D19, D20, D21, D22, D23, D24, D25, D26, D27, D28, D29, D30, D31,
-    D32, D33, D34, D35, D36, D37, D38, D39, 
-    // Maple Native only:
-    D40, D41, D42, D43, D44, D45, D46, D47, D48, D49, D50, D51, D52, D53, D54,
-    D55, D56, D57, D58, D59, D60, D61, D62, D63, D64, D65, D66, D67, D68, D69,
-    D70, D71, D72, D73, D74, D75, D76, D77, D78, D79, D80, D81, D82, D83, D84,
-    D85, D86, D87, D88, D89, D90, D91, D92, D93, D94, D95, D96, D97, D98, D99,
-    D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111,
-};
-
-// Set of all possible analog pin names
+    D32, D33, D34, D35, D36, D37, D38, D39, D40, D41, D42, D43, D44, D45, D46,
+    D47, D48, D49, D50, D51, D52, D53, D54, D55, D56, D57, D58, D59, D60, D61,
+    D62, D63, D64, D65, D66, D67, D68, D69, D70, D71, D72, D73, D74, D75, D76,
+    D77, D78, D79, D80, D81, D82, D83, D84, D85, D86, D87, D88, D89, D90, D91,
+    D92, D93, D94, D95, D96, D97, D98, D99, D100, D101, D102, D103, D104, D105,
+    D106, D107, D108, D109, D110, D111, };
+
+// Set of all possible analog pin names; not all boards have all these
 enum {
     ADC0, ADC1, ADC2, ADC3, ADC4, ADC5, ADC6, ADC7, ADC8, ADC9, ADC10, ADC11,
-    ADC12, ADC13, ADC14, ADC15, ADC16,
-    // Maple Native only:
-    ADC17, ADC18, ADC19, ADC20,
-};
+    ADC12, ADC13, ADC14, ADC15, ADC16, ADC17, ADC18, ADC19, ADC20, };
 
 #define ADC_INVALID       0xFFFFFFFF
 #define TIMER_INVALID     (TimerCCR)0xFFFFFFFF
@@ -79,6 +74,8 @@ typedef struct ExtiInfo {
 // LeafLabs Maple rev3, rev4
 #ifdef BOARD_maple  
 
+    #define CYCLES_PER_MICROSECOND  72
+
     static PinMapping PIN_MAP[NR_GPIO_PINS] = {
         {GPIOA_BASE,  3,        ADC3, TIMER2_CH4_CCR}, // D0/PA3
         {GPIOA_BASE,  2,        ADC2, TIMER2_CH3_CCR}, // D1/PA2
@@ -143,8 +140,76 @@ typedef struct ExtiInfo {
 #endif
 
 // LeafLabs Maple Native (prototype)
-//#ifdef BOARD_maple-native  
-//#endif
+#ifdef BOARD_maple_native  
+
+    #define CYCLES_PER_MICROSECOND  72
+
+    // TODO:
+    static PinMapping PIN_MAP[NR_GPIO_PINS] = {
+        {GPIOA_BASE,  3,        ADC3, TIMER2_CH4_CCR}, // D0/PA3
+        {GPIOA_BASE,  2,        ADC2, TIMER2_CH3_CCR}, // D1/PA2
+        {GPIOA_BASE,  0,        ADC0, TIMER2_CH1_CCR}, // D2/PA0
+        {GPIOA_BASE,  1,        ADC1, TIMER2_CH2_CCR}, // D3/PA1
+        {GPIOB_BASE,  5, ADC_INVALID,  TIMER_INVALID}, // D4/PB5
+        {GPIOB_BASE,  6, ADC_INVALID, TIMER4_CH1_CCR}, // D5/PB6
+        {GPIOA_BASE,  8, ADC_INVALID, TIMER1_CH1_CCR}, // D6/PA8
+        {GPIOA_BASE,  9, ADC_INVALID, TIMER1_CH2_CCR}, // D7/PA9
+        {GPIOA_BASE, 10, ADC_INVALID, TIMER1_CH3_CCR}, // D8/PA10
+        {GPIOB_BASE,  7, ADC_INVALID, TIMER4_CH2_CCR}, // D9/PB7
+        {GPIOA_BASE,  4,        ADC4,  TIMER_INVALID}, // D10/PA4
+        {GPIOA_BASE,  7,        ADC7, TIMER3_CH2_CCR}, // D11/PA7
+        {GPIOA_BASE,  6,        ADC6, TIMER3_CH1_CCR}, // D12/PA6
+        {GPIOA_BASE,  5,        ADC5,  TIMER_INVALID}, // D13/PA5
+        {GPIOB_BASE,  8, ADC_INVALID, TIMER4_CH3_CCR}, // D14/PB8
+        /* Little header  */
+        {GPIOC_BASE,  0,       ADC10,  TIMER_INVALID}, // D15/PC0
+        {GPIOC_BASE,  1,       ADC11,  TIMER_INVALID}, // D16/PC1
+        {GPIOC_BASE,  2,       ADC12,  TIMER_INVALID}, // D17/PC2
+        {GPIOC_BASE,  3,       ADC13,  TIMER_INVALID}, // D18/PC3
+        {GPIOC_BASE,  4,       ADC14,  TIMER_INVALID}, // D19/PC4
+        {GPIOC_BASE,  5,       ADC15,  TIMER_INVALID}, // D20/PC5
+        /* External header  */
+        {GPIOC_BASE, 13, ADC_INVALID,  TIMER_INVALID}, // D21/PC13
+        {GPIOC_BASE, 14, ADC_INVALID,  TIMER_INVALID}, // D22/PC14
+        {GPIOC_BASE, 15, ADC_INVALID,  TIMER_INVALID}, // D23/PC15
+        {GPIOB_BASE,  9, ADC_INVALID, TIMER4_CH4_CCR}, // D24/PB9
+        {GPIOD_BASE,  2, ADC_INVALID,  TIMER_INVALID}, // D25/PD2
+        {GPIOC_BASE, 10, ADC_INVALID,  TIMER_INVALID}, // D26/PC10
+        {GPIOB_BASE,  0,        ADC8,  TIMER3_CH3_CCR}, // D27/PB0
+        {GPIOB_BASE,  1,        ADC9,  TIMER3_CH4_CCR}, // D28/PB1
+        {GPIOB_BASE, 10, ADC_INVALID,  TIMER_INVALID}, // D29/PB10
+        {GPIOB_BASE, 11, ADC_INVALID,  TIMER_INVALID}, // D30/PB11
+        {GPIOB_BASE, 12, ADC_INVALID,  TIMER_INVALID}, // D31/PB12
+        {GPIOB_BASE, 13, ADC_INVALID,  TIMER_INVALID}, // D32/PB13
+        {GPIOB_BASE, 14, ADC_INVALID,  TIMER_INVALID}, // D33/PB14
+        {GPIOB_BASE, 15, ADC_INVALID,  TIMER_INVALID}, // D34/PB15
+        {GPIOC_BASE,  6, ADC_INVALID,  TIMER_INVALID}, // D35/PC6
+        {GPIOC_BASE,  7, ADC_INVALID,  TIMER_INVALID}, // D36/PC7
+        {GPIOC_BASE,  8, ADC_INVALID,  TIMER_INVALID}, // D37/PC8
+        {GPIOC_BASE,  9, ADC_INVALID,  TIMER_INVALID}  // D38/PC9 (BUT)
+    };
+
+    static ExtiInfo PIN_TO_EXTI_CHANNEL[NR_GPIO_PINS] = {
+        {EXTI3,  EXTI_CONFIG_PORTA},      // D0/PA3
+        {EXTI2,  EXTI_CONFIG_PORTA},      // D1/PA2
+        {EXTI0,  EXTI_CONFIG_PORTA},      // D2/PA0
+        {EXTI1,  EXTI_CONFIG_PORTA},      // D3/PA1
+        {EXTI5,  EXTI_CONFIG_PORTB},      // D4/PB5
+        {EXTI6,  EXTI_CONFIG_PORTB},      // D5/PB6
+        {EXTI8,  EXTI_CONFIG_PORTA},      // D6/PA8
+        {EXTI9,  EXTI_CONFIG_PORTA},      // D7/PA9
+        {EXTI10, EXTI_CONFIG_PORTA},      // D8/PA10
+        {EXTI7,  EXTI_CONFIG_PORTB},      // D9/PB7
+        {EXTI4,  EXTI_CONFIG_PORTA},      // D10/PA4
+        {EXTI7,  EXTI_CONFIG_PORTA},      // D11/PA7
+        {EXTI6,  EXTI_CONFIG_PORTA},      // D12/PA6
+        {EXTI5,  EXTI_CONFIG_PORTA},      // D13/PA5
+    };
+#endif
+
+#ifndef CYCLES_PER_MICROSECOND
+#error Board type has not been selected correctly.
+#endif
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/wirish/comm/HardwareSerial.cpp b/wirish/comm/HardwareSerial.cpp
index c1babff..6399ad5 100644
--- a/wirish/comm/HardwareSerial.cpp
+++ b/wirish/comm/HardwareSerial.cpp
@@ -37,6 +37,7 @@
 HardwareSerial Serial1(USART1, 4500000UL, GPIOA_BASE, 9, 10, 1, 2);
 HardwareSerial Serial2(USART2, 2250000UL, GPIOA_BASE, 2, 3,  2, 3);
 HardwareSerial Serial3(USART3, 2250000UL, GPIOB_BASE, 10, 11, 0, 0);
+// TODO: High density device ports
 
 HardwareSerial::HardwareSerial(uint8 usart_num,
                                uint32 max_baud,
diff --git a/wirish/comm/HardwareSerial.h b/wirish/comm/HardwareSerial.h
index c2209ce..df8d7bf 100644
--- a/wirish/comm/HardwareSerial.h
+++ b/wirish/comm/HardwareSerial.h
@@ -61,5 +61,6 @@ class HardwareSerial : public Print {
 extern HardwareSerial Serial1;
 extern HardwareSerial Serial2;
 extern HardwareSerial Serial3;
+// TODO: high density device ports
 #endif
 
diff --git a/wirish/time.c b/wirish/time.c
index c0fd03e..ea8ebe1 100644
--- a/wirish/time.c
+++ b/wirish/time.c
@@ -39,6 +39,7 @@ void delay(unsigned long ms)
 }
 
 void delayMicroseconds(uint32 us) {
+    // So (2^32)/12 micros max, or less than 6 minutes
     us *= 12;
 
     /* fudge for function call overhead  */
diff --git a/wirish/time.h b/wirish/time.h
index 45e82dc..33c04b4 100644
--- a/wirish/time.h
+++ b/wirish/time.h
@@ -35,10 +35,10 @@ extern "C"{
 
 #include "nvic.h"
 #include "systick.h"
+#include "boards.h"
 
-#define CYCLES_PER_MICROSECOND  72
 #define US_PER_MS               1000
-#define MAPLE_RELOAD_VAL        72000
+#define MAPLE_RELOAD_VAL        (CYCLES_PER_MICROSECOND * US_PER_MS)
 
 extern volatile uint32 systick_timer_millis;
 
diff --git a/wirish/wirish.c b/wirish/wirish.c
index d439b23..69bd63b 100644
--- a/wirish/wirish.c
+++ b/wirish/wirish.c
@@ -56,9 +56,13 @@ void init(void) {
    systick_init(MAPLE_RELOAD_VAL);
    gpio_init();
    adc_init();
-   short i = 1;
-   for(i = 1; i <= NR_TIMERS; i++) {
-    timer_init(i, 1);
-   }
+   timer_init(1, 1);
+   timer_init(2, 1);
+   timer_init(3, 1);
+   timer_init(4, 1);
+   #if NR_TIMERS >= 8
+   timer_init(5, 1);
+   timer_init(8, 1);
+   #endif
    setupUSB();
 }
diff --git a/wirish/wirish.h b/wirish/wirish.h
index dd99e5c..7ede77c 100644
--- a/wirish/wirish.h
+++ b/wirish/wirish.h
@@ -33,10 +33,10 @@
 
 #include "libmaple.h"
 #include "boards.h"
+#include "time.h"
 #include "timers.h"
 #include "io.h"
 #include "bits.h"
-#include "time.h"
 #include "pwm.h"
 #include "ext_interrupts.h"
 #include "wirish_math.h"
diff --git a/wirish/wirish_analog.c b/wirish/wirish_analog.c
index 2a8d662..1b911bc 100644
--- a/wirish/wirish_analog.c
+++ b/wirish/wirish_analog.c
@@ -33,8 +33,9 @@
 /* Assumes that the ADC has been initialized and
  * that the pin is set to ANALOG_INPUT */
 uint32 analogRead(uint8 pin) {
-    if (pin >= NR_ANALOG_PINS)
+    if(PIN_MAP[pin].adc == ADC_INVALID) {
         return 0;
+    } 
 
     return adc_read(PIN_MAP[pin].adc);
 }
-- 
cgit v1.2.3


From 0ccec95446d4c7f3ea47a46d267c791fb22bb8d4 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 31 Aug 2010 22:05:39 -0400
Subject: Portability fixes

Still not working but fixed a lot of merge errors
---
 Makefile                      |  2 +-
 libmaple/libmaple.h           | 33 +++++++++++++--------------------
 libmaple/nvic.c               |  7 ++++++-
 libmaple/nvic.h               |  1 +
 libmaple/usb/usb_config.h     |  3 ---
 libmaple/util.c               |  6 +++---
 support/ld/flash.ld           |  4 ++++
 support/ld/jtag.ld            |  8 ++++++--
 support/ld/ram.ld             |  6 +++++-
 support/make/build-targets.mk |  5 +++--
 support/openocd/flash.cfg     |  6 +++++-
 wirish/wirish.c               |  2 +-
 12 files changed, 48 insertions(+), 35 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 28cd4f3..de6c625 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 # Valid BOARDs: maple, maple_native, ...
 BOARD ?= maple
-MEMORY_TARGET ?= flash
+MEMORY_TARGET ?= ram
 
 # USB ID for DFU upload
 VENDOR_ID  := 1EAF
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h
index 8e072c3..437566f 100644
--- a/libmaple/libmaple.h
+++ b/libmaple/libmaple.h
@@ -34,7 +34,7 @@
 #include "libmaple_types.h"
 
 // General configuration
-#define MAPLE_DEBUG 0
+#define MAPLE_DEBUG 1
 
 // MCU-specific configuration
 #ifdef MCU_STM32F103RB  // eg, LeafLabs Maple
@@ -48,16 +48,21 @@
     // Number of timer devices ports, definately used
     #define NR_TIMERS                 4
 
+    // Number of USART ports
+    #define NR_USART                  3
+
     // Has an FSMC bus?
-    #define NR_FSMC                   1
+    #define NR_FSMC                   0
 
     // Has an FSMC bus?
-    #define NR_DAC_PINS               2
+    #define NR_DAC_PINS               0
 
     // USB Identifier numbers
     // Descriptor strings must be modified by hand in usb/descriptors.c for now
     #define VCOM_ID_VENDOR    0x1EAF
     #define VCOM_ID_PRODUCT   0x0004
+    #define USB_DISC_BANK     GPIOC_BASE
+    #define USB_DISC_PIN      12
     #define USB_CONFIG_MAX_POWER      (100 >> 1)
     #define RESET_DELAY               (100)
 
@@ -86,36 +91,26 @@
     #define BITBAND_PERI_BASE  0x42000000
 #endif
 
-#ifdef MCU_STM32F103ZE  // eg, LeafLabs Maple Native
-
-    // Number of GPIO ports (GPIOA, GPIOB, etc), definately used
+#ifdef MCU_STM32F103ZE  
+    // eg, LeafLabs Maple Native
     #define NR_GPIO_PORTS             7
-
-    // Total number of GPIO pins
     #define NR_GPIO_PINS             63
-
-    // Number of timer devices ports, definately used
     #define NR_TIMERS                 8
-
-    // Has an FSMC bus?
+    #define NR_USART                  3
     #define NR_FSMC                   1
-
-    // Has an FSMC bus?
     #define NR_DAC_PINS               2
 
-    // USB Identifier numbers
-    // Descriptor strings must be modified by hand in usb/descriptors.c for now
     #define VCOM_ID_VENDOR    0x1EAF
     #define VCOM_ID_PRODUCT   0x0004
+    #define USB_DISC_BANK     GPIOB_BASE
+    #define USB_DISC_PIN      8
     #define USB_CONFIG_MAX_POWER      (100 >> 1)
     #define RESET_DELAY               (100)
 
-    // Where to put usercode (based on space reserved for bootloader)
     #define USER_ADDR_ROM 0x08005000
     #define USER_ADDR_RAM 0x20000C00
     #define STACK_TOP     0x20000800
 
-    // Debug port settings (from ASSERT)
     #define ERROR_LED_PORT         GPIOC_BASE
     #define ERROR_LED_PIN          15
     #define ERROR_USART_NUM        1
@@ -123,12 +118,10 @@
     #define ERROR_TX_PIN           10
     #define ERROR_TX_PORT          GPIOA_BASE
 
-    // Just in case, most boards have at least some memory
     #ifndef RAMSIZE
     #  define RAMSIZE             (caddr_t)0x50000
     #endif
 
-    // Bitbanded Memory sections
     #define BITBAND_SRAM_REF   0x20000000
     #define BITBAND_SRAM_BASE  0x22000000
     #define BITBAND_PERI_REF   0x40000000
diff --git a/libmaple/nvic.c b/libmaple/nvic.c
index 7aef26d..60e7eac 100644
--- a/libmaple/nvic.c
+++ b/libmaple/nvic.c
@@ -65,7 +65,12 @@ void nvic_irq_disable(uint32 n) {
     }
 }
 
-
+void nvic_irq_disable_all(void) {
+    short n;
+    for(n=0; n<65; n++) {
+        nvic_irq_disable(n);
+    }
+}
 
 /**
  * @brief Initialice the NVIC at address addr
diff --git a/libmaple/nvic.h b/libmaple/nvic.h
index a24086a..4e425c5 100644
--- a/libmaple/nvic.h
+++ b/libmaple/nvic.h
@@ -78,6 +78,7 @@ enum {
 void nvic_init(void);
 void nvic_irq_enable(uint32 device);
 void nvic_irq_disable(uint32 device);
+void nvic_irq_disable_all(void);
 
 #ifdef __cplusplus
 }
diff --git a/libmaple/usb/usb_config.h b/libmaple/usb/usb_config.h
index 27294dc..ba05d42 100644
--- a/libmaple/usb/usb_config.h
+++ b/libmaple/usb/usb_config.h
@@ -40,9 +40,6 @@
 		  CNTR_ESOFM   |	   \
 		  CNTR_RESETM  )
 
-#define USB_DISC_BANK GPIOB_BASE
-#define USB_DISC_PIN  8
-
 #define F_SUSPEND_ENABLED 1
 
 #endif
diff --git a/libmaple/util.c b/libmaple/util.c
index 61beab8..a747948 100644
--- a/libmaple/util.c
+++ b/libmaple/util.c
@@ -44,7 +44,7 @@ void _fail(const char* file, int line, const char* exp) {
     uint32 i       = 0;
 
     /* Turn off interrupts */
-    nvic_disable_interrupts();
+    nvic_irq_disable_all();
 
     /* Turn off timers  */
     timer_disable_all();
@@ -73,8 +73,8 @@ void _fail(const char* file, int line, const char* exp) {
     gpio_set_mode(ERROR_LED_PORT, ERROR_LED_PIN, GPIO_MODE_OUTPUT_PP);
 
     /* Turn the USB interrupt back on so the bootloader keeps on functioning  */
-    nvic_enable_interrupt(NVIC_INT_USBHP);
-    nvic_enable_interrupt(NVIC_INT_USBLP);
+    nvic_irq_enable(NVIC_INT_USBHP);
+    nvic_irq_enable(NVIC_INT_USBLP);
 
     /* Error fade  */
     while (1) {
diff --git a/support/ld/flash.ld b/support/ld/flash.ld
index 7e1e453..d05aa6c 100644
--- a/support/ld/flash.ld
+++ b/support/ld/flash.ld
@@ -25,8 +25,12 @@
 /* Define memory spaces. */
 MEMORY
 {
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 108K
+/* native
   ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
   rom (rx)  : ORIGIN = 0x08005000, LENGTH = 500K
+*/
 }
 
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
diff --git a/support/ld/jtag.ld b/support/ld/jtag.ld
index 890f18a..2ba3ce6 100644
--- a/support/ld/jtag.ld
+++ b/support/ld/jtag.ld
@@ -8,8 +8,12 @@
 /* Define memory spaces. */
 MEMORY
 {
-  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
-  rom (rx) : ORIGIN = 0x08000000, LENGTH = 512K
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 108K
+/* native
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 500K
+*/
 }
 
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
diff --git a/support/ld/ram.ld b/support/ld/ram.ld
index 168c1da..b9dd4ee 100644
--- a/support/ld/ram.ld
+++ b/support/ld/ram.ld
@@ -25,8 +25,12 @@
 /* Define memory spaces. */
 MEMORY
 {
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 0K
+/* native
   ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
-  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 512K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 0K
+*/
 }
 
 
diff --git a/support/make/build-targets.mk b/support/make/build-targets.mk
index 083976a..448b1ee 100644
--- a/support/make/build-targets.mk
+++ b/support/make/build-targets.mk
@@ -24,8 +24,9 @@ MSG_INFO:
 	@echo "================================================================================"
 	@echo ""
 	@echo "  Build info:"
-	@echo "     BOARD:" $(BOARD)
-	@echo "     MEMORY_TARGET:" $(MEMORY_TARGET)
+	@echo "     BOARD:          " $(BOARD)
+	@echo "     MCU:            " $(MCU)
+	@echo "     MEMORY_TARGET:  " $(MEMORY_TARGET)
 	@echo ""
 	@echo "  See 'make help' for all possible targets"
 	@echo ""
diff --git a/support/openocd/flash.cfg b/support/openocd/flash.cfg
index 25fe23f..fcd9561 100644
--- a/support/openocd/flash.cfg
+++ b/support/openocd/flash.cfg
@@ -62,6 +62,8 @@ jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
 
+$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x5000 -work-area-backup 0
+# TODO: native
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x10000 -work-area-backup 0
 
 flash bank stm32x 0x08000000 0x00020000 0 0 $_TARGETNAME
@@ -70,7 +72,9 @@ proc flash_chip {} {
     echo "Halting..."
     halt
     echo "Erasing..."
-    flash erase_address 0x08000000 0x80000
+    flash erase_address 0x08000000 0x20000
+    # TODO: native
+    #flash erase_address 0x08000000 0x80000
     echo "Flashing image..."
     flash write_bank 0 build/maple.bin 0
     echo "Verifying image..."
diff --git a/wirish/wirish.c b/wirish/wirish.c
index 41f5db4..9f3b19e 100644
--- a/wirish/wirish.c
+++ b/wirish/wirish.c
@@ -48,7 +48,7 @@ void init(void) {
    flash_enable_prefetch();
    flash_set_latency(FLASH_WAIT_STATE_2);
 
-   #if HAS_FSMC
+   #if NR_FSMC > 0
    fsmc_native_sram_init();
    #endif
 
-- 
cgit v1.2.3