librilsec-client: Add support for xmm7260 modem

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

diff --git a/ril/libsecril-client/Android.mk b/ril/libsecril-client/Android.mk
index c9ec41f835ed18f98156de5e1d2e41981e279d9c..71125ddf9aeb648be7174841965e3beb22389f9b 100755 (executable)
--- a/ril/libsecril-client/Android.mk
+++ b/ril/libsecril-client/Android.mk
@@ -15,6 +15,10 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_CFLAGS := 
 
+ifeq ($(BOARD_MODEM_TYPE),xmm7260)
+LOCAL_CFLAGS += -DMODEM_TYPE_XMM7260
+endif
+
 LOCAL_MODULE:= libsecril-client
 LOCAL_PRELINK_MODULE := false
 LOCAL_LDLIBS += -lpthread

diff --git a/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp
index 2dcd16bdd4ae37712981eec20ce5fb947c8aedc1..61f046d176084f44bca80ff869dfb611ea8a722b 100755 (executable)
--- a/ril/libsecril-client/secril-client.cpp
+++ b/ril/libsecril-client/secril-client.cpp
@@ -84,6 +84,20 @@ namespace android {
 #define OEM_SND_TYPE_HEADSET        0x31 // Headset(0x30) + Voice(0x01)
 #define OEM_SND_TYPE_BTVOICE        0x41 // BT(0x40) + Voice(0x01)
 
+#ifdef MODEM_TYPE_XMM7260
+#define OEM_SND_AUDIO_PATH_HANDSET            0x01
+#define OEM_SND_AUDIO_PATH_HEADSET            0x02
+#define OEM_SND_AUDIO_PATH_HFK                0x06
+#define OEM_SND_AUDIO_PATH_BLUETOOTH          0x04
+#define OEM_SND_AUDIO_PATH_STEREO_BLUETOOTH   0x05
+#define OEM_SND_AUDIO_PATH_SPEAKER            0x07
+#define OEM_SND_AUDIO_PATH_HEADPHONE          0x08
+#define OEM_SND_AUDIO_PATH_BT_NSEC_OFF        0x09
+#define OEM_SND_AUDIO_PATH_MIC1               0x0A
+#define OEM_SND_AUDIO_PATH_MIC2               0x0B
+#define OEM_SND_AUDIO_PATH_BT_WB              0x0C
+#define OEM_SND_AUDIO_PATH_BT_WB_NSEC_OFF     0x0D
+#else
 #define OEM_SND_AUDIO_PATH_HANDSET      0x01
 #define OEM_SND_AUDIO_PATH_HEADSET      0x02
 #define OEM_SND_AUDIO_PATH_HFK                0x03
@@ -96,6 +110,7 @@ namespace android {
 #define OEM_SND_AUDIO_PATH_MIC2 0x0A
 #define OEM_SND_AUDIO_PATH_BT_WB  0x0B
 #define OEM_SND_AUDIO_PATH_BT_WB_NSEC_OFF  0x0C
+#endif
 
 //---------------------------------------------------------------------------
 // Type definitions