diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-11-09 19:51:32 +0100 |
|---|---|---|
| committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-11-28 11:06:57 +0100 |
| commit | 3020f5caf0b09fcaf85b3b3fa84fdf688ba22cc0 (patch) | |
| tree | 971e36ac2bbd28b534791ca07efeca9e762c614a /source/gpio_ext.c | |
| parent | 41a46914821b1ea72c6dd68b308a3740276139ee (diff) | |
K20: can and spi fixesApalis-TK1_LXDE-Image_2.8b1.64-20171229Apalis-TK1_LXDE-Image_2.7b5-20171201
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'source/gpio_ext.c')
| -rw-r--r-- | source/gpio_ext.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/gpio_ext.c b/source/gpio_ext.c index 977a42e..6d4d3a8 100644 --- a/source/gpio_ext.c +++ b/source/gpio_ext.c @@ -39,8 +39,11 @@ int is_gpio_valid(uint8_t pin) for (i = 0; i < sizeof(gpio_list)/sizeof(struct gpio_id); i++){ temp = port_type_to_int(gpio_list[i].port) * 32; temp += gpio_list[i].pin; - if ( temp == pin ) + if ( temp == pin ) { return i; + } + if (temp > pin) + return -EINVAL; } return -EINVAL; @@ -95,7 +98,7 @@ int gpio_registers(dspi_transfer_t *spi_transfer) uint8_t *tx_buf = &spi_transfer->txData[1]; if (rx_buf[0] == APALIS_TK1_K20_READ_INST) { - switch (rx_buf[1]) { + switch (rx_buf[2]) { case APALIS_TK1_K20_GPIOREG: return -ENOENT; break; @@ -109,7 +112,10 @@ int gpio_registers(dspi_transfer_t *spi_transfer) case APALIS_TK1_K20_GPIO_STA: if (gen_regs.gpio_no != 0xFF){ tx_buf[0] = get_gpio_status(gen_regs.gpio_no); - return 1; + if (tx_buf[0] != 0xFF) + return 1; + else + return -ENOENT; } else return -ENOENT; break; @@ -124,7 +130,7 @@ int gpio_registers(dspi_transfer_t *spi_transfer) case APALIS_TK1_K20_GPIO_NO: if (is_gpio_valid(rx_buf[2]) >= 0){ gen_regs.gpio_no = rx_buf[2]; - return 0; + return 1; } else { gen_regs.gpio_no = 0xFF; return -ENOENT; |