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

Store the i2c configuration in power on because they are not changed permanently.
SPRESENSE · Mar 21, 2024 · 0b8e564 · 0b8e564
1 parent 741f27b
commit 0b8e564
Showing 1 changed file with 11 additions and 24 deletions.
diff --git a/drivers/video/isx012.c b/drivers/video/isx012.c
@@ -195,8 +195,7 @@ struct isx012_dev_s
   struct imgsensor_s      sensor;
   mutex_t                 i2c_lock;
   FAR struct i2c_master_s *i2c;        /* I2C interface */
-  uint8_t                 i2c_addr;    /* I2C address */
-  int                     i2c_freq;    /* Frequency */
+  struct i2c_config_s     i2c_cfg;     /* I2C config */
   isx012_state_t          state;       /* ISX012 status */
   uint8_t                 mode;        /* ISX012 mode */
   isx012_rect_t           clip_video;  /* Clip information for VIDEO */
@@ -675,24 +674,18 @@ static isx012_dev_t g_isx012_private =
 static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
                               uint16_t regaddr, uint16_t regsize)
 {
-  struct i2c_config_s config;
   uint16_t regval = 0;
   uint8_t buffer[2];
   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[1] = regaddr & 0xff;
 
   nxmutex_lock(&priv->i2c_lock);
 
   /* 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)
     {
       verr("i2c_write failed: %d\n", ret);
@@ -701,7 +694,7 @@ static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
     {
       /* 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)
         {
           verr("i2c_read failed: %d\n", ret);
@@ -721,18 +714,11 @@ static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
 static int isx012_putreg(FAR isx012_dev_t *priv,
                          uint16_t regaddr, uint32_t regval, uint16_t regsize)
 {
-  struct i2c_config_s config;
   uint8_t buffer[6];
   int ret;
 
   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 */
 
   buffer[0] = regaddr >> 8;   /* RegAddr Hi */
@@ -744,7 +730,7 @@ static int isx012_putreg(FAR isx012_dev_t *priv,
 
   /* And do it */
 
-  ret = i2c_write(priv->i2c, &config,
+  ret = i2c_write(priv->i2c, &priv->i2c_cfg,
                  (FAR uint8_t *)buffer, regsize + 2);
   if (ret < 0)
     {
@@ -1395,7 +1381,7 @@ int init_isx012(FAR isx012_dev_t *priv)
 #endif
 
   priv->state = STATE_ISX012_SLEEP;
-  priv->i2c_freq = I2CFREQ_FAST;
+  priv->i2c_cfg.frequency = I2CFREQ_FAST;
 
   /* initialize the isx012 hardware */
 
@@ -1443,9 +1429,10 @@ static int isx012_init(FAR struct imgsensor_s *sensor)
   FAR isx012_dev_t *priv = (FAR isx012_dev_t *)sensor;
   int ret = 0;
 
-  priv->i2c      = board_isx012_initialize();
-  priv->i2c_addr = ISX012_I2C_SLV_ADDR;
-  priv->i2c_freq = I2CFREQ_STANDARD;
+  priv->i2c               = board_isx012_initialize();
+  priv->i2c_cfg.address   = ISX012_I2C_SLV_ADDR;
+  priv->i2c_cfg.addrlen   = 7;
+  priv->i2c_cfg.frequency = I2CFREQ_STANDARD;
 
   ret = board_isx012_power_on();
   if (ret < 0)
@@ -1488,8 +1475,8 @@ static int isx012_uninit(FAR struct imgsensor_s *sensor)
 
   board_isx012_uninitialize(priv->i2c);
 
-  priv->i2c_freq = I2CFREQ_STANDARD;
-  priv->state    = STATE_ISX012_POWEROFF;
+  priv->i2c_cfg.frequency = I2CFREQ_STANDARD;
+  priv->state             = STATE_ISX012_POWEROFF;
 
   return ret;
 }