From 6b9cd5f8b49db8d5dab0e7042a1bc7ab333bbe4b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Jan 2015 22:41:22 +0100 Subject: [PATCH] librilsec-client: Add support for xmm7260 modem Change-Id: If287527a26a1f5c79ec493ad2cd1cd7152ba27db Signed-off-by: Andreas Schneider --- ril/libsecril-client/Android.mk | 4 ++++ ril/libsecril-client/secril-client.cpp | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ril/libsecril-client/Android.mk b/ril/libsecril-client/Android.mk index 8518abd2..95e787d7 100755 --- 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 diff --git a/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp index 2dcd16bd..61f046d1 100755 --- 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