diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-10-16 21:15:20 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-31 23:06:27 -0700 |
| commit | 7690f6254ecbc7fec9d9216962d3b4b91d091f9b (patch) | |
| tree | ec820ba4f59c55ccbc7d6f4ffdb1bb9ab6175065 | |
| parent | 43ffbd6e158dc773c9ffd47b096f3c62ed555d78 (diff) | |
| download | android_hardware_qcom_wlan-7690f6254ecbc7fec9d9216962d3b4b91d091f9b.tar.gz android_hardware_qcom_wlan-7690f6254ecbc7fec9d9216962d3b4b91d091f9b.tar.bz2 android_hardware_qcom_wlan-7690f6254ecbc7fec9d9216962d3b4b91d091f9b.zip | |
wcnss_service: Deal with mdm-detect too
Change-Id: I1f6ad7502bb23fd59f182c1fe86ba92cb47470b7
| -rw-r--r-- | wcnss-service/Android.mk | 2 | ||||
| -rw-r--r-- | wcnss-service/wcnss_service.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/wcnss-service/Android.mk b/wcnss-service/Android.mk index f401ec5..95e6323 100644 --- a/wcnss-service/Android.mk +++ b/wcnss-service/Android.mk @@ -56,7 +56,7 @@ ifneq ($(TARGET_WCNSS_MAC_PREFIX),) LOCAL_CFLAGS += -DWCNSS_INVALID_MAC_PREFIX=\"$(TARGET_WCNSS_MAC_PREFIX)\" endif -LOCAL_CFLAGS += -DWCNSS_QMI +LOCAL_CFLAGS += -DWCNSS_QMI -DMDM_DETECT LOCAL_SRC_FILES += wcnss_qmi_client.c LOCAL_MODULE := libwcnss_qmi diff --git a/wcnss-service/wcnss_service.c b/wcnss-service/wcnss_service.c index 6ad9a0e..94d148e 100644 --- a/wcnss-service/wcnss_service.c +++ b/wcnss-service/wcnss_service.c @@ -41,8 +41,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <cutils/properties.h> #ifdef WCNSS_QMI #include "wcnss_qmi_client.h" +#ifdef MDM_DETECT #include "mdm_detect.h" #endif +#endif #ifdef WCNSS_QMI_OSS #include <dlfcn.h> #endif @@ -487,7 +489,7 @@ void setup_wlan_driver_ath_prop() property_set("wlan.driver.ath", WLAN_DRIVER_ATH_DEFAULT_VAL); } -#ifdef WCNSS_QMI +#ifdef MDM_DETECT int check_modem_compatability(struct dev_info *mdm_detect_info) { char args[MODEM_BASEBAND_PROPERTY_SIZE] = {0}; @@ -578,7 +580,9 @@ int main(int argc, char *argv[]) int fd_dev, ret_cal; #ifdef WCNSS_QMI int nv_mac_addr = FAILED; +#ifdef MDM_DETECT struct dev_info mdm_detect_info; +#endif int nom = 0; #endif @@ -610,7 +614,7 @@ int main(int argc, char *argv[]) /* Call ESOC API to get the number of modems. If the number of modems is not zero, only then proceed with the eap_proxy intialization.*/ - +#ifdef MDM_DETECT nom = get_system_info(&mdm_detect_info); if (nom > 0) @@ -628,6 +632,7 @@ int main(int argc, char *argv[]) ALOGE("wcnss_service: Target does not have external modem"); goto nomodem; } +#endif /* initialize the DMS client and request the wlan mac address */ |