1 files changed, 33 insertions, 25 deletions

diff --git a/app/cdcacm.c b/app/cdcacm.c
index 213592e..af45ac6 100644
--- a/app/cdcacm.c
+++ b/app/cdcacm.c
@@ -11,11 +11,15 @@ static uint8_t cdcacm_tx_ring_buf[BUFFER_SIZE];
 
 static int cdcacm_ready = 0;
 
+#define COMM_EP 0x83
+#define DATA_IN 0x01
+#define DATA_OUT 0x82
+
 static const struct usb_endpoint_descriptor comm_endp[] = {
   {
     .bLength = USB_DT_ENDPOINT_SIZE,
     .bDescriptorType = USB_DT_ENDPOINT,
-    .bEndpointAddress = 0x83,
+    .bEndpointAddress = COMM_EP,
     .bmAttributes = USB_ENDPOINT_ATTR_INTERRUPT,
     .wMaxPacketSize = 16,
     .bInterval = 255,
@@ -26,7 +30,7 @@ static const struct usb_endpoint_descriptor data_endp[] = {
   {
     .bLength = USB_DT_ENDPOINT_SIZE,
     .bDescriptorType = USB_DT_ENDPOINT,
-    .bEndpointAddress = 0x01,
+    .bEndpointAddress = DATA_IN,
     .bmAttributes = USB_ENDPOINT_ATTR_BULK,
     .wMaxPacketSize = 64,
     .bInterval = 1,
@@ -34,7 +38,7 @@ static const struct usb_endpoint_descriptor data_endp[] = {
   {
     .bLength = USB_DT_ENDPOINT_SIZE,
     .bDescriptorType = USB_DT_ENDPOINT,
-    .bEndpointAddress = 0x82,
+    .bEndpointAddress = DATA_OUT,
     .bmAttributes = USB_ENDPOINT_ATTR_BULK,
     .wMaxPacketSize = 64,
     .bInterval = 1,
@@ -59,7 +63,7 @@ static const struct {
     .bDescriptorType = CS_INTERFACE,
     .bDescriptorSubtype = USB_CDC_TYPE_CALL_MANAGEMENT,
     .bmCapabilities = 0,
-    .bDataInterface = 1,
+    .bDataInterface = 3,
   },
   .acm = {
     .bFunctionLength = sizeof (struct usb_cdc_acm_descriptor),
@@ -71,15 +75,15 @@ static const struct {
     .bFunctionLength = sizeof (struct usb_cdc_union_descriptor),
     .bDescriptorType = CS_INTERFACE,
     .bDescriptorSubtype = USB_CDC_TYPE_UNION,
-    .bControlInterface = 0,
-    .bSubordinateInterface0 = 1,
+    .bControlInterface = 2,
+    .bSubordinateInterface0 = 3,
   }
 };
 
 const struct usb_interface_descriptor comm_iface = {
   .bLength = USB_DT_INTERFACE_SIZE,
   .bDescriptorType = USB_DT_INTERFACE,
-  .bInterfaceNumber = 0,
+  .bInterfaceNumber = 2,
   .bAlternateSetting = 0,
   .bNumEndpoints = 1,
   .bInterfaceClass = USB_CLASS_CDC,
@@ -94,7 +98,7 @@ const struct usb_interface_descriptor comm_iface = {
 const struct usb_interface_descriptor data_iface = {
   .bLength = USB_DT_INTERFACE_SIZE,
   .bDescriptorType = USB_DT_INTERFACE,
-  .bInterfaceNumber = 1,
+  .bInterfaceNumber = 3,
   .bAlternateSetting = 0,
   .bNumEndpoints = 2,
   .bInterfaceClass = USB_CLASS_DATA,
@@ -105,21 +109,29 @@ const struct usb_interface_descriptor data_iface = {
 };
 
 
+const struct usb_iface_assoc_descriptor cdc_iface_assoc = {
+  .bLength = USB_DT_INTERFACE_ASSOCIATION_SIZE,
+  .bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
+  .bFirstInterface = 2,
+  .bInterfaceCount = 2,
+  .bFunctionClass = USB_CLASS_CDC,
+  .bFunctionSubClass = USB_CDC_SUBCLASS_ACM,
+  .bFunctionProtocol = USB_CDC_PROTOCOL_AT,
+  .iFunction = 6,
+};
+
 
 
-static int cdcacm_control_request (usbd_device *usbd_dev,
-                                   struct usb_setup_data *req,
-                                   uint8_t **buf,
-                                   uint16_t *len,
-                                   usbd_control_complete_callback *complete)
+int cdcacm_control_request (usbd_device *usbd_dev,
+                            struct usb_setup_data *req,
+                            uint8_t **buf,
+                            uint16_t *len,
+                            usbd_control_complete_callback *complete)
 {
   (void) complete;
   (void) buf;
   (void) usbd_dev;
 
-  if (dfu_control_request (usbd_dev, req, buf, len, complete))
-    return 1;
-
 
   switch (req->bRequest) {
   case USB_CDC_REQ_SET_CONTROL_LINE_STATE: {
@@ -145,7 +157,7 @@ static int cdcacm_control_request (usbd_device *usbd_dev,
 
 void cdcacm_tick (void)
 {
-  unsigned ep = 0x82;
+  unsigned ep = DATA_OUT;
   uint8_t buf[16];
   uint8_t *ptr = buf;
   size_t n = 0;
@@ -184,7 +196,7 @@ static void cdcacm_data_rx_cb (usbd_device *usbd_dev, uint8_t ep)
 {
   (void) ep;
   uint8_t buf[64];
-  int len = usbd_ep_read_packet (usbd_dev, 0x01, buf, 64);
+  int len = usbd_ep_read_packet (usbd_dev, DATA_IN, buf, 64);
 
   if (len)
     ring_write (&cdcacm_rx_ring, buf, len, 0);
@@ -193,14 +205,10 @@ static void cdcacm_data_rx_cb (usbd_device *usbd_dev, uint8_t ep)
 void cdcacm_set_config (usbd_device *usbd_dev, uint16_t wValue)
 {
   (void) wValue;
-  usbd_ep_setup (usbd_dev, 0x01, USB_ENDPOINT_ATTR_BULK, 64, cdcacm_data_rx_cb);
-  usbd_ep_setup (usbd_dev, 0x82, USB_ENDPOINT_ATTR_BULK, 64, NULL);
-  usbd_ep_setup (usbd_dev, 0x83, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL);
-  usbd_register_control_callback (usbd_dev,
-                                  USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
-                                  USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
-                                  cdcacm_control_request);
 
+  usbd_ep_setup (usbd_dev, DATA_IN, USB_ENDPOINT_ATTR_BULK, 64, cdcacm_data_rx_cb);
+  usbd_ep_setup (usbd_dev, DATA_OUT, USB_ENDPOINT_ATTR_BULK, 64, NULL);
+  usbd_ep_setup (usbd_dev, COMM_EP, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL);
   cdcacm_ready = 1;
 }