diff options
Diffstat (limited to 'peripheral/libmraa/src/x86/intel_edison_fab_c.c')
-rw-r--r-- | peripheral/libmraa/src/x86/intel_edison_fab_c.c | 369 |
1 files changed, 106 insertions, 263 deletions
diff --git a/peripheral/libmraa/src/x86/intel_edison_fab_c.c b/peripheral/libmraa/src/x86/intel_edison_fab_c.c index e1af114..643616b 100644 --- a/peripheral/libmraa/src/x86/intel_edison_fab_c.c +++ b/peripheral/libmraa/src/x86/intel_edison_fab_c.c @@ -49,14 +49,14 @@ typedef struct { int sysfs; int mode; -} mraa_intel_edison_pindef_t; +} mraa_intel_edision_pindef_t; typedef struct { - mraa_intel_edison_pindef_t gpio; - mraa_intel_edison_pindef_t pwm; - mraa_intel_edison_pindef_t i2c; - mraa_intel_edison_pindef_t spi; - mraa_intel_edison_pindef_t uart; + mraa_intel_edision_pindef_t gpio; + mraa_intel_edision_pindef_t pwm; + mraa_intel_edision_pindef_t i2c; + mraa_intel_edision_pindef_t spi; + mraa_intel_edision_pindef_t uart; } mraa_intel_edison_pinmodes_t; static mraa_gpio_context tristate; @@ -76,9 +76,6 @@ static int mmap_fd = 0; static int mmap_size; static unsigned int mmap_count = 0; -// PWM 0% duty workaround state array -static int pwm_disabled[4] = { 0 }; - mraa_result_t mraa_intel_edison_spi_lsbmode_replace(mraa_spi_context dev, mraa_boolean_t lsb) { @@ -371,30 +368,6 @@ mraa_intel_edison_aio_init_post(mraa_aio_context dev) } mraa_result_t -mraa_intel_edison_pwm_enable_pre(mraa_pwm_context dev, int enable) { - // PWM 0% duty workaround: update state array - // if someone first ran write(0) and then enable(1). - if ((pwm_disabled[dev->pin] == 1) && (enable == 1)) { pwm_disabled[dev->pin] = 0; } - return MRAA_SUCCESS; -} - -mraa_result_t -mraa_intel_edison_pwm_write_pre(mraa_pwm_context dev, float percentage) { - // PWM 0% duty workaround: set the state array and enable/disable pin accordingly - if (percentage == 0.0f) { - syslog(LOG_INFO, "edison_pwm_write_pre (pwm%i): requested zero duty cycle, disabling PWM on the pin", dev->pin); - pwm_disabled[dev->pin] = 1; - return mraa_pwm_enable(dev, 0); - } else if (pwm_disabled[dev->pin] == 1) { - syslog(LOG_INFO, "edison_pwm_write_pre (pwm%i): Re-enabling the pin after setting non-zero duty", dev->pin); - pwm_disabled[dev->pin] = 0; - return mraa_pwm_enable(dev, 1); - } - - return MRAA_SUCCESS; -} - -mraa_result_t mraa_intel_edison_pwm_init_pre(int pin) { if (miniboard == 1) { @@ -441,7 +414,6 @@ mraa_intel_edison_pwm_init_pre(int pin) mraa_result_t mraa_intel_edison_pwm_init_post(mraa_pwm_context pwm) { - pwm_disabled[pwm->pin] = 0; return mraa_gpio_write(tristate, 1); } @@ -532,6 +504,7 @@ mraa_intel_edison_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode value = 0; break; case MRAA_GPIO_HIZ: + return MRAA_SUCCESS; break; default: return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED; @@ -553,7 +526,7 @@ mraa_intel_edison_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode } mraa_result_t -mraa_intel_edison_mb_gpio_mode(mraa_gpio_context dev, mraa_gpio_mode_t mode) +mraa_intel_edsion_mb_gpio_mode(mraa_gpio_context dev, mraa_gpio_mode_t mode) { if (dev->value_fp != -1) { if (close(dev->value_fp) != 0) { @@ -659,7 +632,7 @@ mraa_intel_edison_uart_init_post(mraa_uart_context uart) } static mraa_result_t -mraa_intel_edison_mmap_unsetup() +mraa_intel_edsion_mmap_unsetup() { if (mmap_reg == NULL) { syslog(LOG_ERR, "edison mmap: null register cant unsetup"); @@ -720,7 +693,7 @@ mraa_intel_edison_mmap_setup(mraa_gpio_context dev, mraa_boolean_t en) dev->mmap_read = NULL; mmap_count--; if (mmap_count == 0) { - return mraa_intel_edison_mmap_unsetup(); + return mraa_intel_edsion_mmap_unsetup(); } return MRAA_SUCCESS; } @@ -830,18 +803,16 @@ mraa_intel_edison_miniboard(mraa_board_t* b) } 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->pwm_enable_pre = &mraa_intel_edison_pwm_enable_pre; - b->adv_func->pwm_write_pre = &mraa_intel_edison_pwm_write_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_edison_mb_gpio_mode; + 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); - b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }; + b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0 }; b->pins[pos].gpio.pinmap = 182; b->pins[pos].gpio.mux_total = 0; b->pins[pos].pwm.pinmap = 2; @@ -928,7 +899,7 @@ mraa_intel_edison_miniboard(mraa_board_t* b) pos++; strncpy(b->pins[pos].name, "J18-1", 8); - b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0 , 0}; + b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0 }; b->pins[pos].gpio.pinmap = 13; b->pins[pos].gpio.mux_total = 0; b->pins[pos].pwm.pinmap = 1; @@ -937,7 +908,7 @@ mraa_intel_edison_miniboard(mraa_board_t* b) pos++; strncpy(b->pins[pos].name, "J18-2", 8); - b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }; + b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0 }; b->pins[pos].gpio.pinmap = 165; b->pins[pos].gpio.mux_total = 0; pos++; @@ -960,7 +931,7 @@ mraa_intel_edison_miniboard(mraa_board_t* b) pos++; strncpy(b->pins[pos].name, "J18-7", 8); - b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }; + b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0 }; b->pins[pos].gpio.pinmap = 12; b->pins[pos].gpio.mux_total = 0; b->pins[pos].pwm.pinmap = 0; @@ -969,7 +940,7 @@ mraa_intel_edison_miniboard(mraa_board_t* b) pos++; strncpy(b->pins[pos].name, "J18-8", 8); - b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }; + b->pins[pos].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0 }; b->pins[pos].gpio.pinmap = 183; b->pins[pos].gpio.mux_total = 0; b->pins[pos].pwm.pinmap = 3; @@ -1289,8 +1260,6 @@ mraa_intel_edison_fab_c() 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->pwm_enable_pre = &mraa_intel_edison_pwm_enable_pre; - b->adv_func->pwm_write_pre = &mraa_intel_edison_pwm_write_pre; 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; @@ -1306,9 +1275,8 @@ mraa_intel_edison_fab_c() } if (mraa_gpio_read_dir(tristate, &tristate_dir) != MRAA_SUCCESS) { - free(b->pins); - free(b->adv_func); - goto error; + free(b->adv_func); + goto error; } if (tristate_dir != MRAA_GPIO_OUT) { @@ -1328,10 +1296,7 @@ mraa_intel_edison_fab_c() b->pins[0].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 1 }; b->pins[0].gpio.pinmap = 130; b->pins[0].gpio.parent_id = 0; - b->pins[0].gpio.mux_total = 1; - b->pins[0].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[0].gpio.mux[0].pin = 216; - b->pins[0].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[0].gpio.mux_total = 0; b->pins[0].uart.pinmap = 0; b->pins[0].uart.parent_id = 0; b->pins[0].uart.mux_total = 0; @@ -1340,52 +1305,37 @@ mraa_intel_edison_fab_c() b->pins[1].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 1 }; b->pins[1].gpio.pinmap = 131; b->pins[1].gpio.parent_id = 0; - b->pins[1].gpio.mux_total = 1; - b->pins[1].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[1].gpio.mux[0].pin = 217; - b->pins[1].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[1].gpio.mux_total = 0; b->pins[1].uart.pinmap = 0; b->pins[1].uart.parent_id = 0; b->pins[1].uart.mux_total = 0; strncpy(b->pins[2].name, "IO2", 8); - b->pins[2].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }; + b->pins[2].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0 }; b->pins[2].gpio.pinmap = 128; b->pins[2].gpio.parent_id = 0; - b->pins[2].gpio.mux_total = 1; - b->pins[2].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[2].gpio.mux[0].pin = 218; - b->pins[2].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[2].gpio.mux_total = 0; strncpy(b->pins[3].name, "IO3", 8); - b->pins[3].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }; + b->pins[3].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0 }; b->pins[3].gpio.pinmap = 12; b->pins[3].gpio.parent_id = 0; - b->pins[3].gpio.mux_total = 1; - b->pins[3].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[3].gpio.mux[0].pin = 219; - b->pins[3].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[3].gpio.mux_total = 0; b->pins[3].pwm.pinmap = 0; b->pins[3].pwm.parent_id = 0; b->pins[3].pwm.mux_total = 0; strncpy(b->pins[4].name, "IO4", 8); - b->pins[4].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }; + b->pins[4].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0 }; b->pins[4].gpio.pinmap = 129; b->pins[4].gpio.parent_id = 0; - b->pins[4].gpio.mux_total = 1; - b->pins[4].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[4].gpio.mux[0].pin = 220; - b->pins[4].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[4].gpio.mux_total = 0; strncpy(b->pins[5].name, "IO5", 8); b->pins[5].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }; b->pins[5].gpio.pinmap = 13; b->pins[5].gpio.parent_id = 0; - b->pins[5].gpio.mux_total = 1; - b->pins[5].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[5].gpio.mux[0].pin = 221; - b->pins[5].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[5].gpio.mux_total = 0; b->pins[5].pwm.pinmap = 1; b->pins[5].pwm.parent_id = 0; b->pins[5].pwm.mux_total = 0; @@ -1394,40 +1344,28 @@ mraa_intel_edison_fab_c() b->pins[6].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }; b->pins[6].gpio.pinmap = 182; b->pins[6].gpio.parent_id = 0; - b->pins[6].gpio.mux_total = 1; - b->pins[6].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[6].gpio.mux[0].pin = 222; - b->pins[6].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[6].gpio.mux_total = 0; b->pins[6].pwm.pinmap = 2; b->pins[6].pwm.parent_id = 0; b->pins[6].pwm.mux_total = 0; strncpy(b->pins[7].name, "IO7", 8); - b->pins[7].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }; + b->pins[7].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0 }; b->pins[7].gpio.pinmap = 48; b->pins[7].gpio.parent_id = 0; - b->pins[7].gpio.mux_total = 1; - b->pins[7].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[7].gpio.mux[0].pin = 223; - b->pins[7].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[7].gpio.mux_total = 0; strncpy(b->pins[8].name, "IO8", 8); - b->pins[8].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }; + b->pins[8].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0 }; b->pins[8].gpio.pinmap = 49; b->pins[8].gpio.parent_id = 0; - b->pins[8].gpio.mux_total = 1; - b->pins[8].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[8].gpio.mux[0].pin = 224; - b->pins[8].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[8].gpio.mux_total = 0; strncpy(b->pins[9].name, "IO9", 8); b->pins[9].capabilites = (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }; b->pins[9].gpio.pinmap = 183; b->pins[9].gpio.parent_id = 0; - b->pins[9].gpio.mux_total = 1; - b->pins[9].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[9].gpio.mux[0].pin = 225; - b->pins[9].gpio.mux[0].value = MRAA_GPIO_IN; + b->pins[9].gpio.mux_total = 0; b->pins[9].pwm.pinmap = 3; b->pins[9].pwm.parent_id = 0; b->pins[9].pwm.mux_total = 0; @@ -1436,223 +1374,131 @@ mraa_intel_edison_fab_c() b->pins[10].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 1, 0, 0, 0 }; b->pins[10].gpio.pinmap = 41; b->pins[10].gpio.parent_id = 0; - b->pins[10].gpio.mux_total = 3; - b->pins[10].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[10].gpio.mux[0].pin = 226; - b->pins[10].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[10].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[10].gpio.mux[1].pin = 263; - b->pins[10].gpio.mux[1].value = 1; - b->pins[10].gpio.mux[2].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[10].gpio.mux[2].pin = 240; - b->pins[10].gpio.mux[2].value = 0; + b->pins[10].gpio.mux_total = 2; + b->pins[10].gpio.mux[0].pin = 263; + b->pins[10].gpio.mux[0].value = 1; + b->pins[10].gpio.mux[1].pin = 240; + b->pins[10].gpio.mux[1].value = 0; b->pins[10].spi.pinmap = 5; - b->pins[10].spi.mux_total = 3; - b->pins[10].spi.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[10].spi.mux[0].pin = 226; - b->pins[10].spi.mux[0].value = MRAA_GPIO_IN; - b->pins[10].spi.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[10].spi.mux[1].pin = 263; + b->pins[10].spi.mux_total = 2; + b->pins[10].spi.mux[0].pin = 263; + b->pins[10].spi.mux[0].value = 1; + b->pins[10].spi.mux[1].pin = 240; b->pins[10].spi.mux[1].value = 1; - b->pins[10].spi.mux[2].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[10].spi.mux[2].pin = 240; - b->pins[10].spi.mux[2].value = 1; strncpy(b->pins[11].name, "IO11", 8); b->pins[11].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 1, 0, 0, 0 }; b->pins[11].gpio.pinmap = 43; b->pins[11].gpio.parent_id = 0; - b->pins[11].gpio.mux_total = 3; - b->pins[11].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[11].gpio.mux[0].pin = 227; - b->pins[11].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[11].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[11].gpio.mux[1].pin = 262; - b->pins[11].gpio.mux[1].value = 1; - b->pins[11].gpio.mux[2].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[11].gpio.mux[2].pin = 241; - b->pins[11].gpio.mux[2].value = 0; + b->pins[11].gpio.mux_total = 2; + b->pins[11].gpio.mux[0].pin = 262; + b->pins[11].gpio.mux[0].value = 1; + b->pins[11].gpio.mux[1].pin = 241; + b->pins[11].gpio.mux[1].value = 0; b->pins[11].spi.pinmap = 5; - b->pins[11].spi.mux_total = 3; - b->pins[11].spi.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[11].spi.mux[0].pin = 227; - b->pins[11].spi.mux[0].value = MRAA_GPIO_IN; - b->pins[10].spi.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[11].spi.mux[1].pin = 262; + b->pins[11].spi.mux_total = 2; + b->pins[11].spi.mux[0].pin = 262; + b->pins[11].spi.mux[0].value = 1; + b->pins[11].spi.mux[1].pin = 241; b->pins[11].spi.mux[1].value = 1; - b->pins[10].spi.mux[2].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[11].spi.mux[2].pin = 241; - b->pins[11].spi.mux[2].value = 1; strncpy(b->pins[12].name, "IO12", 8); b->pins[12].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 1, 0, 0, 0 }; b->pins[12].gpio.pinmap = 42; b->pins[12].gpio.parent_id = 0; - b->pins[12].gpio.mux_total = 2; - b->pins[12].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[12].gpio.mux[0].pin = 228; - b->pins[12].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[12].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[12].gpio.mux[1].pin = 242; - b->pins[12].gpio.mux[1].value = 0; + b->pins[12].gpio.mux_total = 1; + b->pins[12].gpio.mux[0].pin = 242; + b->pins[12].gpio.mux[0].value = 0; b->pins[12].spi.pinmap = 5; - b->pins[12].spi.mux_total = 2; - b->pins[12].spi.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[12].spi.mux[0].pin = 228; - b->pins[12].spi.mux[0].value = MRAA_GPIO_IN; - b->pins[12].spi.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[12].spi.mux[1].pin = 242; - b->pins[12].spi.mux[1].value = 1; + b->pins[12].spi.mux_total = 1; + b->pins[12].spi.mux[0].pin = 242; + b->pins[12].spi.mux[0].value = 1; strncpy(b->pins[13].name, "IO13", 8); b->pins[13].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 1, 0, 0, 0 }; b->pins[13].gpio.pinmap = 40; b->pins[13].gpio.parent_id = 0; - b->pins[13].gpio.mux_total = 2; - b->pins[13].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[13].gpio.mux[0].pin = 229; - b->pins[13].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[13].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[13].gpio.mux[1].pin = 243; - b->pins[13].gpio.mux[1].value = 0; + b->pins[13].gpio.mux_total = 1; + b->pins[13].gpio.mux[0].pin = 243; + b->pins[13].gpio.mux[0].value = 0; b->pins[13].spi.pinmap = 5; - b->pins[13].spi.mux_total = 2; - b->pins[13].spi.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[13].spi.mux[0].pin = 229; - b->pins[13].spi.mux[0].value = MRAA_GPIO_IN; - b->pins[13].spi.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[13].spi.mux[1].pin = 243; - b->pins[13].spi.mux[1].value = 1; + b->pins[13].spi.mux_total = 1; + b->pins[13].spi.mux[0].pin = 243; + b->pins[13].spi.mux[0].value = 1; strncpy(b->pins[14].name, "A0", 8); b->pins[14].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 1, 0 }; b->pins[14].aio.pinmap = 0; - b->pins[14].aio.mux_total = 2; - b->pins[14].aio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[14].aio.mux[0].pin = 208; - b->pins[14].aio.mux[0].value = MRAA_GPIO_IN; - b->pins[14].aio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[14].aio.mux[1].pin = 200; - b->pins[14].aio.mux[1].value = 1; + b->pins[14].aio.mux_total = 1; + b->pins[14].aio.mux[0].pin = 200; + b->pins[14].aio.mux[0].value = 1; b->pins[14].gpio.pinmap = 44; - b->pins[14].gpio.mux_total = 2; - b->pins[14].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[14].gpio.mux[0].pin = 208; - b->pins[14].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[14].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[14].gpio.mux[1].pin = 200; - b->pins[14].gpio.mux[1].value = 0; + b->pins[14].gpio.mux_total = 1; + b->pins[14].gpio.mux[0].pin = 200; + b->pins[14].gpio.mux[0].value = 0; strncpy(b->pins[15].name, "A1", 8); b->pins[15].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 1, 0 }; b->pins[15].aio.pinmap = 1; - b->pins[15].aio.mux_total = 2; - b->pins[15].aio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[15].aio.mux[0].pin = 209; - b->pins[15].aio.mux[0].value = MRAA_GPIO_IN; - b->pins[15].aio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[15].aio.mux[1].pin = 201; - b->pins[15].aio.mux[1].value = 1; + b->pins[15].aio.mux_total = 1; + b->pins[15].aio.mux[0].pin = 201; + b->pins[15].aio.mux[0].value = 1; b->pins[15].gpio.pinmap = 45; - b->pins[15].gpio.mux_total = 2; - b->pins[15].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[15].gpio.mux[0].pin = 209; - b->pins[15].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[15].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[15].gpio.mux[1].pin = 201; - b->pins[15].gpio.mux[1].value = 0; + b->pins[15].gpio.mux_total = 1; + b->pins[15].gpio.mux[0].pin = 201; + b->pins[15].gpio.mux[0].value = 0; strncpy(b->pins[16].name, "A2", 8); b->pins[16].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 1, 0 }; b->pins[16].aio.pinmap = 2; - b->pins[16].aio.mux_total = 2; - b->pins[16].aio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[16].aio.mux[0].pin = 210; - b->pins[16].aio.mux[0].value = MRAA_GPIO_IN; - b->pins[16].aio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[16].aio.mux[1].pin = 202; - b->pins[16].aio.mux[1].value = 1; + b->pins[16].aio.mux_total = 1; + b->pins[16].aio.mux[0].pin = 202; + b->pins[16].aio.mux[0].value = 1; b->pins[16].gpio.pinmap = 46; - b->pins[16].gpio.mux_total = 2; - b->pins[16].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[16].gpio.mux[0].pin = 210; - b->pins[16].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[16].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[16].gpio.mux[1].pin = 202; - b->pins[16].gpio.mux[1].value = 0; + b->pins[16].gpio.mux_total = 1; + b->pins[16].gpio.mux[0].pin = 202; + b->pins[16].gpio.mux[0].value = 0; strncpy(b->pins[17].name, "A3", 8); b->pins[17].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 1, 0 }; b->pins[17].aio.pinmap = 3; - b->pins[17].aio.mux_total = 2; - b->pins[17].aio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[17].aio.mux[0].pin = 211; - b->pins[17].aio.mux[0].value = MRAA_GPIO_IN; - b->pins[17].aio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[17].aio.mux[1].pin = 203; - b->pins[17].aio.mux[1].value = 1; + b->pins[17].aio.mux_total = 1; + b->pins[17].aio.mux[0].pin = 203; + b->pins[17].aio.mux[0].value = 1; b->pins[17].gpio.pinmap = 47; - b->pins[17].gpio.mux_total = 2; - b->pins[17].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[17].gpio.mux[0].pin = 211; - b->pins[17].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[17].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[17].gpio.mux[1].pin = 203; - b->pins[17].gpio.mux[1].value = 0; + b->pins[17].gpio.mux_total = 1; + b->pins[17].gpio.mux[0].pin = 203; + b->pins[17].gpio.mux[0].value = 0; strncpy(b->pins[18].name, "A4", 8); b->pins[18].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 1, 1, 0 }; b->pins[18].i2c.pinmap = 1; - b->pins[18].i2c.mux_total = 2; - b->pins[18].i2c.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[18].i2c.mux[0].pin = 212; - b->pins[18].i2c.mux[0].value = MRAA_GPIO_IN; - b->pins[18].i2c.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[18].i2c.mux[1].pin = 204; - b->pins[18].i2c.mux[1].value = 0; + b->pins[18].i2c.mux_total = 1; + b->pins[18].i2c.mux[0].pin = 204; + b->pins[18].i2c.mux[0].value = 0; b->pins[18].aio.pinmap = 4; - b->pins[18].aio.mux_total = 2; - b->pins[18].aio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[18].aio.mux[0].pin = 212; - b->pins[18].aio.mux[0].value = MRAA_GPIO_IN; - b->pins[18].aio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[18].aio.mux[1].pin = 204; - b->pins[18].aio.mux[1].value = 1; + b->pins[18].aio.mux_total = 1; + b->pins[18].aio.mux[0].pin = 204; + b->pins[18].aio.mux[0].value = 1; b->pins[18].gpio.pinmap = 14; - b->pins[18].gpio.mux_total = 2; - b->pins[18].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[18].gpio.mux[0].pin = 212; - b->pins[18].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[18].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[18].gpio.mux[1].pin = 204; - b->pins[18].gpio.mux[1].value = 0; + b->pins[18].gpio.mux_total = 1; + b->pins[18].gpio.mux[0].pin = 204; + b->pins[18].gpio.mux[0].value = 0; strncpy(b->pins[19].name, "A5", 8); b->pins[19].capabilites = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 1, 1, 0 }; b->pins[19].i2c.pinmap = 1; - b->pins[19].i2c.mux_total = 2; - b->pins[19].i2c.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[19].i2c.mux[0].pin = 213; - b->pins[19].i2c.mux[0].value = MRAA_GPIO_IN; - b->pins[19].i2c.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[19].i2c.mux[1].pin = 205; - b->pins[19].i2c.mux[1].value = 0; + b->pins[19].i2c.mux_total = 1; + b->pins[19].i2c.mux[0].pin = 205; + b->pins[19].i2c.mux[0].value = 0; b->pins[19].aio.pinmap = 5; - b->pins[19].aio.mux_total = 2; - b->pins[18].aio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[18].aio.mux[0].pin = 213; - b->pins[18].aio.mux[0].value = MRAA_GPIO_IN; - b->pins[18].aio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[19].aio.mux[1].pin = 205; - b->pins[19].aio.mux[1].value = 1; + b->pins[19].aio.mux_total = 1; + b->pins[19].aio.mux[0].pin = 205; + b->pins[19].aio.mux[0].value = 1; b->pins[19].gpio.pinmap = 165; - b->pins[19].gpio.mux_total = 2; - b->pins[19].gpio.mux[0].pincmd = PINCMD_SET_DIRECTION; - b->pins[19].gpio.mux[0].pin = 213; - b->pins[19].gpio.mux[0].value = MRAA_GPIO_IN; - b->pins[19].gpio.mux[1].pincmd = PINCMD_SET_OUT_VALUE; - b->pins[19].gpio.mux[1].pin = 205; - b->pins[19].gpio.mux[1].value = 0; + b->pins[19].gpio.mux_total = 1; + b->pins[19].gpio.mux[0].pin = 205; + b->pins[19].gpio.mux[0].value = 0; // BUS DEFINITIONS b->i2c_bus_count = 9; @@ -1723,8 +1569,7 @@ mraa_intel_edison_fab_c() pinmodes[6].pwm.sysfs = 182; pinmodes[6].pwm.mode = 1; - // 7 and 8 are provided by something on i2c, very simple - + // 7 and 8 are provided by something on i2c, very simplepinmodes[3].gpio.sysfs = 12; pinmodes[9].gpio.sysfs = 183; pinmodes[9].gpio.mode = 0; pinmodes[9].pwm.sysfs = 183; @@ -1749,9 +1594,7 @@ mraa_intel_edison_fab_c() pinmodes[13].gpio.mode = 0; pinmodes[13].spi.sysfs = 109; // Different pin provides, switched at mux level. pinmodes[13].spi.mode = 1; - // Everything else but A4 A5 LEAVE - pinmodes[18].gpio.sysfs = 14; pinmodes[18].gpio.mode = 0; pinmodes[18].i2c.sysfs = 28; |