Add board for hal test

[platform/core/system/libdevice-node.git] / hw / usb_client_common.c

diff --git a/hw/usb_client_common.c b/hw/usb_client_common.c
index 3020cda..e8f8473 100644 (file)
--- a/hw/usb_client_common.c
+++ b/hw/usb_client_common.c
@@ -59,29 +59,28 @@
 #define EXPORT __attribute__ ((visibility("default")))
 #endif
 
-static bool legacy_is_function_supported(struct usb_client *usb,
-                                        struct usb_function *func)
+static bool legacy_is_function_supported(struct usb_function *func)
 {
-       /*
-        * TODO
-        * Instead of only checking whether we know this function
-        * we should also parse sysfs to check if it is build into
-        * slp-gadget.
-        */
-       if (find_usb_function_by_name(func->name))
-               return true;
-       else
+       char buf[PATH_MAX];
+
+       snprintf (buf, sizeof(buf), "%s/f_%s", LEGACY_ROOTPATH, func->name);
+       if (access(buf, F_OK))
                return false;
+
+       return true;
 }
 
-static bool legacy_is_gadget_supported(struct usb_client *usb,
-                                      struct usb_gadget *gadget)
+static bool legacy_is_gadget_supported(struct usb_gadget *gadget)
 {
        int i, j;
+       struct usb_configuration *config;
 
-       if (!gadget || !gadget->configs || !gadget->funcs)
+       if (!gadget || !gadget->configs || !gadget->configs[0] || !gadget->configs[0]->funcs[0])
                return false;
 
+       if (!gadget->attrs.idVendor || !gadget->attrs.idProduct || !gadget->attrs.bcdDevice)
+                       return false;
+
        /* only strings in US_en are allowed */
        if (gadget->strs.lang_code != DEFAULT_LANG)
                        return false;
@@ -90,27 +89,24 @@ static bool legacy_is_gadget_supported(struct usb_client *usb,
                return false;
 
        for (j = 0; gadget->configs[j]; ++j) {
-               struct usb_configuration *config = gadget->configs[j];
+               config = gadget->configs[j];
 
                if (!config->funcs)
                        return false;
 
                for (i = 0; config->funcs[i]; ++i)
-                       if (!legacy_is_function_supported(usb, config->funcs[i]))
+                       if (!legacy_is_function_supported(config->funcs[i]))
                                return false;
        }
 
-       if (j == 0 || j > 2)
-               return false;
-
        return true;
 }
 
 /* TODO. Maybe move this to sys ? */
 static int legacy_set_int_hex(char *path, int val)
 {
-       char buf[MAX_GADGET_STR_LEN];
        int r;
+       char buf[MAX_GADGET_STR_LEN];
 
        if (!path)
                return -EINVAL;
@@ -206,14 +202,17 @@ empty_config:
        return sys_set_str(cpath, buf);
 }
 
-static int legacy_reconfigure_gadget(struct usb_client *usb,
-                                    struct usb_gadget *gadget)
+static int legacy_reconfigure_gadget(struct usb_client *usb, struct usb_gadget *gadget)
 {
        int ret;
 
-       if (!usb || !gadget || !legacy_is_gadget_supported(usb, gadget))
+       if (!usb || !gadget)
                return -EINVAL;
 
+       /* Verify the gadget and check if function is supported */
+       if (!legacy_is_gadget_supported(gadget))
+               return -ENOTSUP;
+
        ret = legacy_set_gadget_attrs(&gadget->attrs);
        if (ret)
                return ret;
@@ -227,8 +226,10 @@ static int legacy_reconfigure_gadget(struct usb_client *usb,
                return ret;
 
        ret = legacy_set_gadget_config(LEGACY_CONFIG_2_PATH, gadget->configs[1]);
+       if (ret)
+               return ret;
 
-       return ret;
+       return 0;
 }
 
 static void legacy_start_stop_service_and_handler(bool start)