Rework of specifying i2c bus number

OpenIPC · Jan 15, 2025 · a5c11e8 · a5c11e8
1 parent 929840d
commit a5c11e8
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/src/hal/common.c b/src/hal/common.c
@@ -10,8 +10,8 @@
 #include "chipid.h"
 #include "hal/common.h"
 
+int i2c_adapter_nr = 0;
 sensor_addr_t *possible_i2c_addrs;
-
 int (*open_i2c_sensor_fd)();
 int (*open_spi_sensor_fd)();
 bool (*close_sensor_fd)(int fd);

diff --git a/src/hal/common.h b/src/hal/common.h
@@ -68,6 +68,7 @@ typedef struct {
     unsigned char *addrs;
 } sensor_addr_t;
 
+extern int i2c_adapter_nr;
 extern sensor_addr_t *possible_i2c_addrs;
 
 typedef int (*read_register_t)(int fd, unsigned char i2c_addr,

diff --git a/src/hal/hisi/hal_hisi.c b/src/hal/hisi/hal_hisi.c
@@ -40,7 +40,7 @@ static sensor_addr_t my_possible_i2c_addrs[] = {
 
 static float hisi_get_temp();
 
-static int hisi_open_i2c_fd(int i2c_adapter_nr) {
+static int hisi_open_i2c_fd() {
     char filename[FILENAME_MAX];
 
     snprintf(filename, sizeof(filename), "/dev/i2c-%d", i2c_adapter_nr);

diff --git a/src/i2cspi.c b/src/i2cspi.c
@@ -9,8 +9,6 @@
 
 #define SELECT_WIDE(reg_addr) reg_addr > 0xff ? 2 : 1
 
-int i2c_adapter_nr = 0;
-
 static int prepare_i2c_sensor(unsigned char i2c_addr) {
     if (!getchipname()) {
         puts("Unknown chip");

diff --git a/src/main.c b/src/main.c
@@ -39,8 +39,6 @@
 #define RESET_CL "\x1b[0m"
 #define FG_RED "\x1b[31m"
 
-extern int i2c_adapter_nr;
-
 void print_usage() {
 #ifndef SKIP_VERSION
     printf("ipctool, version: ");