From dcbc67fd6086ed8191564e7724592e777afc6847 Mon Sep 17 00:00:00 2001 From: kidswong999 Date: Mon, 24 Jun 2019 14:23:00 +0800 Subject: [PATCH] Change sensor reg_addr to uint16_t --- src/omv/lepton.c | 4 ++-- src/omv/mt9v034.c | 4 ++-- src/omv/ov7725.c | 4 ++-- src/omv/sensor.c | 4 ++-- src/omv/sensor.h | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/omv/lepton.c b/src/omv/lepton.c index 88d341f51..ffb5488cd 100644 --- a/src/omv/lepton.c +++ b/src/omv/lepton.c @@ -115,7 +115,7 @@ static int sleep(sensor_t *sensor, int enable) return 0; } -static int read_reg(sensor_t *sensor, uint8_t reg_addr) +static int read_reg(sensor_t *sensor, uint16_t reg_addr) { uint16_t reg_data; if (cambus_readw2(sensor->slv_addr, reg_addr, ®_data)) { @@ -124,7 +124,7 @@ static int read_reg(sensor_t *sensor, uint8_t reg_addr) return reg_data; } -static int write_reg(sensor_t *sensor, uint8_t reg_addr, uint16_t reg_data) +static int write_reg(sensor_t *sensor, uint16_t reg_addr, uint16_t reg_data) { return cambus_writew2(sensor->slv_addr, reg_addr, reg_data); } diff --git a/src/omv/mt9v034.c b/src/omv/mt9v034.c index a0ff0681d..a72f0e39a 100644 --- a/src/omv/mt9v034.c +++ b/src/omv/mt9v034.c @@ -148,7 +148,7 @@ static int sleep(sensor_t *sensor, int enable) return 0; } -static int read_reg(sensor_t *sensor, uint8_t reg_addr) +static int read_reg(sensor_t *sensor, uint16_t reg_addr) { uint16_t reg_data; @@ -159,7 +159,7 @@ static int read_reg(sensor_t *sensor, uint8_t reg_addr) return reg_data; } -static int write_reg(sensor_t *sensor, uint8_t reg_addr, uint16_t reg_data) +static int write_reg(sensor_t *sensor, uint16_t reg_addr, uint16_t reg_data) { return cambus_writew(sensor->slv_addr, reg_addr, reg_data); } diff --git a/src/omv/ov7725.c b/src/omv/ov7725.c index 9fa8aeda8..da5fc829d 100644 --- a/src/omv/ov7725.c +++ b/src/omv/ov7725.c @@ -179,7 +179,7 @@ static int sleep(sensor_t *sensor, int enable) return cambus_writeb(sensor->slv_addr, COM2, reg) | ret; } -static int read_reg(sensor_t *sensor, uint8_t reg_addr) +static int read_reg(sensor_t *sensor, uint16_t reg_addr) { uint8_t reg_data; if (cambus_readb(sensor->slv_addr, reg_addr, ®_data) != 0) { @@ -188,7 +188,7 @@ static int read_reg(sensor_t *sensor, uint8_t reg_addr) return reg_data; } -static int write_reg(sensor_t *sensor, uint8_t reg_addr, uint16_t reg_data) +static int write_reg(sensor_t *sensor, uint16_t reg_addr, uint16_t reg_data) { return cambus_writeb(sensor->slv_addr, reg_addr, reg_data); } diff --git a/src/omv/sensor.c b/src/omv/sensor.c index 21bc4c208..18270d85f 100644 --- a/src/omv/sensor.c +++ b/src/omv/sensor.c @@ -423,7 +423,7 @@ int sensor_shutdown(int enable) return 0; } -int sensor_read_reg(uint8_t reg_addr) +int sensor_read_reg(uint16_t reg_addr) { if (sensor.read_reg == NULL) { // Operation not supported @@ -432,7 +432,7 @@ int sensor_read_reg(uint8_t reg_addr) return sensor.read_reg(&sensor, reg_addr); } -int sensor_write_reg(uint8_t reg_addr, uint16_t reg_data) +int sensor_write_reg(uint16_t reg_addr, uint16_t reg_data) { if (sensor.write_reg == NULL) { // Operation not supported diff --git a/src/omv/sensor.h b/src/omv/sensor.h index b73e89576..0b9b09e39 100644 --- a/src/omv/sensor.h +++ b/src/omv/sensor.h @@ -150,8 +150,8 @@ typedef struct _sensor { // Sensor function pointers int (*reset) (sensor_t *sensor); int (*sleep) (sensor_t *sensor, int enable); - int (*read_reg) (sensor_t *sensor, uint8_t reg_addr); - int (*write_reg) (sensor_t *sensor, uint8_t reg_addr, uint16_t reg_data); + int (*read_reg) (sensor_t *sensor, uint16_t reg_addr); + int (*write_reg) (sensor_t *sensor, uint16_t reg_addr, uint16_t reg_data); int (*set_pixformat) (sensor_t *sensor, pixformat_t pixformat); int (*set_framesize) (sensor_t *sensor, framesize_t framesize); int (*set_framerate) (sensor_t *sensor, framerate_t framerate); @@ -197,10 +197,10 @@ int sensor_sleep(int enable); int sensor_shutdown(int enable); // Read a sensor register. -int sensor_read_reg(uint8_t reg_addr); +int sensor_read_reg(uint16_t reg_addr); // Write a sensor register. -int sensor_write_reg(uint8_t reg_addr, uint16_t reg_data); +int sensor_write_reg(uint16_t reg_addr, uint16_t reg_data); // Set the sensor pixel format. int sensor_set_pixformat(pixformat_t pixformat);