Rename MAX_REAL_DEP to MAX_BASE_SENSORS and base_idx to base

All your base are belong to us.

Besides, it's simpler.

Change-Id: I6e3711230fbf76d600b3cbbbba91e7528a256062
Signed-off-by: Patrick Porlan <patrick.porlan@intel.com>

diff --git a/common.h b/common.h
index 3a2da16..53138c8 100644 (file)
--- a/common.h
+++ b/common.h
@@ -33,7 +33,7 @@
 
 #define MAX_NAME_SIZE          32
 
-#define MAX_REAL_DEP 3 /* Max number of base sensors a sensor can depend on */
+#define MAX_SENSOR_BASES 3 /* Max number of base sensors a sensor can rely on */
 
 #define ARRAY_SIZE(x) sizeof(x)/sizeof(x[0])
 #define REPORTING_MODE(x)      ((x) & 0x06)
@@ -213,7 +213,7 @@ struct sensor_info_t
 
        /* How many base sensors is the sensor depending on */
        int base_count;
-       int base_idx[MAX_REAL_DEP];
+       int base[MAX_SENSOR_BASES];
 
        uint32_t quirks; /* Bit mask expressing the need for special tweaks */
 

diff --git a/control.c b/control.c
index f7670de..a4bdbd9 100644 (file)
--- a/control.c
+++ b/control.c
@@ -660,7 +660,7 @@ static void sensor_activate_virtual (int s, int enabled, int from_virtual)
        if (enabled) {
                /* Enable all the base sensors for this virtual one */
                for (i = 0; i < sensor[s].base_count; i++) {
-                       base = sensor[s].base_idx[i];
+                       base = sensor[s].base[i];
                        sensor_activate(base, enabled, 1);
                        sensor[base].ref_count++;
                }
@@ -671,7 +671,7 @@ static void sensor_activate_virtual (int s, int enabled, int from_virtual)
        sensor[s].report_pending = 0;
 
        for (i = 0; i < sensor[s].base_count; i++) {
-               base = sensor[s].base_idx[i];
+               base = sensor[s].base[i];
                sensor_activate(base, enabled, 1);
                sensor[base].ref_count--;
        }
@@ -872,7 +872,7 @@ static int arbitrate_bases (int s)
         for (i = 0; i < sensor_count; i++) {
                        for (vidx = 0; vidx < sensor[i].base_count; vidx++)
                        /* If we have a virtual sensor depending on this one - handle it */
-                               if (sensor[i].base_idx[vidx] == s &&
+                               if (sensor[i].base[vidx] == s &&
                                        sensor[i].directly_enabled &&
                                        sensor[i].requested_rate > arbitrated_rate)
                                                arbitrated_rate = sensor[i].requested_rate;
@@ -895,7 +895,7 @@ int arbitrate_delays (int s)
        }
        /* Is virtual sensor - go through bases */
        for (i = 0; i < sensor[s].base_count; i++)
-               arbitrate_bases(sensor[s].base_idx[i]);
+               arbitrate_bases(sensor[s].base[i]);
 
        return 0;
 }

diff --git a/description.c b/description.c
index 08d4148..6b5a5de 100644 (file)
--- a/description.c
+++ b/description.c
@@ -148,7 +148,7 @@ char* sensor_get_name (int s)
                switch (sensor[s].type) {
                        case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
-                               strcpy(buf, sensor[sensor[s].base_idx[0]].friendly_name);
+                               strcpy(buf, sensor[sensor[s].base[0]].friendly_name);
                                snprintf(sensor[s].friendly_name,
                                         MAX_NAME_SIZE,
                                         "%s %s", "Uncalibrated", buf);
@@ -181,7 +181,7 @@ char* sensor_get_vendor (int s)
                switch (sensor[s].type) {
                        case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
-                               return sensor[sensor[s].base_idx[0]].vendor_name;
+                               return sensor[sensor[s].base[0]].vendor_name;
                        break;
 
                        default:
@@ -210,7 +210,7 @@ float sensor_get_max_range (int s)
                switch (sensor[s].type) {
                        case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
-                               return sensor[sensor[s].base_idx[0]].max_range;
+                               return sensor[sensor[s].base[0]].max_range;
 
                        default:
                                return 0.0;
@@ -296,7 +296,7 @@ float sensor_get_resolution (int s)
                switch (sensor[s].type) {
                        case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
-                               return sensor[sensor[s].base_idx[0]].resolution;
+                               return sensor[sensor[s].base[0]].resolution;
 
                        default:
                                return 0;
@@ -318,7 +318,7 @@ float sensor_get_power (int s)
                switch (sensor[s].type) {
                        case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
-                               return sensor[sensor[s].base_idx[0]].power;
+                               return sensor[sensor[s].base[0]].power;
 
                        default:
                                return 0;
@@ -524,7 +524,7 @@ max_delay_t sensor_get_max_delay (int s)
                switch (sensor[s].type) {
                        case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
-                               return sensor_desc[sensor[s].base_idx[0]].maxDelay;
+                               return sensor_desc[sensor[s].base[0]].maxDelay;
                        default:
                                return 0;
                }
@@ -602,7 +602,7 @@ int32_t sensor_get_min_delay(int s)
                switch (sensor[s].type) {
                        case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
-                               return sensor_desc[sensor[s].base_idx[0]].minDelay;
+                               return sensor_desc[sensor[s].base[0]].minDelay;
                        default:
                                return 0;
                }

diff --git a/enumeration.c b/enumeration.c
index 6510754..bb1831d 100644 (file)
--- a/enumeration.c
+++ b/enumeration.c
@@ -733,7 +733,7 @@ static void uncalibrated_gyro_check (void)
        if (has_gyr) {
                uncal_idx = sensor_count;
                sensor[uncal_idx].base_count = 1;
-               sensor[uncal_idx].base_idx[0] = cal_idx;
+               sensor[uncal_idx].base[0] = cal_idx;
 
                for (i=0; i<catalog_size; i++)
                        if (sensor_catalog[i].type == SENSOR_TYPE_GYROSCOPE_UNCALIBRATED) {