modify connection framework function and dir

APP_Framework/Framework/transform_layer/xiuos/transform.c

@@ -21,12 +21,6 @@
 #include <transform.h>
 
 /**************************mutex***************************/
-
-//for test
-#define XIUOS_OS
-
-#ifdef XIUOS_OS
-
 /* private mutex API */
 int PrivMutexCreate(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *attr)
 {
@@ -49,11 +43,11 @@ int PrivMutexAbandon(pthread_mutex_t *p_mutex)
 }
 
 /**********************semaphore****************************/
-
 int PrivSemaphoreCreate(sem_t *sem, int pshared, unsigned int value)
 {
     return sem_init(sem, pshared, value);
 }
+
 int PrivSemaphoreDelete(sem_t *sem)
 {
     return sem_destroy(sem);
@@ -68,13 +62,13 @@ int PrivSemaphoreObtainNoWait(sem_t *sem)
 {
     return sem_trywait(sem);
 }
+
 int PrivSemaphoreAbandon(sem_t *sem)
 {
     return sem_post(sem);
 }
 
 /**************************task*************************/
-
 int PrivTaskCreate(pthread_t *thread, const pthread_attr_t *attr,
                    void *(*start_routine)(void *), void *arg)
 {
@@ -104,7 +98,7 @@ int PrivTaskDelay(int32_t ms)
 /*********************fs**************************/
 
 /************************Driver Posix Transform***********************/
-int PrivOpen(const char *path, int flags, ...)
+int PrivOpen(const char *path, int flags)
 {
     return open(path, flags);
 }
@@ -131,18 +125,31 @@ static int PrivSerialIoctl(int fd, int cmd, void *args)
     return ioctl(fd, cmd, &serial_cfg);
 }
 
+static int PrivPinIoctl(int fd, int cmd, void *args)
+{
+    struct PinParam *pin_cfg = (struct PinParam *)args;
+
+    return ioctl(fd, cmd, &pin_cfg);
+}
+
 int PrivIoctl(int fd, int cmd, void *args)
 {
+    int ret;
     struct PrivIoctlCfg *ioctl_cfg = (struct PrivIoctlCfg *)args;
     
     switch (ioctl_cfg->ioctl_driver_type)
     {
     case SERIAL_TYPE:
-        PrivSerialIoctl(fd, cmd, ioctl_cfg->args);
+        ret = PrivSerialIoctl(fd, cmd, ioctl_cfg->args);
+        break;
+    case PIN_TYPE:
+        ret = PrivSerialIoctl(fd, cmd, ioctl_cfg->args);
         break;
     default:
         break;
     }
+
+    return ret;
 }
 
 /********************memory api************/
@@ -150,6 +157,7 @@ void *PrivMalloc(size_t size)
 {
     return UserMalloc(size);
 }
+
 void *PrivRealloc(void *pointer, size_t size)
 {
     return UserRealloc(pointer, size);
@@ -159,9 +167,9 @@ void *PrivCalloc(size_t  count, size_t size)
 {
     return UserCalloc(count, size);
 }
+
 void PrivFree(void *pointer)
 {
     UserFree(pointer);
 }
 
-#endif

APP_Framework/Framework/transform_layer/xiuos/transform.h

@@ -37,6 +37,19 @@ extern "C" {
 
 #define NAME_NUM_MAX            32
 
+/*********************GPIO define*********************/
+#define GPIO_LOW    0x00
+#define GPIO_HIGH   0x01
+
+#define GPIO_CFG_OUTPUT                          0x00
+#define GPIO_CFG_INPUT                               0x01
+#define GPIO_CFG_INPUT_PULLUP            0x02
+#define GPIO_CFG_INPUT_PULLDOWN     0x03
+#define GPIO_CFG_OUTPUT_OD                  0x04
+
+#define GPIO_CONFIG_MODE                 0xffffffff
+
+/********************SERIAL define*******************/
 #define BAUD_RATE_2400          2400
 #define BAUD_RATE_4800          4800
 #define BAUD_RATE_9600          9600
@@ -75,6 +88,28 @@ extern "C" {
 #define SERIAL_RB_BUFSZ         128
 #endif
 
+struct PinDevIrq
+{
+    int irq_mode;//< RISING/FALLING/HIGH/LOW
+    void (*hdr) (void *args);//< callback function
+    void *args;//< the params of callback function
+};
+
+struct PinParam
+{
+    int cmd;//< cmd:GPIO_CONFIG_MODE/GPIO_IRQ_REGISTER/GPIO_IRQ_FREE/GPIO_IRQ_DISABLE/GPIO_IRQ_ENABLE
+    long  pin;//< pin number
+    int mode;//< pin mode: input/output
+    struct PinDevIrq irq_set;//< pin irq set
+    uint64 arg;
+};
+
+struct PinStat
+{
+    long pin;//< pin number
+    uint16_t val;//< pin level
+};
+
 enum ExtSerialPortConfigure
 {
     PORT_CFG_INIT = 0,
@@ -102,6 +137,7 @@ enum IoctlDriverType
     SERIAL_TYPE = 0,
     SPI_TYPE,
     I2C_TYPE,
+    PIN_TYPE,
     DEFAULT_TYPE,
 };
 
@@ -135,12 +171,17 @@ int PrivTaskStartup(pthread_t *thread);
 int PrivTaskDelete(pthread_t thread, int sig);
 void PrivTaskQuit(void *value_ptr);
 int PrivTaskDelay(int32_t ms);
-int PrivOpen(const char *path, int flags, ...);
+
+/*********************driver*************************/
+
+int PrivOpen(const char *path, int flags);
 int PrivRead(int fd, void *buf, size_t len);
 int PrivWrite(int fd, const void *buf, size_t len);
 int PrivClose(int fd);
 int PrivIoctl(int fd, int cmd, void *args);
 
+/*********************memory***********************/
+
 void *PrivMalloc(size_t size);
 void *PrivRealloc(void *pointer, size_t size);
 void *PrivCalloc(size_t  count, size_t size);