dipper: move gps configs to device tree

it is easier to edit them in device tree.

Change-Id: Idb84dbf8db8c1a2d3fffc17147a9a756a87f9451

dipper-vendor.mk

@@ -6,7 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/dipper
 
 PRODUCT_COPY_FILES += \
-    vendor/xiaomi/dipper/proprietary/vendor/etc/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/etc/SensorHub.patch \
     vendor/xiaomi/dipper/proprietary/vendor/etc/acdbdata/Forte/Forte_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_Bluetooth_cal.acdb \
     vendor/xiaomi/dipper/proprietary/vendor/etc/acdbdata/Forte/Forte_Codec_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_Codec_cal.acdb \
     vendor/xiaomi/dipper/proprietary/vendor/etc/acdbdata/Forte/Forte_General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_General_cal.acdb \
@@ -39,12 +38,9 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/dipper/proprietary/vendor/etc/camera/score_icon.png:$(TARGET_COPY_OUT_VENDOR)/etc/camera/score_icon.png \
     vendor/xiaomi/dipper/proprietary/vendor/etc/camera/sdm_ys_32p_120_21_5_perturb50.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/sdm_ys_32p_120_21_5_perturb50.bin \
     vendor/xiaomi/dipper/proprietary/vendor/etc/camera/watermark_font_2300_3199.dat:$(TARGET_COPY_OUT_VENDOR)/etc/camera/watermark_font_2300_3199.dat \
-    vendor/xiaomi/dipper/proprietary/vendor/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
-    vendor/xiaomi/dipper/proprietary/vendor/etc/gpsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpsconfig.xml \
     vendor/xiaomi/dipper/proprietary/vendor/etc/hdr_config.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/hdr_config.cfg \
     vendor/xiaomi/dipper/proprietary/vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@3.0-service-qti.rc \
     vendor/xiaomi/dipper/proprietary/vendor/etc/init/vendor.qti.secure_element@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.secure_element@1.0-service.rc \
-    vendor/xiaomi/dipper/proprietary/vendor/etc/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lhd.conf \
     vendor/xiaomi/dipper/proprietary/vendor/etc/qdcm_calib_data_ss_notch_fhd_cmd_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_ss_notch_fhd_cmd_dsi_panel.xml \
     vendor/xiaomi/dipper/proprietary/vendor/etc/sdr_config.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/sdr_config.cfg \
     vendor/xiaomi/dipper/proprietary/vendor/etc/sensors/config/adux1050_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/adux1050_0.json \

proprietary/vendor/etc/gps.conf

@@ -1,302 +0,0 @@
-#Version check for XTRA
-#DISABLE = 0
-#AUTO    = 1
-#XTRA2   = 2
-#XTRA3   = 3
-XTRA_VERSION_CHECK=0
-
-#unlimited XTRA download
-XTRA_TEST_ENABLED = 1
-XTRA_THROTTLE_ENABLED = 0
-XTRA_SYSTEM_TIME_INJECT = 1
-# Error Estimate
-# _SET = 1
-# _CLEAR = 0
-ERR_ESTIMATE=0
-
-#NTP server
-NTP_SERVER=time.izatcloud.net
-NTP_SERVER_2=asia.pool.ntp.org
-NTP_SERVER_3=0.cn.pool.ntp.org
-
-#XTRA CA path
-XTRA_CA_PATH=/usr/lib/ssl/certs
-
-# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
-#               4 - Debug, 5 - Verbose
-# If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 3
-
-# Intermediate position report, 1=enable, 0=disable
-INTERMEDIATE_POS=0
-
-# supl version 1.0
-SUPL_VER=0x20000
-
-# Emergency SUPL, 1=enable, 0=disable
-#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=0
-
-#SUPL_MODE is a bit mask set in config.xml per carrier by default.
-#If it is uncommented here, this value will overwrite the value from
-#config.xml.
-#MSA=0X2
-#MSB=0X1
-SUPL_MODE=3
-
-# GPS Capabilities bit mask
-# SCHEDULING = 0x01
-# MSB = 0x02
-# MSA = 0x04
-# ON_DEMAND_TIME = 0x10
-# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING
-CAPABILITIES=0x17
-
-# Accuracy threshold for intermediate positions
-# less accurate positions are ignored, 0 for passing all positions
-ACCURACY_THRES=70
-
-################################
-##### AGPS server settings #####
-################################
-
-# FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234
-
-# FOR MO SUPL SUPPORT, set the following
-# MO_SUPL_HOST=supl.host.com or IP
-# MO_SUPL_PORT=1234
-
-# FOR C2K PDE SUPPORT, set the following
-# C2K_HOST=c2k.pde.com or IP
-# C2K_PORT=1234
-
-# Bitmask of slots that are available
-# for write/install to, where 1s indicate writable,
-# and the default value is 0 where no slots
-# are writable. For example, AGPS_CERT_WRITABLE_MASK
-# of b1000001010 makes 3 slots available
-# and the remaining 7 slots unwritable.
-#AGPS_CERT_WRITABLE_MASK=0
-
-####################################
-#  LTE Positioning Profile Settings
-####################################
-# 0: Enable RRLP on LTE(Default)
-# 1: Enable LPP_User_Plane on LTE
-# 2: Enable LPP_Control_Plane
-# 3: Enable both LPP_User_Plane and LPP_Control_Plane
-LPP_PROFILE = 0
-
-####################################
-#Datum Type
-####################################
-# 0: WGS-84
-# 1: PZ-90
-DATUM_TYPE = 0
-
-####################################
-#Datum Type
-####################################
-# 0: WGS-84
-# 1: PZ-90
-DATUM_TYPE = 0
-
-################################
-# EXTRA SETTINGS
-################################
-# NMEA provider (1=Modem Processor, 0=Application Processor)
-NMEA_PROVIDER=0
-# Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE)
-SGLTE_TARGET=0
-
-##################################################
-# Select Positioning Protocol on A-GLONASS system
-##################################################
-# 0x1: RRC CPlane
-# 0x2: RRLP UPlane
-# 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
-
-##################################################
-# Select technology for LPPe Control Plane
-##################################################
-# 0x1: DBH for LPPe CP
-# 0x2: WLAN AP Measurements for LPPe CP
-# 0x4: SRN AP measurement for CP
-# 0x8: Sensor Barometer Measurement LPPe CP
-#LPPE_CP_TECHNOLOGY = 0
-
-##################################################
-# Select technology for LPPe User Plane
-##################################################
-# 0x1: DBH for LPPe UP
-# 0x2: WLAN AP Measurements for LPPe UP
-# 0x4: SRN AP measurement for UP
-# 0x8: Sensor Barometer Measurement LPPe UP
-#LPPE_UP_TECHNOLOGY = 0
-
-##################################################
-# AGPS_CONFIG_INJECT
-##################################################
-# enable/disable injection of AGPS configurations:
-#     SUPL_VER
-#     SUPL_HOST
-#     SUPL_PORT
-#     MO_SUPL_HOST
-#     MO_SUPL_PORT
-#     C2K_HOST
-#     C2K_PORT
-#     LPP_PROFILE
-#     A_GLONASS_POS_PROTOCOL_SELECT
-# 0: disable
-# 1: enable
-AGPS_CONFIG_INJECT = 1
-
-##################################################
-# GNSS settings for automotive use cases
-# Configurations in following section are
-# specific to automotive use cases, others
-# please do not change, keep the default values
-##################################################
-
-# AP Coarse Timestamp Uncertainty
-##################################################
-# default : 10
-# AP time stamp uncertainty, until GNSS receiver
-# is able to acquire better timing information
-AP_TIMESTAMP_UNCERTAINTY = 10
-
-##################################################
-# QDR engine availability status
-##################################################
-# 0 : NO QDR (default)
-# 1 : QDR enabled
-# This settings enables QDR Configuration for
-# automotive use case, if enabled then
-# DR_AP_Service needs to be enabled in izat.conf
-#EXTERNAL_DR_ENABLED = 0
-
-#####################################
-# DR_SYNC Pulse Availability
-#####################################
-# 0 : DR_SYNC pulse not available (default)
-# 1 : DR_SYNC pulse available
-# This configuration enables the driver to make use
-# of PPS events generated by DR_SYNC pulse
-# Standard Linux PPS driver needs to be enabled
-DR_SYNC_ENABLED = 0
-
-#####################################
-# PPS Device name
-#####################################
-PPS_DEVICENAME = /dev/pps0
-
-#####################################
-# Ignore PPS at Startup and after long outage
-#####################################
-IGNORE_PPS_PULSE_COUNT = 1
-
-#####################################
-# Long GNSS RF outage in seconds
-#####################################
-GNSS_OUTAGE_DURATION = 10
-
-#####################################
-# AP Clock Accuracy
-#####################################
-# Quality of APPS processor clock (in PPM).
-# Value specified is used for calculation of
-# APPS time stamp uncertainty
-AP_CLOCK_PPM = 100
-
-#####################################
-# MAX ms difference to detect missing pulse
-#####################################
-# Specifies time threshold in ms to validate any missing PPS pulses
-MISSING_PULSE_TIME_DELTA = 900
-
-#####################################
-# Propagation time uncertainty
-#####################################
-# This settings enables time uncertainty propagation
-# logic incase of missing PPS pulse
-PROPAGATION_TIME_UNCERTAINTY = 1
-
-#######################################
-#  APN / IP Type Configuration
-#  APN and IP Type to use for setting
-#  up WWAN call.
-#  Use below values for IP Type:
-#  v4 = 4
-#  v6 = 6
-#  v4v6 = 10
-#######################################
-# INTERNET_APN = abc.xyz
-# INTERNET_IP_TYPE = 4
-# SUPL_APN = abc.xyz
-# SUPL_IP_TYPE = 4
-
-#####################################
-# Modem type
-#####################################
-# This setting configures modem type
-# (external=0 or internal=1)
-# comment out the next line to vote
-# for the first modem in the list
-MODEM_TYPE = 1
-
-##################################################
-# CONSTRAINED TIME UNCERTAINTY MODE
-##################################################
-# 0 : disabled (default)
-# 1 : enabled
-# This setting enables GPS engine to keep its time
-# uncertainty below the specified constraint
-#CONSTRAINED_TIME_UNCERTAINTY_ENABLED = 0
-
-# If constrained time uncertainty mode is enabled,
-# this setting specifies the time uncertainty
-# threshold that gps engine need to maintain.
-# In unit of milli-seconds.
-# Default is 0.0 meaning that modem default value
-# of time uncertainty threshold will be used.
-#CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD = 0.0
-
-# If constrained time uncertainty mode is enabled,
-# this setting specifies the power budget that
-# gps engine is allowed to spend to maintain the time
-# uncertainty.
-# Default is 0 meaning that GPS engine is not constained
-# by power budget and can spend as much power as needed.
-# In unit of 0.1 milli watt second.
-#CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET = 0
-
-##################################################
-# POSITION ASSISTED CLOCK ESTIMATOR
-##################################################
-# 0 : disabled (default)
-# 1 : enabled
-# This setting enables GPS engine to estimate clock
-# bias and drift when the signal from at least 1
-# SV is available and the UE’s position is known by
-# other position engines.
-#POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED = 0
-
-#####################################
-# proxyAppPackageName
-#####################################
-# This is a string that is sent to the framework
-# in nfwNotifyCb callback
-PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
-
-#####################################
-# CP_MTLR_ES
-#####################################
-# CP MTLR ES, 1=enable, 0=disable
-CP_MTLR_ES=0

proprietary/vendor/etc/gpsconfig.xml

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <!--HAL Confguration  -->
-  <hal
-    PortName="lhd"
-    GpioDelayMs="130"
-    LogEnabled="true"
-    Log="FILE"
-    LogDirectory="/data/vendor/gps/log/gps"
-    CtrlPipe="/data/vendor/gps/glgpsctrl"
-    NvStorageDir="/data/vendor/gps/"
-    NmeaOutName="/data/vendor/gps/gpspipe"
-
-    WakeLock="geo"
-
-    LPmode="false"
-    ReAidingOnHotStart="true"
-    SuplSslMethod="SSLv23_NO_TLSv1_2"
-    SuplEnable="true"
-    SuplUseApn="false"
-    SuplSslVerify="none"
-    SuplTlsCertPath="/vendor/bin/gps.cer"
-    SuplUT1Seconds="20"
-    SuplUT2Seconds="20"
-    SuplUT3Seconds="20"
-    TcpConnectionTimeout="20"
-
-    HttpSyncLto="true"
-    LtoDir="/data/vendor/gps/"
-    LtoSyncThresholdDays="3"
-
-    AssertEnabled="false"
-
-    SensorsEnable="true"
-    SensorsMask="0x41"
-    SensorsLog="false"
-    SensorsDebugLog="false"
-    LogDirectoryMaxSizeMb="280"
-    LogLineThreshold="400000"
-    GnssYearOfHardware="2018"
-
-  />
-
-  <gll
-    LogPriMask="LOG_INFO"
-    LogFacMask="LOG_GLLIO | LOG_GLLAPI"
-    FrqPlan="FRQ_PLAN_26MHZ_2PPM"
-    RfType="GL_RF_4755_BRCM_EXT_LNA"
-    OnChipLogPriMask="LOG_INFO"
-    OnChipLogFacMask="LOG_GLLIO | LOG_INTEGR"
-    MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-    MultiCarrRFMode ="GL_MULTI_CARR_RF_MODE_L1_L5"
-    GpsCarrierType="3,1,3,1,2,3,2,3,3,3,1,2,1,1,2,1,2,1,1,1,1,1,1,3,3,3,3,1,2,3,2,3"
-    PsfDisableClamping="true"
-    PsfDisableInternalMotionDetector="true"
-    WarmStandbyTimeout1Seconds="10"
-    WarmStandbyTimeout2Seconds="20"
-    ExtL5Bias="13.5"
-    >
-  </gll>
-  <gll_features
-    EnableLowPowerEls="false"
-    EnableLowPowerPmm="false"
-    EnableACSD="true"
-    MPFCollect="true"
-  />
-
-<job Id="Periodic">
-    <task>
-        <req_pos ValidFixes="1000"/>
-    </task>
-</job>
-
-<!-- Periodic Position with the ROM almanac Ignored for simulator testing -->
-<job Id="Simulator_Periodic">
-    <task Id="cont" Repeat="1">
-        <startup IgnoreRomAlm="true"
-          IgnoreOsc="false"
-          IgnoreRamAlm="false"
-          IgnorePosition="true"
-          IgnoreNav="true"
-          IgnoreTime="true"
-/>
-        <req_pos ValidFixes="400" DurationSec="1200"/>
-    </task>
-</job>
-
-<job Id="factory-L5-CW">
-    <task Id="test" Repeat="1">
-        <!-- Instructs GLL to ignore all elements stored in NVRAM listed below -->
-        <startup
-            IgnoreOsc="false"
-            IgnoreTime="true"
-            IgnorePosition="true"
-            IgnoreNav="true"
-            IgnoreRamAlm="true"
-            IgnoreRomAlm="true"
-        />
-        <req_ftest
-            Prn="1"
-            PrnL5a="1"
-            ConstellationL5a="GPS"
-            Disable200KhzCw="true"
-            FactoryTestItems="GL_FACT_TEST_CW"
-            FactoryTestMode="GL_FACT_TEST_CONT"
-            AveragingIntervalSec="10"
-            DurationSec="1000"
-        />
-    </task>
-</job>
-
-</glgps>

proprietary/vendor/etc/lhd.conf

@@ -1,34 +0,0 @@
-PortName=tcp:127.0.0.1:300
-LheName=bbd
-LheSerialControl=BBD:Serial=TTY
-
-GpioNStdbyPath=/sys/devices/platform/soc/890000.spi/spi_master/spi32766/spi32766.0/nstandby
-
-LhePatch=/vendor/etc/SensorHub.patch
-
-GpioDelayMs=255
-LheBbdPacket=/dev/ttyBCM
-#LheBbdReliable=/dev/bbd_reliable
-LheBbdControl=/dev/bbd_control
-#LheBbdSensor=/dev/bbd_sensor
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD
-
-# For developement stage, we need to set this on.
-# For production stage, we should set this off.
-# LheFailSafe=ON
-LheFailSafe=/data/vendor/gps/log/lhd/esw-crash-dump.bin
-# LheFailSafe=LOG
-
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:LOG_INFO:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=FILE
-LogDirectory=/data/vendor/gps/log/lhd
-NvStorageDir=/data/vendor/gps/
-
-## MuxMode setting:
-#ExtLNA for GNSS
-SkipSensorWakeLock=true
-MaxLogDirSizeMb=20
-LogLineThreshold=40000