From 0b814debbf212931bec354c03cc83d808a753fc4 Mon Sep 17 00:00:00 2001 From: "Vanya A. Sergeev" Date: Tue, 11 Apr 2017 19:58:01 -0700 Subject: [PATCH] libbladeRF/backend: add ina219 accessors --- .../libbladeRF/src/backend/backend.h | 4 +++ .../libbladeRF/src/backend/dummy/dummy.c | 13 ++++++++++ .../libbladeRF/src/backend/usb/nios_access.c | 26 +++++++++++++++++++ .../libbladeRF/src/backend/usb/nios_access.h | 22 ++++++++++++++++ .../src/backend/usb/nios_legacy_access.c | 12 +++++++++ .../src/backend/usb/nios_legacy_access.h | 22 ++++++++++++++++ .../libbladeRF/src/backend/usb/usb.c | 6 +++++ 7 files changed, 105 insertions(+) diff --git a/host/libraries/libbladeRF/src/backend/backend.h b/host/libraries/libbladeRF/src/backend/backend.h index e752b677..36878789 100644 --- a/host/libraries/libbladeRF/src/backend/backend.h +++ b/host/libraries/libbladeRF/src/backend/backend.h @@ -155,6 +155,10 @@ struct backend_fns { int (*lms_write)(struct bladerf *dev, uint8_t addr, uint8_t data); int (*lms_read)(struct bladerf *dev, uint8_t addr, uint8_t *data); + /* INA219 accessors */ + int (*ina219_write)(struct bladerf *dev, uint8_t addr, uint16_t data); + int (*ina219_read)(struct bladerf *dev, uint8_t addr, uint16_t *data); + /* AD9361 accessors */ int (*ad9361_spi_write)(struct bladerf *dev, uint16_t cmd, uint64_t data); int (*ad9361_spi_read)(struct bladerf *dev, uint16_t cmd, uint64_t *data); diff --git a/host/libraries/libbladeRF/src/backend/dummy/dummy.c b/host/libraries/libbladeRF/src/backend/dummy/dummy.c index 28049a15..2a4b9a76 100644 --- a/host/libraries/libbladeRF/src/backend/dummy/dummy.c +++ b/host/libraries/libbladeRF/src/backend/dummy/dummy.c @@ -213,6 +213,16 @@ static int dummy_lms_read(struct bladerf *dev, uint8_t addr, uint8_t *data) return 0; } +static int dummy_ina219_write(struct bladerf *dev, uint8_t cmd, uint16_t data) +{ + return 0; +} + +static int dummy_ina219_read(struct bladerf *dev, uint8_t addr, uint16_t *data) +{ + return 0; +} + static int dummy_ad9361_spi_write(struct bladerf *dev, uint16_t cmd, uint64_t data) { return 0; @@ -415,6 +425,9 @@ const struct backend_fns backend_fns_dummy = { FIELD_INIT(.lms_write, dummy_lms_write), FIELD_INIT(.lms_read, dummy_lms_read), + FIELD_INIT(.ina219_write, dummy_ina219_write), + FIELD_INIT(.ina219_read, dummy_ina219_read), + FIELD_INIT(.ad9361_spi_write, dummy_ad9361_spi_write), FIELD_INIT(.ad9361_spi_read, dummy_ad9361_spi_read), diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_access.c b/host/libraries/libbladeRF/src/backend/usb/nios_access.c index 74e67fe8..30ce3eba 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_access.c +++ b/host/libraries/libbladeRF/src/backend/usb/nios_access.c @@ -524,6 +524,32 @@ int nios_lms6_write(struct bladerf *dev, uint8_t addr, uint8_t data) return status; } +int nios_ina219_read(struct bladerf *dev, uint8_t addr, uint16_t *data) +{ + int status; + + status = nios_8x16_read(dev, NIOS_PKT_8x16_TARGET_INA219, addr, data); + if (status == 0) { + log_verbose("%s: Read 0x%04x from addr 0x%02x\n", + __FUNCTION__, *data, addr); + } + + return status; +} + +int nios_ina219_write(struct bladerf *dev, uint8_t addr, uint16_t data) +{ + int status; + + status = nios_8x16_write(dev, NIOS_PKT_8x16_TARGET_INA219, addr, data); + if (status == 0) { + log_verbose("%s: Wrote 0x%04x to addr 0x%02x\n", + __FUNCTION__, data, addr); + } + + return status; +} + int nios_ad9361_spi_read(struct bladerf *dev, uint16_t cmd, uint64_t *data) { int status; diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_access.h b/host/libraries/libbladeRF/src/backend/usb/nios_access.h index 53d10a37..ec38e2b9 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_access.h +++ b/host/libraries/libbladeRF/src/backend/usb/nios_access.h @@ -126,6 +126,28 @@ int nios_lms6_read(struct bladerf *dev, uint8_t addr, uint8_t *data); */ int nios_lms6_write(struct bladerf *dev, uint8_t addr, uint8_t data); +/** + * Read from an INA219 register + * + * @param[in] dev Device handle + * @param[in] addr Register address + * @param[out] data Data + * + * @return 0 on success, BLADERF_ERR_* code on error. + */ +int nios_ina219_read(struct bladerf *dev, uint8_t addr, uint16_t *data); + +/** + * Write to an INA219 register + * + * @param[in] dev Device handle + * @param[in] addr Register address + * @param[in] data Data + * + * @return 0 on success, BLADERF_ERR_* code on error. + */ +int nios_ina219_write(struct bladerf *dev, uint8_t addr, uint16_t data); + /** * Read the AD9361 over SPI. * diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c index f2ecad86..18f5141d 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c +++ b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c @@ -360,6 +360,18 @@ int nios_legacy_lms6_write(struct bladerf *dev, uint8_t addr, uint8_t data) return status; } +int nios_legacy_ina219_read(struct bladerf *dev, uint8_t addr, uint16_t *data) +{ + log_debug("This operation is not supported by the legacy NIOS packet format\n"); + return BLADERF_ERR_UNSUPPORTED; +} + +int nios_legacy_ina219_write(struct bladerf *dev, uint8_t addr, uint16_t data) +{ + log_debug("This operation is not supported by the legacy NIOS packet format\n"); + return BLADERF_ERR_UNSUPPORTED; +} + int nios_legacy_ad9361_spi_read(struct bladerf *dev, uint16_t cmd, uint64_t *data) { diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h index e66d7daf..d9d6e5ef 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h +++ b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h @@ -152,6 +152,28 @@ int nios_legacy_lms6_read(struct bladerf *dev, uint8_t addr, uint8_t *data); */ int nios_legacy_lms6_write(struct bladerf *dev, uint8_t addr, uint8_t data); +/** + * Read from an INA219 register + * + * @param[in] dev Device handle + * @param[in] addr Register address + * @param[out] data Data + * + * @return 0 on success, BLADERF_ERR_* code on error. + */ +int nios_legacy_ina219_read(struct bladerf *dev, uint8_t addr, uint16_t *data); + +/** + * Write to an INA219 register + * + * @param[in] dev Device handle + * @param[in] addr Register address + * @param[in] data Data + * + * @return 0 on success, BLADERF_ERR_* code on error. + */ +int nios_legacy_ina219_write(struct bladerf *dev, uint8_t addr, uint16_t data); + /** * Read the AD9361 over SPI. * diff --git a/host/libraries/libbladeRF/src/backend/usb/usb.c b/host/libraries/libbladeRF/src/backend/usb/usb.c index 6f023ed1..6be02c3e 100644 --- a/host/libraries/libbladeRF/src/backend/usb/usb.c +++ b/host/libraries/libbladeRF/src/backend/usb/usb.c @@ -1145,6 +1145,9 @@ const struct backend_fns backend_fns_usb_legacy = { FIELD_INIT(.lms_write, nios_legacy_lms6_write), FIELD_INIT(.lms_read, nios_legacy_lms6_read), + FIELD_INIT(.ina219_write, nios_legacy_ina219_write), + FIELD_INIT(.ina219_read, nios_legacy_ina219_read), + FIELD_INIT(.ad9361_spi_write, nios_legacy_ad9361_spi_write), FIELD_INIT(.ad9361_spi_read, nios_legacy_ad9361_spi_read), @@ -1238,6 +1241,9 @@ const struct backend_fns backend_fns_usb = { FIELD_INIT(.lms_write, nios_lms6_write), FIELD_INIT(.lms_read, nios_lms6_read), + FIELD_INIT(.ina219_write, nios_ina219_write), + FIELD_INIT(.ina219_read, nios_ina219_read), + FIELD_INIT(.ad9361_spi_write, nios_ad9361_spi_write), FIELD_INIT(.ad9361_spi_read, nios_ad9361_spi_read),