fix:nxp i2c addr err

CYFS3 · CYFS3 · commit 9a9c401ccfd5 · 2025-02-27T13:53:03.000+08:00
diff --git a/bsp/nxp/imx/imx6ull-smart/drivers/drv_i2c.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_i2c.c
@@ -79,7 +79,7 @@ static rt_ssize_t imx6ull_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_
         if(msgs[i].flags & RT_I2C_RD)
         {
             xfer.flags = kI2C_TransferNoStartFlag;
-            xfer.slaveAddress = msgs[i].addr;
+            xfer.slaveAddress = msgs[i].addr >> 1;
             xfer.direction = kI2C_Read;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
@@ -107,7 +107,7 @@ static rt_ssize_t imx6ull_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_
         else
         {
             xfer.flags = kI2C_TransferNoStartFlag;
-            xfer.slaveAddress = msgs[i].addr;
+            xfer.slaveAddress = msgs[i].addr >> 1;
             xfer.direction = kI2C_Write;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
diff --git a/bsp/nxp/imx/imxrt/libraries/drivers/drv_i2c.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_i2c.c
@@ -269,7 +269,7 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
         {
             if ((imxrt_i2c->msg[i].flags & RT_I2C_NO_START) != RT_I2C_NO_START)
             {
-                if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Write) != kStatus_Success)
+                if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Write) != kStatus_Success)
                 {
                     i = 0;
                     break;
@@ -279,15 +279,15 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
                 {
                 }
 
-                if (LPI2C_MasterRepeatedStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)
+                if (LPI2C_MasterRepeatedStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Read) != kStatus_Success)
                 {
                     i = 0;
                     break;
                 }
             }
             else
             {
-                if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)
+                if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Read) != kStatus_Success)
                 {
                     i = 0;
                     break;
@@ -298,7 +298,7 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
                 }
             }
 
-            if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)
+            if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Read) != kStatus_Success)
             {
                 i = 0;
                 break;
@@ -316,7 +316,7 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
         }
         else
         {
-            if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Write) != kStatus_Success)
+            if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Write) != kStatus_Success)
             {
                 i = 0;
                 break;
diff --git a/bsp/nxp/lpc/lpc54114-lite/drivers/drv_i2c.c b/bsp/nxp/lpc/lpc54114-lite/drivers/drv_i2c.c
@@ -55,7 +55,7 @@ static rt_ssize_t master_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg m
         if (!(msg->flags & RT_I2C_NO_START))
         {
             /* Start condition and slave address. */
-            result = I2C_MasterStart(lpc_i2c->base, msg->addr, direction);
+            result = I2C_MasterStart(lpc_i2c->base, msg->addr >> 1, direction);
         }
 
         if (result == kStatus_Success)
diff --git a/bsp/nxp/lpc/lpc54608-LPCXpresso/drivers/drv_i2c.c b/bsp/nxp/lpc/lpc54608-LPCXpresso/drivers/drv_i2c.c
@@ -159,7 +159,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,
 
         if (msg->flags & RT_I2C_RD)
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kI2C_Read;
             xfer.subaddress = 1;
             xfer.subaddressSize = 1;
@@ -175,7 +175,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,
         }
         else
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kI2C_Write;
             xfer.subaddress = 0;
             xfer.subaddressSize = 1;
diff --git a/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_i2c.c b/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_i2c.c
@@ -99,7 +99,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,
 
         if (msg->flags & RT_I2C_RD)
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kI2C_Read;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
@@ -120,7 +120,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,
         }
         else
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kI2C_Write;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
diff --git a/bsp/nxp/mcx/mcxa/Libraries/drivers/drv_i2c.c b/bsp/nxp/mcx/mcxa/Libraries/drivers/drv_i2c.c
@@ -67,7 +67,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg
 
         if (msg->flags & RT_I2C_RD)
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kLPI2C_Read;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
@@ -86,7 +86,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg
         }
         else
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kLPI2C_Write;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
diff --git a/bsp/nxp/mcx/mcxc/Libraries/drivers/drv_i2c.c b/bsp/nxp/mcx/mcxc/Libraries/drivers/drv_i2c.c
@@ -57,7 +57,7 @@ static int mcx_i2c_master_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg
 
         if (msg->flags & RT_I2C_RD)
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kI2C_Read;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
@@ -84,7 +84,7 @@ static int mcx_i2c_master_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg
         }
         else
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kI2C_Write;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
diff --git a/bsp/nxp/mcx/mcxn/Libraries/drivers/drv_i2c.c b/bsp/nxp/mcx/mcxn/Libraries/drivers/drv_i2c.c
@@ -93,7 +93,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg
 
         if (msg->flags & RT_I2C_RD)
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kLPI2C_Read;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;
@@ -112,7 +112,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg
         }
         else
         {
-            xfer.slaveAddress = msg->addr;
+            xfer.slaveAddress = msg->addr >> 1;
             xfer.direction = kLPI2C_Write;
             xfer.subaddress = 0;
             xfer.subaddressSize = 0;

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,`
`269`	`269`	`{`
`270`	`270`	`if ((imxrt_i2c->msg[i].flags & RT_I2C_NO_START) != RT_I2C_NO_START)`
`271`	`271`	`{`
`272`		`- if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Write) != kStatus_Success)`
	`272`	`+ if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Write) != kStatus_Success)`
`273`	`273`	`{`
`274`	`274`	`i = 0;`
`275`	`275`	`break;`
`@@ -279,15 +279,15 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,`
`279`	`279`	`{`
`280`	`280`	`}`
`281`	`281`
`282`		`- if (LPI2C_MasterRepeatedStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)`
	`282`	`+ if (LPI2C_MasterRepeatedStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Read) != kStatus_Success)`
`283`	`283`	`{`
`284`	`284`	`i = 0;`
`285`	`285`	`break;`
`286`	`286`	`}`
`287`	`287`	`}`
`288`	`288`	`else`
`289`	`289`	`{`
`290`		`- if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)`
	`290`	`+ if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Read) != kStatus_Success)`
`291`	`291`	`{`
`292`	`292`	`i = 0;`
`293`	`293`	`break;`
`@@ -298,7 +298,7 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`301`		`- if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)`
	`301`	`+ if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Read) != kStatus_Success)`
`302`	`302`	`{`
`303`	`303`	`i = 0;`
`304`	`304`	`break;`
`@@ -316,7 +316,7 @@ static rt_ssize_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,`
`316`	`316`	`}`
`317`	`317`	`else`
`318`	`318`	`{`
`319`		`- if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Write) != kStatus_Success)`
	`319`	`+ if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr >> 1, kLPI2C_Write) != kStatus_Success)`
`320`	`320`	`{`
`321`	`321`	`i = 0;`
`322`	`322`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static rt_ssize_t master_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg m`
`55`	`55`	`if (!(msg->flags & RT_I2C_NO_START))`
`56`	`56`	`{`
`57`	`57`	`/* Start condition and slave address. */`
`58`		`- result = I2C_MasterStart(lpc_i2c->base, msg->addr, direction);`
	`58`	`+ result = I2C_MasterStart(lpc_i2c->base, msg->addr >> 1, direction);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (result == kStatus_Success)`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,`
`159`	`159`
`160`	`160`	`if (msg->flags & RT_I2C_RD)`
`161`	`161`	`{`
`162`		`- xfer.slaveAddress = msg->addr;`
	`162`	`+ xfer.slaveAddress = msg->addr >> 1;`
`163`	`163`	`xfer.direction = kI2C_Read;`
`164`	`164`	`xfer.subaddress = 1;`
`165`	`165`	`xfer.subaddressSize = 1;`
`@@ -175,7 +175,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,`
`175`	`175`	`}`
`176`	`176`	`else`
`177`	`177`	`{`
`178`		`- xfer.slaveAddress = msg->addr;`
	`178`	`+ xfer.slaveAddress = msg->addr >> 1;`
`179`	`179`	`xfer.direction = kI2C_Write;`
`180`	`180`	`xfer.subaddress = 0;`
`181`	`181`	`xfer.subaddressSize = 1;`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,`
`99`	`99`
`100`	`100`	`if (msg->flags & RT_I2C_RD)`
`101`	`101`	`{`
`102`		`- xfer.slaveAddress = msg->addr;`
	`102`	`+ xfer.slaveAddress = msg->addr >> 1;`
`103`	`103`	`xfer.direction = kI2C_Read;`
`104`	`104`	`xfer.subaddress = 0;`
`105`	`105`	`xfer.subaddressSize = 0;`
`@@ -120,7 +120,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus,`
`120`	`120`	`}`
`121`	`121`	`else`
`122`	`122`	`{`
`123`		`- xfer.slaveAddress = msg->addr;`
	`123`	`+ xfer.slaveAddress = msg->addr >> 1;`
`124`	`124`	`xfer.direction = kI2C_Write;`
`125`	`125`	`xfer.subaddress = 0;`
`126`	`126`	`xfer.subaddressSize = 0;`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg`
`67`	`67`
`68`	`68`	`if (msg->flags & RT_I2C_RD)`
`69`	`69`	`{`
`70`		`- xfer.slaveAddress = msg->addr;`
	`70`	`+ xfer.slaveAddress = msg->addr >> 1;`
`71`	`71`	`xfer.direction = kLPI2C_Read;`
`72`	`72`	`xfer.subaddress = 0;`
`73`	`73`	`xfer.subaddressSize = 0;`
`@@ -86,7 +86,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg`
`86`	`86`	`}`
`87`	`87`	`else`
`88`	`88`	`{`
`89`		`- xfer.slaveAddress = msg->addr;`
	`89`	`+ xfer.slaveAddress = msg->addr >> 1;`
`90`	`90`	`xfer.direction = kLPI2C_Write;`
`91`	`91`	`xfer.subaddress = 0;`
`92`	`92`	`xfer.subaddressSize = 0;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static int mcx_i2c_master_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg`
`57`	`57`
`58`	`58`	`if (msg->flags & RT_I2C_RD)`
`59`	`59`	`{`
`60`		`- xfer.slaveAddress = msg->addr;`
	`60`	`+ xfer.slaveAddress = msg->addr >> 1;`
`61`	`61`	`xfer.direction = kI2C_Read;`
`62`	`62`	`xfer.subaddress = 0;`
`63`	`63`	`xfer.subaddressSize = 0;`
`@@ -84,7 +84,7 @@ static int mcx_i2c_master_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg`
`84`	`84`	`}`
`85`	`85`	`else`
`86`	`86`	`{`
`87`		`- xfer.slaveAddress = msg->addr;`
	`87`	`+ xfer.slaveAddress = msg->addr >> 1;`
`88`	`88`	`xfer.direction = kI2C_Write;`
`89`	`89`	`xfer.subaddress = 0;`
`90`	`90`	`xfer.subaddressSize = 0;`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg`
`93`	`93`
`94`	`94`	`if (msg->flags & RT_I2C_RD)`
`95`	`95`	`{`
`96`		`- xfer.slaveAddress = msg->addr;`
	`96`	`+ xfer.slaveAddress = msg->addr >> 1;`
`97`	`97`	`xfer.direction = kLPI2C_Read;`
`98`	`98`	`xfer.subaddress = 0;`
`99`	`99`	`xfer.subaddressSize = 0;`
`@@ -112,7 +112,7 @@ static rt_ssize_t lpc_i2c_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg`
`112`	`112`	`}`
`113`	`113`	`else`
`114`	`114`	`{`
`115`		`- xfer.slaveAddress = msg->addr;`
	`115`	`+ xfer.slaveAddress = msg->addr >> 1;`
`116`	`116`	`xfer.direction = kLPI2C_Write;`
`117`	`117`	`xfer.subaddress = 0;`
`118`	`118`	`xfer.subaddressSize = 0;`