From 7714af5a22b42095785121c17dd4b3c8bdd30ca2 Mon Sep 17 00:00:00 2001
From: Daniel Bateman <jetison.24@gmail.com>
Date: Thu, 15 Mar 2012 22:17:30 -0500
Subject: aries-common: allow for GPS init modularity

---
 device_base.mk    |  3 ++-
 init.aries.gps.rc | 18 ++++++++++++++++++
 init.aries.rc     | 13 +------------
 3 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 init.aries.gps.rc

diff --git a/device_base.mk b/device_base.mk
index 1ec33b8..ec30a95 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -50,6 +50,7 @@ PRODUCT_COPY_FILES := \
 # Init files
 PRODUCT_COPY_FILES += \
 	device/samsung/aries-common/init.aries.rc:root/init.aries.rc \
+	device/samsung/aries-common/init.aries.gps.rc:root/init.aries.gps.rc \
 	device/samsung/aries-common/init.aries.usb.rc:root/init.aries.usb.rc \
 	device/samsung/aries-common/init.aries.usb.rc:recovery/root/usb.rc \
 	device/samsung/aries-common/lpm.rc:root/lpm.rc \
@@ -180,4 +181,4 @@ PRODUCT_TAGS += dalvik.gc.type-precise
 PRODUCT_COPY_FILES += \
 	device/samsung/aries-common/updater.sh:updater.sh
 
-$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/device-bcm.mk)
\ No newline at end of file
+$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/device-bcm.mk)
diff --git a/init.aries.gps.rc b/init.aries.gps.rc
new file mode 100644
index 0000000..ec3ca2c
--- /dev/null
+++ b/init.aries.gps.rc
@@ -0,0 +1,18 @@
+#
+# init rc file for GPS: this is here to allow for devices
+# to provide their own GPS initialization code without
+# conflicting with the default GPS init. (i.e. Vibrant)
+#
+
+service gpsd /system/vendor/bin/gpsd -c /vendor/etc/gps.xml
+    class late_start
+    socket gps seqpacket 0660 gps system
+    user gps
+    group system inet
+
+on post-fs-data
+    # create data/gps for GPS demon
+    mkdir /data/gps 700 gps system
+    chown gps system /data/gps
+    chown gps root /sys/class/sec/gps/GPS_PWR_EN/value
+    chmod 660 /sys/class/sec/gps/GPS_PWR_EN/value
diff --git a/init.aries.rc b/init.aries.rc
index b668b55..50e1ad4 100644
--- a/init.aries.rc
+++ b/init.aries.rc
@@ -1,4 +1,5 @@
 import init.aries.usb.rc
+import init.aries.gps.rc
 
 on init
     loglevel 9
@@ -88,12 +89,6 @@ on post-fs-data
     # setup datadata
     exec /sbin/setupdatadata.sh
 
-    # create data/gps for GPS demon
-    mkdir /data/gps 700 gps system
-    chown gps system /data/gps
-    chown gps root /sys/class/sec/gps/GPS_PWR_EN/value
-    chmod 660 /sys/class/sec/gps/GPS_PWR_EN/value
-
     # wi-fi
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/misc/dhcp 0770 dhcp dhcp
@@ -117,12 +112,6 @@ service pvrsrvinit /system/vendor/bin/pvrsrvinit
     group root
     oneshot
 
-service gpsd /system/vendor/bin/gpsd -c /vendor/etc/gps.xml
-    class late_start
-    socket gps seqpacket 0660 gps system
-    user gps
-    group system inet
-
 service wpa_supplicant /system/bin/wpa_supplicant \
 		-Dnl80211 -iwlan0 -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin
     class main
-- 
cgit v1.1