Vendor RIL Library Submissions for LTE: Version 1

* MM/LTE V-RIL based on Motorola tag LTEDC_U_03.1D.00 + additional fixes * _mm_ril: Multi-mode V-RIL supporting both LTE & CDMA V-RILs * _lte_ril: LTE V-RIL, communicates with LTE Modem * _db_ril: temporary database to store LTE V-RIL response to RIL requests * CDMA V-RIL Version 3.3 (using QMI Lib version 1.04) NOTE: REQUIRES CDMA BP v3.16 * _cdma_ril: CDMA V-RIL lib * _qmi_ril: QMI library to support multiple data sessions * _nwif_ril: controls the qmi network interface * initial submission supporting multiple PDP contexts in CDMA & LTE support * Google bug 4136339: return non-zero operator value when BP returns invalid string or 0 * System properties change to support LTE * addition of new Vendor RILs for LTE, Multimodem and renaming existing CDMA RIL binaries * increase MUX channels to support Modem-Modem communication * Updated CleanSpec.mk file to clean out existing binaries from the repo * Added apns-confi.xml. * Removed reference to pppd/chat in the ril dir as well as makefiles Change-Id: Ie1d2aa201fa8c712909ee380ea3b79e1dd32b651 Signed-off-by: vidya rao <vidya.rao@motorola.com>
AOKP · Mar 28, 2011 · f54033e · f54033e
1 parent 71a9ecf
commit f54033e
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 72 deletions.
diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -49,6 +49,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/sh)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/ash)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/sh)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/mksh)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmoto_ril.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libril_rds.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/apns-conf.xml)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

diff --git a/apns-conf.xml b/apns-conf.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- use empty string to specify no proxy or port -->
+<!-- This version must agree with that in apps/common/res/apns.xml -->
+<apns version="6">
+    <!-- Modify Apn database for VZW LTE support -->
+    <apn carrier="Verizon Internet"
+        mcc="310"
+        mnc="004"
+        apn="VZWINTERNET"
+        mmsc="http://mms.vtext.com/servlets/mms"
+        type="default,mms,dun"
+        protocol="IPv6v4"
+        roaming_protocol="IPv6v4"
+    />
+    <apn carrier="Verizon FOTA"
+        mcc="310"
+        mnc="004"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPv6v4"
+        roaming_protocol="IPv6v4"
+    />
+    <apn carrier="Verizon IMS"
+        mcc="310"
+        mnc="004"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPv6v4"
+        roaming_protocol="IPv6v4"
+    />
+    <apn carrier="Verizon CBS"
+        mcc="310"
+        mnc="004"
+        apn="VZWAPP"
+        type="cbs"
+        protocol="IPv6v4"
+        roaming_protocol="IPv6v4"
+    />
+    <!-- END modify Apn database for VZW LTE support -->
+</apns>
diff --git a/board-info.txt b/board-info.txt
@@ -1,4 +1,3 @@
-require mid=001
-require product=stingray|xoom-cdma
-require version-bootloader=1042
-require version-baseband=N_02.0F.00R
+require product=stingray|xoom-cdma|xoom-cdma-lte
+require version-bootloader=1043
+require version-baseband=CDMA_N_03.16.00RU
diff --git a/device.mk b/device.mk
@@ -18,6 +18,18 @@ $(call inherit-product, device/moto/wingray/device_base.mk)
 
 PRODUCT_COPY_FILES += \
     device/moto/stingray/ril/tty2ttyd:system/bin/tty2ttyd \
+    device/moto/stingray/apns-conf.xml:system/etc/apns-conf.xml
+
+ifneq ($(AP_RIL_BLDSRC),1)
+PRODUCT_COPY_FILES += \
+    device/moto/stingray/ril/libmoto_cdma_ril.so:system/lib/libmoto_cdma_ril.so \
+    device/moto/stingray/ril/libmoto_rds_ril.so:system/lib/libmoto_rds_ril.so \
+    device/moto/stingray/ril/libmoto_qmi_ril.so:system/lib/libmoto_qmi_ril.so \
+    device/moto/stingray/ril/libmoto_nwif_ril.so:system/lib/libmoto_nwif_ril.so \
+    device/moto/stingray/ril/libmoto_lte_ril.so:system/lib/libmoto_lte_ril.so \
+    device/moto/stingray/ril/libmoto_db_ril.so:system/lib/libmoto_db_ril.so \
+    device/moto/stingray/ril/libmoto_mm_ril.so:system/lib/libmoto_mm_ril.so
+endif
 
 # Overrides
 DEVICE_PACKAGE_OVERLAYS := \

diff --git a/ril/Android.mk b/ril/Android.mk
@@ -1,49 +1,2 @@
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(AP_MODEM_CDMA_BLDSRC),1)
-file := $(TARGET_OUT_SHARED_LIBRARIES)/libmoto_ril.so
-$(file) : $(LOCAL_PATH)/libmoto_ril.so | $(ACP)
-	$(transform-prebuilt-to-target)
-ALL_PREBUILT += $(file)
-endif
-
-ifneq ($(AP_MODEM_CDMA_BLDSRC),1)
-file := $(PRODUCT_OUT)/obj/lib/libmoto_ril.so
-$(file) : $(LOCAL_PATH)/libmoto_ril.so | $(ACP)
-	$(transform-prebuilt-to-target)
-ALL_PREBUILT += $(file)
-endif
-
-ifneq ($(AP_MODEM_CDMA_BLDSRC),1)
-file := $(TARGET_OUT_SHARED_LIBRARIES)/libpppd_plugin-ril.so
-$(file) : $(LOCAL_PATH)/libpppd_plugin-ril.so | $(ACP)
-	$(transform-prebuilt-to-target)
-ALL_PREBUILT += $(file)
-endif
-
-ifneq ($(AP_MODEM_CDMA_BLDSRC),1)
-file := $(TARGET_OUT_SHARED_LIBRARIES)/libril_rds.so
-$(file) : $(LOCAL_PATH)/libril_rds.so | $(ACP)
-	$(transform-prebuilt-to-target)
-ALL_PREBUILT += $(file)
-endif
-
-ifneq ($(AP_MODEM_CDMA_BLDSRC),1)
-file := $(TARGET_OUT_EXECUTABLES)/chat-ril
-$(file) : $(LOCAL_PATH)/chat-ril | $(ACP)
-	$(transform-prebuilt-to-target)
-ALL_PREBUILT += $(file)
-endif
-
-ifneq ($(AP_MODEM_CDMA_BLDSRC),1)
-file := $(TARGET_OUT_EXECUTABLES)/pppd-ril
-$(file) : $(LOCAL_PATH)/pppd-ril | $(ACP)
-	$(transform-prebuilt-to-target)
-ALL_PREBUILT += $(file)
-endif
-
-file := $(TARGET_OUT_ETC)/ppp/peers/pppd-ril.options
-$(file) : $(LOCAL_PATH)/pppd-ril.options | $(ACP)
-	$(transform-prebuilt-to-target)
-ALL_PREBUILT += $(file)
-
diff --git a/ril/chat-ril b/ril/chat-ril
diff --git a/ril/libmoto_cdma_ril.so b/ril/libmoto_cdma_ril.so
diff --git a/ril/libmoto_db_ril.so b/ril/libmoto_db_ril.so
diff --git a/ril/libmoto_lte_ril.so b/ril/libmoto_lte_ril.so
diff --git a/ril/libmoto_mm_ril.so b/ril/libmoto_mm_ril.so
diff --git a/ril/libmoto_nwif_ril.so b/ril/libmoto_nwif_ril.so
diff --git a/ril/libmoto_qmi_ril.so b/ril/libmoto_qmi_ril.so
diff --git a/ril/libmoto_rds_ril.so b/ril/libmoto_rds_ril.so
diff --git a/ril/libmoto_ril.so b/ril/libmoto_ril.so
diff --git a/ril/libpppd_plugin-ril.so b/ril/libpppd_plugin-ril.so
diff --git a/ril/libril_rds.so b/ril/libril_rds.so
diff --git a/ril/pppd-ril b/ril/pppd-ril
diff --git a/ril/pppd-ril.options b/ril/pppd-ril.options
diff --git a/system.prop b/system.prop
@@ -1,16 +1,25 @@
 # RIL and telephony related settings
 rild.libargs=-d /dev/chnlat10
-rild.libpath=/system/lib/libmoto_ril.so
+#Point to lte, CDMA, MM RILs
+lte_ril.libpath=/system/lib/libmoto_lte_ril.so
+cdma_ril.libpath=/system/lib/libmoto_cdma_ril.so
+rild.libpath=/system/lib/libmoto_mm_ril.so
+ril.rat=LTE
 persist.ril.mux.ttydevice=/dev/usb/tty2-1:1.2
-persist.ril.mux.noofchannels=8
+# Increase # channels to 10 to allow M2M communication
+persist.ril.mux.noofchannels=10
 persist.ril.modem.mode=1
 ro.cdma.home.operator.numeric=310004
 ro.cdma.home.operator.alpha=Verizon
 ro.cdma.homesystem=64,65,76,77,78,79,80,81,82,83
 ro.cdma.data_retry_config=default_randomization=2000,0,0,120000,180000,540000,960000
 persist.ril.modem.ttydevice=/dev/usb/tty2-1:1.4
+#Leave default mode to 4 (CDMA) but need it to be Global (7) for LTE/CDMA
 ro.telephony.default_network=4
 
+#For FW to support the LTE and eHRPD capability
+ro.telephony.lte_on_cdma=1
+
 # The OpenGL ES API level that is natively supported by this device.
 # This is a 16.16 fixed point number
 ro.opengles.version = 131072