usb-gadget: remove usb-gadget and add configuration file

The actual operation of usb-gadget is not hal dependent anymore.
Instead, deviced is now in charge of running usb-gadget.
The hal backend has changed to provide only target specific usb-gadget configurations.
If there is no target specific configuration, deviced runs usb-gadget
with default configurations.

Change-Id: I178544240994750c3bdd987893218b934c691c57
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67315e61610e0f33af3adc59fdc800a51e7e335e..e96d4726b0aefe273029d1ee8a9afadc6f3820ac 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,6 @@ ADD_SUBDIRECTORY(hw/board)
 ADD_SUBDIRECTORY(hw/display)
 ADD_SUBDIRECTORY(hw/led)
 ADD_SUBDIRECTORY(hw/touchscreen)
-ADD_SUBDIRECTORY(hw/usb_gadget)
 ADD_SUBDIRECTORY(hw/thermal)
 ADD_SUBDIRECTORY(hw/haptic)
 ADD_SUBDIRECTORY(hw/memory)

diff --git a/conf/usb-gadget.conf b/conf/usb-gadget.conf
new file mode 100644 (file)
index 0000000..d2abda4
--- /dev/null
+++ b/conf/usb-gadget.conf
@@ -0,0 +1,18 @@
+#[SystemdUnit]
+#Service=diag.service
+#RemainAfterDisable=yes
+#
+#[Attribute]
+#Function=diag|rmnet
+#idVendor=0x05c6
+#idProduct=0x901d
+#
+#[Attribute]
+#Function=acm|diag
+#idVendor=0x05c6
+#idProduct=0x901d
+#
+#[Attribute]
+#Function=diag
+#idVendor=0x05c6
+#idProduct=0x901d

diff --git a/hw/usb_gadget/CMakeLists.txt b/hw/usb_gadget/CMakeLists.txt
deleted file mode 100644 (file)
index c744e99..0000000
--- a/hw/usb_gadget/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(hal-backend-device-usb-gadget C)
-
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(hal-backend-device-usb-gadget_pkgs REQUIRED hal-backend-device-common hal-backend-device-common)
-
-FOREACH(flag ${hal-backend-device-usb-gadget_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_gadget.c)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-usb-gadget_pkgs_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries)

diff --git a/hw/usb_gadget/usb_gadget.c b/hw/usb_gadget/usb_gadget.c
deleted file mode 100644 (file)
index 8821a1a..0000000
--- a/hw/usb_gadget/usb_gadget.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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 <errno.h>
-#include <stdlib.h>
-
-#include <hal/hal-common-interface.h>
-#include <hal/device/hal-usb_gadget-interface.h>
-
-#include </hal/include/device/hal-backend-common-usb_gadget.h>
-#include </hal/include/device/hal-backend-common.h>
-
-static int usb_gadget_init(void **data)
-{
-       hal_backend_usb_gadget_funcs *usb_gadget_funcs;
-
-       if (!data)
-               return -EINVAL;
-
-       usb_gadget_funcs = calloc(1, sizeof(hal_backend_usb_gadget_funcs));
-       if (!usb_gadget_funcs)
-               return -ENOMEM;
-
-       // usb_gadget_translator
-       if (simple_translator_open(usb_gadget_funcs)) {
-               _E("No USB gadget translator");
-               goto error_translator_open;
-       }
-
-       // usb_client
-       if (hw_cfs_gadget_open(usb_gadget_funcs)) {
-               _I("No USB client");
-               goto error_gadget_open;
-       }
-
-       *data = (void *)usb_gadget_funcs;
-
-       return 0;
-
-error_gadget_open:
-       simple_translator_close(usb_gadget_funcs);
-
-error_translator_open:
-       free(usb_gadget_funcs);
-
-       return -ENODEV;
-}
-
-static int usb_gadget_exit(void *data)
-{
-       hal_backend_usb_gadget_funcs *usb_gadget_funcs = (hal_backend_usb_gadget_funcs *)data;
-
-       if (usb_gadget_funcs) {
-               hw_cfs_gadget_close(usb_gadget_funcs);
-               simple_translator_close(usb_gadget_funcs);
-               free(usb_gadget_funcs);
-       }
-
-       return 0;
-}
-
-hal_backend EXPORT hal_backend_device_usb_gadget_data = {
-       .name = "usb_gadget",
-       .vendor = "ARTIK",
-       .abi_version = HAL_ABI_VERSION_TIZEN_6_5,
-       .init = usb_gadget_init,
-       .exit = usb_gadget_exit,
-};

diff --git a/packaging/hal-backend-device-artik.spec b/packaging/hal-backend-device-artik.spec
index a99528b1127a430f74d584d3af35c5f89e2175a3..80e7b2f66b1ac6448ff61a455887748f90f1c719 100644 (file)
--- a/packaging/hal-backend-device-artik.spec
+++ b/packaging/hal-backend-device-artik.spec
@@ -34,6 +34,9 @@ make %{?jobs:-j%jobs}
 %install
 %make_install
 
+# install conf files
+mkdir -p %{buildroot}%{_hal_sysconfdir}/deviced
+install -m 644 conf/*.conf %{buildroot}%{_hal_sysconfdir}/deviced
 
 %post
 /sbin/ldconfig
@@ -42,6 +45,7 @@ make %{?jobs:-j%jobs}
 /sbin/ldconfig
 
 %files
-%{_hal_libdir}/*.so*
 %manifest %{name}.manifest
 %{_hal_licensedir}/%{name}/LICENSE
+%{_hal_libdir}/*.so*
+%{_hal_sysconfdir}/deviced/*