commit 6fd0afa027e9206344ae6e2e7830530c081ce75b
author Johann Fischer <j.fischer@phytec.de> Wed Oct 04 23:24:33 2017 +0200
committer Anas Nashif <nashif@linux.intel.com> Fri Oct 13 09:18:14 2017 -0400
tree 4c0f740dee495787ca053569d6f4bd79907e5e0b
parent 9b0da3bc0a8e3b53d0ced5810d672f573ec5b08a

subsys: cdc_acm: add composite device configuration

Signed-off-by: Johann Fischer <j.fischer@phytec.de>

subsys/usb/Makefile

diff --git a/subsys/usb/Makefile b/subsys/usb/Makefile
index d292fff..101f924 100644
--- a/subsys/usb/Makefile
+++ b/subsys/usb/Makefile
@@ -1,4 +1,5 @@
 ccflags-y += -I${srctree}/include/drivers/usb -I${srctree}/usb/include
 
 obj-$(CONFIG_USB_DEVICE_STACK) += usb_device.o usb_descriptor.o
+obj-$(CONFIG_USB_COMPOSITE_DEVICE) += composite.o
 obj-$(CONFIG_USB_DEVICE_STACK) += class/

subsys/usb/class/cdc_acm.c

diff --git a/subsys/usb/class/cdc_acm.c b/subsys/usb/class/cdc_acm.c
index 83ef361..78dc883 100644
--- a/subsys/usb/class/cdc_acm.c
+++ b/subsys/usb/class/cdc_acm.c
@@ -46,6 +46,7 @@
 #include <usb/usb_device.h>
 #include <usb/usb_common.h>
 #include "../usb_descriptor.h"
+#include "../composite.h"
 
 #ifndef CONFIG_UART_INTERRUPT_DRIVEN
 #error "CONFIG_UART_INTERRUPT_DRIVEN must be set for CDC ACM driver"
@@ -93,7 +94,9 @@
 	u32_t rx_buf_head;             /* Head of the internal Rx buffer */
 	u32_t rx_buf_tail;             /* Tail of the internal Rx buffer */
 	/* Interface data buffer */
+#ifndef CONFIG_USB_COMPOSITE_DEVICE
 	u8_t interface_data[CDC_CLASS_REQ_MAX_DATA_SIZE];
+#endif
 	/* CDC ACM line coding properties. LE order */
 	struct cdc_acm_line_coding line_coding;
 	/* CDC ACM line state bitmap, DTE side */
@@ -353,11 +356,18 @@
  */
 static int cdc_acm_init(struct device *dev)
 {
-	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
 	int ret;
 
 	cdc_acm_dev = dev;
 
+#ifdef CONFIG_USB_COMPOSITE_DEVICE
+	ret = composite_add_function(&cdc_acm_config, FIRST_IFACE_CDC_ACM);
+	if (ret < 0) {
+		SYS_LOG_ERR("Failed to add a function");
+		return ret;
+	}
+#else
+	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
 	cdc_acm_config.interface.payload_data = dev_data->interface_data;
 	cdc_acm_config.usb_device_description = usb_get_device_descriptor();
 	/* Initialize the USB driver with the right configuration */
@@ -373,7 +383,7 @@
 		SYS_LOG_ERR("Failed to enable USB");
 		return ret;
 	}
-
+#endif
 	dev->driver_api = &cdc_acm_driver_api;
 	k_sem_init(&poll_wait_sem, 0, UINT_MAX);