usb: Clean up some globals with new struct usblib_dev.

Add struct usblib_dev (and USBLIB, a pointer to the singleton) to
usb.h.  USBLIB contains the global state which is used by
functionality imported from usb_lib/.

Consolidating global state into USBLIB will make it easier to remove
later.

Initial fields in struct usblib_dev are endpoint interrupt callbacks,
a mask for what to handle in the low-priority USB interrupt, and
device state.  These replace pEpInt_IN, pEpInt_OUT; wInterrupt_Mask;
and bDeviceState, respectively from usb_lib/, so remove their
declarations from usb_lib_globals.h accordingly.  Also remove unused
SaveState declaration from usblib_globals.h. Move bDeviceState into
'state' field in usblib_dev.  Device state type changes from
DEVICE_STATE to usb_dev_state, volatile gets dropped, and enumerators
get a 'USB_' prefix, but it's otherwise the same.

usb_lib/ expects pInformation to point to   Device_Info,
                 pUser_Standard_Requests -> User_Standard_Requests, and
                 pProperty               -> Device_Property.

Alter usb_init_usblib() to reflect these assumptions.  Reorganize
usb_lib_globals.h to make these assumptions more apparent to the
reader.

Modify usb_init_usblib() to take endpoint callbacks as arguments;
update its caller in usb_cdcacm.c.

usb_lib/ defines pInformation, pProperty, and pUser_Standard_Requests
itself (in usb_init.c), but we have our own definitions (in usb.c).
Remove the duplicates from usb.c.  Also remove EPindex and Device_Info
definitions from usb.c. Unused, and anyways already defined in
usb_lib/usb_init.c.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>

1 files changed, 10 insertions, 11 deletions

diff --git a/libmaple/usb/usb_lib_globals.h b/libmaple/usb/usb_lib_globals.h
index 854cb12..a494817 100644
--- a/libmaple/usb/usb_lib_globals.h
+++ b/libmaple/usb/usb_lib_globals.h
@@ -34,19 +34,18 @@
 extern "C" {
 #endif
 
-extern void (*pEpInt_IN[7])(void);
-extern void (*pEpInt_OUT[7])(void);
-extern DEVICE_PROP Device_Property;
-extern USER_STANDARD_REQUESTS User_Standard_Requests;
-extern DEVICE  Device_Table;
-extern DEVICE_INFO Device_Info;
+extern USER_STANDARD_REQUESTS  User_Standard_Requests;
+extern USER_STANDARD_REQUESTS *pUser_Standard_Requests;
+
+extern DEVICE_PROP  Device_Property;
+extern DEVICE_PROP *pProperty;
+
+extern DEVICE_INFO  Device_Info;
+extern DEVICE_INFO *pInformation;
+
+extern DEVICE Device_Table;
 extern u16 SaveRState;
 extern u16 SaveTState;
-extern DEVICE_INFO* pInformation;
-extern DEVICE_PROP* pProperty;
-extern USER_STANDARD_REQUESTS *pUser_Standard_Requests;
-extern u16 SaveState ;
-extern u16 wInterrupt_Mask;
 
 #ifdef __cplusplus
 }