修复gpiobuff读取缓冲未置空同步优化API接口添加前缀删除冗余代码
Change-Id: I71fb0e2006226ab6e30d3c648a5ea530ef2d3a10
diff --git a/mbtk/libmbtk_lib/common/mbtk_gpio.c b/mbtk/libmbtk_lib/common/mbtk_gpio.c
index ea45359..d861e3e 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"
-int gpio_export(int gpio)
+int mbtk_gpio_export(int gpio)
{
int fd = -1;
char buffer[50];
@@ -44,7 +44,7 @@
return 0;
}
-int gpio_unexport(int gpio)
+int mbtk_gpio_unexport(int gpio)
{
int fd = -1;
char buffer[50];
@@ -115,7 +115,7 @@
int fd = -1;
int ret = 0;
- if(gpio_export(gpio)) {
+ if(mbtk_gpio_export(gpio)) {
return -1;
}
@@ -161,6 +161,7 @@
return -1;
}
+ memset(buffer, 0, sizeof(buffer));
if(read(fd, buffer, sizeof(buffer)) <= 0)
{
LOGE("Get gpio[%d] value fail", gpio);
@@ -178,7 +179,7 @@
int fd = -1;
int ret =-1;
- if(gpio_export(gpio)) {
+ if(mbtk_gpio_export(gpio)) {
return -1;
}
@@ -210,87 +211,7 @@
}
}
-int gpio_direct_get(int gpio, char *value, int value_size)
-{
- char buffer[50]= {0};
- int file =-1;
- int result =-1;
-
- memset(buffer,0,50);
- sprintf(buffer,"/sys/class/gpio/gpio%d/direction", gpio);
- file = open(buffer, O_RDONLY);
- if(file == -1)
- {
- LOGE("Open gpio[%d] direct fail.", gpio);
- return -1;
- }
-
- memset(value, 0x0, value_size);
- result = read(file,value,value_size);
- if(result <= 0)
- {
- LOGE("Get gpio[%d] direct fail.", gpio);
- close(file);
- return -1;
- }
- close(file);
-
- return 0;
-}
-
-int gpio_direct_set(int gpio, char *value)
-{
- char buffer[50]= {0};
- int file =-1;
- int result =-1;
-
- memset(buffer,0,50);
- sprintf(buffer,"/sys/class/gpio/gpio%d/direction", gpio);
- file = open(buffer, O_WRONLY);
- if(file == -1)
- {
- LOGE("Open gpio[%d] direct fail.", gpio);
- return -1;
- }
-
- result = write(file,value,strlen(value));
- if(result != strlen(value))
- {
- LOGE("Set gpio[%d] direct fail.", gpio);
- close(file);
- return -1;
- }
- close(file);
-
- return 0;
-}
-
-int gpio_value_get(int gpio)
-{
- char buffer[50];
- int fd =-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;
- }
-
- if(read(fd, buffer, sizeof(buffer)) <= 0)
- {
- LOGE("Get gpio[%d] value fail", gpio);
- close(fd);
- return -1;
- }
-
- close(fd);
- return atoi(buffer);
-}
-
-int gpio_value_set(int gpio, int value)
+int mbtk_gpio_value_set_2(int gpio, int value)
{
char buffer[50]= {0};
int file =-1;