From e892db1aaff2ca87d73af888e35d7d43d15218b4 Mon Sep 17 00:00:00 2001 From: Rob Date: Sun, 7 Jul 2013 21:13:08 -0400 Subject: [PATCH] hdl: driver: change GPIO register size to 32 bits GPIO reads and writes can now 8 bits of the 32bit nios_gpio (GPIO register) register at a time by subscripting into the register with the uart_cmd.addr variable. addr 0 operates on the least significant byte, addr 1 operates on the second least significant byte. --- .../lms_spi_controller/hello_world_small.c | 8 +++-- linux/lib/src/bladerf.c | 29 ++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/hdl/fpga/ip/altera/nios_system/software/lms_spi_controller/hello_world_small.c b/hdl/fpga/ip/altera/nios_system/software/lms_spi_controller/hello_world_small.c index 4d72ae41..dd73e580 100644 --- a/hdl/fpga/ip/altera/nios_system/software/lms_spi_controller/hello_world_small.c +++ b/hdl/fpga/ip/altera/nios_system/software/lms_spi_controller/hello_world_small.c @@ -352,9 +352,13 @@ int main() } if ((mode & UART_PKT_MODE_DEV_MASK) == UART_PKT_DEV_GPIO) { if ((mode & UART_PKT_MODE_DIR_MASK) == UART_PKT_MODE_DIR_READ) { - cmd_ptr->data = IORD_ALTERA_AVALON_PIO_DATA(PIO_0_BASE) ; + cmd_ptr->data = (IORD_ALTERA_AVALON_PIO_DATA(PIO_0_BASE)) >> (cmd_ptr->addr * 8); } else if ((mode & UART_PKT_MODE_DIR_MASK) == UART_PKT_MODE_DIR_WRITE) { - IOWR_ALTERA_AVALON_PIO_DATA(PIO_0_BASE, cmd_ptr->data); + uint32_t tmpvar; + tmpvar = IORD_ALTERA_AVALON_PIO_DATA(PIO_0_BASE); + tmpvar &= ~ (0xff << (8 * cmd_ptr->addr)); + tmpvar |= cmd_ptr->data << (8 * cmd_ptr->addr); + IOWR_ALTERA_AVALON_PIO_DATA(PIO_0_BASE, tmpvar); cmd_ptr->data = 0; } else { cmd_ptr->addr = 0; diff --git a/linux/lib/src/bladerf.c b/linux/lib/src/bladerf.c index d029d72e..09d452e9 100644 --- a/linux/lib/src/bladerf.c +++ b/linux/lib/src/bladerf.c @@ -810,20 +810,35 @@ int lms_spi_write(struct bladerf *dev, uint8_t address, uint8_t val) int gpio_read(struct bladerf *dev, uint32_t *val) { int ret; + int i; + uint32_t rval; struct uart_cmd uc; - uc.addr = 0; - uc.data = 0xff; - ret = ioctl(dev->fd, BLADE_GPIO_READ, &uc); - *val = uc.data; + rval = 0; + for (i = 0; i < 4; i++) { + uc.addr = i; + uc.data = 0xff; + ret = ioctl(dev->fd, BLADE_GPIO_READ, &uc); + if (ret) + break; + rval |= uc.data << (i * 8); + } + *val = rval; return ret; } int gpio_write(struct bladerf *dev, uint32_t val) { struct uart_cmd uc; - uc.addr = 0; - uc.data = val; - return ioctl(dev->fd, BLADE_GPIO_WRITE, &uc); + int ret; + int i; + for (i = 0; i < 4; i++) { + uc.addr = i; + uc.data = val >> (i * 8); + ret = ioctl(dev->fd, BLADE_GPIO_WRITE, &uc); + if (ret) + break; + } + return ret; } /*------------------------------------------------------------------------------