summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunmi Ha <yunmi.ha@samsung.com>2021-01-19 15:11:15 +0900
committerYunmi Ha <yunmi.ha@samsung.com>2021-01-19 15:49:43 +0900
commit887920a5feb7bfb28000216c4adb619a86fdb9ca (patch)
tree4f0fa37776766dda775d0bcd0cb46890113a2e05
parent035a2922c8dfcd90867cf928465a4cb27a33f0ff (diff)
downloaddevice-manager-plugin-artik-887920a5feb7bfb28000216c4adb619a86fdb9ca.tar.gz
device-manager-plugin-artik-887920a5feb7bfb28000216c4adb619a86fdb9ca.tar.bz2
device-manager-plugin-artik-887920a5feb7bfb28000216c4adb619a86fdb9ca.zip
Use file library of libsyscommon
Change-Id: I48c998553b56c8ee70886b40c88afa7c26850aeb Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>
-rw-r--r--hw/common/common.h111
-rw-r--r--hw/display/display.c2
-rw-r--r--hw/touchscreen/touchscreen.c2
3 files changed, 5 insertions, 110 deletions
diff --git a/hw/common/common.h b/hw/common/common.h
index 6f56601..37ce972 100644
--- a/hw/common/common.h
+++ b/hw/common/common.h
@@ -17,13 +17,6 @@
#ifndef __HAL_BACKEND_COMMON_H__
#define __HAL_BACKEND_COMMON_H__
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
#ifdef FEATURE_DLOG
#define LOG_TAG "HAL_BACKEND_DEVICE"
#include <dlog.h>
@@ -42,106 +35,4 @@
#define ARRAY_SIZE(name) (sizeof(name)/sizeof(name[0]))
-#define SHARED_H_BUF_MAX 255
-
-static inline 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 inline 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;
-}
-
-static inline int sys_get_int(char *fname, int *val)
-{
- char buf[SHARED_H_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;
-}
-
-static inline 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;
-}
-
-static inline int sys_set_int(char *fname, int val)
-{
- char buf[SHARED_H_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;
-}
-
-static inline 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;
-}
-
-#endif /* __HAL_BACKEND_COMMON_H__ */ \ No newline at end of file
+#endif /* __HAL_BACKEND_COMMON_H__ */
diff --git a/hw/display/display.c b/hw/display/display.c
index 7796867..75ec356 100644
--- a/hw/display/display.c
+++ b/hw/display/display.c
@@ -25,6 +25,8 @@
#include <hal/device/hal-display-interface.h>
#include <hal/hal-common-interface.h>
+#include <libsyscommon/file.h>
+
#include "common.h"
#ifndef BACKLIGHT_PATH
diff --git a/hw/touchscreen/touchscreen.c b/hw/touchscreen/touchscreen.c
index a69e260..4f2d97a 100644
--- a/hw/touchscreen/touchscreen.c
+++ b/hw/touchscreen/touchscreen.c
@@ -26,6 +26,8 @@
#include <hal/device/hal-touchscreen-interface.h>
#include <hal/hal-common-interface.h>
+#include <libsyscommon/file.h>
+
#include "common.h"
#define INPUT_PATH "/sys/class/input/"