hook: move gpio init post hook

[contrib/mraa.git] / src / gpio / gpio.c

diff --git a/src/gpio/gpio.c b/src/gpio/gpio.c
index 338ad09..ec71531 100644 (file)
--- a/src/gpio/gpio.c
+++ b/src/gpio/gpio.c
@@ -61,15 +61,22 @@ mraa_gpio_init(int pin)
 
     mraa_gpio_context r = mraa_gpio_init_raw(pinm);
     r->phy_pin = pin;
+
+    if (advance_func->gpio_init_post != NULL) {
+        mraa_result_t ret = advance_func->gpio_init_post(r);
+        if (ret != MRAA_SUCCESS) {
+            free(r);
+            return NULL;
+        }
+    }
     return r;
 }
 
 mraa_gpio_context
 mraa_gpio_init_raw(int pin)
 {
-    if (advance_func.gpio_init_pre != NULL) {
-        printf("Actually entering\n");
-        if (advance_func.gpio_init_pre(pin) != MRAA_SUCCESS)
+    if (advance_func->gpio_init_pre != NULL) {
+        if (advance_func->gpio_init_pre(pin) != MRAA_SUCCESS)
             return NULL;
     }
 
@@ -90,7 +97,6 @@ mraa_gpio_init_raw(int pin)
     snprintf(directory, MAX_SIZE, SYSFS_CLASS_GPIO "/gpio%d/", dev->pin);
     struct stat dir;
     if (stat(directory, &dir) == 0 && S_ISDIR(dir.st_mode)) {
-        //fprintf(stderr, "GPIO Pin already exporting, continuing.\n");
         dev->owner = 0; // Not Owner
     } else {
         int export = open(SYSFS_CLASS_GPIO "/export", O_WRONLY);
@@ -108,20 +114,16 @@ mraa_gpio_init_raw(int pin)
         close(export);
     }
 
-    if (advance_func.gpio_init_post != NULL) {
-        free(dev);
-        return NULL;
-    }
     return dev;
 }
 
 static mraa_result_t
 mraa_gpio_write_register(mraa_gpio_context dev,int value)
 {
-    if (advance_func.gpio_mmaped_write_replace != NULL)
-        return advance_func.gpio_mmaped_write_replace(dev,value);
-    if (advance_func.gpio_mmaped_write_pre != NULL) {
-        mraa_result_t pre_ret = (advance_func.gpio_mmaped_write_pre(dev,value));
+    if (advance_func->gpio_mmaped_write_replace != NULL)
+        return advance_func->gpio_mmaped_write_replace(dev,value);
+    if (advance_func->gpio_mmaped_write_pre != NULL) {
+        mraa_result_t pre_ret = (advance_func->gpio_mmaped_write_pre(dev,value));
         if(pre_ret != MRAA_SUCCESS)
             return pre_ret;
     }
@@ -131,8 +133,8 @@ mraa_gpio_write_register(mraa_gpio_context dev,int value)
     }
     *((unsigned *)dev->reg) &= ~(1<<dev->reg_bit_pos);
 
-    if (advance_func.gpio_mmaped_write_post != NULL)
-        return advance_func.gpio_mmaped_write_post(dev,value);
+    if (advance_func->gpio_mmaped_write_post != NULL)
+        return advance_func->gpio_mmaped_write_post(dev,value);
     return MRAA_SUCCESS;
 }
 
@@ -187,9 +189,9 @@ mraa_gpio_interrupt_handler(void* arg)
             PyObject *arglist;
             PyObject *ret;
             arglist = Py_BuildValue("(i)", dev->isr_args);
-                       if (arglist == NULL) {
-                               fprintf(stdout, "Py_BuildValue NULL\n");
-                       } else {
+            if (arglist == NULL) {
+                fprintf(stdout, "Py_BuildValue NULL\n");
+            } else {
                 ret = PyEval_CallObject((PyObject*)dev->isr, arglist);
                 if (ret == NULL) {
                     fprintf(stdout, "PyEval_CallObject failed\n");
@@ -318,11 +320,11 @@ mraa_gpio_isr_exit(mraa_gpio_context dev)
 mraa_result_t
 mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
 {
-    if (advance_func.gpio_mode_replace != NULL)
-        return advance_func.gpio_mode_replace(dev,mode);
+    if (advance_func->gpio_mode_replace != NULL)
+        return advance_func->gpio_mode_replace(dev,mode);
 
-    if (advance_func.gpio_mode_pre != NULL) {
-        mraa_result_t pre_ret = (advance_func.gpio_mode_pre(dev,mode));
+    if (advance_func->gpio_mode_pre != NULL) {
+        mraa_result_t pre_ret = (advance_func->gpio_mode_pre(dev,mode));
         if(pre_ret != MRAA_SUCCESS)
             return pre_ret;
     }
@@ -368,18 +370,18 @@ mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
     }
 
     close(drive);
-    if (advance_func.gpio_mode_post != NULL)
-        return advance_func.gpio_mode_post(dev,mode);
+    if (advance_func->gpio_mode_post != NULL)
+        return advance_func->gpio_mode_post(dev,mode);
     return MRAA_SUCCESS;
 }
 
 mraa_result_t
 mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
 {
-    if (advance_func.gpio_dir_replace != NULL)
-        return advance_func.gpio_dir_replace(dev,dir);
-    if (advance_func.gpio_dir_pre != NULL) {
-        mraa_result_t pre_ret = (advance_func.gpio_dir_pre(dev,dir));
+    if (advance_func->gpio_dir_replace != NULL)
+        return advance_func->gpio_dir_replace(dev,dir);
+    if (advance_func->gpio_dir_pre != NULL) {
+        mraa_result_t pre_ret = (advance_func->gpio_dir_pre(dev,dir));
         if(pre_ret != MRAA_SUCCESS)
             return pre_ret;
     }
@@ -402,11 +404,9 @@ mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
 
     char bu[MAX_SIZE];
     int length;
-    int out_switch = 0;
     switch(dir) {
         case MRAA_GPIO_OUT:
             length = snprintf(bu, sizeof(bu), "out");
-            out_switch = 1;
             break;
         case MRAA_GPIO_IN:
             length = snprintf(bu, sizeof(bu), "in");
@@ -416,20 +416,14 @@ mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
             return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED;
     }
 
-    if (dev->phy_pin >= 0) {
-        mraa_result_t swap_res = mraa_swap_complex_gpio(dev->phy_pin, out_switch);
-        if (swap_res != MRAA_SUCCESS)
-            return swap_res;
-    }
-
     if (write(direction, bu, length*sizeof(char)) == -1) {
         close(direction);
         return MRAA_ERROR_INVALID_RESOURCE;
     }
 
     close(direction);
-    if (advance_func.gpio_dir_post != NULL)
-        return advance_func.gpio_dir_post(dev,dir);
+    if (advance_func->gpio_dir_post != NULL)
+        return advance_func->gpio_dir_post(dev,dir);
     return MRAA_SUCCESS;
 }
 
@@ -462,8 +456,8 @@ mraa_gpio_write(mraa_gpio_context dev, int value)
     if (dev->mmap == 1)
         return mraa_gpio_write_register(dev,value);
 
-    if (advance_func.gpio_write_pre != NULL) {
-        mraa_result_t pre_ret = (advance_func.gpio_write_pre(dev,value));
+    if (advance_func->gpio_write_pre != NULL) {
+        mraa_result_t pre_ret = (advance_func->gpio_write_pre(dev,value));
         if(pre_ret != MRAA_SUCCESS)
             return pre_ret;
     }
@@ -481,8 +475,8 @@ mraa_gpio_write(mraa_gpio_context dev, int value)
         return MRAA_ERROR_INVALID_HANDLE;
     }
 
-    if (advance_func.gpio_write_post != NULL)
-        return advance_func.gpio_write_post(dev,value);
+    if (advance_func->gpio_write_post != NULL)
+        return advance_func->gpio_write_post(dev,value);
     return MRAA_SUCCESS;
 }
 
@@ -563,6 +557,7 @@ mraa_gpio_use_mmaped(mraa_gpio_context dev, mraa_boolean_t mmap_en)
             dev->reg = mmap(NULL, dev->reg_sz, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
             dev->reg_bit_pos = mmp->bit_pos;
             dev->mmap = 1;
+            close(fd);
             return MRAA_SUCCESS;
         }
         return MRAA_ERROR_INVALID_PARAMETER;