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

hook: remove hooks, move into branch.

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-07-01 18:29:06 +01:00
parent a65ad6a551
commit 0e46b94793
8 changed files with 8 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/gpio/gpio.c
View File

@@ -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;
}