From 34443289d97da5c95270c6071d140f4567047624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Vo=C3=9F?= Date: Sat, 1 Apr 2017 22:11:42 +0200 Subject: [PATCH] mbim-modem: disable location interface MBIM does not support 3gpp location data right now. For that, we make sure that the location interface is not reported as supported by MBIM modems. --- src/mm-broadband-modem-mbim.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index c5286a3f..0d1126d4 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -35,6 +35,7 @@ #include "mm-bearer-list.h" #include "mm-iface-modem.h" #include "mm-iface-modem-3gpp.h" +#include "mm-iface-modem-location.h" #include "mm-iface-modem-messaging.h" #include "mm-iface-modem-signal.h" #include "mm-sms-part-3gpp.h" @@ -45,12 +46,14 @@ static void iface_modem_init (MMIfaceModem *iface); static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); static void iface_modem_messaging_init (MMIfaceModemMessaging *iface); static void iface_modem_signal_init (MMIfaceModemSignal *iface); G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbim, mm_broadband_modem_mbim, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init) + G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_MESSAGING, iface_modem_messaging_init) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_SIGNAL, iface_modem_signal_init)) @@ -3287,6 +3290,15 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface) iface->scan_networks_finish = modem_3gpp_scan_networks_finish; } +static void +iface_modem_location_init (MMIfaceModemLocation *iface) +{ + iface->load_capabilities = NULL; + iface->load_capabilities_finish = NULL; + iface->enable_location_gathering = NULL; + iface->enable_location_gathering_finish = NULL; +} + static void iface_modem_messaging_init (MMIfaceModemMessaging *iface) {