commit 8cb8de66bb7582d390e9c25da9bc143042433c54
author Andreas Schneider <asn@cryptomilk.org> Tue Apr 07 18:58:14 2015 +0200
committer Andreas Schneider <asn@cryptomilk.org> Wed Apr 08 14:00:36 2015 +0200
tree dbd20c54a60f191bf799ef7b6373026b50cb0dfc
parent 8e5fa432f3f0e0c9cad389a5615952289350242c

libril: Use consistent names for modem defines

Change-Id: I3ac65d2458878a6a631439be4f830c851aa50759
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

ril/libril/Android.mk

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 @@
     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 @@
     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

ril/libril/ril.cpp

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 @@
         }
 
         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;