usb: Disentangle CDC ACM functionality.

Add new usb_cdcacm.h, which provides the virtual serial port API.
This file (and new usb_cdcacm.c) consolidate the VCOM support, which
was previously distributed through descriptors.[hc], usb.[hc],
usb_callbacks.[hc], and usb_config.h.

Add usb_init_usblib() to usb.h, as a way of initializing the USB
peripheral in terms of the data structures required by usb_lib.  This
is used by the new usb_cdcacm_enable().

Create new usb_lib_globals.h, with declarations for the usb_lib global
state which is most used throughout the rest of the libmaple USB stack.

Remove descriptors.c and usb_callbacks.[hc]; they are no longer
necessary.

Update the USB README accordingly.

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

1 files changed, 0 insertions, 196 deletions

diff --git a/libmaple/usb/descriptors.c b/libmaple/usb/descriptors.c
deleted file mode 100644
index a0bc046..0000000
--- a/libmaple/usb/descriptors.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/******************************************************************************
- * The MIT License
- *
- * Copyright (c) 2010 LeafLabs LLC.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *****************************************************************************/
-
-#include "descriptors.h"
-#include "libmaple.h"
-#include "usb_config.h"
-
-const USB_Descriptor_Device usbVcomDescriptor_Device = {
- bLength:              sizeof(USB_Descriptor_Device),
- bDescriptorType:      USB_DESCRIPTOR_TYPE_DEVICE,
- bcdUSB:               0x0200,
- bDeviceClass:         USB_DEVICE_CLASS_CDC,
- bDeviceSubClass:      USB_DEVICE_SUBCLASS_CDC,
- bDeviceProtocol:      0x00,
- bMaxPacketSize0:      0x40,
- idVendor:             VCOM_ID_VENDOR,
- idProduct:            VCOM_ID_PRODUCT,
- bcdDevice:            0x0200,
- iManufacturer:        0x01,
- iProduct:             0x02,
- iSerialNumber:        0x00,
- bNumConfigurations:   0x01
-};
-
-const USB_Descriptor_Config usbVcomDescriptor_Config = {
- Config_Header: {
-   bLength:                   sizeof(USB_Descriptor_Config_Header),
-   bDescriptorType:           USB_DESCRIPTOR_TYPE_CONFIGURATION,
-   wTotalLength:              sizeof(USB_Descriptor_Config),
-   bNumInterfaces:            0x02,
-   bConfigurationValue:       0x01,
-   iConfiguration:            0x00,
-   bmAttributes:              (USB_CONFIG_ATTR_BUSPOWERED |
-                               USB_CONFIG_ATTR_SELF_POWERED),
-   bMaxPower:                 USB_CONFIG_MAX_POWER,
- },
-
- CCI_Interface:
-   {
-   bLength:                  sizeof(USB_Descriptor_Interface),
-   bDescriptorType:          USB_DESCRIPTOR_TYPE_INTERFACE,
-   bInterfaceNumber:         0x00,
-   bAlternateSetting:        0x00,
-   bNumEndpoints:            0x01,
-   bInterfaceClass:          USB_INTERFACE_CLASS_CDC,
-   bInterfaceSubClass:       USB_INTERFACE_SUBCLASS_CDC_ACM,
-   bInterfaceProtocol:       0x01, /* Common AT Commands */
-   iInterface:               0x00
-   },
-
- CDC_Functional_IntHeader:
-   {
-   bLength:                  CDC_FUNCTIONAL_DESCRIPTOR_SIZE(2),
-   bDescriptorType:          0x24,
-   SubType:                  0x00,
-   Data:                     {0x01, 0x10}
-   },
-
- CDC_Functional_CallManagement:
-   {
-   bLength:                  CDC_FUNCTIONAL_DESCRIPTOR_SIZE(2),
-   bDescriptorType:          0x24,
-   SubType:                  0x01,
-   Data:                     {0x03, 0x01}
-   },
-
- CDC_Functional_ACM:
-   {
-   bLength:                  CDC_FUNCTIONAL_DESCRIPTOR_SIZE(1),
-   bDescriptorType:          0x24,
-   SubType:                  0x02,
-   Data:                     {0x06}
-   },
-
- CDC_Functional_Union:
-   {
-   bLength:                  CDC_FUNCTIONAL_DESCRIPTOR_SIZE(2),
-   bDescriptorType:          0x24,
-   SubType:                  0x06,
-   Data:                     {0x00, 0x01}
-   },
-
- ManagementEndpoint:
-   {
-   bLength:                 sizeof(USB_Descriptor_Endpoint),
-   bDescriptorType:         USB_DESCRIPTOR_TYPE_ENDPOINT,
-   bEndpointAddress:        (USB_DESCRIPTOR_ENDPOINT_IN | VCOM_NOTIFICATION_EPNUM),
-   bmAttributes:            EP_TYPE_INTERRUPT,
-   wMaxPacketSize:          VCOM_NOTIFICATION_EPSIZE,
-   bInterval:               0xFF,
-   },
-
- DCI_Interface:
-   {
-   bLength:                sizeof(USB_Descriptor_Interface),
-   bDescriptorType:        USB_DESCRIPTOR_TYPE_INTERFACE,
-   bInterfaceNumber:       0x01,
-   bAlternateSetting:      0x00,
-   bNumEndpoints:          0x02,
-   bInterfaceClass:        USB_INTERFACE_CLASS_DIC,
-   bInterfaceSubClass:     0x00, /* None */
-   bInterfaceProtocol:     0x00, /* None */
-   iInterface:             0x00,
-   },
-
- DataOutEndpoint:
-   {
-   bLength:               sizeof(USB_Descriptor_Endpoint),
-   bDescriptorType:       USB_DESCRIPTOR_TYPE_ENDPOINT,
-   bEndpointAddress:      (USB_DESCRIPTOR_ENDPOINT_OUT | VCOM_RX_EPNUM),
-   bmAttributes:          EP_TYPE_BULK,
-   wMaxPacketSize:        VCOM_RX_EPSIZE,
-   bInterval:             0x00,
-   },
-
- DataInEndpoint:
-   {
-   bLength:               sizeof(USB_Descriptor_Endpoint),
-   bDescriptorType:       USB_DESCRIPTOR_TYPE_ENDPOINT,
-   bEndpointAddress:      (USB_DESCRIPTOR_ENDPOINT_IN | VCOM_TX_EPNUM),
-   bmAttributes:          EP_TYPE_BULK,
-   wMaxPacketSize:        VCOM_TX_EPSIZE,
-   bInterval:             0x00
-   }
-};
-
-/*****************************************************************************
- *****************************************************************************
- ***
- *** FIXME FIXME FIXME NOT THE RIGHT THING! MOVE ALL THIS INTO TO WIRISH!
- ***
- *****************************************************************************
- *****************************************************************************/
-
-const uint8 usbVcomDescriptor_LangID[USB_DESCRIPTOR_STRING_LEN(1)] = {
-    USB_DESCRIPTOR_STRING_LEN(1),
-    USB_DESCRIPTOR_TYPE_STRING,
-    0x09,
-    0x04
-};
-
-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
-};
-
-/*
-  String Identifiers:
-
-  we may choose to specify any or none of the following string
-  identifiers:
-
-  iManufacturer:    LeafLabs
-  iProduct:         Maple R3
-  iSerialNumber:    NONE
-  iConfiguration:   NONE
-  iInterface(CCI):  NONE
-  iInterface(DCI):  NONE
-
-  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
-};
-
-/*****************************************************************************
- *****************************************************************************/