summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Szewczyk <p.szewczyk@samsung.com>2018-06-28 15:19:07 +0200
committerPaweł Szewczyk <p.szewczyk@samsung.com>2018-06-28 15:19:07 +0200
commitc6cb9580dcef097da8d5e68bfae06d79dc985ea4 (patch)
tree19bab3df3759ac1951344c852414d650b04acc36
parent4f733c9d09ab6cfb49debf2484bb25c03544084b (diff)
downloaddevice-manager-plugin-emul-c6cb9580dcef097da8d5e68bfae06d79dc985ea4.tar.gz
device-manager-plugin-emul-c6cb9580dcef097da8d5e68bfae06d79dc985ea4.tar.bz2
device-manager-plugin-emul-c6cb9580dcef097da8d5e68bfae06d79dc985ea4.zip
Change-Id: I448ad19aa235603b3b3eb3a027cc022f3ea12d98 Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>
-rw-r--r--hw/battery/CMakeLists.txt2
-rw-r--r--hw/battery/battery.c2
-rw-r--r--hw/dbus.c2
-rw-r--r--hw/display/CMakeLists.txt2
-rw-r--r--hw/display/display.c2
-rw-r--r--hw/external_connection/CMakeLists.txt2
-rw-r--r--hw/external_connection/external_connection.c2
-rw-r--r--hw/shared.c129
-rw-r--r--hw/shared.h43
-rw-r--r--hw/usb_client/CMakeLists.txt2
-rw-r--r--hw/usb_gadget/CMakeLists.txt2
11 files changed, 9 insertions, 181 deletions
diff --git a/hw/battery/CMakeLists.txt b/hw/battery/CMakeLists.txt
index 4a67cde..5d68e4b 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 ../dbus.c)
+ADD_LIBRARY(${PROJECT_NAME} MODULE battery.c ../dbus.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 583a5c3..86923ee 100644
--- 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 "../dbus.h"
#define BATTERY_BUS "org.tizen.system.deviced"
diff --git a/hw/dbus.c b/hw/dbus.c
index ca14f3f..82fbc97 100644
--- a/hw/dbus.c
+++ b/hw/dbus.c
@@ -17,7 +17,7 @@
*/
#include "dbus.h"
-#include "shared.h"
+#include <hw/shared.h>
int register_dbus_signal(const char *object,
const char *iface, const char *signal,
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 0cd242c..71e7260 100644
--- 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/emulator"
diff --git a/hw/external_connection/CMakeLists.txt b/hw/external_connection/CMakeLists.txt
index 913ceb4..8c03f5b 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 ../dbus.c)
+ADD_LIBRARY(${PROJECT_NAME} MODULE external_connection.c ../dbus.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 741cc77..f1106ac 100644
--- a/hw/external_connection/external_connection.c
+++ b/hw/external_connection/external_connection.c
@@ -26,7 +26,7 @@
#include <dirent.h>
#include <hw/external_connection.h>
-#include "../shared.h"
+#include <hw/shared.h>
#include "../dbus.h"
#define EXTCON_BUS "org.tizen.system.deviced"
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 <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 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 <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/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_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)