Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

hook: change structure to pointer

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-07-14 15:21:28 +01:00
parent b74759e973
commit fb030b5e9f
7 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/intel_galileo_rev_d.h
View File

@@ -33,7 +33,7 @@ extern "C" {
#define MRAA_INTEL_GALILEO_REV_D_PINCOUNT 25 #define MRAA_INTEL_GALILEO_REV_D_PINCOUNT 25
mraa_board_t* mraa_board_t*
mraa_intel_galileo_rev_d(mraa_adv_func_t* adv); mraa_intel_galileo_rev_d();
#ifdef __cplusplus #ifdef __cplusplus
} }

2
include/intel_galileo_rev_g.h
View File

@@ -33,7 +33,7 @@ extern "C" {
#define MRAA_INTEL_GALILEO_GEN_2_PINCOUNT 25 #define MRAA_INTEL_GALILEO_GEN_2_PINCOUNT 25
mraa_board_t* mraa_board_t*
mraa_intel_galileo_gen2(mraa_adv_func_t* adv); mraa_intel_galileo_gen2();
#ifdef __cplusplus #ifdef __cplusplus
} }

2
include/mraa_internal.h
View File

@@ -32,7 +32,7 @@ extern "C" {
#include "mraa_internal_types.h" #include "mraa_internal_types.h"
#include "mraa_adv_func.h" #include "mraa_adv_func.h"
extern mraa_adv_func_t advance_func; extern mraa_adv_func_t* advance_func;
/** Setup gpio /** Setup gpio
* *

50
src/gpio/gpio.c
View File

@@ -67,9 +67,9 @@ mraa_gpio_init(int pin)
mraa_gpio_context mraa_gpio_context
mraa_gpio_init_raw(int pin) mraa_gpio_init_raw(int pin)
{ {
if (advance_func.gpio_init_pre != NULL) { if (advance_func->gpio_init_pre != NULL) {
printf("Actually entering\n"); printf("Actually entering\n");
if (advance_func.gpio_init_pre(pin) != MRAA_SUCCESS) if (advance_func->gpio_init_pre(pin) != MRAA_SUCCESS)
return NULL; return NULL;
} }
@@ -108,7 +108,7 @@ mraa_gpio_init_raw(int pin)
close(export); close(export);
} }
if (advance_func.gpio_init_post != NULL) { if (advance_func->gpio_init_post != NULL) {
free(dev); free(dev);
return NULL; return NULL;
} }
@@ -118,10 +118,10 @@ mraa_gpio_init_raw(int pin)
static mraa_result_t static mraa_result_t
mraa_gpio_write_register(mraa_gpio_context dev,int value) mraa_gpio_write_register(mraa_gpio_context dev,int value)
{ {
if (advance_func.gpio_mmaped_write_replace != NULL) if (advance_func->gpio_mmaped_write_replace != NULL)
return advance_func.gpio_mmaped_write_replace(dev,value); return advance_func->gpio_mmaped_write_replace(dev,value);
if (advance_func.gpio_mmaped_write_pre != NULL) { if (advance_func->gpio_mmaped_write_pre != NULL) {
mraa_result_t pre_ret = (advance_func.gpio_mmaped_write_pre(dev,value)); mraa_result_t pre_ret = (advance_func->gpio_mmaped_write_pre(dev,value));
if(pre_ret != MRAA_SUCCESS) if(pre_ret != MRAA_SUCCESS)
return pre_ret; return pre_ret;
} }
@@ -131,8 +131,8 @@ mraa_gpio_write_register(mraa_gpio_context dev,int value)
} }
*((unsigned *)dev->reg) &= ~(1<<dev->reg_bit_pos); *((unsigned *)dev->reg) &= ~(1<<dev->reg_bit_pos);
if (advance_func.gpio_mmaped_write_post != NULL) if (advance_func->gpio_mmaped_write_post != NULL)
return advance_func.gpio_mmaped_write_post(dev,value); return advance_func->gpio_mmaped_write_post(dev,value);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }
@@ -318,11 +318,11 @@ mraa_gpio_isr_exit(mraa_gpio_context dev)
mraa_result_t mraa_result_t
mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode) mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
{ {
if (advance_func.gpio_mode_replace != NULL) if (advance_func->gpio_mode_replace != NULL)
return advance_func.gpio_mode_replace(dev,mode); return advance_func->gpio_mode_replace(dev,mode);
if (advance_func.gpio_mode_pre != NULL) { if (advance_func->gpio_mode_pre != NULL) {
mraa_result_t pre_ret = (advance_func.gpio_mode_pre(dev,mode)); mraa_result_t pre_ret = (advance_func->gpio_mode_pre(dev,mode));
if(pre_ret != MRAA_SUCCESS) if(pre_ret != MRAA_SUCCESS)
return pre_ret; return pre_ret;
} }
@@ -368,18 +368,18 @@ mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
} }
close(drive); close(drive);
if (advance_func.gpio_mode_post != NULL) if (advance_func->gpio_mode_post != NULL)
return advance_func.gpio_mode_post(dev,mode); return advance_func->gpio_mode_post(dev,mode);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }
mraa_result_t mraa_result_t
mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir) mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
{ {
if (advance_func.gpio_dir_replace != NULL) if (advance_func->gpio_dir_replace != NULL)
return advance_func.gpio_dir_replace(dev,dir); return advance_func->gpio_dir_replace(dev,dir);
if (advance_func.gpio_dir_pre != NULL) { if (advance_func->gpio_dir_pre != NULL) {
mraa_result_t pre_ret = (advance_func.gpio_dir_pre(dev,dir)); mraa_result_t pre_ret = (advance_func->gpio_dir_pre(dev,dir));
if(pre_ret != MRAA_SUCCESS) if(pre_ret != MRAA_SUCCESS)
return pre_ret; return pre_ret;
} }
@@ -428,8 +428,8 @@ mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
} }
close(direction); close(direction);
if (advance_func.gpio_dir_post != NULL) if (advance_func->gpio_dir_post != NULL)
return advance_func.gpio_dir_post(dev,dir); return advance_func->gpio_dir_post(dev,dir);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }
@@ -462,8 +462,8 @@ mraa_gpio_write(mraa_gpio_context dev, int value)
if (dev->mmap == 1) if (dev->mmap == 1)
return mraa_gpio_write_register(dev,value); return mraa_gpio_write_register(dev,value);
if (advance_func.gpio_write_pre != NULL) { if (advance_func->gpio_write_pre != NULL) {
mraa_result_t pre_ret = (advance_func.gpio_write_pre(dev,value)); mraa_result_t pre_ret = (advance_func->gpio_write_pre(dev,value));
if(pre_ret != MRAA_SUCCESS) if(pre_ret != MRAA_SUCCESS)
return pre_ret; return pre_ret;
} }
@@ -481,8 +481,8 @@ mraa_gpio_write(mraa_gpio_context dev, int value)
return MRAA_ERROR_INVALID_HANDLE; return MRAA_ERROR_INVALID_HANDLE;
} }
if (advance_func.gpio_write_post != NULL) if (advance_func->gpio_write_post != NULL)
return advance_func.gpio_write_post(dev,value); return advance_func->gpio_write_post(dev,value);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }

2
src/intel_galileo_rev_d.c
View File

@@ -29,7 +29,7 @@
#include "intel_galileo_rev_d.h" #include "intel_galileo_rev_d.h"
mraa_board_t* 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)); mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
if (b == NULL) if (b == NULL)

2
src/intel_galileo_rev_g.c
View File

@@ -30,7 +30,7 @@
#include "intel_galileo_rev_g.h" #include "intel_galileo_rev_g.h"
mraa_board_t* 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)); mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
if (b == NULL) if (b == NULL)

12
src/mraa.c
View File

@@ -37,7 +37,7 @@
//static mraa_pininfo_t* pindata; //static mraa_pininfo_t* pindata;
static mraa_board_t* plat = NULL; static mraa_board_t* plat = NULL;
static mraa_platform_t platform_type = MRAA_UNKNOWN_PLATFORM; static mraa_platform_t platform_type = MRAA_UNKNOWN_PLATFORM;
mraa_adv_func_t advance_func; mraa_adv_func_t* advance_func;
const char * const char *
mraa_get_version() mraa_get_version()
@@ -77,16 +77,18 @@ mraa_init()
free(line); free(line);
fclose(fh); 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) { switch(platform_type) {
case MRAA_INTEL_GALILEO_GEN2: case MRAA_INTEL_GALILEO_GEN2:
plat = mraa_intel_galileo_gen2(&advance_func); plat = mraa_intel_galileo_gen2();
break; break;
case MRAA_INTEL_GALILEO_GEN1: case MRAA_INTEL_GALILEO_GEN1:
plat = mraa_intel_galileo_rev_d(&advance_func); plat = mraa_intel_galileo_rev_d();
break; break;
default: 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"); fprintf(stderr, "Platform not found, initialising MRAA_INTEL_GALILEO_GEN1\n");
} }