Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 01:21:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

drivers/video/isx012: Make the I2C access more efficient

Browse Source 
Store the i2c configuration in power on
because they are not changed permanently.
This commit is contained in:
SPRESENSE
2024-03-04 14:28:29 +09:00
committed by Alin Jerpelea
parent d9f9c0143c
commit 1d2fcc81f4
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/video/isx012.c
+12 -24
View File
@@ -195,8 +195,7 @@ struct isx012_dev_s
struct imgsensor_s sensor; struct imgsensor_s sensor;
mutex_t i2c_lock; mutex_t i2c_lock;
FAR struct i2c_master_s *i2c; /* I2C interface */ FAR struct i2c_master_s *i2c; /* I2C interface */
uint8_t i2c_addr; /* I2C address */ struct i2c_config_s i2c_cfg; /* I2C config */
int i2c_freq; /* Frequency */
isx012_state_t state; /* ISX012 status */ isx012_state_t state; /* ISX012 status */
uint8_t mode; /* ISX012 mode */ uint8_t mode; /* ISX012 mode */
isx012_rect_t clip_video; /* Clip information for VIDEO */ isx012_rect_t clip_video; /* Clip information for VIDEO */
@@ -675,16 +674,10 @@ static isx012_dev_t g_isx012_private =
static uint16_t isx012_getreg(FAR isx012_dev_t *priv, static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
uint16_t regaddr, uint16_t regsize) uint16_t regaddr, uint16_t regsize)
{ {
struct i2c_config_s config;
uint16_t regval = 0; uint16_t regval = 0;
uint8_t buffer[2]; uint8_t buffer[2];
int ret; int ret;
/* Set up the I2C configuration */
config.frequency = priv->i2c_freq;
config.address = priv->i2c_addr;
config.addrlen = 7;
buffer[0] = regaddr >> 8; buffer[0] = regaddr >> 8;
buffer[1] = regaddr & 0xff; buffer[1] = regaddr & 0xff;
@@ -692,7 +685,7 @@ static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
/* Write the register address */ /* Write the register address */
ret = i2c_write(priv->i2c, &config, (FAR uint8_t *)buffer, 2); ret = i2c_write(priv->i2c, &priv->i2c_cfg, (FAR uint8_t *)buffer, 2);
if (ret < 0) if (ret < 0)
{ {
verr("i2c_write failed: %d\n", ret); verr("i2c_write failed: %d\n", ret);
@@ -701,7 +694,8 @@ static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
{ {
/* Restart and read 16bits from the register */ /* Restart and read 16bits from the register */
ret = i2c_read(priv->i2c, &config, (FAR uint8_t *)buffer, regsize); ret = i2c_read(priv->i2c, &priv->i2c_cfg,
(FAR uint8_t *)buffer, regsize);
if (ret < 0) if (ret < 0)
{ {
verr("i2c_read failed: %d\n", ret); verr("i2c_read failed: %d\n", ret);
@@ -721,18 +715,11 @@ static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
static int isx012_putreg(FAR isx012_dev_t *priv, static int isx012_putreg(FAR isx012_dev_t *priv,
uint16_t regaddr, uint32_t regval, uint16_t regsize) uint16_t regaddr, uint32_t regval, uint16_t regsize)
{ {
struct i2c_config_s config;
uint8_t buffer[6]; uint8_t buffer[6];
int ret; int ret;
DEBUGASSERT(regsize <= 4); DEBUGASSERT(regsize <= 4);
/* Set up the I2C configuration */
config.frequency = priv->i2c_freq;
config.address = priv->i2c_addr;
config.addrlen = 7;
/* Set up for the transfer */ /* Set up for the transfer */
buffer[0] = regaddr >> 8; /* RegAddr Hi */ buffer[0] = regaddr >> 8; /* RegAddr Hi */
@@ -744,7 +731,7 @@ static int isx012_putreg(FAR isx012_dev_t *priv,
/* And do it */ /* And do it */
ret = i2c_write(priv->i2c, &config, ret = i2c_write(priv->i2c, &priv->i2c_cfg,
(FAR uint8_t *)buffer, regsize + 2); (FAR uint8_t *)buffer, regsize + 2);
if (ret < 0) if (ret < 0)
{ {
@@ -1395,7 +1382,7 @@ int init_isx012(FAR isx012_dev_t *priv)
#endif #endif
priv->state = STATE_ISX012_SLEEP; priv->state = STATE_ISX012_SLEEP;
priv->i2c_freq = I2CFREQ_FAST; priv->i2c_cfg.frequency = I2CFREQ_FAST;
/* initialize the isx012 hardware */ /* initialize the isx012 hardware */
@@ -1443,9 +1430,10 @@ static int isx012_init(FAR struct imgsensor_s *sensor)
FAR isx012_dev_t *priv = (FAR isx012_dev_t *)sensor; FAR isx012_dev_t *priv = (FAR isx012_dev_t *)sensor;
int ret = 0; int ret = 0;
priv->i2c = board_isx012_initialize(); priv->i2c = board_isx012_initialize();
priv->i2c_addr = ISX012_I2C_SLV_ADDR; priv->i2c_cfg.address = ISX012_I2C_SLV_ADDR;
priv->i2c_freq = I2CFREQ_STANDARD; priv->i2c_cfg.addrlen = 7;
priv->i2c_cfg.frequency = I2CFREQ_STANDARD;
ret = board_isx012_power_on(); ret = board_isx012_power_on();
if (ret < 0) if (ret < 0)
@@ -1488,8 +1476,8 @@ static int isx012_uninit(FAR struct imgsensor_s *sensor)
board_isx012_uninitialize(priv->i2c); board_isx012_uninitialize(priv->i2c);
priv->i2c_freq = I2CFREQ_STANDARD; priv->i2c_cfg.frequency = I2CFREQ_STANDARD;
priv->state = STATE_ISX012_POWEROFF; priv->state = STATE_ISX012_POWEROFF;
return ret; return ret;
} }