GPS LOCK did not work when NMEA_PROVIDER follows it

there is an implicit requirement on the loc_gps_cfg_s_type field
data type, that is they must be 32 bit fields. Otherwise it would
only work with the assistance of padding. When two adjacent 8 bit
fields are defined, the later filled field would overwrite the
previously written neighbor. This is why GPS_LOCK was tested as
broken in the latest build.

This also fixes a theoretic bug that when there are two of the
same fields defined in the config table to be filled, the
accounting of the filled entries was incorrect earlier. This is
not a realistic bug, as there are no idential entries in the
config table HAL fills.

Bug: 16131208

CRs-fixed: 736966
Change-Id: I2e262fb30272f6f334508df17bb640022d7b1ef5

1 files changed, 2 insertions, 3 deletions

diff --git a/utils/loc_cfg.cpp b/utils/loc_cfg.cpp
index b4b3ded..404f3ed 100644
--- a/utils/loc_cfg.cpp
+++ b/utils/loc_cfg.cpp
@@ -175,8 +175,7 @@ DEPENDENCIES
    N/A
 
 RETURN VALUE
-   0: No config or incomplete config or invalid parameter
-   1: Filled a record
+   0: Number of records in the config_table filled with input_buf
 
 SIDE EFFECTS
    N/A
@@ -220,7 +219,7 @@ int loc_fill_conf_item(char* input_buf,
                 for(uint32_t i = 0; NULL != config_table && i < table_length; i++)
                 {
                     if(!loc_set_config_entry(&config_table[i], &config_value)) {
-                        ret = 1;
+                        ret += 1;
                     }
                 }
             }