From: INSUN PYO <insun.pyo@samsung.com>
Date: Thu, 6 Feb 2020 03:58:30 +0000 (+0900)
Subject: Extend USB gadget configuration for ACM mode.
X-Git-Tag: submit/tizen_5.5/20200206.042606^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4dc7cd95d50c2bd6cd62085615f09160fbdeb87;p=platform%2Fcore%2Fsystem%2Flibdevice-node.git

Extend USB gadget configuration for ACM mode.

TV profile doesn't have mtp-responder.service.
If mtp-responder.service does not exist in the configfs environment, usb initialization will fail.
So, we check to see if mtp-responder.service exists and remove MTP from usb mode if it doesn't exist.

If you do not build deviced in engineer mode and have a TV profile, ACM only mode exists.
(Engineer mode always adds SDB to usb mode.)

Change-Id: I0472ee10e572e36638d73df7b2be691c49d8f857
(cherry picked from commit 16d7f6721fe4650090cb94af21e001713956de7d)
---

diff --git a/hw/usb_gadget_common.c b/hw/usb_gadget_common.c
index 368077a..70d6c51 100644
--- a/hw/usb_gadget_common.c
+++ b/hw/usb_gadget_common.c
@@ -234,20 +234,27 @@ static int simple_id_to_gadget(struct usb_gadget_id *gadget_id,
 	 * so in this switch we sort our functions in a correct order
 	 */
 	switch (gadget_id->function_mask) {
-	case USB_FUNCTION_SDB:
+	case USB_FUNCTION_MTP:
 		n_configs = 1;
-		functions[0][0] = USB_FUNCTION_SDB;
+		functions[0][0] = USB_FUNCTION_MTP;
 		functions[0][1] = 0;
-		gadget->attrs.idProduct = 0x685d;
+		gadget->attrs.idProduct = 0x6860;
 		break;
 
-	case USB_FUNCTION_MTP:
+	case USB_FUNCTION_ACM:
 		n_configs = 1;
-		functions[0][0] = USB_FUNCTION_MTP;
+		functions[0][0] = USB_FUNCTION_ACM;
 		functions[0][1] = 0;
 		gadget->attrs.idProduct = 0x6860;
 		break;
 
+	case USB_FUNCTION_SDB:
+		n_configs = 1;
+		functions[0][0] = USB_FUNCTION_SDB;
+		functions[0][1] = 0;
+		gadget->attrs.idProduct = 0x685d;
+		break;
+
 	case USB_FUNCTION_RNDIS:
 		n_configs = 1;
 		functions[0][0] = USB_FUNCTION_RNDIS;