Add I2C support for BCM

Author: widgetii

src/hal/bcm.c

@@ -9,6 +9,11 @@
 #include "cjson/cJSON.h"
 #endif
 
+static unsigned char omni_addrs[] = {0x36, 0};
+
+static sensor_addr_t my_possible_i2c_addrs[] = {{SENSOR_OMNIVISION, omni_addrs},
+                                                {0, NULL}};
+
 bool bcm_detect_cpu(char *chip_name) {
     char buf[256];
 
@@ -40,7 +45,21 @@ 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
+ *  in your /boot/config.txt
+ */
 void bcm_setup_hal() {
+    possible_i2c_addrs = my_possible_i2c_addrs;
+    i2c_change_addr = i2c_change_plain_addr;
 #ifndef STANDALONE_LIBRARY
     hal_chip_properties = chip_properties;
 #endif

src/hal/hisi/hal_hisi.c

@@ -28,7 +28,7 @@ static unsigned char omni_addrs[] = {0x60, 0x6c, 0x42, 0};
 static unsigned char gc_addrs[] = {0x6e, 0x52, 0};
 static unsigned char superpix_addrs[] = {0x79, 0};
 
-sensor_addr_t hisi_possible_i2c_addrs[] = {
+static sensor_addr_t my_possible_i2c_addrs[] = {
     {SENSOR_SONY, sony_addrs},         {SENSOR_SOI, soi_addrs},
     {SENSOR_ONSEMI, onsemi_addrs},     {SENSOR_SMARTSENS, ssens_addrs},
     {SENSOR_OMNIVISION, omni_addrs},   {SENSOR_GALAXYCORE, gc_addrs},
@@ -429,7 +429,7 @@ void setup_hal_hisi() {
         i2c_read_register = hisi_sensor_read_register;
         i2c_write_register = hisi_sensor_write_register;
     }
-    possible_i2c_addrs = hisi_possible_i2c_addrs;
+    possible_i2c_addrs = my_possible_i2c_addrs;
     hal_temperature = hisi_get_temp;
 #ifndef STANDALONE_LIBRARY
     hal_detect_ethernet = hisi_ethdetect;

src/hal/tegra.c

@@ -34,7 +34,7 @@ static int tegra_open_sensor_fd() {
     return universal_open_sensor_fd("/dev/i2c-6");
 }
 
-static int i2c_no_change_addr(int fd, unsigned char addr) {
+static int i2c_change_plain_addr(int fd, unsigned char addr) {
     if (ioctl(fd, I2C_SLAVE_FORCE, addr) < 0) {
         return -1;
     }
@@ -65,7 +65,7 @@ static void firmware_props(cJSON *j_inner) {
 void tegra_setup_hal() {
     open_i2c_sensor_fd = tegra_open_sensor_fd;
     possible_i2c_addrs = tegra_possible_i2c_addrs;
-    i2c_change_addr = i2c_no_change_addr;
+    i2c_change_addr = i2c_change_plain_addr;
 #ifndef STANDALONE_LIBRARY
     hal_chip_properties = chip_properties;
     hal_firmware_props = firmware_props;

src/sensors.c

@@ -557,16 +557,16 @@ static int detect_omni_sensor(sensor_ctx_t *ctx, int fd,
     res = prod_msb << 8 | prod_lsb;
 
     switch (res) {
-    case 0x4688:
-        res = 0x4689;
-        sprintf(ctx->sensor_id, "OV4689");
-        return true;
     case 0x2710:
     case 0x2715:
     case 0x2718:
+    case 0x5647:
     case 0x9732:
         sprintf(ctx->sensor_id, "OV%04x", res);
         return true;
+    case 0x4688:
+        sprintf(ctx->sensor_id, "OV4689");
+        return true;
     case 0x5305:
         sprintf(ctx->sensor_id, "OS05A");
         return true;