Maple Native Changes

added the usb disc pin at GPIOB-8, added some macro definitions to reduce
magic-number-plaque

Author: AJM

hardware.h

@@ -33,6 +33,7 @@
 #define RCC   ((u32)0x40021000)
 #define FLASH ((u32)0x40022000)
 #define GPIOA ((u32)0x40010800)
+#define GPIOB ((u32)0x40010C00)
 #define GPIOC ((u32)0x40011000)
 
 #define RCC_CR      RCC

usb.c

@@ -35,24 +35,23 @@
 
 void setupUSB (void) {
   u32 rwmVal; /* read-write-modify place holder var */
-
+  
   /* Setup the USB DISC Pin */
   rwmVal  = GET_REG(RCC_APB2ENR);
-  rwmVal |= 0x00000010;
+  rwmVal |= RCC_BANKB_ENB;
   SET_REG(RCC_APB2ENR,rwmVal);
 
-  // todo, macroize usb_disc pin
-  /* Setup GPIOC Pin 12 as OD out */
-  rwmVal  = GET_REG(GPIO_CRH(GPIOC));
-  rwmVal &= 0xFFF0FFFF;
-  rwmVal |= 0x00050000;
-  setPin (GPIOC,12);
-  SET_REG(GPIO_CRH(GPIOC),rwmVal);
+  /* Setup GPIOB Pin 8 as OD out */
+  rwmVal  = GET_REG(GPIO_CRH(USB_DISC_BANK));
+  rwmVal &= PIN_8_MASK;
+  rwmVal |= PIN_8_OUTPUT_PP;
+  setPin (USB_DISC_BANK,USB_DISC);
+  SET_REG(GPIO_CRH(USB_DISC_BANK),rwmVal);
 
-  pRCC->APB1ENR |= 0x00800000;
+  pRCC->APB1ENR |= RCC_USB_ENB;
 
   /* initialize the usb application */
-  resetPin (GPIOC,12);  /* present ourselves to the host */
+  resetPin (USB_DISC_BANK,USB_DISC);  /* present ourselves to the host */
   usbAppInit();
 
 }

usb.h

@@ -28,6 +28,15 @@
 #include "usb_lib.h"
 #include "usb_descriptor.h"
 
+/* USB Disc Pin Setup */
+#define USB_DISC 8
+#define USB_DISC_BANK GPIOB
+
+#define RCC_BANKB_ENB   0x00000008
+#define PIN_8_MASK      0xFFFFFFF0
+#define PIN_8_OUTPUT_PP 0x00000005
+#define RCC_USB_ENB     0x00800000
+
 /* USB configuration params */
 #define BTABLE_ADDRESS  0x00
 #define ENDP0_RXADDR    0x40