MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AU_LINUX_ANDROID_KK.04.04.04.010.182 based on quic/aosp/kk

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAlQsxwMACgkQoUgPZYCpAfG54gCdFhi4kcvtS8jo5rRwqMemDRJw
 JZAAoOcZBG/Y1bH/Kmd1+27OQJUOH/Yg
 =fi7/
 -----END PGP SIGNATURE-----

Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.182' into HEAD

AU_LINUX_ANDROID_KK.04.04.04.010.182 based on quic/aosp/kk

Conflicts:
	loc_api/libloc_api_50001/loc_eng.h

Change-Id: I3a734e3bdc3347961f1bd4bf5499ec7ca9aecfbc
This commit is contained in:
Zhoulu Luo 2014-10-02 14:42:00 -07:00
commit 94ca706b3c
5 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
etc/gps.conf
View file

@ -39,6 +39,11 @@ SUPL_VER=0x10000
# Emergency SUPL, 1=enable, 0=disable # Emergency SUPL, 1=enable, 0=disable
SUPL_ES=1 SUPL_ES=1
#Choose PDN for Emergency SUPL
#1 - Use emergency PDN
#0 - Use regular SUPL PDN for Emergency SUPL
USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1
# GPS Capabilities bit mask # GPS Capabilities bit mask
# SCHEDULING = 0x01 # SCHEDULING = 0x01
# MSB = 0x02 # MSB = 0x02

24
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -101,6 +101,7 @@ static loc_param_s_type loc_parameter_table[] =
{"NMEA_PROVIDER", &gps_conf.NMEA_PROVIDER, NULL, 'n'}, {"NMEA_PROVIDER", &gps_conf.NMEA_PROVIDER, NULL, 'n'},
{"SUPL_VER", &gps_conf.SUPL_VER, NULL, 'n'}, {"SUPL_VER", &gps_conf.SUPL_VER, NULL, 'n'},
{"CAPABILITIES", &gps_conf.CAPABILITIES, NULL, 'n'}, {"CAPABILITIES", &gps_conf.CAPABILITIES, NULL, 'n'},
{"USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL", &gps_conf.USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL, NULL, 'n'},
{"GYRO_BIAS_RANDOM_WALK", &sap_conf.GYRO_BIAS_RANDOM_WALK, &sap_conf.GYRO_BIAS_RANDOM_WALK_VALID, 'f'}, {"GYRO_BIAS_RANDOM_WALK", &sap_conf.GYRO_BIAS_RANDOM_WALK, &sap_conf.GYRO_BIAS_RANDOM_WALK_VALID, 'f'},
{"ACCEL_RANDOM_WALK_SPECTRAL_DENSITY", &sap_conf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY, &sap_conf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY_VALID, 'f'}, {"ACCEL_RANDOM_WALK_SPECTRAL_DENSITY", &sap_conf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY, &sap_conf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY_VALID, 'f'},
{"ANGLE_RANDOM_WALK_SPECTRAL_DENSITY", &sap_conf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY, &sap_conf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY_VALID, 'f'}, {"ANGLE_RANDOM_WALK_SPECTRAL_DENSITY", &sap_conf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY, &sap_conf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY_VALID, 'f'},
@ -141,6 +142,8 @@ static void loc_default_parameters(void)
gps_conf.A_GLONASS_POS_PROTOCOL_SELECT = 0; gps_conf.A_GLONASS_POS_PROTOCOL_SELECT = 0;
/*XTRA version check is disabled by default*/ /*XTRA version check is disabled by default*/
gps_conf.XTRA_VERSION_CHECK=0; gps_conf.XTRA_VERSION_CHECK=0;
/*Use emergency PDN by default*/
gps_conf.USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL = 1;
/*Defaults for sap.conf*/ /*Defaults for sap.conf*/
sap_conf.GYRO_BIAS_RANDOM_WALK = 0; sap_conf.GYRO_BIAS_RANDOM_WALK = 0;
@ -1108,7 +1111,17 @@ void LocEngRequestSuplEs::proc() const {
AgpsStateMachine* sm = locEng->ds_nif; AgpsStateMachine* sm = locEng->ds_nif;
DSSubscriber s(sm, mID); DSSubscriber s(sm, mID);
sm->subscribeRsrc((Subscriber*)&s); sm->subscribeRsrc((Subscriber*)&s);
} else { }
else if (locEng->agnss_nif) {
AgpsStateMachine *sm = locEng->agnss_nif;
ATLSubscriber s(mID,
sm,
locEng->adapter,
false);
sm->subscribeRsrc((Subscriber*)&s);
LOC_LOGD("%s:%d]: Using regular ATL for SUPL ES", __func__, __LINE__);
}
else {
locEng->adapter->atlOpenStatus(mID, 0, NULL, -1, -1); locEng->adapter->atlOpenStatus(mID, 0, NULL, -1, -1);
} }
} }
@ -2191,8 +2204,9 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsExtCallbacks* call
false); false);
if (adapter->mSupportsAgpsRequests) { if (adapter->mSupportsAgpsRequests) {
loc_eng_data.adapter->sendMsg(new LocEngDataClientInit(&loc_eng_data)); if(gps_conf.USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL) {
loc_eng_data.adapter->sendMsg(new LocEngDataClientInit(&loc_eng_data));
}
loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb, loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb,
NULL, NULL, &loc_eng_data); NULL, NULL, &loc_eng_data);
} }
@ -2224,7 +2238,9 @@ getAgpsStateMachine(loc_eng_data_s_type &locEng, AGpsExtType agpsType) {
break; break;
} }
case AGPS_TYPE_SUPL_ES: { case AGPS_TYPE_SUPL_ES: {
stateMachine = locEng.ds_nif; locEng.ds_nif ?
stateMachine = locEng.ds_nif:
stateMachine = locEng.agnss_nif;
break; break;
} }
default: default:

1
loc_api/libloc_api_50001/loc_eng.h
View file

@ -153,6 +153,7 @@ typedef struct loc_gps_cfg_s
char XTRA_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH]; char XTRA_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH];
char XTRA_SERVER_3[MAX_XTRA_SERVER_URL_LENGTH]; char XTRA_SERVER_3[MAX_XTRA_SERVER_URL_LENGTH];
unsigned long AGPS_CERT_WRITABLE_MASK; unsigned long AGPS_CERT_WRITABLE_MASK;
unsigned long USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL;
} loc_gps_cfg_s_type; } loc_gps_cfg_s_type;
typedef struct typedef struct

1
utils/loc_cfg.cpp
View file

@ -280,7 +280,6 @@ void loc_read_conf(const char* conf_file_name, loc_param_s_type* config_table,
uint32_t table_length) uint32_t table_length)
{ {
FILE *gps_conf_fp = NULL; FILE *gps_conf_fp = NULL;
char input_buf[LOC_MAX_PARAM_LINE]; /* declare a char array */
char *lasts; char *lasts;
loc_param_v_type config_value; loc_param_v_type config_value;
uint32_t i; uint32_t i;

4
utils/loc_cfg.h
View file

@ -33,9 +33,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#define LOC_MAX_PARAM_NAME 48 #define LOC_MAX_PARAM_NAME 80
#define LOC_MAX_PARAM_STRING 80 #define LOC_MAX_PARAM_STRING 80
#define LOC_MAX_PARAM_LINE 80 #define LOC_MAX_PARAM_LINE (LOC_MAX_PARAM_NAME + LOC_MAX_PARAM_STRING)
#define UTIL_READ_CONF_DEFAULT(filename) \ #define UTIL_READ_CONF_DEFAULT(filename) \
loc_read_conf((filename), NULL, 0); loc_read_conf((filename), NULL, 0);