[WIP] GPIO refactor: seems ok, ready for review

5 files changed, 39 insertions, 80 deletions

diff --git a/libmaple/usb/usb.c b/libmaple/usb/usb.c
index 62f56fc..2fc4eb2 100644
--- a/libmaple/usb/usb.c
+++ b/libmaple/usb/usb.c
@@ -44,7 +44,7 @@
 
 volatile uint32 bDeviceState = UNCONNECTED;
 volatile uint16 wIstr = 0;
-volatile bIntPackSOF  = 0;
+volatile uint32 bIntPackSOF = 0;
 
 DEVICE Device_Table =
     {NUM_ENDPTS,
@@ -99,15 +99,13 @@ struct {
 } ResumeS;
 
 void setupUSB (void) {
-  gpio_set_mode(USB_DISC_BANK,
-                USB_DISC_PIN,
-                GPIO_MODE_OUTPUT_PP);
+  gpio_set_mode(USB_DISC_DEV, USB_DISC_PIN, GPIO_OUTPUT_PP);
 
   /* setup the apb1 clock for USB */
   pRCC->APB1ENR |= 0x00800000;
 
   /* initialize the usb application */
-  gpio_write_bit(USB_DISC_BANK, USB_DISC_PIN, 0); // presents us to the host
+  gpio_write_bit(USB_DISC_DEV, USB_DISC_PIN, 0); // presents us to the host
   USB_Init();  // low level init routine provided by the ST library
 }
 
@@ -115,7 +113,7 @@ void disableUSB (void) {
   // These are just guesses about how to do this
   // TODO: real disable function
   usbDsbISR();
-  gpio_write_bit(USB_DISC_BANK,USB_DISC_PIN,1);
+  gpio_write_bit(USB_DISC_DEV, USB_DISC_PIN, 1);
 }
 
 void usbSuspend(void) {
@@ -320,8 +318,29 @@ if (wIstr & ISTR_CTR & wInterrupt_Mask) {
 
 }
 
+static void FIXME_delayMicroseconds_copy(uint32 us) {
+    /* So (2^32)/12 micros max, or less than 6 minutes */
+    us *= 12;
+
+    /* fudge for function call overhead  */
+    us--;
+    asm volatile("   mov r0, %[us]          \n\t"
+                 "1: subs r0, #1            \n\t"
+                 "   bhi 1b                 \n\t"
+                 :
+                 : [us] "r" (us)
+                 : "r0");
+}
+
+static void FIXME_delay_copy(unsigned long ms) {
+    uint32 i;
+    for (i = 0; i < ms; i++) {
+        FIXME_delayMicroseconds_copy(1000);
+    }
+}
+
 void usbWaitReset(void) {
-  delay(RESET_DELAY);
+  FIXME_delay_copy(RESET_DELAY);
   systemHardReset();
 }
 
diff --git a/libmaple/usb/usb_callbacks.c b/libmaple/usb/usb_callbacks.c
index ccb0fdd..8184537 100644
--- a/libmaple/usb/usb_callbacks.c
+++ b/libmaple/usb/usb_callbacks.c
@@ -129,7 +129,7 @@ u8* vcomGetSetLineCoding(uint16 length) {
     return (uint8*)&line_coding;
 }
 
-vcomSetLineState(void) {
+void vcomSetLineState(void) {
 }
 
 void usbInit(void) {
diff --git a/libmaple/usb/usb_config.h b/libmaple/usb/usb_config.h
index 394c580..9003da9 100644
--- a/libmaple/usb/usb_config.h
+++ b/libmaple/usb/usb_config.h
@@ -4,6 +4,7 @@
 #define __USB_CONFIG_H
 
 #include "usb_lib.h"
+#include "gpio.h"
 
 /******************************************************************************
  ******************************************************************************
@@ -31,19 +32,19 @@
 
     /* USB Identifier numbers */
     #define VCOM_ID_PRODUCT      0x0004
-    #define USB_DISC_BANK        GPIOC_BASE
+    #define USB_DISC_DEV         GPIOC
     #define USB_DISC_PIN         12
 
 #elif defined(BOARD_maple_mini)
 
     #define VCOM_ID_PRODUCT      0x0005
-    #define USB_DISC_BANK        GPIOB_BASE
+    #define USB_DISC_DEV         GPIOB
     #define USB_DISC_PIN         9
 
 #elif defined(BOARD_maple_native)
 
     #define VCOM_ID_PRODUCT      0x0006
-    #define USB_DISC_BANK        GPIOB_BASE
+    #define USB_DISC_DEV         GPIOB
     #define USB_DISC_PIN         8
 
 #else
diff --git a/libmaple/usb/usb_hardware.c b/libmaple/usb/usb_hardware.c
index 505dcf1..9a7d12c 100644
--- a/libmaple/usb/usb_hardware.c
+++ b/libmaple/usb/usb_hardware.c
@@ -33,47 +33,6 @@
 
 #include "usb_hardware.h"
 
-void setPin(u32 bank, u8 pin) {
-    u32 pinMask = 0x1 << (pin);
-    SET_REG(GPIO_BSRR(bank),pinMask);
-}
-
-void resetPin(u32 bank, u8 pin) {
-    u32 pinMask = 0x1 << (16+pin);
-    SET_REG(GPIO_BSRR(bank),pinMask);
-}
-
-void systemReset(void) {
-    SET_REG(RCC_CR, GET_REG(RCC_CR)     | 0x00000001);
-    SET_REG(RCC_CFGR, GET_REG(RCC_CFGR) & 0xF8FF0000);
-    SET_REG(RCC_CR, GET_REG(RCC_CR)     & 0xFEF6FFFF);
-    SET_REG(RCC_CR, GET_REG(RCC_CR)     & 0xFFFBFFFF);
-    SET_REG(RCC_CFGR, GET_REG(RCC_CFGR) & 0xFF80FFFF);
-
-    SET_REG(RCC_CIR, 0x00000000); // disable all RCC interrupts
-}
-
-void setupCLK (void) {
-    /* enable HSE */
-    SET_REG(RCC_CR,GET_REG(RCC_CR) | 0x00010001);
-    /* for it to come on */
-    while ((GET_REG(RCC_CR) & 0x00020000) == 0);
-
-    /* Configure PLL */
-    /* pll=72Mhz,APB1=36Mhz,AHB=72Mhz */
-    SET_REG(RCC_CFGR,GET_REG(RCC_CFGR) | 0x001D0400);
-    /* enable the pll */
-    SET_REG(RCC_CR,GET_REG(RCC_CR)     | 0x01000000);
-    /* wait for it to come on */
-    while ((GET_REG(RCC_CR) & 0x03000000) == 0);
-
-    /* Set SYSCLK as PLL */
-    SET_REG(RCC_CFGR,GET_REG(RCC_CFGR) | 0x00000002);
-    /* wait for it to come on */
-    while ((GET_REG(RCC_CFGR) & 0x00000008) == 0);
-}
-
-
 void nvicInit(NVIC_InitTypeDef* NVIC_InitStruct) {
     u32 tmppriority = 0x00;
     u32 tmpreg      = 0x00;
diff --git a/libmaple/usb/usb_hardware.h b/libmaple/usb/usb_hardware.h
index e4a26b4..cfead1a 100644
--- a/libmaple/usb/usb_hardware.h
+++ b/libmaple/usb/usb_hardware.h
@@ -22,34 +22,20 @@
  * THE SOFTWARE.
  * ****************************************************************************/
 
-#ifndef __HARDWARE_H
-#define __HARDWARE_H
-
+#include "rcc.h"
 #include "usb_type.h"
 
+#ifndef _USB_HARDWARE_H_
+#define _USB_HARDWARE_H_
+
 /* macro'd register and peripheral definitions */
 #define EXC_RETURN 0xFFFFFFF9
 #define DEFAULT_CPSR 0x61000000
 
-#define RCC   ((u32)0x40021000)
 #define FLASH ((u32)0x40022000)
-#define GPIOA ((u32)0x40010800)
-#define GPIOC ((u32)0x40011000)
 
 #define USB_PACKET_BUFFER ((u32)0x40006000)
 
-#define RCC_CR      RCC
-#define RCC_CFGR    RCC + 0x04
-#define RCC_CIR     RCC + 0x08
-#define RCC_AHBENR  RCC + 0x14
-#define RCC_APB2ENR RCC + 0x18
-#define RCC_APB1ENR RCC + 0x16
-
-#define GPIO_CRL(port)  port
-#define GPIO_CRH(port)  port+0x04
-#define GPIO_ODR(port)  port+0x0c
-#define GPIO_BSRR(port) port+0x10
-
 #define SCS_BASE   ((u32)0xE000E000)
 #define NVIC_BASE  (SCS_BASE + 0x0100)
 #define SCB_BASE   (SCS_BASE + 0x0D00)
@@ -74,9 +60,8 @@
 #define __PSC(__TIMCLK, __PERIOD)  (((__VAL(__TIMCLK, __PERIOD)+49999UL)/50000UL) - 1)
 #define __ARR(__TIMCLK, __PERIOD) ((__VAL(__TIMCLK, __PERIOD)/(__PSC(__TIMCLK, __PERIOD)+1)) - 1)
 
-/* todo, wrap in do whiles for the natural ; */
-#define SET_REG(addr,val) *(vu32*)(addr)=val
-#define GET_REG(addr)     *(vu32*)(addr)
+#define SET_REG(addr,val)  do { *(vu32*)(addr)=val; } while (0)
+#define GET_REG(addr)      do { *(vu32*)(addr); } while (0)
 
 #if defined(__cplusplus)
 extern "C" {
@@ -85,7 +70,7 @@ extern "C" {
 /* todo: there must be some major misunderstanding in how we access regs. The direct access approach (GET_REG)
    causes the usb init to fail upon trying to activate RCC_APB1 |= 0x00800000. However, using the struct approach
    from ST, it works fine...temporarily switching to that approach */
-typedef struct 
+typedef struct
 {
   vu32 CR;
   vu32 CFGR;
@@ -98,7 +83,7 @@ typedef struct
   vu32 BDCR;
   vu32 CSR;
 } RCC_RegStruct;
-#define pRCC ((RCC_RegStruct *) RCC)
+#define pRCC ((RCC_RegStruct *) RCC_BASE)
 
 typedef struct {
   vu32 ISER[2];
@@ -139,12 +124,7 @@ typedef struct {
 } SCB_TypeDef;
 
 
-void setPin    (u32 bank, u8 pin);
-void resetPin  (u32 bank, u8 pin);
-
 void systemHardReset(void);
-void systemReset   (void);
-void setupCLK      (void);
 
 void nvicInit        (NVIC_InitTypeDef*);
 void nvicDisableInterrupts(void);