解耦SLEEP和LPM,LPM在具体API实现,优化GPIOAPI,优化sleep头文件
Change-Id: I7b737054080cb31bf99b6810296fdc40aac925df
diff --git a/mbtk/libmbtk_lib/Makefile b/mbtk/libmbtk_lib/Makefile
index 450bc10..f067400 100755
--- a/mbtk/libmbtk_lib/Makefile
+++ b/mbtk/libmbtk_lib/Makefile
@@ -141,6 +141,7 @@
# sleep
LOCAL_SRC_FILES += \
sleep/mbtk_sleep.c
+
#wifi
LOCAL_SRC_FILES += \
wifi/sta_cli.c \
diff --git a/mbtk/libmbtk_lib/common/mbtk_gpio.c b/mbtk/libmbtk_lib/common/mbtk_gpio.c
index 40106f3..ea45359 100755
--- a/mbtk/libmbtk_lib/common/mbtk_gpio.c
+++ b/mbtk/libmbtk_lib/common/mbtk_gpio.c
@@ -12,7 +12,7 @@
#include "mbtk_gpio.h"
-static int gpio_export(int gpio)
+int gpio_export(int gpio)
{
int fd = -1;
char buffer[50];
@@ -44,7 +44,7 @@
return 0;
}
-static int gpio_unexport(int gpio)
+int gpio_unexport(int gpio)
{
int fd = -1;
char buffer[50];
@@ -268,30 +268,26 @@
int gpio_value_get(int gpio)
{
char buffer[50];
- char path[10];
- int file =-1;
- int result =-1;
- int value;
+ int fd =-1;
- memset(path,0,50);
- memset(buffer,0,10);
- sprintf(path,"/sys/class/gpio/gpio%d/value", gpio);
- file = open(path,O_RDONLY);
- if(file == -1)
+ memset(buffer, 0, sizeof(buffer));
+ sprintf(buffer, "/sys/class/gpio/gpio%d/value", gpio);
+ fd = open(buffer, O_RDONLY);
+ if(fd == -1)
{
LOGE("Open gpio[%d] fail.", gpio);
return -1;
}
- result = read(file,buffer,5);
- if(result <= 0)
+
+ if(read(fd, buffer, sizeof(buffer)) <= 0)
{
LOGE("Get gpio[%d] value fail", gpio);
- close(file);
+ close(fd);
return -1;
}
- close(file);
- value = atoi(buffer);
- return value;
+
+ close(fd);
+ return atoi(buffer);
}
int gpio_value_set(int gpio, int value)
diff --git a/mbtk/libmbtk_lib/sleep/mbtk_sleep.c b/mbtk/libmbtk_lib/sleep/mbtk_sleep.c
index 6021b42..c2b8be0 100755
--- a/mbtk/libmbtk_lib/sleep/mbtk_sleep.c
+++ b/mbtk/libmbtk_lib/sleep/mbtk_sleep.c
@@ -1,32 +1,8 @@
#include "mbtk_sleep.h"
#include "mbtk_log.h"
-static int sleep_epoll_deregister(int epoll_fd,int fd )
-{
- int ret;
- do {
- ret = epoll_ctl( epoll_fd, EPOLL_CTL_DEL, fd, NULL );
- } while (ret < 0 && errno == EINTR);
- return ret;
-}
+static mbtk_lock_name_s mbtk_lock_name[LOCK_MAX_SIZE]={0};
-static int sleep_epoll_register(int epoll_fd, int fd)
-{
- struct epoll_event ev;
- int ret, flags;
-
- /* important: make the fd non-blocking */
- flags = fcntl(fd, F_GETFL);
- fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-
- ev.events = EPOLLIN;
- ev.data.fd = fd;
- do {
- ret = epoll_ctl( epoll_fd, EPOLL_CTL_ADD, fd, &ev );
- } while (ret < 0 && errno == EINTR);
-
- return ret;
-}
int mbtk_autosuspend_enable(char enable)
{