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

hook: rename from declared struct to adance_func

Browse Source 
* Removed bitfield, now checks if pointer NULL.

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-07-10 22:19:00 +01:00
committed by Brendan Le Foll
parent b5b7dec441
commit 1fafd97f5e
4 changed files with 39 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/mraa_adv_func.h
View File

@@ -29,25 +29,8 @@
#include "types.h" #include "types.h"
typedef struct { typedef struct {
mraa_boolean_t gpio_init_pre:1; mraa_result_t (*gpio_init_pre) (int pin);
mraa_boolean_t gpio_init_post:1; mraa_result_t (*gpio_init_post) (mraa_gpio_context dev);
mraa_boolean_t gpio_mode_replace:1;
mraa_boolean_t gpio_mode_pre:1;
mraa_boolean_t gpio_mode_post:1;
mraa_boolean_t gpio_dir_replace:1;
mraa_boolean_t gpio_dir_pre:1;
mraa_boolean_t gpio_dir_post:1;
mraa_boolean_t gpio_write_pre:1;
mraa_boolean_t gpio_write_post:1;
mraa_boolean_t gpio_mmaped_write_replace:1;
mraa_boolean_t gpio_mmaped_write_pre:1;
mraa_boolean_t gpio_mmaped_write_post:1;
} mraa_adv_def_t;
typedef struct {
mraa_adv_def_t defined;
int (*gpio_init_pre) (int pin);
void (*gpio_init_post) (mraa_gpio_context dev);
mraa_result_t (*gpio_mode_replace) (mraa_gpio_context dev, gpio_mode_t mode); mraa_result_t (*gpio_mode_replace) (mraa_gpio_context dev, gpio_mode_t mode);
mraa_result_t (*gpio_mode_pre) (mraa_gpio_context dev, gpio_mode_t mode); mraa_result_t (*gpio_mode_pre) (mraa_gpio_context dev, gpio_mode_t mode);

2
include/mraa_internal.h
View File

@@ -32,6 +32,8 @@ extern "C" {
#include "mraa_adv_func.h" #include "mraa_adv_func.h"
#include "mraa_internal_types.h" #include "mraa_internal_types.h"
extern mraa_adv_func advance_func;
/** Setup gpio /** Setup gpio
* *
* Will check input is valid for gpio and will also setup required multiplexers. * Will check input is valid for gpio and will also setup required multiplexers.

62
src/gpio/gpio.c
View File

@@ -39,8 +39,6 @@
#define MAX_SIZE 64 #define MAX_SIZE 64
#define POLL_TIMEOUT #define POLL_TIMEOUT
static mraa_adv_func* advance;
static mraa_result_t static mraa_result_t
mraa_gpio_get_valfp(mraa_gpio_context dev) mraa_gpio_get_valfp(mraa_gpio_context dev)
{ {
@@ -69,13 +67,11 @@ mraa_gpio_init(int pin)
mraa_gpio_context mraa_gpio_context
mraa_gpio_init_raw(int pin) mraa_gpio_init_raw(int pin)
{ {
advance = mraa_get_advance(); if (advance_func.gpio_init_pre != NULL) {
if (advance->defined.gpio_init_pre) { printf("Actually entering\n");
if((advance->gpio_init_pre(pin)) != 0) { if (advance_func.gpio_init_pre(pin) != MRAA_SUCCESS)
printf("MRAA: Error in pre hook\n");
return NULL; return NULL;
} }
}
if (pin < 0) if (pin < 0)
return NULL; return NULL;
@@ -111,18 +107,20 @@ mraa_gpio_init_raw(int pin)
close(export); close(export);
} }
if (advance->defined.gpio_init_post) if (advance_func.gpio_init_post != NULL) {
advance->gpio_init_post(dev); free(dev);
return NULL;
}
return dev; return dev;
} }
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->defined.gpio_mmaped_write_replace) if (advance_func.gpio_mmaped_write_replace != NULL)
return advance->gpio_mmaped_write_replace(dev,value); return advance_func.gpio_mmaped_write_replace(dev,value);
if (advance->defined.gpio_mmaped_write_pre) { if (advance_func.gpio_mmaped_write_pre != NULL) {
mraa_result_t pre_ret = (advance->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;
} }
@@ -132,8 +130,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->defined.gpio_mmaped_write_post) if (advance_func.gpio_mmaped_write_post != NULL)
return advance->gpio_mmaped_write_post(dev,value); return advance_func.gpio_mmaped_write_post(dev,value);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }
@@ -313,18 +311,17 @@ mraa_gpio_isr_exit(mraa_gpio_context dev)
// assume our thread will exit either way we just lost it's handle // assume our thread will exit either way we just lost it's handle
dev->thread_id = 0; dev->thread_id = 0;
dev->isr_value_fp = -1; dev->isr_value_fp = -1;
return ret; return ret;
} }
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->defined.gpio_mode_replace) if (advance_func.gpio_mode_replace != NULL)
return advance->gpio_mode_replace(dev,mode); return advance_func.gpio_mode_replace(dev,mode);
if (advance->defined.gpio_mode_pre) { if (advance_func.gpio_mode_pre != NULL) {
mraa_result_t pre_ret = (advance->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;
} }
@@ -370,18 +367,18 @@ mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
} }
close(drive); close(drive);
if (advance->defined.gpio_mode_post) if (advance_func.gpio_mode_post != NULL)
return advance->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->defined.gpio_dir_replace) if (advance_func.gpio_dir_replace != NULL)
return advance->gpio_dir_replace(dev,dir); return advance_func.gpio_dir_replace(dev,dir);
if (advance->defined.gpio_dir_pre) { if (advance_func.gpio_dir_pre != NULL) {
mraa_result_t pre_ret = (advance->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;
} }
@@ -429,8 +426,8 @@ mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
} }
close(direction); close(direction);
if (advance->defined.gpio_dir_post) if (advance_func.gpio_dir_post != NULL)
return advance->gpio_dir_post(dev,dir); return advance_func.gpio_dir_post(dev,dir);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }
@@ -454,6 +451,7 @@ mraa_gpio_read(mraa_gpio_context dev)
int ret = strtol(bu, NULL, 10); int ret = strtol(bu, NULL, 10);
return ret; return ret;
return 0;
} }
mraa_result_t mraa_result_t
@@ -462,8 +460,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->defined.gpio_write_pre) { if (advance_func.gpio_write_pre != NULL) {
mraa_result_t pre_ret = (advance->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 +479,8 @@ mraa_gpio_write(mraa_gpio_context dev, int value)
return MRAA_ERROR_INVALID_HANDLE; return MRAA_ERROR_INVALID_HANDLE;
} }
if (advance->defined.gpio_write_post) if (advance_func.gpio_write_post != NULL)
return advance->gpio_write_post(dev,value); return advance_func.gpio_write_post(dev,value);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }

20
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;
static mraa_adv_func* advance = NULL; mraa_adv_func advance_func;
const char * const char *
mraa_get_version() mraa_get_version()
@@ -45,13 +45,8 @@ mraa_get_version()
return gVERSION; return gVERSION;
} }
#ifdef SWIG
mraa_result_t
mraa_init()
#else
mraa_result_t __attribute__((constructor)) mraa_result_t __attribute__((constructor))
mraa_init() mraa_init()
#endif
{ {
/** Once more board definitions have been added, /** Once more board definitions have been added,
* A method for detecting them will need to be devised. * A method for detecting them will need to be devised.
@@ -82,16 +77,16 @@ mraa_init()
free(line); free(line);
fclose(fh); fclose(fh);
advance = (mraa_adv_func*) malloc(sizeof(mraa_adv_func)); memset(&advance_func, 0, sizeof(mraa_adv_func));
switch(platform_type) { switch(platform_type) {
case MRAA_INTEL_GALILEO_GEN2: case MRAA_INTEL_GALILEO_GEN2:
plat = mraa_intel_galileo_gen2(advance); plat = mraa_intel_galileo_gen2(&advance_func);
break; break;
case MRAA_INTEL_GALILEO_GEN1: case MRAA_INTEL_GALILEO_GEN1:
plat = mraa_intel_galileo_rev_d(advance); plat = mraa_intel_galileo_rev_d(&advance_func);
break; break;
default: default:
plat = mraa_intel_galileo_rev_d(advance); plat = mraa_intel_galileo_rev_d(&advance_func);
fprintf(stderr, "Platform not found, initialising MRAA_INTEL_GALILEO_GEN1\n"); fprintf(stderr, "Platform not found, initialising MRAA_INTEL_GALILEO_GEN1\n");
} }
@@ -445,8 +440,3 @@ mraa_adc_supported_bits()
return plat->adc_supported; return plat->adc_supported;
} }
mraa_adv_func*
mraa_get_advance() {
return advance;
}