Cleaned out libmaple.h; this had wide-ranging implications.

Many of the #defines in libmaple.h were board-specific, not
MCU-specific.  Most of these were only used by code under
libmaple/usb/.  These were moved into usb_config.h, and are clearly
marked as being terrible hacks.  I'm going to treat the USB stack as a
black box that we'll deal with later.

Further, instead of having a variety of #defines like "How many USARTS
do I have?", we decide that based on the density of the chip.  This is
determined by testing for STM32_MEDIUM_DENSITY or STM32_HIGH_DENSITY
defines.  libmaple currently doesn't support low-density chips, so
that suffices.  The Makefile will set these automatically based on the
MCU.

Other offending #defines are ERROR_LED_PORT and ERROR_LED_PIN; these
were made optional, but they're set in the Makefile as a hack to keep
things working.

2 files changed, 109 insertions, 40 deletions

diff --git a/libmaple/usb/descriptors.c b/libmaple/usb/descriptors.c
index 360e6dd..8dd9521 100644
--- a/libmaple/usb/descriptors.c
+++ b/libmaple/usb/descriptors.c
@@ -150,43 +150,50 @@ const USB_Descriptor_Config usbVcomDescriptor_Config = {
  //  }
 };
 
-/*
-   String Identifiers:
+/*****************************************************************************
+ *****************************************************************************
+ ***
+ *** FIXME FIXME FIXME NOT THE RIGHT THING! MOVE ALL THIS INTO TO WIRISH!
+ ***
+ *****************************************************************************
+ *****************************************************************************/
 
-   we may choose to specify any or none of the following string
-   identifiers:
+const uint8 usbVcomDescriptor_LangID[USB_DESCRIPTOR_STRING_LEN(1)] = {
+    USB_DESCRIPTOR_STRING_LEN(1),
+    USB_DESCRIPTOR_TYPE_STRING,
+    0x09,
+    0x04
+};
 
-   iManufacturer:    LeafLabs
-   iProduct:         Maple R3
-   iSerialNumber:    NONE
-   iConfiguration:   NONE
-   iInterface(CCI):  NONE
-   iInterface(DCI):  NONE
+const uint8 usbVcomDescriptor_iManufacturer[USB_DESCRIPTOR_STRING_LEN(8)] = {
+    USB_DESCRIPTOR_STRING_LEN(8),
+    USB_DESCRIPTOR_TYPE_STRING,
+    'L', 0, 'e', 0, 'a', 0, 'f', 0,
+    'L', 0, 'a', 0, 'b', 0, 's', 0
+};
 
-   additionally we must provide the unicode language identifier,
-   which is 0x0409 for US English
-*/
+/*
+  String Identifiers:
 
-const uint8 usbVcomDescriptor_LangID[USB_DESCRIPTOR_STRING_LEN(1)] =
-{
-  USB_DESCRIPTOR_STRING_LEN(1),
-  USB_DESCRIPTOR_TYPE_STRING,
-  0x09,
-  0x04
-};
+  we may choose to specify any or none of the following string
+  identifiers:
 
-const uint8 usbVcomDescriptor_iManufacturer[USB_DESCRIPTOR_STRING_LEN(8)] =
-{
-  USB_DESCRIPTOR_STRING_LEN(8),
-  USB_DESCRIPTOR_TYPE_STRING,
-  'L', 0, 'e', 0, 'a', 0, 'f', 0,
-  'L', 0, 'a', 0, 'b', 0, 's', 0
-};
+  iManufacturer:    LeafLabs
+  iProduct:         Maple R3
+  iSerialNumber:    NONE
+  iConfiguration:   NONE
+  iInterface(CCI):  NONE
+  iInterface(DCI):  NONE
 
-const uint8 usbVcomDescriptor_iProduct[USB_DESCRIPTOR_STRING_LEN(8)] =
-{
-  USB_DESCRIPTOR_STRING_LEN(8),
-  USB_DESCRIPTOR_TYPE_STRING,
-  'M', 0, 'a', 0, 'p', 0, 'l', 0,
-  'e', 0, ' ', 0, 'R', 0, '3', 0
+  additionally we must provide the unicode language identifier,
+  which is 0x0409 for US English
+*/
+const uint8 usbVcomDescriptor_iProduct[USB_DESCRIPTOR_STRING_LEN(8)] = {
+    USB_DESCRIPTOR_STRING_LEN(8),
+    USB_DESCRIPTOR_TYPE_STRING,
+    'M', 0, 'a', 0, 'p', 0, 'l', 0,
+    'e', 0, ' ', 0, ' ', 0, ' ', 0
 };
+
+/*****************************************************************************
+ *****************************************************************************/
diff --git a/libmaple/usb/usb_config.h b/libmaple/usb/usb_config.h
index e5f3979..394c580 100644
--- a/libmaple/usb/usb_config.h
+++ b/libmaple/usb/usb_config.h
@@ -5,6 +5,67 @@
 
 #include "usb_lib.h"
 
+/******************************************************************************
+ ******************************************************************************
+ ***
+ ***   HACK ALERT
+ ***
+ ***   FIXME FIXME FIXME FIXME
+ ***
+ ***   A bunch of board-specific #defines that are only used by the
+ ***   USB routines got put into libmaple.h for what appear to be
+ ***   historical reasons.  I'm [mbolivar] putting them in here for
+ ***   now, so that we can treat the usb/ directory as a black box,
+ ***   freeing the rest of libmaple/ to be implemented as a
+ ***   general-purpose STM32 library. All of this REALLY needs to get
+ ***   moved into wirish when we get a chance to redo the USB stack.
+ ***
+ ******************************************************************************
+ *****************************************************************************/
+
+#define VCOM_ID_VENDOR            0x1EAF
+#define RESET_DELAY               (100)
+#define USB_CONFIG_MAX_POWER      (100 >> 1)
+
+#if defined(BOARD_maple)
+
+    /* USB Identifier numbers */
+    #define VCOM_ID_PRODUCT      0x0004
+    #define USB_DISC_BANK        GPIOC_BASE
+    #define USB_DISC_PIN         12
+
+#elif defined(BOARD_maple_mini)
+
+    #define VCOM_ID_PRODUCT      0x0005
+    #define USB_DISC_BANK        GPIOB_BASE
+    #define USB_DISC_PIN         9
+
+#elif defined(BOARD_maple_native)
+
+    #define VCOM_ID_PRODUCT      0x0006
+    #define USB_DISC_BANK        GPIOB_BASE
+    #define USB_DISC_PIN         8
+
+#else
+
+#error ("Sorry! the USB stack relies on LeafLabs board-specific "       \
+        "configuration right now.  If you want, you can pretend you're one " \
+        "of our boards; i.e., #define BOARD_maple, BOARD_maple_mini, or "  \
+        "BOARD_maple_native according to what matches your MCU best. " \
+        "You should also take a look at libmaple/usb/descriptors.c; we make " \
+        "some assumptions there that you probably won't like.")
+
+#endif
+
+/******************************************************************************
+ ******************************************************************************
+ ***
+ ***   END HACK
+ ***
+ ******************************************************************************
+ *****************************************************************************/
+
+
 /* choose addresses to give endpoints the max 64 byte buffers */
 #define USB_BTABLE_ADDRESS        0x00
 #define VCOM_CTRL_EPNUM           0x00
@@ -33,14 +94,15 @@
 #define NUM_ENDPTS                0x04
 
 /* handle all usb interrupts */
-#define ISR_MSK ( CNTR_CTRM    |           \
-		  CNTR_WKUPM   |	   \
-		  CNTR_SUSPM   |	   \
-		  CNTR_ERRM    |	   \
-		  CNTR_SOFM    |	   \
-		  CNTR_ESOFM   |	   \
-		  CNTR_RESETM  )
+#define ISR_MSK (CNTR_CTRM    |                                         \
+                 CNTR_WKUPM   |                                         \
+                 CNTR_SUSPM   |                                         \
+                 CNTR_ERRM    |                                         \
+                 CNTR_SOFM    |                                         \
+                 CNTR_ESOFM   |                                         \
+                 CNTR_RESETM)
 
 #define F_SUSPEND_ENABLED 1
 
+
 #endif