Fix mistake with Maple mini USB DISC pin using LED_PIN, also renamed USB_DISC to USB_DISC_PIN to more accurately reflect its use

Author: rogerclarkmelbourne

STM32F1/config.h

@@ -104,7 +104,7 @@
 
 	/* USB Disc Pin Setup.   USB DISC is PB9 */
 	#define USB_DISC_BANK       GPIOB
-	#define USB_DISC            9
+	#define USB_DISC_PIN            9
 
 #elif defined TARGET_MAPLE_REV3
 
@@ -123,7 +123,7 @@
 
 	/* USB Disc Pin Setup.   USB DISC is PB9 */
 	#define USB_DISC_BANK         GPIOB
-	#define USB_DISC              9
+	#define USB_DISC_PIN              9
 
 #elif defined TARGET_MAPLE_REV5
 
@@ -140,7 +140,7 @@
 
 	/* USB Disc Pin Setup.   USB DISC is PB9 */
 	#define USB_DISC_BANK         GPIOB
-	#define USB_DISC              9
+	#define USB_DISC_PIN              9
 
 #elif defined TARGET_GENERIC_F103_PC13
 

STM32F1/usb.c

@@ -41,31 +41,31 @@ void setupUSB (void) {
 
 #ifdef HAS_MAPLE_HARDWARE	
   /* Setup USB DISC pin as output open drain */	
-  SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC),(GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC)) & crMask(USB_DISC)) | CR_OUTPUT_OD << CR_SHITF(LED_PIN));  
-  gpio_write_bit(USB_DISC_BANK,USB_DISC,1);
+  SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN),(GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN)) & crMask(USB_DISC_PIN)) | CR_OUTPUT_OD << CR_SHITF(USB_DISC_PIN));  
+  gpio_write_bit(USB_DISC_BANK,USB_DISC_PIN,1);
 
   /* turn on the USB clock */
   //pRCC->APB1ENR |= RCC_APB1ENR_USB_CLK;// done in setupCLK()
 
-  gpio_write_bit(USB_DISC_BANK,USB_DISC,0);  /* present ourselves to the host */
+  gpio_write_bit(USB_DISC_BANK,USB_DISC_PIN,0);  /* present ourselves to the host */
 #else
 
 /* Generic boards don't have disconnect hardware, so we drive PA12 which is connected to the usb D+ line*/
 #define USB_DISC_BANK         GPIOA
-#define USB_DISC              12
+#define USB_DISC_PIN              12
 
-  SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC),
-          (GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC)) & crMask(USB_DISC)) | CR_OUTPUT_PP << CR_SHITF(USB_DISC));
+  SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN),
+          (GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN)) & crMask(USB_DISC_PIN)) | CR_OUTPUT_PP << CR_SHITF(USB_DISC_PIN));
 
-  gpio_write_bit(USB_DISC_BANK,USB_DISC,0);  /* present ourselves to the host */
+  gpio_write_bit(USB_DISC_BANK,USB_DISC_PIN,0);  /* present ourselves to the host */
 
   volatile unsigned int delay;
   for(delay = 0;delay<256;delay++);
 
   //  volatile unsigned x = 1024; do { ; }while(--x);// wait a moment
   /* turn on the USB clock */
-   SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC),
-          (GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC)) & crMask(USB_DISC)) | CR_INPUT << CR_SHITF(USB_DISC)); //Sets the PA12 as floating input
+   SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN),
+          (GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN)) & crMask(USB_DISC_PIN)) | CR_INPUT << CR_SHITF(USB_DISC_PIN)); //Sets the PA12 as floating input
  //  pRCC->APB1ENR |= RCC_APB1ENR_USB_CLK;
 #endif  
   /* initialize the usb application */
@@ -85,11 +85,11 @@ void setupUSB (void) {
 
 
 void usbDsbBus(void) {
-// setPin(USB_DISC_BANK,USB_DISC);
+// setPin(USB_DISC_BANK,USB_DISC_PIN);
 usbPowerOff();
 // SET_REG(USB_DISC_CR,
 // (GET_REG(USB_DISC_CR) & USB_DISC_CR_MASK) | USB_DISC_CR_OUTPUT);
-// resetPin(USB_DISC_BANK, USB_DISC); /* Pull DP+ down */
+// resetPin(USB_DISC_BANK, USB_DISC_PIN); /* Pull DP+ down */
 // volatile unsigned x = 500000; do { ; }while(--x);
 // SET_REG(USB_DISC_CR,
 // (GET_REG(USB_DISC_CR) & USB_DISC_CR_MASK) | USB_DISC_CR_INPUT); //Sets the PA12 as floating input
@@ -264,7 +264,7 @@ RESULT usbPowerOff(void) {
 
     /* note that all weve done here is powerdown the
        usb peripheral. we have no disabled the clocks,
-       pulled the usb_disc pin back up, or reset the
+       pulled the USB_DISC_PIN pin back up, or reset the
        application state machines */
 
     return USB_SUCCESS;