diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-10-16 21:15:20 -0700 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-09-20 09:12:43 +0200 |
| commit | 346c76fca9ee0f017b1bca12751972d7fe030199 (patch) | |
| tree | d88556cabc988873c4cb1e3bc0dd24deee58d138 | |
| parent | 400bf351d02af6a3ed1be803f383fc6db2796946 (diff) | |
| download | android_hardware_qcom_wlan-346c76fca9ee0f017b1bca12751972d7fe030199.tar.gz android_hardware_qcom_wlan-346c76fca9ee0f017b1bca12751972d7fe030199.tar.bz2 android_hardware_qcom_wlan-346c76fca9ee0f017b1bca12751972d7fe030199.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 | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/wcnss-service/Android.mk b/wcnss-service/Android.mk index 4ea6c78..5b2cdd3 100644 --- a/wcnss-service/Android.mk +++ b/wcnss-service/Android.mk @@ -24,7 +24,7 @@ LOCAL_CFLAGS += -DWCNSS_QMI_MAC_ADDR_REV endif ifneq ($(QCPATH),) -LOCAL_CFLAGS += -DWCNSS_QMI +LOCAL_CFLAGS += -DWCNSS_QMI -DMDM_DETECT LOCAL_SHARED_LIBRARIES += libwcnss_qmi else LOCAL_CFLAGS += -DWCNSS_QMI_OSS diff --git a/wcnss-service/wcnss_service.c b/wcnss-service/wcnss_service.c index b6c57a5..9e76f5e 100644 --- a/wcnss-service/wcnss_service.c +++ b/wcnss-service/wcnss_service.c @@ -42,8 +42,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 @@ -514,7 +516,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}; @@ -796,9 +798,11 @@ int main(int argc, char *argv[]) int fd_dev, ret_cal; #if defined(WCNSS_QMI) || defined(WCNSS_QMI_OSS) int nv_mac_addr = FAILED; +#ifdef MDM_DETECT struct dev_info mdm_detect_info; int nom = 0; #endif +#endif setup_wlan_config_file(); @@ -825,6 +829,7 @@ int main(int argc, char *argv[]) } #endif #ifdef WCNSS_QMI +#ifdef MDM_DETECT /* 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.*/ @@ -846,6 +851,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 */ |