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

mraa: Remove global advance_func struct and place it in platform configuration

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2015-09-03 15:28:36 +01:00
parent fc55088c03
commit 07343e2ee7
19 changed files with 277 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/x86/intel_edison_fab_c.c
View File

@@ -760,19 +760,19 @@ mraa_intel_edison_miniboard(mraa_board_t* b)
return MRAA_ERROR_UNSPECIFIED;
}
mraa_adv_func_t* adv_func = (mraa_adv_func_t*) calloc(1, sizeof(mraa_adv_func_t));
if (adv_func == NULL) {
b->adv_func = (mraa_adv_func_t*) calloc(1, sizeof(mraa_adv_func_t));
if (b->adv_func == NULL) {
free(b->pins);
return MRAA_ERROR_UNSPECIFIED;
}
adv_func->gpio_init_post = &mraa_intel_edison_gpio_init_post;
adv_func->pwm_init_pre = &mraa_intel_edison_pwm_init_pre;
adv_func->i2c_init_pre = &mraa_intel_edison_i2c_init_pre;
adv_func->i2c_set_frequency_replace = &mraa_intel_edison_i2c_freq;
adv_func->spi_init_pre = &mraa_intel_edison_spi_init_pre;
adv_func->gpio_mode_replace = &mraa_intel_edsion_mb_gpio_mode;
adv_func->uart_init_pre = &mraa_intel_edison_uart_init_pre;
adv_func->gpio_mmap_setup = &mraa_intel_edison_mmap_setup;
b->adv_func = adv_func;
b->adv_func->gpio_init_post = &mraa_intel_edison_gpio_init_post;
b->adv_func->pwm_init_pre = &mraa_intel_edison_pwm_init_pre;
b->adv_func->i2c_init_pre = &mraa_intel_edison_i2c_init_pre;
b->adv_func->i2c_set_frequency_replace = &mraa_intel_edison_i2c_freq;
b->adv_func->spi_init_pre = &mraa_intel_edison_spi_init_pre;
b->adv_func->gpio_mode_replace = &mraa_intel_edsion_mb_gpio_mode;
b->adv_func->uart_init_pre = &mraa_intel_edison_uart_init_pre;
b->adv_func->gpio_mmap_setup = &mraa_intel_edison_mmap_setup;
int pos = 0;
strncpy(b->pins[pos].name, "J17-1", 8);
@@ -1141,32 +1141,32 @@ mraa_intel_edison_fab_c()
b->gpio_count = 14;
b->aio_count = 6;
mraa_adv_func_t* adv_func = (mraa_adv_func_t*) calloc(1, sizeof(mraa_adv_func_t));
if (adv_func == NULL) {
return NULL;
b->adv_func = (mraa_adv_func_t*) calloc(1, sizeof(mraa_adv_func_t));
if (b->adv_func == NULL) {
goto error;
}
adv_func->gpio_dir_pre = &mraa_intel_edison_gpio_dir_pre;
adv_func->gpio_init_post = &mraa_intel_edison_gpio_init_post;
adv_func->gpio_close_pre = &mraa_intel_edison_gpio_close_pre;
adv_func->gpio_dir_post = &mraa_intel_edison_gpio_dir_post;
adv_func->i2c_init_pre = &mraa_intel_edison_i2c_init_pre;
adv_func->i2c_set_frequency_replace = &mraa_intel_edison_i2c_freq;
adv_func->aio_get_valid_fp = &mraa_intel_edison_aio_get_fp;
adv_func->aio_init_pre = &mraa_intel_edison_aio_init_pre;
adv_func->aio_init_post = &mraa_intel_edison_aio_init_post;
adv_func->pwm_init_pre = &mraa_intel_edison_pwm_init_pre;
adv_func->pwm_init_post = &mraa_intel_edison_pwm_init_post;
adv_func->spi_init_pre = &mraa_intel_edison_spi_init_pre;
adv_func->spi_init_post = &mraa_intel_edison_spi_init_post;
adv_func->gpio_mode_replace = &mraa_intel_edison_gpio_mode_replace;
adv_func->uart_init_pre = &mraa_intel_edison_uart_init_pre;
adv_func->uart_init_post = &mraa_intel_edison_uart_init_post;
adv_func->gpio_mmap_setup = &mraa_intel_edison_mmap_setup;
adv_func->spi_lsbmode_replace = &mraa_intel_edison_spi_lsbmode_replace;
b->adv_func = adv_func;
b->adv_func->gpio_dir_pre = &mraa_intel_edison_gpio_dir_pre;
b->adv_func->gpio_init_post = &mraa_intel_edison_gpio_init_post;
b->adv_func->gpio_close_pre = &mraa_intel_edison_gpio_close_pre;
b->adv_func->gpio_dir_post = &mraa_intel_edison_gpio_dir_post;
b->adv_func->i2c_init_pre = &mraa_intel_edison_i2c_init_pre;
b->adv_func->i2c_set_frequency_replace = &mraa_intel_edison_i2c_freq;
b->adv_func->aio_get_valid_fp = &mraa_intel_edison_aio_get_fp;
b->adv_func->aio_init_pre = &mraa_intel_edison_aio_init_pre;
b->adv_func->aio_init_post = &mraa_intel_edison_aio_init_post;
b->adv_func->pwm_init_pre = &mraa_intel_edison_pwm_init_pre;
b->adv_func->pwm_init_post = &mraa_intel_edison_pwm_init_post;
b->adv_func->spi_init_pre = &mraa_intel_edison_spi_init_pre;
b->adv_func->spi_init_post = &mraa_intel_edison_spi_init_post;
b->adv_func->gpio_mode_replace = &mraa_intel_edison_gpio_mode_replace;
b->adv_func->uart_init_pre = &mraa_intel_edison_uart_init_pre;
b->adv_func->uart_init_post = &mraa_intel_edison_uart_init_post;
b->adv_func->gpio_mmap_setup = &mraa_intel_edison_mmap_setup;
b->adv_func->spi_lsbmode_replace = &mraa_intel_edison_spi_lsbmode_replace;
b->pins = (mraa_pininfo_t*) malloc(sizeof(mraa_pininfo_t) * MRAA_INTEL_EDISON_PINCOUNT);
if (b->pins == NULL) {
free(b->adv_func);
goto error;
}