summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-04-07 18:58:14 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-04-08 05:40:16 +0000
commit91809f28e870af68b0c388f30a42bb9a6891c79c (patch)
treedbd20c54a60f191bf799ef7b6373026b50cb0dfc
parent1e38f69b0c6328a02a76f2743e0a5966c16b1c84 (diff)
downloadandroid_hardware_samsung-91809f28e870af68b0c388f30a42bb9a6891c79c.tar.gz
android_hardware_samsung-91809f28e870af68b0c388f30a42bb9a6891c79c.tar.bz2
android_hardware_samsung-91809f28e870af68b0c388f30a42bb9a6891c79c.zip
libril: Use consistent names for modem defines
Change-Id: I3ac65d2458878a6a631439be4f830c851aa50759 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--ril/libril/Android.mk8
-rw-r--r--ril/libril/ril.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index 3e7ff05..101c987 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -18,10 +18,10 @@ LOCAL_SHARED_LIBRARIES := \
librilutils
ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
-LOCAL_CFLAGS := -DMODEM_TYPE_6262
+LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262
endif
ifeq ($(BOARD_MODEM_TYPE),xmm6260)
-LOCAL_CFLAGS := -DMODEM_TYPE_6260
+LOCAL_CFLAGS := -DMODEM_TYPE_XMM6260
endif
LOCAL_MODULE:= libril
@@ -43,10 +43,10 @@ LOCAL_STATIC_LIBRARIES := \
librilutils_static
ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
-LOCAL_CFLAGS := -DMODEM_TYPE_6262
+LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262
endif
ifeq ($(BOARD_MODEM_TYPE),xmm6260)
-LOCAL_CFLAGS := -DMODEM_TYPE_6260
+LOCAL_CFLAGS := -DMODEM_TYPE_XMM6260
endif
LOCAL_MODULE:= libril_static
diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp
index 9fda4ee..51decd6 100644
--- a/ril/libril/ril.cpp
+++ b/ril/libril/ril.cpp
@@ -805,9 +805,9 @@ dispatchDial (Parcel &p, RequestInfo *pRI) {
}
if (uusPresent == 0) {
-#ifdef MODEM_TYPE_6262
+#ifdef MODEM_TYPE_XMM6262
dial.uusInfo = NULL;
-#elif MODEM_TYPE_6260
+#elif MODEM_TYPE_XMM6260
/* Samsung hack */
memset(&uusInfo, 0, sizeof(RIL_UUS_Info));
uusInfo.uusType = (RIL_UUS_Type) 0;