[mynewt-core] branch master updated: Fix bq27z561 and adp5061 charge control interface (#1269)

[vipulrahane]

This is an automated email from the ASF dual-hosted git repository.

vipulrahane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new b8a0075  Fix bq27z561 and adp5061 charge control interface (#1269)
b8a0075 is described below

commit b8a007522ce65b4562276791dc7287c59921e609
Author: Vipul Rahane <vrah...@gmail.com>
AuthorDate: Thu Jul 12 14:25:00 2018 -0700

    Fix bq27z561 and adp5061 charge control interface (#1269)
---
 hw/drivers/bq27z561/src/bq27z561.c        |  6 +++---
 hw/drivers/chg_ctrl/adp5061/src/adp5061.c | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/hw/drivers/bq27z561/src/bq27z561.c 
b/hw/drivers/bq27z561/src/bq27z561.c
index 64ac9cb..860bd0b 100644
--- a/hw/drivers/bq27z561/src/bq27z561.c
+++ b/hw/drivers/bq27z561/src/bq27z561.c
@@ -170,7 +170,7 @@ bq27z561_rd_std_reg_word(struct bq27z561 *dev, uint8_t reg, 
uint16_t *val)
 
     rc = hal_i2c_master_write(dev->bq27_itf.itf_num, &i2c, OS_TICKS_PER_SEC, 
0);
     if (rc != 0) {
-        BQ27Z561_ERROR("I2C reg read (wr) failed 0x%02X\n", reg);
+        BQ27Z561_LOG(ERROR, "I2C reg read (wr) failed 0x%02X\n", reg);
         goto err;
     }
 
@@ -178,7 +178,7 @@ bq27z561_rd_std_reg_word(struct bq27z561 *dev, uint8_t reg, 
uint16_t *val)
     i2c.buffer = (uint8_t *)val;
     rc = hal_i2c_master_read(dev->bq27_itf.itf_num, &i2c, OS_TICKS_PER_SEC, 1);
     if (rc != 0) {
-        BQ27Z561_ERROR("I2C reg read (rd) failed 0x%02X\n", reg);
+        BQ27Z561_LOG(ERROR, "I2C reg read (rd) failed 0x%02X\n", reg);
         goto err;
     }
 
@@ -206,7 +206,7 @@ bq27z561_wr_std_reg_byte(struct bq27z561 *dev, uint8_t reg, 
uint8_t val)
 
     rc = hal_i2c_master_write(dev->bq27_itf.itf_num, &i2c, OS_TICKS_PER_SEC, 
1);
     if (rc != 0) {
-        BQ27Z561_ERROR("I2C reg write 0x%02X failed\n", reg);
+        BQ27Z561_LOG(ERROR, "I2C reg write 0x%02X failed\n", reg);
         return rc;
     }
 
diff --git a/hw/drivers/chg_ctrl/adp5061/src/adp5061.c 
b/hw/drivers/chg_ctrl/adp5061/src/adp5061.c
index 9fe1066..3d936df 100644
--- a/hw/drivers/chg_ctrl/adp5061/src/adp5061.c
+++ b/hw/drivers/chg_ctrl/adp5061/src/adp5061.c
@@ -586,6 +586,7 @@ adp5061_init(struct os_dev *dev, void *arg)
 {
     struct adp5061_dev *adp5061 = (struct adp5061_dev *)dev;
     struct charge_control *cc;
+    struct charge_control_itf *cci;
     const struct adp5061_config *cfg;
     uint8_t device_id;
     int rc;
@@ -597,13 +598,14 @@ adp5061_init(struct os_dev *dev, void *arg)
 
     cc = &adp5061->a_chg_ctrl;
 
+    cci = (struct charge_control_itf *)arg;
+
     rc = charge_control_init(cc, dev);
     if (rc) {
         goto err;
     }
-    cc->cc_itf.cci_addr = ADP5061_ADDR;
-    cc->cc_itf.cci_num = MYNEWT_VAL(ADP5061_I2C_NUM);
-    cc->cc_itf.cci_type = CHARGE_CONTROL_ITF_I2C;
+
+    charge_control_set_interface(cc, cci);
 
     /* Add the driver with all the supported types */
     rc = charge_control_set_driver(cc, CHARGE_CONTROL_TYPE_STATUS,
@@ -614,11 +616,8 @@ adp5061_init(struct os_dev *dev, void *arg)
 
     charge_control_set_type_mask(cc,
             CHARGE_CONTROL_TYPE_STATUS | CHARGE_CONTROL_TYPE_FAULT);
-    if (arg) {
-        cfg = (struct adp5061_config *)(arg);
-    } else {
-        cfg = &default_config;
-    }
+
+    cfg = &default_config;
 
     rc = adp5061_get_device_id(adp5061, &device_id);
     if (rc) {