From fecf856169c45152fda950a1d97db7dbed3777bf Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sat, 21 Oct 2017 14:17:53 +0200 Subject: [PATCH] Revert "Add generic cam bus read/write." This reverts commit d2ebe6f7e28b88296f8b07c7a30706cd94042f39. --- src/omv/cambus.c | 12 ++++++------ src/omv/cambus.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/omv/cambus.c b/src/omv/cambus.c index 04b7f5645..de4cce573 100644 --- a/src/omv/cambus.c +++ b/src/omv/cambus.c @@ -80,24 +80,24 @@ int cambus_writeb(uint8_t slv_addr, uint8_t reg_addr, uint8_t reg_data) return ret; } -int cambus_read(uint8_t slv_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t reg_size) +int cambus_readw(uint8_t slv_addr, uint8_t reg_addr, uint16_t *reg_data) { int ret=0; __disable_irq(); - if (HAL_I2C_Mem_Read(&I2CHandle, slv_addr | 1, reg_addr, - reg_size, reg_data, reg_size, I2C_TIMEOUT) != HAL_OK) { + if (HAL_I2C_Mem_Read(&I2CHandle, slv_addr, reg_addr, + I2C_MEMADD_SIZE_8BIT, (uint8_t*) reg_data, 2, I2C_TIMEOUT) != HAL_OK) { ret = -1; } __enable_irq(); return ret; } -int cambus_write(uint8_t slv_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t reg_size) +int cambus_writew(uint8_t slv_addr, uint8_t reg_addr, uint16_t reg_data) { int ret=0; __disable_irq(); - if (HAL_I2C_Mem_Write(&I2CHandle, slv_addr | 0, reg_addr, - reg_size, reg_data, reg_size, I2C_TIMEOUT) != HAL_OK) { + if (HAL_I2C_Mem_Write(&I2CHandle, slv_addr, reg_addr, + I2C_MEMADD_SIZE_8BIT, (uint8_t*) ®_data, 2, I2C_TIMEOUT) != HAL_OK) { ret = -1; } __enable_irq(); diff --git a/src/omv/cambus.h b/src/omv/cambus.h index 987d67ffd..17f6a471e 100644 --- a/src/omv/cambus.h +++ b/src/omv/cambus.h @@ -13,6 +13,6 @@ int cambus_init(); int cambus_scan(); int cambus_readb(uint8_t slv_addr, uint8_t reg_addr, uint8_t *reg_data); int cambus_writeb(uint8_t slv_addr, uint8_t reg_addr, uint8_t reg_data); -int cambus_read(uint8_t slv_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t reg_size); -int cambus_write(uint8_t slv_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t reg_size); +int cambus_readw(uint8_t slv_addr, uint8_t reg_addr, uint16_t *reg_data); +int cambus_writew(uint8_t slv_addr, uint8_t reg_addr, uint16_t reg_data); #endif // __CAMBUS_H__