Refactor I2C procedures

Author: widgetii

src/hal/bcm.c

@@ -45,13 +45,6 @@ static void chip_properties(cJSON *j_inner) {
 }
 #endif
 
-static int i2c_change_plain_addr(int fd, unsigned char addr) {
-    if (ioctl(fd, I2C_SLAVE_FORCE, addr) < 0) {
-        return -1;
-    }
-    return 0;
-}
-
 /* For using I2C functions make sure you have:
  * dtparam=i2c_arm=on
  * dtparam=i2c0=on

src/hal/common.c

@@ -62,13 +62,20 @@ int dummy_sensor_i2c_change_addr(int fd, unsigned char addr) {
 }
 
 // Universal I2C code
-int universal_i2c_change_addr(int fd, unsigned char addr) {
+int i2c_changenshift_addr(int fd, unsigned char addr) {
     if (ioctl(fd, I2C_SLAVE_FORCE, addr >> 1) < 0) {
         return -1;
     }
     return 0;
 }
 
+int i2c_change_plain_addr(int fd, unsigned char addr) {
+    if (ioctl(fd, I2C_SLAVE_FORCE, addr) < 0) {
+        return -1;
+    }
+    return 0;
+}
+
 int universal_i2c_write_register(int fd, unsigned char i2c_addr,
                                  unsigned int reg_addr, unsigned int reg_width,
                                  unsigned int data, unsigned int data_width) {
@@ -207,7 +214,7 @@ static unsigned long default_totalmem(unsigned long *media_mem) {
 void setup_hal_fallback() {
     open_i2c_sensor_fd = fallback_open_sensor_fd;
     close_sensor_fd = universal_close_sensor_fd;
-    i2c_change_addr = universal_i2c_change_addr;
+    i2c_change_addr = i2c_changenshift_addr;
     i2c_read_register = universal_i2c_read_register;
     spi_read_register = universal_spi_read_register;
     i2c_write_register = universal_i2c_write_register;

src/hal/common.h

@@ -99,7 +99,8 @@ int universal_open_sensor_fd(const char *dev_name);
 bool universal_close_sensor_fd(int fd);
 
 int dummy_sensor_i2c_change_addr(int fd, unsigned char addr);
-int universal_i2c_change_addr(int fd, unsigned char addr);
+int i2c_change_plain_addr(int fd, unsigned char addr);
+int i2c_changenshift_addr(int fd, unsigned char addr);
 int universal_i2c_write_register(int fd, unsigned char i2c_addr,
                                  unsigned int reg_addr, unsigned int reg_width,
                                  unsigned int data, unsigned int data_width);

src/hal/fh.c

@@ -14,7 +14,7 @@ static unsigned char omni_addrs[] = {0x6c, 0};
 static unsigned char onsemi_addrs[] = {0x20, 0};
 static unsigned char gc_addrs[] = {0x6e, 0x52, 0};
 
-sensor_addr_t fh_possible_i2c_addrs[] = {
+static sensor_addr_t fh_possible_i2c_addrs[] = {
     {SENSOR_SONY, sony_addrs},     {SENSOR_SMARTSENS, ssens_addrs},
     {SENSOR_ONSEMI, onsemi_addrs}, {SENSOR_OMNIVISION, omni_addrs},
     {SENSOR_GALAXYCORE, gc_addrs}, {0, NULL}};

src/hal/gm.c

@@ -14,7 +14,7 @@ static unsigned char omni_addrs[] = {0x6c, 0};
 static unsigned char onsemi_addrs[] = {0x20, 0};
 static unsigned char gc_addrs[] = {0x6e, 0};
 
-sensor_addr_t gm_possible_i2c_addrs[] = {
+static sensor_addr_t gm_possible_i2c_addrs[] = {
     {SENSOR_SONY, sony_addrs},     {SENSOR_SMARTSENS, ssens_addrs},
     {SENSOR_ONSEMI, onsemi_addrs}, {SENSOR_OMNIVISION, omni_addrs},
     {SENSOR_GALAXYCORE, gc_addrs}, {0, NULL}};

src/hal/hisi/hal_hisi.c

@@ -92,14 +92,6 @@ static int hisi_gen1_open_spi_sensor_fd() {
     return universal_open_sensor_fd("/dev/ssp");
 }
 
-// Set I2C slave address
-int hisi_gen2_sensor_i2c_change_addr(int fd, unsigned char addr) {
-    if (ioctl(fd, I2C_SLAVE_FORCE, addr) < 0) {
-        return -1;
-    }
-    return 0;
-}
-
 #define I2C_16BIT_REG 0x0709  /* 16BIT REG WIDTH */
 #define I2C_16BIT_DATA 0x070a /* 16BIT DATA WIDTH */
 int hisi_gen2_set_width(int fd, unsigned int reg_width,
@@ -424,7 +416,7 @@ void setup_hal_hisi() {
     } else if (chip_generation == HISI_V2 || chip_generation == HISI_V2A) {
         i2c_read_register = hisi_gen2_sensor_read_register;
         i2c_write_register = hisi_gen2_sensor_write_register;
-        i2c_change_addr = hisi_gen2_sensor_i2c_change_addr;
+        i2c_change_addr = i2c_change_plain_addr;
     } else {
         i2c_read_register = hisi_sensor_read_register;
         i2c_write_register = hisi_sensor_write_register;

src/hal/ingenic.c

@@ -15,13 +15,14 @@ static unsigned char onsemi_addrs[] = {0x20, 0};
 static unsigned char gc_addrs[] = {0x6e, 0x52, 0};
 static unsigned char soi_addrs[] = {0x60, 0x80, 0};
 
-sensor_addr_t ingenic_possible_i2c_addrs[] = {{SENSOR_SONY, sony_addrs},
-                                              {SENSOR_SMARTSENS, ssens_addrs},
-                                              {SENSOR_ONSEMI, onsemi_addrs},
-                                              {SENSOR_OMNIVISION, omni_addrs},
-                                              {SENSOR_GALAXYCORE, gc_addrs},
-                                              {SENSOR_SOI, soi_addrs},
-                                              {0, NULL}};
+static sensor_addr_t ingenic_possible_i2c_addrs[] = {
+    {SENSOR_SONY, sony_addrs},
+    {SENSOR_SMARTSENS, ssens_addrs},
+    {SENSOR_ONSEMI, onsemi_addrs},
+    {SENSOR_OMNIVISION, omni_addrs},
+    {SENSOR_GALAXYCORE, gc_addrs},
+    {SENSOR_SOI, soi_addrs},
+    {0, NULL}};
 
 typedef unsigned char uint8;
 typedef unsigned short uint16;

src/hal/novatek.c

@@ -16,7 +16,7 @@ static unsigned char omni_addrs[] = {0x6c, 0};
 static unsigned char onsemi_addrs[] = {0x20, 0};
 static unsigned char gc_addrs[] = {0x6e, 0};
 
-sensor_addr_t novatek_possible_i2c_addrs[] = {
+static sensor_addr_t novatek_possible_i2c_addrs[] = {
     {SENSOR_SONY, sony_addrs},     {SENSOR_SMARTSENS, ssens_addrs},
     {SENSOR_ONSEMI, onsemi_addrs}, {SENSOR_OMNIVISION, omni_addrs},
     {SENSOR_GALAXYCORE, gc_addrs}, {0, NULL}};

src/hal/rockchip.c

@@ -15,7 +15,7 @@ static unsigned char omni_addrs[] = {0x6c, 0};
 static unsigned char onsemi_addrs[] = {0x20, 0};
 static unsigned char gc_addrs[] = {0x6e, 0};
 
-sensor_addr_t rockchip_possible_i2c_addrs[] = {
+static sensor_addr_t rockchip_possible_i2c_addrs[] = {
     {SENSOR_SONY, sony_addrs},     {SENSOR_SMARTSENS, ssens_addrs},
     {SENSOR_ONSEMI, onsemi_addrs}, {SENSOR_OMNIVISION, omni_addrs},
     {SENSOR_GALAXYCORE, gc_addrs}, {0, NULL}};

src/hal/sstar.c

@@ -17,7 +17,7 @@ static unsigned char omni_addrs[] = {0x6c, 0};
 static unsigned char onsemi_addrs[] = {0x20, 0};
 static unsigned char gc_addrs[] = {0x6e, 0};
 
-sensor_addr_t sstar_possible_i2c_addrs[] = {
+static sensor_addr_t sstar_possible_i2c_addrs[] = {
     {SENSOR_SONY, sony_addrs},     {SENSOR_SMARTSENS, ssens_addrs},
     {SENSOR_ONSEMI, onsemi_addrs}, {SENSOR_OMNIVISION, omni_addrs},
     {SENSOR_GALAXYCORE, gc_addrs}, {0, NULL}};