hook: remove hooks, move into branch.

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>

src/gpio/gpio.c

@@ -39,8 +39,6 @@
 #define MAX_SIZE 64
 #define POLL_TIMEOUT
 
-static mraa_adv_func* advance;
-
 static mraa_result_t
 mraa_gpio_get_valfp(mraa_gpio_context dev)
 {
@@ -69,13 +67,6 @@ mraa_gpio_init(int pin)
 mraa_gpio_context
 mraa_gpio_init_raw(int pin)
 {
-    advance = mraa_get_advance();
-    if (advance->defined.gpio_init_pre) {
-        if((advance->gpio_init_pre(pin)) != 0) {
-            printf("MRAA: Error in pre hook\n");
-            return NULL;
-        }
-    }
     if (pin < 0)
         return NULL;
 
@@ -111,29 +102,18 @@ mraa_gpio_init_raw(int pin)
         close(export);
     }
 
-    if (advance->defined.gpio_init_post)
-        advance->gpio_init_post(dev);
     return dev;
 }
 
 static mraa_result_t
 mraa_gpio_write_register(mraa_gpio_context dev,int value)
 {
-    if (advance->defined.gpio_mmaped_write_replace)
-        return advance->gpio_mmaped_write_replace(dev,value);
-    if (advance->defined.gpio_mmaped_write_pre) {
-        mraa_result_t pre_ret = (advance->gpio_mmaped_write_pre(dev,value));
-        if(pre_ret != MRAA_SUCCESS)
-            return pre_ret;
-    }
-    if (value == 1) {
+   if (value == 1) {
         *((unsigned *)dev->reg) |= (1<<dev->reg_bit_pos);
         return MRAA_SUCCESS;
     }
     *((unsigned *)dev->reg) &= ~(1<<dev->reg_bit_pos);
 
-    if (advance->defined.gpio_mmaped_write_post)
-        return advance->gpio_mmaped_write_post(dev,value);
     return MRAA_SUCCESS;
 }
 
@@ -320,15 +300,6 @@ mraa_gpio_isr_exit(mraa_gpio_context dev)
 mraa_result_t
 mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
 {
-    if (advance->defined.gpio_mode_replace)
-        return advance->gpio_mode_replace(dev,mode);
-
-    if (advance->defined.gpio_mode_pre) {
-        mraa_result_t pre_ret = (advance->gpio_mode_pre(dev,mode));
-        if(pre_ret != MRAA_SUCCESS)
-            return pre_ret;
-    }
-
     if (dev->value_fp != -1) {
          close(dev->value_fp);
          dev->value_fp = -1;
@@ -370,21 +341,12 @@ mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
     }
 
     close(drive);
-    if (advance->defined.gpio_mode_post)
-        return advance->gpio_mode_post(dev,mode);
     return MRAA_SUCCESS;
 }
 
 mraa_result_t
 mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
 {
-    if (advance->defined.gpio_dir_replace)
-        return advance->gpio_dir_replace(dev,dir);
-    if (advance->defined.gpio_dir_pre) {
-        mraa_result_t pre_ret = (advance->gpio_dir_pre(dev,dir));
-        if(pre_ret != MRAA_SUCCESS)
-            return pre_ret;
-    }
     if (dev == NULL) {
         return MRAA_ERROR_INVALID_HANDLE;
     }
@@ -429,8 +391,6 @@ mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
     }
 
     close(direction);
-    if (advance->defined.gpio_dir_post)
-        return advance->gpio_dir_post(dev,dir);
     return MRAA_SUCCESS;
 }
 
@@ -462,12 +422,6 @@ mraa_gpio_write(mraa_gpio_context dev, int value)
     if (dev->mmap == 1)
         return mraa_gpio_write_register(dev,value);
 
-    if (advance->defined.gpio_write_pre) {
-        mraa_result_t pre_ret = (advance->gpio_write_pre(dev,value));
-        if(pre_ret != MRAA_SUCCESS)
-            return pre_ret;
-    }
-
     if (dev->value_fp == -1) {
         mraa_gpio_get_valfp(dev);
     }
@@ -481,8 +435,6 @@ mraa_gpio_write(mraa_gpio_context dev, int value)
         return MRAA_ERROR_INVALID_HANDLE;
     }
 
-    if (advance->defined.gpio_write_post)
-        return advance->gpio_write_post(dev,value);
     return MRAA_SUCCESS;
 }
 

src/intel_galileo_rev_d.c

@@ -29,7 +29,7 @@
 #include "intel_galileo_rev_d.h"
 
 mraa_board_t*
-mraa_intel_galileo_rev_d(mraa_adv_func* adv)
+mraa_intel_galileo_rev_d()
 {
     mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
     if (b == NULL)

src/intel_galileo_rev_g.c

@@ -30,7 +30,7 @@
 #include "intel_galileo_rev_g.h"
 
 mraa_board_t*
-mraa_intel_galileo_gen2(mraa_adv_func* adv)
+mraa_intel_galileo_gen2()
 {
     mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
     if (b == NULL)

src/mraa.c

@@ -37,7 +37,6 @@
 //static mraa_pininfo_t* pindata;
 static mraa_board_t* plat = NULL;
 static mraa_platform_t platform_type = MRAA_UNKNOWN_PLATFORM;
-static mraa_adv_func* advance = NULL;
 
 const char *
 mraa_get_version()
@@ -85,16 +84,15 @@ mraa_init()
     free(line);
     fclose(fh);
 
-    advance = (mraa_adv_func*) malloc(sizeof(mraa_adv_func));
     switch(platform_type) {
         case MRAA_INTEL_GALILEO_GEN2:
-            plat = mraa_intel_galileo_gen2(advance);
+            plat = mraa_intel_galileo_gen2();
             break;
         case MRAA_INTEL_GALILEO_GEN1:
-            plat = mraa_intel_galileo_rev_d(advance);
+            plat = mraa_intel_galileo_rev_d();
             break;
         default:
-            plat = mraa_intel_galileo_rev_d(advance);
+            plat = mraa_intel_galileo_rev_d();
             fprintf(stderr, "Platform not found, initialising MRAA_INTEL_GALILEO_GEN1\n");
     }
 
@@ -455,8 +453,3 @@ mraa_adc_supported_bits()
 
     return plat->adc_supported;
 }
-
-mraa_adv_func*
-mraa_get_advance() {
-    return advance;
-}