Merge pull request #3509 from wangyq2018/bugfix

BernardXiong · web-flow · commit 234cd0e9b2e0 · 2020-04-10T00:37:36.000+08:00
fixed i2c bug, change i2c_dbg() to LOG_E().
diff --git a/bsp/essemi/es32f0271/drivers/drv_i2c.c b/bsp/essemi/es32f0271/drivers/drv_i2c.c
@@ -8,9 +8,9 @@
  * 2019-10-23     yuzrain       the first version
  */
 
-#include <rthw.h>
 #include <rtthread.h>
 #include <rtdevice.h>
+#include <rtdbg.h>
 #include "board.h"
 #include "drv_i2c.h"
 #include "md_i2c.h"
@@ -159,15 +159,15 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,
         {
             if (__i2c_master_recv(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)
             {
-                i2c_dbg("i2c bus write failed,i2c bus stop!\n");
+                LOG_E("i2c bus write failed,i2c bus stop!\n");
                 goto out;
             }
         }
         else
         {
             if (__i2c_master_send(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)
             {
-                i2c_dbg("i2c bus write failed,i2c bus stop!\n");
+                LOG_E("i2c bus write failed,i2c bus stop!\n");
                 goto out;
             }
         }
@@ -176,7 +176,7 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,
     ret = i;
 
 out:
-    i2c_dbg("send stop condition\n");
+    LOG_E("send stop condition\n");
 
     return ret;
 }
diff --git a/bsp/essemi/es32f0334/drivers/drv_i2c.c b/bsp/essemi/es32f0334/drivers/drv_i2c.c
@@ -9,9 +9,9 @@
  * 2019-11-01     wangyq        update libraries
  */
 
-#include <rthw.h>
 #include <rtthread.h>
 #include <rtdevice.h>
+#include <rtdbg.h>
 #include "board.h"
 #include "drv_i2c.h"
 #include <ald_i2c.h>
@@ -84,15 +84,15 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,
         {
             if (ald_i2c_master_recv(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)
             {
-                i2c_dbg("i2c bus write failed,i2c bus stop!\n");
+                LOG_E("i2c bus write failed,i2c bus stop!\n");
                 goto out;
             }
         }
         else
         {
             if (ald_i2c_master_send(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)
             {
-                i2c_dbg("i2c bus write failed,i2c bus stop!\n");
+                LOG_E("i2c bus write failed,i2c bus stop!\n");
                 goto out;
             }
         }
@@ -101,7 +101,7 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,
     ret = i;
 
 out:
-    i2c_dbg("send stop condition\n");
+    LOG_E("send stop condition\n");
 
     return ret;
 }
diff --git a/bsp/essemi/es32f0654/drivers/drv_i2c.c b/bsp/essemi/es32f0654/drivers/drv_i2c.c
@@ -9,9 +9,9 @@
  * 2019-11-01     wangyq        update libraries
  */
 
-#include <rthw.h>
 #include <rtthread.h>
 #include <rtdevice.h>
+#include <rtdbg.h>
 #include "board.h"
 #include "drv_i2c.h"
 #include <ald_i2c.h>
@@ -84,15 +84,15 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,
         {
             if (ald_i2c_master_recv(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)
             {
-                i2c_dbg("i2c bus write failed,i2c bus stop!\n");
+                LOG_E("i2c bus write failed,i2c bus stop!\n");
                 goto out;
             }
         }
         else
         {
             if (ald_i2c_master_send(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)
             {
-                i2c_dbg("i2c bus write failed,i2c bus stop!\n");
+                LOG_E("i2c bus write failed,i2c bus stop!\n");
                 goto out;
             }
         }
@@ -101,7 +101,7 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,
     ret = i;
 
 out:
-    i2c_dbg("send stop condition\n");
+    LOG_E("send stop condition\n");
 
     return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`* 2019-10-23 yuzrain the first version`
`9`	`9`	`*/`
`10`	`10`
`11`		`-#include <rthw.h>`
`12`	`11`	`#include <rtthread.h>`
`13`	`12`	`#include <rtdevice.h>`
	`13`	`+#include <rtdbg.h>`
`14`	`14`	`#include "board.h"`
`15`	`15`	`#include "drv_i2c.h"`
`16`	`16`	`#include "md_i2c.h"`
`@@ -159,15 +159,15 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,`
`159`	`159`	`{`
`160`	`160`	`if (__i2c_master_recv(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)`
`161`	`161`	`{`
`162`		`- i2c_dbg("i2c bus write failed,i2c bus stop!\n");`
	`162`	`+ LOG_E("i2c bus write failed,i2c bus stop!\n");`
`163`	`163`	`goto out;`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`else`
`167`	`167`	`{`
`168`	`168`	`if (__i2c_master_send(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)`
`169`	`169`	`{`
`170`		`- i2c_dbg("i2c bus write failed,i2c bus stop!\n");`
	`170`	`+ LOG_E("i2c bus write failed,i2c bus stop!\n");`
`171`	`171`	`goto out;`
`172`	`172`	`}`
`173`	`173`	`}`
`@@ -176,7 +176,7 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,`
`176`	`176`	`ret = i;`
`177`	`177`
`178`	`178`	`out:`
`179`		`- i2c_dbg("send stop condition\n");`
	`179`	`+ LOG_E("send stop condition\n");`
`180`	`180`
`181`	`181`	`return ret;`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@`
`9`	`9`	`* 2019-11-01 wangyq update libraries`
`10`	`10`	`*/`
`11`	`11`
`12`		`-#include <rthw.h>`
`13`	`12`	`#include <rtthread.h>`
`14`	`13`	`#include <rtdevice.h>`
	`14`	`+#include <rtdbg.h>`
`15`	`15`	`#include "board.h"`
`16`	`16`	`#include "drv_i2c.h"`
`17`	`17`	`#include <ald_i2c.h>`
`@@ -84,15 +84,15 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,`
`84`	`84`	`{`
`85`	`85`	`if (ald_i2c_master_recv(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)`
`86`	`86`	`{`
`87`		`- i2c_dbg("i2c bus write failed,i2c bus stop!\n");`
	`87`	`+ LOG_E("i2c bus write failed,i2c bus stop!\n");`
`88`	`88`	`goto out;`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`else`
`92`	`92`	`{`
`93`	`93`	`if (ald_i2c_master_send(bus->priv, msg->addr << 1, msg->buf, msg->len, TIMEOUT) != 0)`
`94`	`94`	`{`
`95`		`- i2c_dbg("i2c bus write failed,i2c bus stop!\n");`
	`95`	`+ LOG_E("i2c bus write failed,i2c bus stop!\n");`
`96`	`96`	`goto out;`
`97`	`97`	`}`
`98`	`98`	`}`
`@@ -101,7 +101,7 @@ static rt_size_t es32f0_master_xfer(struct rt_i2c_bus_device *bus,`
`101`	`101`	`ret = i;`
`102`	`102`
`103`	`103`	`out:`
`104`		`- i2c_dbg("send stop condition\n");`
	`104`	`+ LOG_E("send stop condition\n");`
`105`	`105`
`106`	`106`	`return ret;`
`107`	`107`	`}`