usb: patches to selectively support both slp and functionfs 15/172415/1
authorINSUN PYO <insun.pyo@samsung.com>
Wed, 14 Mar 2018 01:23:57 +0000 (10:23 +0900)
committerINSUN PYO <insun.pyo@samsung.com>
Wed, 14 Mar 2018 01:27:46 +0000 (10:27 +0900)
If /sys/class/usb_mode/usb0/enable exists, it is slp usb_hal.
Otherwise it is configfs usb_hal.

Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
Change-Id: I8e6b74ffbc6287fe7b5f0a7ab475edff16b2fd88

CMakeLists.txt
hw/usb_cfs_client/CMakeLists.txt [new file with mode: 0644]
hw/usb_cfs_client/usb_cfs_client.c [new file with mode: 0644]
hw/usb_client/usb_client.c
hw/usb_client/usb_client_configfs.c [deleted file]
packaging/device-manager-plugin-odroid.spec

index 4858e216b3b1581b044191b35902e7713d93af59..90a976c8c52b484a14732d09fd5650f85987a5ff 100644 (file)
@@ -6,3 +6,4 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 ADD_SUBDIRECTORY(hw/display)
 ADD_SUBDIRECTORY(hw/usb_gadget)
 ADD_SUBDIRECTORY(hw/usb_client)
+ADD_SUBDIRECTORY(hw/usb_cfs_client)
diff --git a/hw/usb_cfs_client/CMakeLists.txt b/hw/usb_cfs_client/CMakeLists.txt
new file mode 100644 (file)
index 0000000..15e7cbc
--- /dev/null
@@ -0,0 +1,19 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(usb_cfs_client C)
+
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(usb_cfs_client_pkgs REQUIRED hwcommon dlog glib-2.0 libsystemd libusbgx)
+
+FOREACH(flag ${usb_cfs_client_pkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+
+ADD_LIBRARY(${PROJECT_NAME} MODULE usb_cfs_client.c ../shared.c)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${usb_cfs_client_pkgs_LDFLAGS})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries)
diff --git a/hw/usb_cfs_client/usb_cfs_client.c b/hw/usb_cfs_client/usb_cfs_client.c
new file mode 100644 (file)
index 0000000..e32112d
--- /dev/null
@@ -0,0 +1,1042 @@
+/*
+ * device-node
+ *
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <hw/usb_client.h>
+
+#include "../shared.h"
+
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <usbg/usbg.h>
+#include <unistd.h>
+#include <systemd/sd-bus.h>
+
+#include <unistd.h>
+
+#define zalloc(amount) calloc(1, amount)
+
+#define MAX_GADGET_STR_LEN 256
+#define MAX_FUNCS 32
+
+#define CONFIGFS_PATH "/sys/kernel/config"
+
+#define CONFIGFS_GADGET_NAME "hal-gadget"
+#define CONFIGFS_CONFIG_LABEL "hal-config"
+
+#define NAME_INSTANCE_SEP '.'
+#define MAX_INSTANCE_LEN 512
+
+#define USB_FUNCS_PATH "/dev/usb-funcs/"
+
+struct cfs_client {
+       struct usb_client client;
+       usbg_state *ctx;
+       usbg_gadget *gadget;
+       usbg_udc *udc;
+};
+
+/* Based on values in slp-gadget kernel module */
+struct usbg_gadget_attrs default_g_attrs = {
+       .bcdUSB = 0x0200,
+       .idVendor = 0x04e8,
+       .idProduct = 0x6860,
+       .bcdDevice = 0x0100,
+};
+
+struct usbg_gadget_strs default_g_strs = {
+       .manufacturer = "Samsung",
+       .product = "TIZEN",
+       .serial = "01234TEST",
+};
+
+static void cfs_free_config(struct usb_configuration *config)
+{
+       int i;
+
+       if (!config)
+               return;
+
+       if (config->strs) {
+               for (i = 0; config->strs[i].lang_code; ++i)
+                       free(config->strs[i].config_str);
+
+               free(config->strs);
+       }
+
+       /*
+        * Each function will be free later,
+        * for now we cleanup only pointers.
+        */
+       if (config->funcs)
+               free(config->funcs);
+
+       free(config);
+}
+
+static void cfs_free_gadget(struct usb_gadget *gadget)
+{
+       int i;
+
+       if (!gadget)
+               return;
+
+       if (gadget->strs) {
+               for (i = 0; gadget->strs[i].lang_code; ++i) {
+                       free(gadget->strs[i].manufacturer);
+                       free(gadget->strs[i].product);
+                       free(gadget->strs[i].serial);
+               }
+               free(gadget->strs);
+       }
+
+       if (gadget->configs) {
+               for (i = 0; gadget->configs[i]; ++i)
+                       cfs_free_config(gadget->configs[i]);
+
+               free(gadget->configs);
+       }
+
+       if (gadget->funcs) {
+               for (i = 0; gadget->funcs[i]; ++i)
+                       gadget->funcs[i]->free_func(gadget->funcs[i]);
+
+               free(gadget->funcs);
+       }
+}
+
+static int cfs_read_gadget_attrs_strs(usbg_gadget *gadget,
+                                     struct usb_gadget *usb_gadget)
+{
+       struct usbg_gadget_attrs attrs;
+       struct usbg_gadget_strs strs;
+       int ret;
+
+       ret = usbg_get_gadget_attrs(gadget, &attrs);
+       if (ret)
+               goto out;
+
+       usb_gadget->attrs.bDeviceClass = attrs.bDeviceClass;
+       usb_gadget->attrs.bDeviceSubClass = attrs.bDeviceSubClass;
+       usb_gadget->attrs.bDeviceProtocol = attrs.bDeviceProtocol;
+       usb_gadget->attrs.idVendor = attrs.idVendor;
+       usb_gadget->attrs.idProduct = attrs.idProduct;
+       usb_gadget->attrs.bcdDevice = attrs.bcdDevice;
+
+
+       ret = usbg_get_gadget_strs(gadget, LANG_US_ENG, &strs);
+       if (ret)
+               goto out;
+
+       usb_gadget->strs[0].manufacturer = strdup(strs.manufacturer);
+       usb_gadget->strs[0].product = strdup(strs.product);
+       usb_gadget->strs[0].serial = strdup(strs.serial);
+
+       if (!usb_gadget->strs[0].manufacturer ||
+           !usb_gadget->strs[0].product ||
+           !usb_gadget->strs[0].serial) {
+               ret = -ENOMEM;
+               goto err_strs;
+       }
+
+       return 0;
+err_strs:
+       free(usb_gadget->strs[0].manufacturer);
+       free(usb_gadget->strs[0].product);
+       free(usb_gadget->strs[0].serial);
+out:
+       return ret;
+}
+
+static bool cfs_match_func(struct usb_function *f,
+                        const char *name, const char *instance) {
+       if (strcmp(name, usbg_get_function_type_str(USBG_F_FFS))) {
+               /* Standard functions */
+               if (!strcmp(name, f->name) && !strcmp(instance, f->instance))
+                       return true;
+       } else {
+               /* Function with service */
+               const char *sep, *fname, *finst;
+               int len;
+
+               sep = strchr(instance, NAME_INSTANCE_SEP);
+               if (!sep || strlen(sep + 1) < 1)
+                       return false;
+
+               fname = instance;
+               len = sep - instance;
+               finst = sep + 1;
+
+               if (strlen(f->name) == len
+                   && !strncmp(f->name, fname, len)
+                   && !strcmp(f->instance, finst))
+                       return true;
+       }
+
+       return false;
+}
+
+
+static int cfs_find_func(const char *name, const char *instance)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(_available_funcs); ++i)
+               if (cfs_match_func(_available_funcs[i], name, instance))
+                       return i;
+
+       return -ENOENT;
+}
+
+static int cfs_alloc_new_func(struct usb_gadget *gadget, const char *fname,
+                             const char *instance, struct usb_function **_func)
+{
+       struct usb_function *func;
+       int ret;
+
+       ret = cfs_find_func(fname, instance);
+       if (ret < 0)
+               return -ENOTSUP;
+
+       ret = _available_funcs[ret]->clone(_available_funcs[ret], &func);
+       if (ret)
+               return ret;
+
+       *_func = func;
+       return 0;
+}
+
+static int cfs_read_funcs(usbg_gadget *gadget, struct usb_gadget *usb_gadget)
+{
+       usbg_function *func;
+       int i;
+       int ret;
+
+       i = 0;
+       usbg_for_each_function(func, gadget) {
+               char *func_name = (char *)usbg_get_function_type_str(
+                                           usbg_get_function_type(func));
+               char *instance = (char *)usbg_get_function_instance(func);
+
+               ret = cfs_alloc_new_func(usb_gadget, func_name, instance,
+                                        usb_gadget->funcs + i);
+               if (ret < 0)
+                       goto clean_prev;
+               ++i;
+       }
+
+       return 0;
+clean_prev:
+       while (i >= 0) {
+               usb_gadget->funcs[i]->free_func(usb_gadget->funcs[i]);
+               --i;
+       }
+
+       return ret;
+}
+
+static struct usb_function *cfs_find_func_in_gadget(
+       struct usb_gadget *gadget, const char *name, const char *instance)
+{
+       int i;
+
+       for (i = 0; gadget->funcs[i]; ++i)
+               if (cfs_match_func(gadget->funcs[i], name, instance))
+                       return gadget->funcs[i];
+
+       return NULL;
+}
+
+static int cfs_alloc_config(int n_funcs, struct usb_configuration **_config)
+{
+       struct usb_configuration *config;
+
+       config = zalloc(sizeof(*config));
+       if (!config)
+               goto out;
+
+       config->strs = calloc(2, sizeof(*config->strs));
+       if (!config->strs)
+               goto free_config;
+
+       config->funcs = calloc(n_funcs + 1, sizeof(*config->funcs));
+       if (!config->funcs)
+               goto free_strs;
+
+       *_config = config;
+
+       return 0;
+free_strs:
+       free(config->strs);
+free_config:
+       free(config);
+out:
+       return -ENOMEM;
+}
+
+static int cfs_read_config(usbg_config *config, struct usb_gadget *gadget,
+                          struct usb_configuration *usb_config)
+{
+       usbg_binding *b;
+       usbg_function *func;
+       char *name, *instance;
+       struct usbg_config_attrs c_attrs;
+       struct usbg_config_strs c_strs;
+       int i = 0;
+       int ret;
+
+       usbg_for_each_binding(b, config) {
+               func = usbg_get_binding_target(b);
+
+               name = (char *)usbg_get_function_type_str(
+                       usbg_get_function_type(func));
+               instance = (char *)usbg_get_function_instance(func);
+
+               usb_config->funcs[i] = cfs_find_func_in_gadget(gadget,
+                                                              name, instance);
+               if (!usb_config->funcs[i]) {
+                       return -ENOTSUP;
+               }
+               ++i;
+       }
+
+       ret = usbg_get_config_attrs(config, &c_attrs);
+       if (ret)
+               return ret;
+
+       usb_config->attrs.MaxPower = c_attrs.bMaxPower*2;
+       usb_config->attrs.bmAttributs = c_attrs.bmAttributes;
+
+       ret = usbg_get_config_strs(config, LANG_US_ENG, &c_strs);
+       if (ret) {
+               usb_config->strs[0].lang_code = 0;
+       } else {
+               usb_config->strs[0].lang_code = LANG_US_ENG;
+               usb_config->strs[0].config_str = strdup(c_strs.configuration);
+               if (!usb_config->strs[0].config_str)
+                       return -ENOMEM;
+       }
+
+       return 0;
+}
+
+static int cfs_count_bindings(usbg_config *config)
+{
+       usbg_binding *b;
+       int i = 0;
+
+       usbg_for_each_binding(b, config) ++i;
+
+       return i;
+}
+
+static int cfs_read_configs(usbg_gadget *gadget, struct usb_gadget *usb_gadget)
+{
+       usbg_config *config;
+       int i = 0;
+       int n_funcs;
+       int ret;
+
+       usbg_for_each_config(config, gadget) {
+               n_funcs = cfs_count_bindings(config);
+
+               ret = cfs_alloc_config(n_funcs, usb_gadget->configs + i);
+               if (ret)
+                       goto clean_prev;
+               ret = cfs_read_config(config, usb_gadget,
+                                     usb_gadget->configs[i]);
+               if (ret)
+                       goto free_current;
+
+               ++i;
+       }
+
+       return 0;
+free_current:
+       free(usb_gadget->configs[i]->strs);
+       free(usb_gadget->configs[i]->funcs);
+       free(usb_gadget->configs[i]);
+clean_prev:
+       while (i >= 0)
+               cfs_free_config(usb_gadget->configs[i]);
+       return ret;
+}
+
+static int cfs_count_configs(usbg_gadget *gadget)
+{
+       usbg_config *config;
+       int i = 0;
+
+       usbg_for_each_config(config, gadget) ++i;
+
+       return i;
+}
+
+static int cfs_count_functions(usbg_gadget *gadget)
+{
+       usbg_function *func;
+       int i = 0;
+
+       usbg_for_each_function(func, gadget) ++i;
+
+       return i;
+}
+
+static int cfs_get_current_gadget(struct usb_client *usb,
+                                    struct usb_gadget **_usb_gadget)
+{
+       struct cfs_client *cfs_client;
+       struct usb_gadget *usb_gadget;
+       struct usb_gadget_strings *strs;
+       struct usb_configuration **usb_configs;
+       struct usb_function **usb_funcs;
+       int n_funcs, n_configs;
+       int i;
+       int ret = -ENOMEM;
+
+       if (!usb)
+               return -EINVAL;
+
+       cfs_client = container_of(usb, struct cfs_client,
+                                 client);
+
+       usb_gadget = zalloc(sizeof(*usb_gadget));
+       if (!usb_gadget)
+               goto out;
+
+       /*
+        * Currently there is no interface in libusbg which
+        * allows to list all string languages.
+        * That's why we do this only for USA english
+        */
+       strs = calloc(2, sizeof(*strs));
+       if (!strs)
+               goto free_gadget;
+
+       strs[0].lang_code = LANG_US_ENG;
+
+       usb_gadget->strs = strs;
+
+       ret = cfs_read_gadget_attrs_strs(cfs_client->gadget, usb_gadget);
+       if (ret)
+               goto free_strs;
+
+
+       n_funcs = cfs_count_functions(cfs_client->gadget);
+       usb_funcs = calloc(n_funcs + 1, sizeof(*usb_funcs));
+       if (!usb_funcs)
+               goto free_strs_with_content;
+
+       usb_gadget->funcs = usb_funcs;
+
+       ret = cfs_read_funcs(cfs_client->gadget, usb_gadget);
+       if (ret)
+               goto free_funcs;
+
+       n_configs = cfs_count_configs(cfs_client->gadget);
+       usb_configs = calloc(n_configs + 1, sizeof(*usb_configs));
+       if (!usb_configs)
+               goto free_funcs_with_content;
+
+       usb_gadget->configs = usb_configs;
+
+       ret = cfs_read_configs(cfs_client->gadget, usb_gadget);
+       if (ret)
+               goto free_configs;
+
+       *_usb_gadget = usb_gadget;
+       return 0;
+
+free_configs:
+       free(usb_configs);
+free_funcs_with_content:
+       for (i = 0; usb_gadget->funcs[i]; ++i)
+               usb_gadget->funcs[i]->free_func(usb_gadget->funcs[i]);
+free_funcs:
+       free(usb_funcs);
+free_strs_with_content:
+       for (i = 0; usb_gadget->strs[i].lang_code; ++i) {
+               free(usb_gadget->strs[0].manufacturer);
+               free(usb_gadget->strs[0].product);
+               free(usb_gadget->strs[0].serial);
+       }
+free_strs:
+       free(usb_gadget->strs);
+free_gadget:
+       free(usb_gadget);
+out:
+       return ret;
+}
+
+static bool cfs_is_function_supported(struct usb_client *usb,
+                                        struct usb_function *func)
+{
+       bool res;
+       int ret;
+
+       switch (func->function_group) {
+       case USB_FUNCTION_GROUP_SIMPLE:
+               ret = usbg_lookup_function_type(func->name);
+               res = ret >= 0;
+               break;
+       case USB_FUNCTION_GROUP_WITH_SERVICE:
+               /* TODO: Check if socket is available */
+               res = true;
+               break;
+       default:
+               res = false;
+       }
+
+       return res;
+}
+
+static bool cfs_is_gadget_supported(struct usb_client *usb,
+                                      struct usb_gadget *gadget)
+{
+       int i, j;
+
+       if (!gadget || !gadget->configs || !gadget->funcs)
+               return false;
+
+       /*
+        * TODO
+        * Here is a good place to ensure that serial is immutable
+        */
+
+       /* No real restrictions for strings */
+       for (j = 0; gadget->configs && gadget->configs[j]; ++j) {
+               struct usb_configuration *config = gadget->configs[j];
+
+               if (!config->funcs)
+                       return false;
+
+               for (i = 0; config->funcs[i]; ++i)
+                       if (!cfs_is_function_supported(usb, config->funcs[i]))
+                               return false;
+       }
+
+       if (j == 0)
+               return false;
+
+       return true;
+}
+
+static int cfs_set_gadget_attrs(struct cfs_client *cfs_client,
+                               struct usb_gadget_attrs *attrs)
+{
+       int ret;
+       struct usbg_gadget_attrs gadget_attrs;
+
+       ret = usbg_get_gadget_attrs(cfs_client->gadget, &gadget_attrs);
+       if (ret)
+               return ret;
+
+       gadget_attrs.bDeviceClass = attrs->bDeviceClass;
+       gadget_attrs.bDeviceSubClass = attrs->bDeviceSubClass;
+       gadget_attrs.bDeviceProtocol = attrs->bDeviceProtocol;
+       gadget_attrs.idVendor = attrs->idVendor;
+       gadget_attrs.idProduct = attrs->idProduct;
+       gadget_attrs.bcdDevice = attrs->bcdDevice;
+
+       ret = usbg_set_gadget_attrs(cfs_client->gadget, &gadget_attrs);
+
+       return ret;
+}
+
+static int cfs_set_gadget_strs(struct cfs_client *cfs_client,
+                                 struct usb_gadget_strings *strs)
+{
+       int ret = 0;
+
+       /*
+        * TODO
+        * Here is a good place to ensure that serial is immutable
+        */
+#define SET_STR(FIELD, STR_ID)                         \
+       if (strs->FIELD) {                              \
+               ret = usbg_set_gadget_str(cfs_client->gadget,   \
+                                         STR_ID,               \
+                                         strs->lang_code,      \
+                                         strs->FIELD);         \
+               if (ret)                                        \
+                       return ret;                             \
+       }
+
+       SET_STR(manufacturer, USBG_STR_MANUFACTURER);
+       SET_STR(product, USBG_STR_PRODUCT);
+       SET_STR(serial, USBG_STR_SERIAL_NUMBER);
+#undef SET_STR
+       return ret;
+}
+
+#define SYSTEMD_DBUS_SERVICE "org.freedesktop.systemd1"
+#define SYSTEMD_DBUS_PATH "/org/freedesktop/systemd1"
+#define SYSTEMD_DBUS_MANAGER_IFACE "org.freedesktop.systemd1.Manager"
+
+#define SYSTEMD_SOCKET_SUFFIX ".socket"
+#define MAX_SOCKET_NAME 1024
+
+struct bus_ctx {
+       const char *unit;
+       sd_event *loop;
+};
+
+static int socket_started(sd_bus_message *m, void *userdata,
+                         sd_bus_error *ret_error)
+{
+       struct bus_ctx *ctx = userdata;
+       char *signal_unit;
+       int ret;
+
+       ret = sd_bus_message_read(m, "uoss", NULL, NULL, &signal_unit, NULL);
+       if (ret < 0) {
+               sd_event_exit(ctx->loop, ret);
+               return 0;
+       }
+
+       if (!strcmp(signal_unit, ctx->unit))
+               sd_event_exit(ctx->loop, 0);
+
+       return 0;
+}
+
+static int systemd_unit_interface_sync(const char *method, const char *unit,
+                                      bool wait)
+{
+       sd_bus *bus = NULL;
+       sd_event *loop = NULL;
+       struct bus_ctx ctx;
+       int ret;
+
+       ret = sd_bus_open_system(&bus);
+       if (ret < 0)
+               return ret;
+
+       if (wait) {
+               ret = sd_event_new(&loop);
+               if (ret < 0)
+                       goto unref_bus;
+
+               ctx.loop = loop;
+               ctx.unit = unit;
+
+               ret = sd_bus_attach_event(bus, loop, SD_EVENT_PRIORITY_NORMAL);
+               if (ret < 0)
+                       goto unref_loop;
+
+               ret = sd_bus_add_match(bus, NULL,
+                                      "type='signal',"
+                                      "sender='" SYSTEMD_DBUS_SERVICE "',"
+                                      "interface='" SYSTEMD_DBUS_MANAGER_IFACE "',"
+                                      "member='JobRemoved',"
+                                      "path_namespace='" SYSTEMD_DBUS_PATH "'",
+                                      socket_started,
+                                      &ctx);
+               if (ret < 0)
+                       goto unref_loop;
+       }
+
+
+       ret = sd_bus_call_method(bus,
+                       SYSTEMD_DBUS_SERVICE,
+                       SYSTEMD_DBUS_PATH,
+                       SYSTEMD_DBUS_MANAGER_IFACE,
+                       method,
+                       NULL,
+                       NULL,
+                       "ss",
+                       unit,
+                       "replace");
+       if (ret < 0)
+               goto unref_loop;
+
+       if (wait)
+               ret = sd_event_loop(loop);
+
+unref_loop:
+       if (wait)
+               sd_event_unref(loop);
+unref_bus:
+       sd_bus_unref(bus);
+       return ret;
+}
+
+static int systemd_start_socket(const char *socket_name)
+{
+       char unit[MAX_SOCKET_NAME];
+       int ret;
+
+       ret = snprintf(unit, sizeof(unit), "%s" SYSTEMD_SOCKET_SUFFIX,
+                      socket_name);
+       if (ret < 0 || ret >= sizeof(unit))
+               return -ENAMETOOLONG;
+
+
+       return systemd_unit_interface_sync("StartUnit", unit, true);
+}
+
+static int systemd_stop_socket(const char *socket_name)
+{
+       char unit[MAX_SOCKET_NAME];
+       int ret;
+
+       ret = snprintf(unit, sizeof(unit), "%s" SYSTEMD_SOCKET_SUFFIX,
+                      socket_name);
+       if (ret < 0 || ret >= sizeof(unit))
+               return -ENAMETOOLONG;
+
+       return systemd_unit_interface_sync("StopUnit", unit, false);
+}
+
+static int cfs_ensure_dir(char *path)
+{
+       int ret;
+
+       ret = mkdir(path, 0770);
+       if (ret < 0)
+               ret = errno == EEXIST ? 0 : errno;
+
+       return ret;
+}
+
+static int cfs_prep_ffs_service(const char *name, const char *instance,
+                               const char *dev_name, const char *socket_name)
+{
+       char buf[PATH_MAX];
+       size_t left;
+       char *pos;
+       int ret;
+
+       /* TODO: Add some good error handling */
+
+       left = sizeof(buf);
+       pos = buf;
+       ret = snprintf(pos, left, "%s", USB_FUNCS_PATH);
+       if (ret < 0 || ret >= left) {
+               return -ENAMETOOLONG;
+       } else {
+               left -= ret;
+               pos += ret;
+       }
+       ret = cfs_ensure_dir(buf);
+       if (ret < 0)
+               return ret;
+
+       ret = snprintf(pos, left, "/%s", name);
+       if (ret < 0 || ret >= left) {
+               return -ENAMETOOLONG;
+       } else {
+               left -= ret;
+               pos += ret;
+       }
+       ret = cfs_ensure_dir(buf);
+       if (ret < 0)
+               return ret;
+
+       ret = snprintf(pos, left, "/%s", instance);
+       if (ret < 0 || ret >= left) {
+               return -ENAMETOOLONG;
+       } else {
+               left -= ret;
+               pos += ret;
+       }
+       ret = cfs_ensure_dir(buf);
+       if (ret < 0)
+               return ret;
+
+       ret = mount(dev_name, buf, "functionfs", 0, NULL);
+       if (ret < 0)
+               return ret;
+
+       ret = systemd_start_socket(socket_name);
+       if (ret < 0)
+               goto umount_ffs;
+
+       return 0;
+umount_ffs:
+       umount(buf);
+       return ret;
+}
+
+static int cfs_set_gadget_config(struct cfs_client *cfs_client,
+                                   int config_id,
+                                   struct usb_configuration *usb_config)
+{
+       struct usbg_config_attrs cattrs = {
+               .bmAttributes = usb_config->attrs.bmAttributs,
+               .bMaxPower = usb_config->attrs.MaxPower/2,
+       };
+       usbg_config *config;
+       int i;
+       int ret;
+
+       if (!usb_config->funcs || !usb_config->funcs[0])
+               return -EINVAL;
+
+       config = usbg_get_config(cfs_client->gadget, config_id, NULL);
+       if (config) {
+               ret = usbg_rm_config(config, USBG_RM_RECURSE);
+               if (ret)
+                       return ret;
+       }
+
+       ret = usbg_create_config(cfs_client->gadget, config_id,
+                                CONFIGFS_CONFIG_LABEL, &cattrs, NULL, &config);
+       if (ret)
+               return ret;
+
+       for (i = 0; usb_config->strs && usb_config->strs[i].lang_code; ++i) {
+               ret = usbg_set_config_string(config, usb_config->strs[i].lang_code,
+                                            usb_config->strs[i].config_str);
+               if (ret)
+                       return ret;
+       }
+
+       for (i = 0; usb_config->funcs && usb_config->funcs[i]; ++i) {
+               struct usb_function *usb_func = usb_config->funcs[i];
+               char instance[MAX_INSTANCE_LEN];
+               int type;
+               usbg_function *func;
+
+               switch (usb_func->function_group) {
+               case USB_FUNCTION_GROUP_SIMPLE:
+                       type = usbg_lookup_function_type(usb_func->name);
+                       if (strlen(usb_func->instance) >= MAX_INSTANCE_LEN)
+                               return -ENAMETOOLONG;
+                       strcpy(instance, usb_func->instance);
+                       break;
+               case USB_FUNCTION_GROUP_WITH_SERVICE:
+                       type = USBG_F_FFS;
+                       ret = snprintf(instance, sizeof(instance), "%s%c%s",
+                                      usb_func->name, NAME_INSTANCE_SEP,
+                                      usb_func->instance);
+                       if (ret < 0 || ret >= sizeof(instance))
+                               return -ENAMETOOLONG;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+
+
+               func = usbg_get_function(cfs_client->gadget, type, instance);
+               if (!func) {
+                       ret = usbg_create_function(cfs_client->gadget,
+                                                  type,
+                                                  instance,
+                                                  NULL, &func);
+                       if (ret)
+                               return ret;
+
+                       if (usb_func->function_group ==
+                           USB_FUNCTION_GROUP_WITH_SERVICE) {
+                               struct usb_function_with_service *fws;
+
+                               fws = container_of(usb_func,
+                                                  struct usb_function_with_service,
+                                                  func);
+                               ret = cfs_prep_ffs_service(usb_func->name,
+                                                          usb_func->instance,
+                                                          instance,
+                                                          fws->service);
+                               if (ret)
+                                       return ret;
+                       }
+
+               }
+
+               ret = usbg_add_config_function(config, NULL, func);
+               if (ret)
+                       return ret;
+       }
+
+       return ret;
+}
+
+static int cfs_cleanup_left_configs(struct cfs_client *cfs_client,
+                                   int last_config)
+{
+       usbg_config *lconfig, *config;
+       int ret;
+
+       lconfig = usbg_get_config(cfs_client->gadget, last_config, NULL);
+       for (config = usbg_get_next_config(lconfig);
+            config;
+            config = usbg_get_next_config(lconfig)) {
+               ret = usbg_rm_config(config, USBG_RM_RECURSE);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
+static int cfs_reconfigure_gadget(struct usb_client *usb,
+                                 struct usb_gadget *gadget)
+{
+       struct cfs_client *cfs_client;
+       int i;
+       int ret;
+
+       if (!usb)
+               return -EINVAL;
+
+       cfs_client = container_of(usb, struct cfs_client,
+                                 client);
+
+       if (!usb || !gadget || !cfs_is_gadget_supported(usb, gadget))
+               return -EINVAL;
+
+       ret = cfs_set_gadget_attrs(cfs_client, &gadget->attrs);
+       if (ret)
+               goto out;
+
+       for (i = 0; gadget->strs && gadget->strs[i].lang_code > 0; ++i) {
+               ret = cfs_set_gadget_strs(cfs_client, gadget->strs + i);
+               if (ret)
+                       goto out;
+       }
+
+       for (i = 0; gadget->configs && gadget->configs[i]; ++i) {
+               ret = cfs_set_gadget_config(cfs_client, i + 1,
+                                           gadget->configs[i]);
+               if (ret)
+                       goto out;
+       }
+
+       ret = cfs_cleanup_left_configs(cfs_client, i);
+
+       /* TODO
+        * Cleanup things which are left after previous gadget
+        */
+out:
+       return ret;
+}
+
+static int cfs_enable(struct usb_client *usb)
+{
+       struct cfs_client *cfs_client;
+
+       if (!usb)
+               return -EINVAL;
+
+       cfs_client = container_of(usb, struct cfs_client,
+                                 client);
+
+       return usbg_enable_gadget(cfs_client->gadget, cfs_client->udc);
+}
+
+static int cfs_disable(struct usb_client *usb)
+{
+       struct cfs_client *cfs_client;
+
+       if (!usb)
+               return -EINVAL;
+
+       cfs_client = container_of(usb, struct cfs_client,
+                                 client);
+
+       return usbg_disable_gadget(cfs_client->gadget);
+}
+
+static int cfs_gadget_open(struct hw_info *info,
+               const char *id, struct hw_common **common)
+{
+       struct cfs_client *cfs_client;
+       int ret;
+
+       if (!info || !common)
+               return -EINVAL;
+
+       /* used exclusively with slp usb_client*/
+       if (!access("/sys/class/usb_mode/usb0/enable", F_OK))
+               return -ENOENT;
+
+       cfs_client = zalloc(sizeof(*cfs_client));
+       if (!cfs_client)
+               return -ENOMEM;
+
+       ret = usbg_init(CONFIGFS_PATH, &cfs_client->ctx);
+       if (ret)
+               goto err_usbg_init;
+
+       cfs_client->udc = usbg_get_first_udc(cfs_client->ctx);
+       if (!cfs_client->udc) {
+               ret = -ENODEV;
+               goto err_no_udc;
+       }
+
+       ret = usbg_create_gadget(cfs_client->ctx, CONFIGFS_GADGET_NAME,
+                                &default_g_attrs, &default_g_strs,
+                                &cfs_client->gadget);
+       if (ret)
+               goto err_create_gadget;
+
+       cfs_client->client.common.info = info;
+       cfs_client->client.get_current_gadget = cfs_get_current_gadget;
+       cfs_client->client.reconfigure_gadget = cfs_reconfigure_gadget;
+       cfs_client->client.is_gadget_supported = cfs_is_gadget_supported;
+       cfs_client->client.is_function_supported = cfs_is_function_supported;
+       cfs_client->client.enable = cfs_enable;
+       cfs_client->client.disable = cfs_disable;
+       cfs_client->client.free_gadget = cfs_free_gadget;
+
+       *common = &cfs_client->client.common;
+       return 0;
+
+err_create_gadget:
+err_no_udc:
+       usbg_cleanup(cfs_client->ctx);
+err_usbg_init:
+       free(cfs_client);
+
+       return ret;
+}
+
+static int cfs_gadget_close(struct hw_common *common)
+{
+       struct cfs_client *cfs_client;
+
+       if (!common)
+               return -EINVAL;
+
+       cfs_client = container_of(common, struct cfs_client,
+                                 client.common);
+
+       /*
+        * For now we don't check for errors
+        * but we should somehow handle them
+        */
+       usbg_rm_gadget(cfs_client->gadget, USBG_RM_RECURSE);
+       usbg_cleanup(cfs_client->ctx);
+       free(cfs_client);
+
+       return 0;
+}
+
+HARDWARE_MODULE_STRUCTURE = {
+       .magic = HARDWARE_INFO_TAG,
+       .hal_version = HARDWARE_INFO_VERSION,
+       .device_version = USB_CLIENT_HARDWARE_DEVICE_VERSION,
+       .id = USB_CFS_CLIENT_HARDWARE_DEVICE_ID,
+       .name = "cfs-gadget",
+       .open = cfs_gadget_open,
+       .close = cfs_gadget_close,
+};
index f8bdd3aeefa976c87d1cf9ae5a312a99878f3e91..4f6baf288cd01367a20a8b15c211e3cca045e05c 100644 (file)
@@ -23,6 +23,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <systemd/sd-bus.h>
 
 #define zalloc(amount) calloc(1, amount)
@@ -712,6 +713,10 @@ static int legacy_gadget_open(struct hw_info *info,
        if (!info || !common)
                return -EINVAL;
 
+       /* check if slp usb gadget exists */
+       if (access("/sys/class/usb_mode/usb0/enable", F_OK))
+               return -ENOENT;
+
        legacy = zalloc(sizeof(*legacy));
        if (!legacy)
                return -ENOMEM;
diff --git a/hw/usb_client/usb_client_configfs.c b/hw/usb_client/usb_client_configfs.c
deleted file mode 100644 (file)
index d48ae0d..0000000
+++ /dev/null
@@ -1,1037 +0,0 @@
-/*
- * device-node
- *
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <hw/usb_client.h>
-
-#include "../shared.h"
-
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <usbg/usbg.h>
-#include <systemd/sd-bus.h>
-
-#include <unistd.h>
-
-#define zalloc(amount) calloc(1, amount)
-
-#define MAX_GADGET_STR_LEN 256
-#define MAX_FUNCS 32
-
-#define CONFIGFS_PATH "/sys/kernel/config"
-
-#define CONFIGFS_GADGET_NAME "hal-gadget"
-#define CONFIGFS_CONFIG_LABEL "hal-config"
-
-#define NAME_INSTANCE_SEP '.'
-#define MAX_INSTANCE_LEN 512
-
-#define USB_FUNCS_PATH "/dev/usb-funcs/"
-
-struct cfs_client {
-       struct usb_client client;
-       usbg_state *ctx;
-       usbg_gadget *gadget;
-       usbg_udc *udc;
-};
-
-/* Based on values in slp-gadget kernel module */
-struct usbg_gadget_attrs default_g_attrs = {
-       .bcdUSB = 0x0200,
-       .idVendor = 0x04e8,
-       .idProduct = 0x6860,
-       .bcdDevice = 0x0100,
-};
-
-struct usbg_gadget_strs default_g_strs = {
-       .manufacturer = "Samsung",
-       .product = "TIZEN",
-       .serial = "01234TEST",
-};
-
-static void cfs_free_config(struct usb_configuration *config)
-{
-       int i;
-
-       if (!config)
-               return;
-
-       if (config->strs) {
-               for (i = 0; config->strs[i].lang_code; ++i)
-                       free(config->strs[i].config_str);
-
-               free(config->strs);
-       }
-
-       /*
-        * Each function will be free later,
-        * for now we cleanup only pointers.
-        */
-       if (config->funcs)
-               free(config->funcs);
-
-       free(config);
-}
-
-static void cfs_free_gadget(struct usb_gadget *gadget)
-{
-       int i;
-
-       if (!gadget)
-               return;
-
-       if (gadget->strs) {
-               for (i = 0; gadget->strs[i].lang_code; ++i) {
-                       free(gadget->strs[i].manufacturer);
-                       free(gadget->strs[i].product);
-                       free(gadget->strs[i].serial);
-               }
-               free(gadget->strs);
-       }
-
-       if (gadget->configs) {
-               for (i = 0; gadget->configs[i]; ++i)
-                       cfs_free_config(gadget->configs[i]);
-
-               free(gadget->configs);
-       }
-
-       if (gadget->funcs) {
-               for (i = 0; gadget->funcs[i]; ++i)
-                       gadget->funcs[i]->free_func(gadget->funcs[i]);
-
-               free(gadget->funcs);
-       }
-}
-
-static int cfs_read_gadget_attrs_strs(usbg_gadget *gadget,
-                                     struct usb_gadget *usb_gadget)
-{
-       struct usbg_gadget_attrs attrs;
-       struct usbg_gadget_strs strs;
-       int ret;
-
-       ret = usbg_get_gadget_attrs(gadget, &attrs);
-       if (ret)
-               goto out;
-
-       usb_gadget->attrs.bDeviceClass = attrs.bDeviceClass;
-       usb_gadget->attrs.bDeviceSubClass = attrs.bDeviceSubClass;
-       usb_gadget->attrs.bDeviceProtocol = attrs.bDeviceProtocol;
-       usb_gadget->attrs.idVendor = attrs.idVendor;
-       usb_gadget->attrs.idProduct = attrs.idProduct;
-       usb_gadget->attrs.bcdDevice = attrs.bcdDevice;
-
-
-       ret = usbg_get_gadget_strs(gadget, LANG_US_ENG, &strs);
-       if (ret)
-               goto out;
-
-       usb_gadget->strs[0].manufacturer = strdup(strs.manufacturer);
-       usb_gadget->strs[0].product = strdup(strs.product);
-       usb_gadget->strs[0].serial = strdup(strs.serial);
-
-       if (!usb_gadget->strs[0].manufacturer ||
-           !usb_gadget->strs[0].product ||
-           !usb_gadget->strs[0].serial) {
-               ret = -ENOMEM;
-               goto err_strs;
-       }
-
-       return 0;
-err_strs:
-       free(usb_gadget->strs[0].manufacturer);
-       free(usb_gadget->strs[0].product);
-       free(usb_gadget->strs[0].serial);
-out:
-       return ret;
-}
-
-static bool cfs_match_func(struct usb_function *f,
-                        const char *name, const char *instance) {
-       if (strcmp(name, usbg_get_function_type_str(USBG_F_FFS))) {
-               /* Standard functions */
-               if (!strcmp(name, f->name) && !strcmp(instance, f->instance))
-                       return true;
-       } else {
-               /* Function with service */
-               const char *sep, *fname, *finst;
-               int len;
-
-               sep = strchr(instance, NAME_INSTANCE_SEP);
-               if (!sep || strlen(sep + 1) < 1)
-                       return false;
-
-               fname = instance;
-               len = sep - instance;
-               finst = sep + 1;
-
-               if (strlen(f->name) == len
-                   && !strncmp(f->name, fname, len)
-                   && !strcmp(f->instance, finst))
-                       return true;
-       }
-
-       return false;
-}
-
-
-static int cfs_find_func(const char *name, const char *instance)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(_available_funcs); ++i)
-               if (cfs_match_func(_available_funcs[i], name, instance))
-                       return i;
-
-       return -ENOENT;
-}
-
-static int cfs_alloc_new_func(struct usb_gadget *gadget, const char *fname,
-                             const char *instance, struct usb_function **_func)
-{
-       struct usb_function *func;
-       int ret;
-
-       ret = cfs_find_func(fname, instance);
-       if (ret < 0)
-               return -ENOTSUP;
-
-       ret = _available_funcs[ret]->clone(_available_funcs[ret], &func);
-       if (ret)
-               return ret;
-
-       *_func = func;
-       return 0;
-}
-
-static int cfs_read_funcs(usbg_gadget *gadget, struct usb_gadget *usb_gadget)
-{
-       usbg_function *func;
-       int i;
-       int ret;
-
-       i = 0;
-       usbg_for_each_function(func, gadget) {
-               char *func_name = (char *)usbg_get_function_type_str(
-                                           usbg_get_function_type(func));
-               char *instance = (char *)usbg_get_function_instance(func);
-
-               ret = cfs_alloc_new_func(usb_gadget, func_name, instance,
-                                        usb_gadget->funcs + i);
-               if (ret < 0)
-                       goto clean_prev;
-               ++i;
-       }
-
-       return 0;
-clean_prev:
-       while (i >= 0) {
-               usb_gadget->funcs[i]->free_func(usb_gadget->funcs[i]);
-               --i;
-       }
-
-       return ret;
-}
-
-static struct usb_function *cfs_find_func_in_gadget(
-       struct usb_gadget *gadget, const char *name, const char *instance)
-{
-       int i;
-
-       for (i = 0; gadget->funcs[i]; ++i)
-               if (cfs_match_func(gadget->funcs[i], name, instance))
-                       return gadget->funcs[i];
-
-       return NULL;
-}
-
-static int cfs_alloc_config(int n_funcs, struct usb_configuration **_config)
-{
-       struct usb_configuration *config;
-
-       config = zalloc(sizeof(*config));
-       if (!config)
-               goto out;
-
-       config->strs = calloc(2, sizeof(*config->strs));
-       if (!config->strs)
-               goto free_config;
-
-       config->funcs = calloc(n_funcs + 1, sizeof(*config->funcs));
-       if (!config->funcs)
-               goto free_strs;
-
-       *_config = config;
-
-       return 0;
-free_strs:
-       free(config->strs);
-free_config:
-       free(config);
-out:
-       return -ENOMEM;
-}
-
-static int cfs_read_config(usbg_config *config, struct usb_gadget *gadget,
-                          struct usb_configuration *usb_config)
-{
-       usbg_binding *b;
-       usbg_function *func;
-       char *name, *instance;
-       struct usbg_config_attrs c_attrs;
-       struct usbg_config_strs c_strs;
-       int i = 0;
-       int ret;
-
-       usbg_for_each_binding(b, config) {
-               func = usbg_get_binding_target(b);
-
-               name = (char *)usbg_get_function_type_str(
-                       usbg_get_function_type(func));
-               instance = (char *)usbg_get_function_instance(func);
-
-               usb_config->funcs[i] = cfs_find_func_in_gadget(gadget,
-                                                              name, instance);
-               if (!usb_config->funcs[i]) {
-                       return -ENOTSUP;
-               }
-               ++i;
-       }
-
-       ret = usbg_get_config_attrs(config, &c_attrs);
-       if (ret)
-               return ret;
-
-       usb_config->attrs.MaxPower = c_attrs.bMaxPower*2;
-       usb_config->attrs.bmAttributs = c_attrs.bmAttributes;
-
-       ret = usbg_get_config_strs(config, LANG_US_ENG, &c_strs);
-       if (ret) {
-               usb_config->strs[0].lang_code = 0;
-       } else {
-               usb_config->strs[0].lang_code = LANG_US_ENG;
-               usb_config->strs[0].config_str = strdup(c_strs.configuration);
-               if (!usb_config->strs[0].config_str)
-                       return -ENOMEM;
-       }
-
-       return 0;
-}
-
-static int cfs_count_bindings(usbg_config *config)
-{
-       usbg_binding *b;
-       int i = 0;
-
-       usbg_for_each_binding(b, config) ++i;
-
-       return i;
-}
-
-static int cfs_read_configs(usbg_gadget *gadget, struct usb_gadget *usb_gadget)
-{
-       usbg_config *config;
-       int i = 0;
-       int n_funcs;
-       int ret;
-
-       usbg_for_each_config(config, gadget) {
-               n_funcs = cfs_count_bindings(config);
-
-               ret = cfs_alloc_config(n_funcs, usb_gadget->configs + i);
-               if (ret)
-                       goto clean_prev;
-               ret = cfs_read_config(config, usb_gadget,
-                                     usb_gadget->configs[i]);
-               if (ret)
-                       goto free_current;
-
-               ++i;
-       }
-
-       return 0;
-free_current:
-       free(usb_gadget->configs[i]->strs);
-       free(usb_gadget->configs[i]->funcs);
-       free(usb_gadget->configs[i]);
-clean_prev:
-       while (i >= 0)
-               cfs_free_config(usb_gadget->configs[i]);
-       return ret;
-}
-
-static int cfs_count_configs(usbg_gadget *gadget)
-{
-       usbg_config *config;
-       int i = 0;
-
-       usbg_for_each_config(config, gadget) ++i;
-
-       return i;
-}
-
-static int cfs_count_functions(usbg_gadget *gadget)
-{
-       usbg_function *func;
-       int i = 0;
-
-       usbg_for_each_function(func, gadget) ++i;
-
-       return i;
-}
-
-static int cfs_get_current_gadget(struct usb_client *usb,
-                                    struct usb_gadget **_usb_gadget)
-{
-       struct cfs_client *cfs_client;
-       struct usb_gadget *usb_gadget;
-       struct usb_gadget_strings *strs;
-       struct usb_configuration **usb_configs;
-       struct usb_function **usb_funcs;
-       int n_funcs, n_configs;
-       int i;
-       int ret = -ENOMEM;
-
-       if (!usb)
-               return -EINVAL;
-
-       cfs_client = container_of(usb, struct cfs_client,
-                                 client);
-
-       usb_gadget = zalloc(sizeof(*usb_gadget));
-       if (!usb_gadget)
-               goto out;
-
-       /*
-        * Currently there is no interface in libusbg which
-        * allows to list all string languages.
-        * That's why we do this only for USA english
-        */
-       strs = calloc(2, sizeof(*strs));
-       if (!strs)
-               goto free_gadget;
-
-       strs[0].lang_code = LANG_US_ENG;
-
-       usb_gadget->strs = strs;
-
-       ret = cfs_read_gadget_attrs_strs(cfs_client->gadget, usb_gadget);
-       if (ret)
-               goto free_strs;
-
-
-       n_funcs = cfs_count_functions(cfs_client->gadget);
-       usb_funcs = calloc(n_funcs + 1, sizeof(*usb_funcs));
-       if (!usb_funcs)
-               goto free_strs_with_content;
-
-       usb_gadget->funcs = usb_funcs;
-
-       ret = cfs_read_funcs(cfs_client->gadget, usb_gadget);
-       if (ret)
-               goto free_funcs;
-
-       n_configs = cfs_count_configs(cfs_client->gadget);
-       usb_configs = calloc(n_configs + 1, sizeof(*usb_configs));
-       if (!usb_configs)
-               goto free_funcs_with_content;
-
-       usb_gadget->configs = usb_configs;
-
-       ret = cfs_read_configs(cfs_client->gadget, usb_gadget);
-       if (ret)
-               goto free_configs;
-
-       *_usb_gadget = usb_gadget;
-       return 0;
-
-free_configs:
-       free(usb_configs);
-free_funcs_with_content:
-       for (i = 0; usb_gadget->funcs[i]; ++i)
-               usb_gadget->funcs[i]->free_func(usb_gadget->funcs[i]);
-free_funcs:
-       free(usb_funcs);
-free_strs_with_content:
-       for (i = 0; usb_gadget->strs[i].lang_code; ++i) {
-               free(usb_gadget->strs[0].manufacturer);
-               free(usb_gadget->strs[0].product);
-               free(usb_gadget->strs[0].serial);
-       }
-free_strs:
-       free(usb_gadget->strs);
-free_gadget:
-       free(usb_gadget);
-out:
-       return ret;
-}
-
-static bool cfs_is_function_supported(struct usb_client *usb,
-                                        struct usb_function *func)
-{
-       bool res;
-       int ret;
-
-       switch (func->function_group) {
-       case USB_FUNCTION_GROUP_SIMPLE:
-               ret = usbg_lookup_function_type(func->name);
-               res = ret >= 0;
-               break;
-       case USB_FUNCTION_GROUP_WITH_SERVICE:
-               /* TODO: Check if socket is available */
-               res = true;
-               break;
-       default:
-               res = false;
-       }
-
-       return res;
-}
-
-static bool cfs_is_gadget_supported(struct usb_client *usb,
-                                      struct usb_gadget *gadget)
-{
-       int i, j;
-
-       if (!gadget || !gadget->configs || !gadget->funcs)
-               return false;
-
-       /*
-        * TODO
-        * Here is a good place to ensure that serial is immutable
-        */
-
-       /* No real restrictions for strings */
-       for (j = 0; gadget->configs && gadget->configs[j]; ++j) {
-               struct usb_configuration *config = gadget->configs[j];
-
-               if (!config->funcs)
-                       return false;
-
-               for (i = 0; config->funcs[i]; ++i)
-                       if (!cfs_is_function_supported(usb, config->funcs[i]))
-                               return false;
-       }
-
-       if (j == 0)
-               return false;
-
-       return true;
-}
-
-static int cfs_set_gadget_attrs(struct cfs_client *cfs_client,
-                               struct usb_gadget_attrs *attrs)
-{
-       int ret;
-       struct usbg_gadget_attrs gadget_attrs;
-
-       ret = usbg_get_gadget_attrs(cfs_client->gadget, &gadget_attrs);
-       if (ret)
-               return ret;
-
-       gadget_attrs.bDeviceClass = attrs->bDeviceClass;
-       gadget_attrs.bDeviceSubClass = attrs->bDeviceSubClass;
-       gadget_attrs.bDeviceProtocol = attrs->bDeviceProtocol;
-       gadget_attrs.idVendor = attrs->idVendor;
-       gadget_attrs.idProduct = attrs->idProduct;
-       gadget_attrs.bcdDevice = attrs->bcdDevice;
-
-       ret = usbg_set_gadget_attrs(cfs_client->gadget, &gadget_attrs);
-
-       return ret;
-}
-
-static int cfs_set_gadget_strs(struct cfs_client *cfs_client,
-                                 struct usb_gadget_strings *strs)
-{
-       int ret = 0;
-
-       /*
-        * TODO
-        * Here is a good place to ensure that serial is immutable
-        */
-#define SET_STR(FIELD, STR_ID)                         \
-       if (strs->FIELD) {                              \
-               ret = usbg_set_gadget_str(cfs_client->gadget,   \
-                                         STR_ID,               \
-                                         strs->lang_code,      \
-                                         strs->FIELD);         \
-               if (ret)                                        \
-                       return ret;                             \
-       }
-
-       SET_STR(manufacturer, USBG_STR_MANUFACTURER);
-       SET_STR(product, USBG_STR_PRODUCT);
-       SET_STR(serial, USBG_STR_SERIAL_NUMBER);
-#undef SET_STR
-       return ret;
-}
-
-#define SYSTEMD_DBUS_SERVICE "org.freedesktop.systemd1"
-#define SYSTEMD_DBUS_PATH "/org/freedesktop/systemd1"
-#define SYSTEMD_DBUS_MANAGER_IFACE "org.freedesktop.systemd1.Manager"
-
-#define SYSTEMD_SOCKET_SUFFIX ".socket"
-#define MAX_SOCKET_NAME 1024
-
-struct bus_ctx {
-       const char *unit;
-       sd_event *loop;
-};
-
-static int socket_started(sd_bus_message *m, void *userdata,
-                         sd_bus_error *ret_error)
-{
-       struct bus_ctx *ctx = userdata;
-       char *signal_unit;
-       int ret;
-
-       ret = sd_bus_message_read(m, "uoss", NULL, NULL, &signal_unit, NULL);
-       if (ret < 0) {
-               sd_event_exit(ctx->loop, ret);
-               return 0;
-       }
-
-       if (!strcmp(signal_unit, ctx->unit))
-               sd_event_exit(ctx->loop, 0);
-
-       return 0;
-}
-
-static int systemd_unit_interface_sync(const char *method, const char *unit,
-                                      bool wait)
-{
-       sd_bus *bus = NULL;
-       sd_event *loop = NULL;
-       struct bus_ctx ctx;
-       int ret;
-
-       ret = sd_bus_open_system(&bus);
-       if (ret < 0)
-               return ret;
-
-       if (wait) {
-               ret = sd_event_new(&loop);
-               if (ret < 0)
-                       goto unref_bus;
-
-               ctx.loop = loop;
-               ctx.unit = unit;
-
-               ret = sd_bus_attach_event(bus, loop, SD_EVENT_PRIORITY_NORMAL);
-               if (ret < 0)
-                       goto unref_loop;
-
-               ret = sd_bus_add_match(bus, NULL,
-                                      "type='signal',"
-                                      "sender='" SYSTEMD_DBUS_SERVICE "',"
-                                      "interface='" SYSTEMD_DBUS_MANAGER_IFACE "',"
-                                      "member='JobRemoved',"
-                                      "path_namespace='" SYSTEMD_DBUS_PATH "'",
-                                      socket_started,
-                                      &ctx);
-               if (ret < 0)
-                       goto unref_loop;
-       }
-
-
-       ret = sd_bus_call_method(bus,
-                       SYSTEMD_DBUS_SERVICE,
-                       SYSTEMD_DBUS_PATH,
-                       SYSTEMD_DBUS_MANAGER_IFACE,
-                       method,
-                       NULL,
-                       NULL,
-                       "ss",
-                       unit,
-                       "replace");
-       if (ret < 0)
-               goto unref_loop;
-
-       if (wait)
-               ret = sd_event_loop(loop);
-
-unref_loop:
-       if (wait)
-               sd_event_unref(loop);
-unref_bus:
-       sd_bus_unref(bus);
-       return ret;
-}
-
-static int systemd_start_socket(const char *socket_name)
-{
-       char unit[MAX_SOCKET_NAME];
-       int ret;
-
-       ret = snprintf(unit, sizeof(unit), "%s" SYSTEMD_SOCKET_SUFFIX,
-                      socket_name);
-       if (ret < 0 || ret >= sizeof(unit))
-               return -ENAMETOOLONG;
-
-
-       return systemd_unit_interface_sync("StartUnit", unit, true);
-}
-
-static int systemd_stop_socket(const char *socket_name)
-{
-       char unit[MAX_SOCKET_NAME];
-       int ret;
-
-       ret = snprintf(unit, sizeof(unit), "%s" SYSTEMD_SOCKET_SUFFIX,
-                      socket_name);
-       if (ret < 0 || ret >= sizeof(unit))
-               return -ENAMETOOLONG;
-
-       return systemd_unit_interface_sync("StopUnit", unit, false);
-}
-
-static int cfs_ensure_dir(char *path)
-{
-       int ret;
-
-       ret = mkdir(path, 0770);
-       if (ret < 0)
-               ret = errno == EEXIST ? 0 : errno;
-
-       return ret;
-}
-
-static int cfs_prep_ffs_service(const char *name, const char *instance,
-                               const char *dev_name, const char *socket_name)
-{
-       char buf[PATH_MAX];
-       size_t left;
-       char *pos;
-       int ret;
-
-       /* TODO: Add some good error handling */
-
-       left = sizeof(buf);
-       pos = buf;
-       ret = snprintf(pos, left, "%s", USB_FUNCS_PATH);
-       if (ret < 0 || ret >= left) {
-               return -ENAMETOOLONG;
-       } else {
-               left -= ret;
-               pos += ret;
-       }
-       ret = cfs_ensure_dir(buf);
-       if (ret < 0)
-               return ret;
-
-       ret = snprintf(pos, left, "/%s", name);
-       if (ret < 0 || ret >= left) {
-               return -ENAMETOOLONG;
-       } else {
-               left -= ret;
-               pos += ret;
-       }
-       ret = cfs_ensure_dir(buf);
-       if (ret < 0)
-               return ret;
-
-       ret = snprintf(pos, left, "/%s", instance);
-       if (ret < 0 || ret >= left) {
-               return -ENAMETOOLONG;
-       } else {
-               left -= ret;
-               pos += ret;
-       }
-       ret = cfs_ensure_dir(buf);
-       if (ret < 0)
-               return ret;
-
-       ret = mount(dev_name, buf, "functionfs", 0, NULL);
-       if (ret < 0)
-               return ret;
-
-       ret = systemd_start_socket(socket_name);
-       if (ret < 0)
-               goto umount_ffs;
-
-       return 0;
-umount_ffs:
-       umount(buf);
-       return ret;
-}
-
-static int cfs_set_gadget_config(struct cfs_client *cfs_client,
-                                   int config_id,
-                                   struct usb_configuration *usb_config)
-{
-       struct usbg_config_attrs cattrs = {
-               .bmAttributes = usb_config->attrs.bmAttributs,
-               .bMaxPower = usb_config->attrs.MaxPower/2,
-       };
-       usbg_config *config;
-       int i;
-       int ret;
-
-       if (!usb_config->funcs || !usb_config->funcs[0])
-               return -EINVAL;
-
-       config = usbg_get_config(cfs_client->gadget, config_id, NULL);
-       if (config) {
-               ret = usbg_rm_config(config, USBG_RM_RECURSE);
-               if (ret)
-                       return ret;
-       }
-
-       ret = usbg_create_config(cfs_client->gadget, config_id,
-                                CONFIGFS_CONFIG_LABEL, &cattrs, NULL, &config);
-       if (ret)
-               return ret;
-
-       for (i = 0; usb_config->strs && usb_config->strs[i].lang_code; ++i) {
-               ret = usbg_set_config_string(config, usb_config->strs[i].lang_code,
-                                            usb_config->strs[i].config_str);
-               if (ret)
-                       return ret;
-       }
-
-       for (i = 0; usb_config->funcs && usb_config->funcs[i]; ++i) {
-               struct usb_function *usb_func = usb_config->funcs[i];
-               char instance[MAX_INSTANCE_LEN];
-               int type;
-               usbg_function *func;
-
-               switch (usb_func->function_group) {
-               case USB_FUNCTION_GROUP_SIMPLE:
-                       type = usbg_lookup_function_type(usb_func->name);
-                       if (strlen(usb_func->instance) >= MAX_INSTANCE_LEN)
-                               return -ENAMETOOLONG;
-                       strcpy(instance, usb_func->instance);
-                       break;
-               case USB_FUNCTION_GROUP_WITH_SERVICE:
-                       type = USBG_F_FFS;
-                       ret = snprintf(instance, sizeof(instance), "%s%c%s",
-                                      usb_func->name, NAME_INSTANCE_SEP,
-                                      usb_func->instance);
-                       if (ret < 0 || ret >= sizeof(instance))
-                               return -ENAMETOOLONG;
-                       break;
-               default:
-                       return -EINVAL;
-               }
-
-
-               func = usbg_get_function(cfs_client->gadget, type, instance);
-               if (!func) {
-                       ret = usbg_create_function(cfs_client->gadget,
-                                                  type,
-                                                  instance,
-                                                  NULL, &func);
-                       if (ret)
-                               return ret;
-
-                       if (usb_func->function_group ==
-                           USB_FUNCTION_GROUP_WITH_SERVICE) {
-                               struct usb_function_with_service *fws;
-
-                               fws = container_of(usb_func,
-                                                  struct usb_function_with_service,
-                                                  func);
-                               ret = cfs_prep_ffs_service(usb_func->name,
-                                                          usb_func->instance,
-                                                          instance,
-                                                          fws->service);
-                               if (ret)
-                                       return ret;
-                       }
-
-               }
-
-               ret = usbg_add_config_function(config, NULL, func);
-               if (ret)
-                       return ret;
-       }
-
-       return ret;
-}
-
-static int cfs_cleanup_left_configs(struct cfs_client *cfs_client,
-                                   int last_config)
-{
-       usbg_config *lconfig, *config;
-       int ret;
-
-       lconfig = usbg_get_config(cfs_client->gadget, last_config, NULL);
-       for (config = usbg_get_next_config(lconfig);
-            config;
-            config = usbg_get_next_config(lconfig)) {
-               ret = usbg_rm_config(config, USBG_RM_RECURSE);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-
-static int cfs_reconfigure_gadget(struct usb_client *usb,
-                                 struct usb_gadget *gadget)
-{
-       struct cfs_client *cfs_client;
-       int i;
-       int ret;
-
-       if (!usb)
-               return -EINVAL;
-
-       cfs_client = container_of(usb, struct cfs_client,
-                                 client);
-
-       if (!usb || !gadget || !cfs_is_gadget_supported(usb, gadget))
-               return -EINVAL;
-
-       ret = cfs_set_gadget_attrs(cfs_client, &gadget->attrs);
-       if (ret)
-               goto out;
-
-       for (i = 0; gadget->strs && gadget->strs[i].lang_code > 0; ++i) {
-               ret = cfs_set_gadget_strs(cfs_client, gadget->strs + i);
-               if (ret)
-                       goto out;
-       }
-
-       for (i = 0; gadget->configs && gadget->configs[i]; ++i) {
-               ret = cfs_set_gadget_config(cfs_client, i + 1,
-                                           gadget->configs[i]);
-               if (ret)
-                       goto out;
-       }
-
-       ret = cfs_cleanup_left_configs(cfs_client, i);
-
-       /* TODO
-        * Cleanup things which are left after previous gadget
-        */
-out:
-       return ret;
-}
-
-static int cfs_enable(struct usb_client *usb)
-{
-       struct cfs_client *cfs_client;
-
-       if (!usb)
-               return -EINVAL;
-
-       cfs_client = container_of(usb, struct cfs_client,
-                                 client);
-
-       return usbg_enable_gadget(cfs_client->gadget, cfs_client->udc);
-}
-
-static int cfs_disable(struct usb_client *usb)
-{
-       struct cfs_client *cfs_client;
-
-       if (!usb)
-               return -EINVAL;
-
-       cfs_client = container_of(usb, struct cfs_client,
-                                 client);
-
-       return usbg_disable_gadget(cfs_client->gadget);
-}
-
-static int cfs_gadget_open(struct hw_info *info,
-               const char *id, struct hw_common **common)
-{
-       struct cfs_client *cfs_client;
-       int ret;
-
-       if (!info || !common)
-               return -EINVAL;
-
-       cfs_client = zalloc(sizeof(*cfs_client));
-       if (!cfs_client)
-               return -ENOMEM;
-
-       ret = usbg_init(CONFIGFS_PATH, &cfs_client->ctx);
-       if (ret)
-               goto err_usbg_init;
-
-       cfs_client->udc = usbg_get_first_udc(cfs_client->ctx);
-       if (!cfs_client->udc) {
-               ret = -ENODEV;
-               goto err_no_udc;
-       }
-
-       ret = usbg_create_gadget(cfs_client->ctx, CONFIGFS_GADGET_NAME,
-                                &default_g_attrs, &default_g_strs,
-                                &cfs_client->gadget);
-       if (ret)
-               goto err_create_gadget;
-
-       cfs_client->client.common.info = info;
-       cfs_client->client.get_current_gadget = cfs_get_current_gadget;
-       cfs_client->client.reconfigure_gadget = cfs_reconfigure_gadget;
-       cfs_client->client.is_gadget_supported = cfs_is_gadget_supported;
-       cfs_client->client.is_function_supported = cfs_is_function_supported;
-       cfs_client->client.enable = cfs_enable;
-       cfs_client->client.disable = cfs_disable;
-       cfs_client->client.free_gadget = cfs_free_gadget;
-
-       *common = &cfs_client->client.common;
-       return 0;
-
-err_create_gadget:
-err_no_udc:
-       usbg_cleanup(cfs_client->ctx);
-err_usbg_init:
-       free(cfs_client);
-
-       return ret;
-}
-
-static int cfs_gadget_close(struct hw_common *common)
-{
-       struct cfs_client *cfs_client;
-
-       if (!common)
-               return -EINVAL;
-
-       cfs_client = container_of(common, struct cfs_client,
-                                 client.common);
-
-       /*
-        * For now we don't check for errors
-        * but we should somehow handle them
-        */
-       usbg_rm_gadget(cfs_client->gadget, USBG_RM_RECURSE);
-       usbg_cleanup(cfs_client->ctx);
-       free(cfs_client);
-
-       return 0;
-}
-
-HARDWARE_MODULE_STRUCTURE = {
-       .magic = HARDWARE_INFO_TAG,
-       .hal_version = HARDWARE_INFO_VERSION,
-       .device_version = USB_CLIENT_HARDWARE_DEVICE_VERSION,
-       .id = USB_CLIENT_HARDWARE_DEVICE_ID,
-       .name = "cfs-gadget",
-       .open = cfs_gadget_open,
-       .close = cfs_gadget_close,
-};
index c87dedb8588a5d314fce1b9845571803d117fb4b..8a6550720c8dd5fcd0185da719aeb668a9a6d62c 100644 (file)
@@ -13,6 +13,7 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(hwcommon)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libusbgx)
 
 %description
 Device manager plugin for ODROID development board.