1 files changed, 13 insertions, 10 deletions

diff --git a/chip/host/i2c.c b/chip/host/i2c.c
index 72960c789d..af80926223 100644
--- a/chip/host/i2c.c
+++ b/chip/host/i2c.c
@@ -14,7 +14,7 @@
 
 struct i2c_dev {
 	int port;
-	int slave_addr;
+	uint16_t slave_addr__7bf;
 	int valid;
 };
 
@@ -28,7 +28,7 @@ static void detach_init(void)
 }
 DECLARE_HOOK(HOOK_INIT, detach_init, HOOK_PRIO_FIRST);
 
-int test_detach_i2c(int port, int slave_addr)
+int test_detach_i2c__7bf(const int port, const uint16_t slave_addr__7bf)
 {
 	int i;
 
@@ -40,20 +40,20 @@ int test_detach_i2c(int port, int slave_addr)
 		return EC_ERROR_OVERFLOW;
 
 	detached_devs[i].port = port;
-	detached_devs[i].slave_addr = slave_addr;
+	detached_devs[i].slave_addr__7bf = slave_addr__7bf;
 	detached_devs[i].valid = 1;
 
 	return EC_SUCCESS;
 }
 
-int test_attach_i2c(int port, int slave_addr)
+int test_attach_i2c__7bf(const int port, const uint16_t slave_addr__7bf)
 {
 	int i;
 
 	for (i = 0; i < MAX_DETACHED_DEV_COUNT; ++i)
 		if (detached_devs[i].valid &&
 		    detached_devs[i].port == port &&
-		    detached_devs[i].slave_addr == slave_addr)
+		    detached_devs[i].slave_addr__7bf == slave_addr__7bf)
 			break;
 
 	if (i == MAX_DETACHED_DEV_COUNT)
@@ -63,28 +63,31 @@ int test_attach_i2c(int port, int slave_addr)
 	return EC_SUCCESS;
 }
 
-static int test_check_detached(int port, int slave_addr)
+static int test_check_detached__7bf(const int port,
+			       const uint16_t slave_addr__7bf)
 {
 	int i;
 
 	for (i = 0; i < MAX_DETACHED_DEV_COUNT; ++i)
 		if (detached_devs[i].valid &&
 		    detached_devs[i].port == port &&
-		    detached_devs[i].slave_addr == slave_addr)
+		    detached_devs[i].slave_addr__7bf == slave_addr__7bf)
 			return 1;
 	return 0;
 }
 
-int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size,
+int chip_i2c_xfer__7bf(const int port, const uint16_t slave_addr__7bf,
+		  const uint8_t *out, int out_size,
 		  uint8_t *in, int in_size, int flags)
 {
 	const struct test_i2c_xfer *p;
 	int rv;
 
-	if (test_check_detached(port, slave_addr))
+	if (test_check_detached__7bf(port, slave_addr__7bf))
 		return EC_ERROR_UNKNOWN;
 	for (p = __test_i2c_xfer; p < __test_i2c_xfer_end; ++p) {
-		rv = p->routine(port, slave_addr, out, out_size,
+		rv = p->routine__7bf(port, slave_addr__7bf,
+				out, out_size,
 				in, in_size, flags);
 		if (rv != EC_ERROR_INVAL)
 			return rv;