13 files changed, 64 insertions, 28 deletions

diff --git a/configs/gps.xml b/configs/gps.xml
new file mode 100755
index 0000000..f64c75d
--- /dev/null
+++ b/configs/gps.xml
@@ -0,0 +1,58 @@
+<?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 
+       acPortName="/dev/s3c2410_serial1" lBaudRate="115200" cLogEnableInitState="false" cLogEnabled="true" acLogDirectory="/sdcard/gps/broadcom/" ltoFileName="lto2.dat" 
+       enhanced-assisted="false" cp-enhanced-assisted="false" TISEnabled="true" RILEnabled="true" LPmode="false" cp-cold-start="false" cp-guard-time-sec="1"
+       arp-supl-enable="true" arp-supl-cap-msb="true" arp-supl-cap-msa="true" arp-supl-cap-ecid="false" arp-supl-use-apn="false"
+       acSuplServer="supl.google.com" SuplPort="7276" tlsCertPath="/system/bin/gps.cer"
+       ReAidingIntervalSec="1200"
+       LbsEnable="true" LbsLocal="false" LbsServer="BCMLS2.glpals.com" LbsPort="7275" LbsSyncLto="true" LbsSyncCells="true" LbsWlanEnable="false"       
+       LbsSyncLtoThresholdDays="1"
+       gpioNStdbyPath="/sys/class/sec/gps/GPS_PWR_EN/value"
+       gpioNResetPath="/sys/class/sec/gps/GPS_nRST/value"
+       gpioDelayMs="250"
+       lcsApiSockName="/dev/socket/gps"
+       acNvStoDir="/data/gps/"
+       
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       
+       splitlog="true"
+
+       posAccOverride="-1"
+       LbsTAC="10101102"
+
+       SensorsEnable="false"
+       SensorsMask="0F"
+       SensorsLog="false"
+       SensorsType="5"
+       SensorsMoEnable="true" 
+       SensorsTurnEnable="false"
+       SensorsRawAcclGyroEnable="true"
+       />
+
+  <!-- Parameters passed to GlEngine   -->
+  <!--gll
+         LogPriMask="LOG_DEBUG"
+         LogFacMask="LOG_GLLAPI | LOG_DEVIA | LOG_NMEA | LOG_RAWDATA | LOG_DEVMS | LOG_ASIC_IO | LOG_BBTEST | LOG_DEVET | LOG_MESM | LOG_DEVKF | LOG_DEVJG | LOG_DEVMR" 
+         FrqPlan="FRQ_PLAN_10MHZ_2PPM_10MHZ_100PPB" FrqPlan="FRQ_PLAN_10MHZ_2PPM" "FRQ_PLAN_16_8MHZ_2PPM"
+         RfType="GL_RF_PALS7" "GL_RF_BARRACUDA" "GL_RF_2075_LN22" "GL_RF_2075_BRCM" "GL_RF_PALS7_BRCM" "GL_RF_BARRACUDA_BRCM" "GL_RF_BARRACUDA_EXT_LNA"
+         NOTE: "GL_RF_BARRACUDA_EXT_LNA" should be used for BAS
+         LbsEnable="true" LbsLocal="true" LbsServer="bcmlbsqa1.glpals.com" LbsPort="7275" LbsSyncTimeSec = "60" LbsSyncLto="true" LbsSyncCells="true"
+  /-->
+
+  <!-- NOTE: BrcmRFwildBase, BrcmRFclkDiv, anBrcmRFclkRefHz only needed for Broadcom RF front end test chips
+            ( i.e. GL_RF_2075_BRCM and GL_RF_PALS7_BRCM ) -->
+
+  <gll 
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_GLLAPI | LOG_NMEA | LOG_RAWDATA | LOG_DEVKF | LOG_DEVMS | LOG_DEVRA | LOG_DEVET" 
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_26MHZ_300PPB"   
+       RfType="GL_RF_47511_BRCM_EXT_LNA"   
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+    >
+  </gll>
+</glgps>
diff --git a/configs/sirfgps.conf b/configs/sirfgps.conf
deleted file mode 100755
index b01a5b0..0000000
--- a/configs/sirfgps.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-#CSR SiRF plc
-#PROJECT_NAME : white Space is not allowed
-#UART_DRIVER : Uart Driver Path
-#RESET_GPIO : Reset GPIO Driver Path
-#ONOFF_GPIO : OnOff GPIO Driver Path
-#EXTERNAL_LNA : 1 - use External LNA, 0 - use Internal LNA only
-#REF_CLOCK_26MHZ: 1 - use 26MHz TCXO, 0 - use 16.369MHz TCXO
-#UART_BAUD_RATE : 0 - 115200bps 1 - 230400, 2 - 460800, 3 - 57600
-#FREQUENCY_AIDING : 0 - Disable, 1 - Enable
-#SENSOR_AIDING : 0 - Disable, 1 - Enable
-#SET_ID_IMSI : 1 - Use IMSI for SET ID, 0 - Use MSISDN for SET ID, especially for Japan Network Operators
-#DEBUGGING_FILES : 0 - no log file, 1 - log files enabled
-#SSL_ENABLED : 0 - SSL Disabled, 1 - SSL Enabled
-#CERTI_VERSION : 0 - TLSv1 , 1 - SSLv3 , 2 - SSLv23
-PROJECT=SAMSUNG_U1
-UART_DRIVER=/dev/s3c2410_serial1
-RESET_GPIO=/sys/devices/virtual/sec/gps/GPS_nRST/value
-ONOFF_GPIO=/sys/devices/virtual/sec/gps/GPS_PWR_EN/value
-EXTERNAL_LNA=1
-REF_CLOCK_26MHZ=1
-UART_BAUD_RATE=2
-FREQUENCY_AIDING=1
-SENSOR_AIDING=0
-SET_ID_IMSI=1
-DEBUGGING_FILES=0
-SSL_ENABLED=0
-CERTI_VERSION=0
diff --git a/galaxynote.mk b/galaxynote.mk
index 8da2e21..9ce2491 100755
--- a/galaxynote.mk
+++ b/galaxynote.mk
@@ -75,7 +75,7 @@ $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330
 # Gps
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/gps.conf:system/etc/gps.conf \
-	device/samsung/galaxynote/configs/sirfgps.conf:system/etc/sirfgps.conf
+	device/samsung/galaxynote/configs/gps.xml:system/etc/gps.xml
 
 # Packages
 PRODUCT_PACKAGES := \
diff --git a/init.smdkv310.rc b/init.smdkv310.rc
index 8441bc2..e550b8b 100755
--- a/init.smdkv310.rc
+++ b/init.smdkv310.rc
@@ -275,6 +275,11 @@ service tvout /system/bin/tvoutserver
     user system

     group graphics

 

+service gpsd /system/bin/gpsd -c /system/etc/gps.xml

+    socket gps seqpacket 0660 gps system

+    user gps

+    group system inet sdcard_rw

+	

 # bugreport is triggered by holding down volume down, volume up and power

 service bugreport /system/bin/bugmailer.sh -v

     class main

diff --git a/kernel b/kernel
index 0ad6f6f..5933135 100755
--- a/kernel
+++ b/kernel
diff --git a/modules/Si4709_driver.ko b/modules/Si4709_driver.ko
index dd9a6de..0affb4d 100755
--- a/modules/Si4709_driver.ko
+++ b/modules/Si4709_driver.ko
diff --git a/modules/bthid.ko b/modules/bthid.ko
index 59eeab4..f9b16d6 100755
--- a/modules/bthid.ko
+++ b/modules/bthid.ko
diff --git a/modules/cifs.ko b/modules/cifs.ko
index 7ec43f7..8b6463d 100755
--- a/modules/cifs.ko
+++ b/modules/cifs.ko
diff --git a/modules/dhd.ko b/modules/dhd.ko
index 531a2b8..7c062c5 100755
--- a/modules/dhd.ko
+++ b/modules/dhd.ko
diff --git a/modules/gspca_main.ko b/modules/gspca_main.ko
index 7a01904..873b7ab 100755
--- a/modules/gspca_main.ko
+++ b/modules/gspca_main.ko
diff --git a/modules/j4fs.ko b/modules/j4fs.ko
index 7e073d3..12b3825 100755
--- a/modules/j4fs.ko
+++ b/modules/j4fs.ko
diff --git a/modules/scsi_wait_scan.ko b/modules/scsi_wait_scan.ko
index f45acfe..e9d029a 100755
--- a/modules/scsi_wait_scan.ko
+++ b/modules/scsi_wait_scan.ko
diff --git a/modules/vibrator.ko b/modules/vibrator.ko
index c6a10c3..d8f8894 100755
--- a/modules/vibrator.ko
+++ b/modules/vibrator.ko