From 72e62a62cb769f665c595d7f21c5f616f9697bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 5 Nov 2019 10:51:28 +0100 Subject: [PATCH] batt_smbus: make bus_options const and rename to smbus_bus_options as it is a global name. --- src/drivers/batt_smbus/batt_smbus.cpp | 6 +++--- src/drivers/batt_smbus/batt_smbus.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/batt_smbus/batt_smbus.cpp b/src/drivers/batt_smbus/batt_smbus.cpp index fa200f220b..a6211c5961 100644 --- a/src/drivers/batt_smbus/batt_smbus.cpp +++ b/src/drivers/batt_smbus/batt_smbus.cpp @@ -117,10 +117,10 @@ int BATT_SMBUS::task_spawn(int argc, char *argv[]) for (unsigned i = 0; i < NUM_BUS_OPTIONS; i++) { - if (!is_running() && (busid == BATT_SMBUS_BUS_ALL || bus_options[i].busid == busid)) { + if (!is_running() && (busid == BATT_SMBUS_BUS_ALL || smbus_bus_options[i].busid == busid)) { - SMBus *interface = new SMBus(bus_options[i].busnum, BATT_SMBUS_ADDR); - BATT_SMBUS *dev = new BATT_SMBUS(interface, bus_options[i].devpath); + SMBus *interface = new SMBus(smbus_bus_options[i].busnum, BATT_SMBUS_ADDR); + BATT_SMBUS *dev = new BATT_SMBUS(interface, smbus_bus_options[i].devpath); // Successful read of device type, we've found our battery _object.store(dev); diff --git a/src/drivers/batt_smbus/batt_smbus.h b/src/drivers/batt_smbus/batt_smbus.h index e72e6c6b06..e8c0d619dd 100644 --- a/src/drivers/batt_smbus/batt_smbus.h +++ b/src/drivers/batt_smbus/batt_smbus.h @@ -95,7 +95,7 @@ #define BATT_SMBUS_ENABLED_PROTECTIONS_A_DEFAULT 0xcf #define BATT_SMBUS_ENABLED_PROTECTIONS_A_CUV_DISABLED 0xce -#define NUM_BUS_OPTIONS (sizeof(bus_options)/sizeof(bus_options[0])) +#define NUM_BUS_OPTIONS (sizeof(smbus_bus_options)/sizeof(smbus_bus_options[0])) enum BATT_SMBUS_BUS { BATT_SMBUS_BUS_ALL = 0, @@ -109,7 +109,7 @@ struct batt_smbus_bus_option { enum BATT_SMBUS_BUS busid; const char *devpath; uint8_t busnum; -} bus_options[] = { +} const smbus_bus_options[] = { { BATT_SMBUS_BUS_I2C_EXTERNAL, "/dev/batt_smbus_ext", PX4_I2C_BUS_EXPANSION}, #ifdef PX4_I2C_BUS_EXPANSION1 { BATT_SMBUS_BUS_I2C_EXTERNAL1, "/dev/batt_smbus_ext1", PX4_I2C_BUS_EXPANSION1},