From fb030b5e9f39551697d67f64ca0df52a5bd161e8 Mon Sep 17 00:00:00 2001 From: Thomas Ingleby Date: Mon, 14 Jul 2014 15:21:28 +0100 Subject: [PATCH] hook: change structure to pointer Signed-off-by: Thomas Ingleby --- include/intel_galileo_rev_d.h | 2 +- include/intel_galileo_rev_g.h | 2 +- include/mraa_internal.h | 2 +- src/gpio/gpio.c | 50 +++++++++++++++++------------------ src/intel_galileo_rev_d.c | 2 +- src/intel_galileo_rev_g.c | 2 +- src/mraa.c | 12 +++++---- 7 files changed, 37 insertions(+), 35 deletions(-) diff --git a/include/intel_galileo_rev_d.h b/include/intel_galileo_rev_d.h index 2dccef4..30391ff 100644 --- a/include/intel_galileo_rev_d.h +++ b/include/intel_galileo_rev_d.h @@ -33,7 +33,7 @@ extern "C" { #define MRAA_INTEL_GALILEO_REV_D_PINCOUNT 25 mraa_board_t* -mraa_intel_galileo_rev_d(mraa_adv_func_t* adv); +mraa_intel_galileo_rev_d(); #ifdef __cplusplus } diff --git a/include/intel_galileo_rev_g.h b/include/intel_galileo_rev_g.h index c90e3c3..e69175a 100644 --- a/include/intel_galileo_rev_g.h +++ b/include/intel_galileo_rev_g.h @@ -33,7 +33,7 @@ extern "C" { #define MRAA_INTEL_GALILEO_GEN_2_PINCOUNT 25 mraa_board_t* -mraa_intel_galileo_gen2(mraa_adv_func_t* adv); +mraa_intel_galileo_gen2(); #ifdef __cplusplus } diff --git a/include/mraa_internal.h b/include/mraa_internal.h index 6db9770..4d71aa1 100644 --- a/include/mraa_internal.h +++ b/include/mraa_internal.h @@ -32,7 +32,7 @@ extern "C" { #include "mraa_internal_types.h" #include "mraa_adv_func.h" -extern mraa_adv_func_t advance_func; +extern mraa_adv_func_t* advance_func; /** Setup gpio * diff --git a/src/gpio/gpio.c b/src/gpio/gpio.c index 338ad09..86116a3 100644 --- a/src/gpio/gpio.c +++ b/src/gpio/gpio.c @@ -67,9 +67,9 @@ mraa_gpio_init(int pin) mraa_gpio_context mraa_gpio_init_raw(int pin) { - if (advance_func.gpio_init_pre != NULL) { + 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(pin) != MRAA_SUCCESS) return NULL; } @@ -108,7 +108,7 @@ mraa_gpio_init_raw(int pin) close(export); } - if (advance_func.gpio_init_post != NULL) { + if (advance_func->gpio_init_post != NULL) { free(dev); return NULL; } @@ -118,10 +118,10 @@ mraa_gpio_init_raw(int pin) 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 +131,8 @@ mraa_gpio_write_register(mraa_gpio_context dev,int value) } *((unsigned *)dev->reg) &= ~(1<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; } @@ -318,11 +318,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 +368,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; } @@ -428,8 +428,8 @@ mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir) } 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 +462,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 +481,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; } diff --git a/src/intel_galileo_rev_d.c b/src/intel_galileo_rev_d.c index 867df81..ae0d70d 100644 --- a/src/intel_galileo_rev_d.c +++ b/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_t* adv) +mraa_intel_galileo_rev_d() { mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t)); if (b == NULL) diff --git a/src/intel_galileo_rev_g.c b/src/intel_galileo_rev_g.c index d50c72c..2bbfe69 100644 --- a/src/intel_galileo_rev_g.c +++ b/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_t* adv) +mraa_intel_galileo_gen2() { mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t)); if (b == NULL) diff --git a/src/mraa.c b/src/mraa.c index ccc2eae..99c35d3 100644 --- a/src/mraa.c +++ b/src/mraa.c @@ -37,7 +37,7 @@ //static mraa_pininfo_t* pindata; static mraa_board_t* plat = NULL; static mraa_platform_t platform_type = MRAA_UNKNOWN_PLATFORM; -mraa_adv_func_t advance_func; +mraa_adv_func_t* advance_func; const char * mraa_get_version() @@ -77,16 +77,18 @@ mraa_init() free(line); fclose(fh); - memset(&advance_func, 0, sizeof(mraa_adv_func_t)); + advance_func = (mraa_adv_func_t*) malloc(sizeof(mraa_adv_func_t)); + memset(advance_func, 0, sizeof(mraa_adv_func_t)); + switch(platform_type) { case MRAA_INTEL_GALILEO_GEN2: - plat = mraa_intel_galileo_gen2(&advance_func); + plat = mraa_intel_galileo_gen2(); break; case MRAA_INTEL_GALILEO_GEN1: - plat = mraa_intel_galileo_rev_d(&advance_func); + plat = mraa_intel_galileo_rev_d(); break; default: - plat = mraa_intel_galileo_rev_d(&advance_func); + plat = mraa_intel_galileo_rev_d(); fprintf(stderr, "Platform not found, initialising MRAA_INTEL_GALILEO_GEN1\n"); }