From c7ebaabc00052b1f33cb955e9a4d08ed7eb56ffa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Szewczyk?= Date: Thu, 28 Jun 2018 14:04:56 +0200 Subject: [PATCH] Move shared files to hwcommon package MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I110a8ccd4241b84f7d14889770958cb704534c5f Signed-off-by: Paweł Szewczyk --- hw/battery/CMakeLists.txt | 2 +- hw/battery/battery.c | 2 +- hw/cpu/CMakeLists.txt | 2 +- hw/cpu/cpu.c | 2 +- hw/display/CMakeLists.txt | 2 +- hw/display/display.c | 2 +- hw/external_connection/CMakeLists.txt | 2 +- hw/external_connection/external_connection.c | 2 +- hw/ir/CMakeLists.txt | 2 +- hw/ir/ir.c | 2 +- hw/led/CMakeLists.txt | 2 +- hw/led/led.c | 2 +- hw/shared.c | 129 --------------------------- hw/shared.h | 43 --------- hw/thermal/CMakeLists.txt | 2 +- hw/thermal/thermal.c | 2 +- hw/touchscreen/CMakeLists.txt | 2 +- hw/touchscreen/touchscreen.c | 2 +- hw/udev.c | 2 +- hw/usb_client/CMakeLists.txt | 2 +- hw/usb_client/usb_client.c | 3 +- hw/usb_gadget/CMakeLists.txt | 2 +- 22 files changed, 20 insertions(+), 193 deletions(-) delete mode 100644 hw/shared.c delete mode 100644 hw/shared.h diff --git a/hw/battery/CMakeLists.txt b/hw/battery/CMakeLists.txt index 48ef1aa..820c168 100644 --- 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 75f79ac..8be3580 100755 --- a/hw/battery/battery.c +++ b/hw/battery/battery.c @@ -25,7 +25,7 @@ #include #include -#include "../shared.h" +#include #include "../udev.h" #define BATTERY_ROOT_PATH "/sys/class/power_supply" diff --git a/hw/cpu/CMakeLists.txt b/hw/cpu/CMakeLists.txt index de64784..5d80083 100644 --- a/hw/cpu/CMakeLists.txt +++ b/hw/cpu/CMakeLists.txt @@ -11,6 +11,6 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE cpu.c ../shared.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE cpu.c) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/cpu/cpu.c b/hw/cpu/cpu.c index 6ad5bdc..d98117e 100644 --- a/hw/cpu/cpu.c +++ b/hw/cpu/cpu.c @@ -29,7 +29,7 @@ #include #include -#include "../shared.h" +#include #define CPU_BOOST_SOCKET_FOR_SCENARIO "/dev/socket/scenario_info" #define BUF_MAX 128 diff --git a/hw/display/CMakeLists.txt b/hw/display/CMakeLists.txt index ebccfbe..08c293d 100644 --- 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 3b13a34..2a85da7 100755 --- a/hw/display/display.c +++ b/hw/display/display.c @@ -24,7 +24,7 @@ #include #include -#include "../shared.h" +#include #ifndef BACKLIGHT_PATH #define BACKLIGHT_PATH "/sys/class/backlight/panel" diff --git a/hw/external_connection/CMakeLists.txt b/hw/external_connection/CMakeLists.txt index e700a2f..b1f2f83 100644 --- 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 aa4f7da..24c7f1f 100644 --- a/hw/external_connection/external_connection.c +++ b/hw/external_connection/external_connection.c @@ -25,7 +25,7 @@ #include #include -#include "../shared.h" +#include #include "../udev.h" #define SWITCH_ROOT_PATH "/sys/devices/virtual/switch" diff --git a/hw/ir/CMakeLists.txt b/hw/ir/CMakeLists.txt index ab104e7..a50cc82 100644 --- a/hw/ir/CMakeLists.txt +++ b/hw/ir/CMakeLists.txt @@ -11,6 +11,6 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -ADD_LIBRARY(${PROJECT_NAME} MODULE ir.c ../shared.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE ir.c) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/ir/ir.c b/hw/ir/ir.c index 82a36f7..57b66c5 100644 --- a/hw/ir/ir.c +++ b/hw/ir/ir.c @@ -26,7 +26,7 @@ #include #include -#include "../shared.h" +#include #define IRLED_CONTROL_PATH "/sys/class/sec/sec_ir/ir_send" diff --git a/hw/led/CMakeLists.txt b/hw/led/CMakeLists.txt index 017ddc6..4604c29 100644 --- a/hw/led/CMakeLists.txt +++ b/hw/led/CMakeLists.txt @@ -11,6 +11,6 @@ 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) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/led/led.c b/hw/led/led.c index 4729f44..c075cbd 100644 --- a/hw/led/led.c +++ b/hw/led/led.c @@ -24,7 +24,7 @@ #include #include -#include "../shared.h" +#include #ifndef CAMERA_BACK_PATH #define CAMERA_BACK_PATH "/sys/class/leds/torch-sec1" diff --git a/hw/shared.c b/hw/shared.c deleted file mode 100644 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 -#include -#include -#include -#include -#include -#include -#include - -#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 100644 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 -#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/thermal/CMakeLists.txt b/hw/thermal/CMakeLists.txt index 352f375..1aa2e45 100644 --- a/hw/thermal/CMakeLists.txt +++ b/hw/thermal/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 thermal.c ../shared.c ../udev.c) +ADD_LIBRARY(${PROJECT_NAME} MODULE thermal.c ../udev.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${thermal_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/hw COMPONENT RuntimeLibraries) diff --git a/hw/thermal/thermal.c b/hw/thermal/thermal.c index eacd8ed..c423668 100644 --- a/hw/thermal/thermal.c +++ b/hw/thermal/thermal.c @@ -24,7 +24,7 @@ #include #include -#include "../shared.h" +#include #define THERMAL_PATH "/sys/class/sec/temperature/ap_therm" diff --git a/hw/touchscreen/CMakeLists.txt b/hw/touchscreen/CMakeLists.txt index b097615..f364805 100644 --- 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 b9e2e12..e384d34 100644 --- a/hw/touchscreen/touchscreen.c +++ b/hw/touchscreen/touchscreen.c @@ -25,7 +25,7 @@ #include #include -#include "../shared.h" +#include #define INPUT_PATH "/sys/class/input/" #define KEY_CAPABILITIES_PATH "/device/capabilities/key" diff --git a/hw/udev.c b/hw/udev.c index 1f64b08..e0c0d13 100644 --- a/hw/udev.c +++ b/hw/udev.c @@ -23,7 +23,7 @@ #include #include #include -#include "shared.h" +#include #include "udev.h" #define EVENT_KERNEL "kernel" diff --git a/hw/usb_client/CMakeLists.txt b/hw/usb_client/CMakeLists.txt index f7b32c1..32183ab 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 232381b..aa92cdd 100755 --- a/hw/usb_client/usb_client.c +++ b/hw/usb_client/usb_client.c @@ -17,8 +17,7 @@ */ #include - -#include "../shared.h" +#include #include #include 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) -- 2.7.4