colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

foxconn: firmware info loading only if MBIM-QMUX enabled in libqmi

Browse Source 
Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/477
This commit is contained in:
Aleksander Morgado
2022-01-20 13:46:23 +01:00
parent bb256b0cec
commit 6ec97a29ae
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
View File

@@ -33,21 +33,21 @@
#include "mm-iface-modem-location.h" #include "mm-iface-modem-location.h"
#include "mm-broadband-modem-mbim-foxconn.h" #include "mm-broadband-modem-mbim-foxconn.h"
#if defined WITH_QMI #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
# include "mm-iface-modem-firmware.h" # include "mm-iface-modem-firmware.h"
# include "mm-shared-qmi.h" # include "mm-shared-qmi.h"
#endif #endif
static void iface_modem_location_init (MMIfaceModemLocation *iface); static void iface_modem_location_init (MMIfaceModemLocation *iface);
#if defined WITH_QMI #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
#endif #endif
static MMIfaceModemLocation *iface_modem_location_parent; static MMIfaceModemLocation *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFoxconn, mm_broadband_modem_mbim_foxconn, MM_TYPE_BROADBAND_MODEM_MBIM, 0, G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFoxconn, mm_broadband_modem_mbim_foxconn, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
#if defined WITH_QMI #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init)
#endif #endif
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init)) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init))
@@ -63,7 +63,7 @@ struct _MMBroadbandModemMbimFoxconnPrivate {
}; };
#if defined WITH_QMI #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
/*****************************************************************************/ /*****************************************************************************/
/* Firmware update settings /* Firmware update settings
@@ -497,7 +497,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = disable_location_gathering_finish; iface->disable_location_gathering_finish = disable_location_gathering_finish;
} }
#if defined WITH_QMI #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
static void static void
iface_modem_firmware_init (MMIfaceModemFirmware *iface) iface_modem_firmware_init (MMIfaceModemFirmware *iface)