diff options
author | Paweł Szewczyk <p.szewczyk@samsung.com> | 2018-06-28 12:58:23 +0200 |
---|---|---|
committer | Paweł Szewczyk <p.szewczyk@samsung.com> | 2018-06-28 13:11:40 +0200 |
commit | 1f4cfca92c372350baea186ad3a753f674597ee6 (patch) | |
tree | 18ea6bae1ee71a71bbe6759c816c2fb5738244cc | |
parent | 963911e53cfc6883e0087b24703e0e858754cc6a (diff) | |
download | device-manager-plugin-artik-1f4cfca92c372350baea186ad3a753f674597ee6.tar.gz device-manager-plugin-artik-1f4cfca92c372350baea186ad3a753f674597ee6.tar.bz2 device-manager-plugin-artik-1f4cfca92c372350baea186ad3a753f674597ee6.zip |
Move shared files to hwcommon package
Change-Id: Ieafe89155a1a4b54bb5368fae9b8aef24f96a248
Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>
-rwxr-xr-x | hw/battery/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | hw/battery/battery.c | 2 | ||||
-rwxr-xr-x | hw/display/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | hw/display/display.c | 2 | ||||
-rwxr-xr-x | hw/external_connection/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | hw/external_connection/external_connection.c | 2 | ||||
-rw-r--r-- | hw/led/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | hw/led/led.c | 2 | ||||
-rwxr-xr-x | hw/shared.c | 129 | ||||
-rwxr-xr-x | hw/shared.h | 43 | ||||
-rwxr-xr-x | hw/touchscreen/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | hw/touchscreen/touchscreen.c | 2 | ||||
-rwxr-xr-x | hw/udev.c | 2 | ||||
-rw-r--r-- | hw/usb_cfs_client/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/usb_cfs_client/usb_cfs_client.c | 3 | ||||
-rw-r--r-- | hw/usb_client/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/usb_client/usb_client.c | 3 | ||||
-rw-r--r-- | hw/usb_gadget/CMakeLists.txt | 2 |
18 files changed, 16 insertions, 190 deletions
diff --git a/hw/battery/CMakeLists.txt b/hw/battery/CMakeLists.txt index 48ef1aa..820c168 100755 --- a/hw/battery/CMakeLists.txt +++ b/hw/battery/CMakeLists.txt @@ -13,7 +13,7 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE battery.c ../shared.c ../udev.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE battery.c ../udev.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${battery_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/battery/battery.c b/hw/battery/battery.c index 076a542..f16da48 100755 --- a/hw/battery/battery.c +++ b/hw/battery/battery.c @@ -25,7 +25,7 @@ #include <dirent.h> #include <hw/battery.h> -#include "../shared.h" +#include <hw/shared.h> #include "../udev.h" #define BATTERY_ROOT_PATH "/sys/class/power_supply" diff --git a/hw/display/CMakeLists.txt b/hw/display/CMakeLists.txt index ebccfbe..08c293d 100755 --- a/hw/display/CMakeLists.txt +++ b/hw/display/CMakeLists.txt @@ -13,7 +13,7 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE display.c ../shared.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE display.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${display_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/display/display.c b/hw/display/display.c index a38ebd0..2d60b4b 100755 --- a/hw/display/display.c +++ b/hw/display/display.c @@ -24,7 +24,7 @@ #include <linux/limits.h> #include <hw/display.h> -#include "../shared.h" +#include <hw/shared.h> #ifndef BACKLIGHT_PATH //#define BACKLIGHT_PATH "/sys/class/backlight/s6e36w1x01-bl" diff --git a/hw/external_connection/CMakeLists.txt b/hw/external_connection/CMakeLists.txt index e700a2f..b1f2f83 100755 --- a/hw/external_connection/CMakeLists.txt +++ b/hw/external_connection/CMakeLists.txt @@ -13,7 +13,7 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE external_connection.c ../shared.c ../udev.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE external_connection.c ../udev.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${external_connection_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/external_connection/external_connection.c b/hw/external_connection/external_connection.c index 0a94629..f49083b 100755 --- a/hw/external_connection/external_connection.c +++ b/hw/external_connection/external_connection.c @@ -25,7 +25,7 @@ #include <dirent.h> #include <hw/external_connection.h> -#include "../shared.h" +#include <hw/shared.h> #include "../udev.h" #define SWITCH_ROOT_PATH "/sys/devices/virtual/switch" diff --git a/hw/led/CMakeLists.txt b/hw/led/CMakeLists.txt index 6acfd7b..dfe38d5 100644 --- a/hw/led/CMakeLists.txt +++ b/hw/led/CMakeLists.txt @@ -13,7 +13,7 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE led.c ../shared.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE led.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${led_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") diff --git a/hw/led/led.c b/hw/led/led.c index 130a8e7..3ff670f 100755 --- a/hw/led/led.c +++ b/hw/led/led.c @@ -21,7 +21,7 @@ #include <glib.h> #include <hw/led.h> -#include "../shared.h" +#include <hw/shared.h> #include <peripheral_io.h> diff --git a/hw/shared.c b/hw/shared.c deleted file mode 100755 index b6401c1..0000000 --- a/hw/shared.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * device-node - * - * Copyright (c) 2015 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 <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <errno.h> - -#define BUF_MAX 255 - -static int sys_read_buf(char *file, char *buf, int len) -{ - int fd, r; - - if (!file || !buf || len < 0) - return -EINVAL; - - fd = open(file, O_RDONLY); - if (fd == -1) - return -ENOENT; - - r = read(fd, buf, len); - close(fd); - if ((r >= 0) && (r < len)) - buf[r] = '\0'; - else - return -EIO; - - return 0; -} - -static int sys_write_buf(char *file, char *buf) -{ - int fd, r; - - if (!file || !buf) - return -EINVAL; - - fd = open(file, O_WRONLY); - if (fd == -1) - return -EPERM; - - r = write(fd, buf, strlen(buf)); - close(fd); - if (r < 0) - return -EIO; - - return 0; -} - -int sys_get_int(char *fname, int *val) -{ - char buf[BUF_MAX]; - int r; - - if (!fname || !val) - return -EINVAL; - - r = sys_read_buf(fname, buf, sizeof(buf)); - if (r < 0) - return r; - - *val = atoi(buf); - return 0; -} - -int sys_get_str(char *fname, char *str, int len) -{ - int r; - - if (!fname || !str || len < 0) - return -EINVAL; - - r = sys_read_buf(fname, str, len); - if (r < 0) - return r; - - return 0; -} - -int sys_set_int(char *fname, int val) -{ - char buf[BUF_MAX]; - int r; - - if (!fname) - return -EINVAL; - - snprintf(buf, sizeof(buf), "%d", val); - r = sys_write_buf(fname, buf); - if (r < 0) - return r; - - return 0; -} - -int sys_set_str(char *fname, char *val) -{ - int r; - - if (!fname || !val) - return -EINVAL; - - r = sys_write_buf(fname, val); - if (r < 0) - return r; - - return 0; -} diff --git a/hw/shared.h b/hw/shared.h deleted file mode 100755 index da51ca4..0000000 --- a/hw/shared.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * libdevice-node - * - * Copyright (c) 2015 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. - */ - - -#ifndef __HW_DEFAULT_SHARED_H__ -#define __HW_DEFAULT_SHARED_H__ - -#define FEATURE_HARDWARE_DLOG -#ifdef FEATURE_HARDWARE_DLOG -#define LOG_TAG "HARDWARE" -#include <dlog.h> -#define _I(fmt, args...) SLOGI(fmt, ##args) -#define _D(fmt, args...) SLOGD(fmt, ##args) -#define _E(fmt, args...) SLOGE(fmt, ##args) -#else -#define _I(x, ...) do { } while (0) -#define _D(x, ...) do { } while (0) -#define _E(x, ...) do { } while (0) -#endif - -#define ARRAY_SIZE(name) (sizeof(name)/sizeof(name[0])) - -int sys_get_int(char *fname, int *val); -int sys_get_str(char *fname, char *str, int len); -int sys_set_int(char *fname, int val); -int sys_set_str(char *fname, char *val); - -#endif diff --git a/hw/touchscreen/CMakeLists.txt b/hw/touchscreen/CMakeLists.txt index b097615..f364805 100755 --- a/hw/touchscreen/CMakeLists.txt +++ b/hw/touchscreen/CMakeLists.txt @@ -13,7 +13,7 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE touchscreen.c ../shared.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE touchscreen.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${touchscreen_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/touchscreen/touchscreen.c b/hw/touchscreen/touchscreen.c index fe3c97e..5fe1cc6 100755 --- a/hw/touchscreen/touchscreen.c +++ b/hw/touchscreen/touchscreen.c @@ -25,7 +25,7 @@ #include <dirent.h> #include <hw/touchscreen.h> -#include "../shared.h" +#include <hw/shared.h> #define INPUT_PATH "/sys/class/input/" #define KEY_CAPABILITIES_PATH "/device/capabilities/key" @@ -23,7 +23,7 @@ #include <libudev.h> #include <glib.h> #include <string.h> -#include "shared.h" +#include <hw/shared.h> #include "udev.h" #define EVENT_KERNEL "kernel" diff --git a/hw/usb_cfs_client/CMakeLists.txt b/hw/usb_cfs_client/CMakeLists.txt index fefe1dc..70b054d 100644 --- a/hw/usb_cfs_client/CMakeLists.txt +++ b/hw/usb_cfs_client/CMakeLists.txt @@ -13,7 +13,7 @@ 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) +ADD_LIBRARY(${PROJECT_NAME} MODULE usb_cfs_client.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 index 28b10a0..f77f8be 100644 --- a/hw/usb_cfs_client/usb_cfs_client.c +++ b/hw/usb_cfs_client/usb_cfs_client.c @@ -18,8 +18,7 @@ #include <hw/usb_client.h> #include <hw/systemd.h> - -#include "../shared.h" +#include <hw/shared.h> #include <limits.h> #include <stdio.h> diff --git a/hw/usb_client/CMakeLists.txt b/hw/usb_client/CMakeLists.txt index 8494082..28bab08 100644 --- a/hw/usb_client/CMakeLists.txt +++ b/hw/usb_client/CMakeLists.txt @@ -13,7 +13,7 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE usb_client.c ../shared.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE usb_client.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${usb_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_client/usb_client.c b/hw/usb_client/usb_client.c index 2857c33..6f4b6d1 100644 --- a/hw/usb_client/usb_client.c +++ b/hw/usb_client/usb_client.c @@ -18,8 +18,7 @@ #include <hw/usb_client.h> #include <hw/systemd.h> - -#include "../shared.h" +#include <hw/shared.h> #include <limits.h> #include <stdio.h> diff --git a/hw/usb_gadget/CMakeLists.txt b/hw/usb_gadget/CMakeLists.txt index 2e28b15..039baa4 100644 --- a/hw/usb_gadget/CMakeLists.txt +++ b/hw/usb_gadget/CMakeLists.txt @@ -13,7 +13,7 @@ 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 ../shared.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE usb_gadget.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${usb_gadget_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) |