libril: Use consistent names for modem defines

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

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

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;