1 files changed, 8 insertions, 28 deletions
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);