broadband-modem-qmi: A-GPS available by default

Also bump libqmi requirement to 1.11.1, which is the one exposing the new A-GPS
related commands.
This commit is contained in:
Aleksander Morgado
2014-02-06 15:31:54 +01:00
parent 63f2e72c6c
commit 836892902e
2 changed files with 6 additions and 3 deletions

View File

@@ -222,7 +222,7 @@ AC_ARG_WITH(qmi, AS_HELP_STRING([--without-qmi], [Build without QMI support]), [
AM_CONDITIONAL(WITH_QMI, test "x$with_qmi" = "xyes") AM_CONDITIONAL(WITH_QMI, test "x$with_qmi" = "xyes")
case $with_qmi in case $with_qmi in
yes) yes)
PKG_CHECK_MODULES(QMI, [qmi-glib >= 1.6], [have_qmi=yes],[have_qmi=no]) PKG_CHECK_MODULES(QMI, [qmi-glib >= 1.11.1], [have_qmi=yes],[have_qmi=no])
if test "x$have_qmi" = "xno"; then if test "x$have_qmi" = "xno"; then
AC_MSG_ERROR([Couldn't find libqmi-glib. Install it, or otherwise configure using --without-qmi to disable QMI support.]) AC_MSG_ERROR([Couldn't find libqmi-glib. Install it, or otherwise configure using --without-qmi to disable QMI support.])
else else

View File

@@ -11,6 +11,7 @@
* GNU General Public License for more details: * GNU General Public License for more details:
* *
* Copyright (C) 2012 Google Inc. * Copyright (C) 2012 Google Inc.
* Copyright (C) 2014 Aleksander Morgado <aleksander@aleksander.es>
*/ */
#include <config.h> #include <config.h>
@@ -7659,11 +7660,13 @@ parent_load_capabilities_ready (MMIfaceModemLocation *self,
/* Now our own checks */ /* Now our own checks */
/* If we have support for the PDS client, GPS location is supported */ /* If we have support for the PDS client, GPS and A-GPS location is supported */
if (port && mm_port_qmi_peek_client (port, if (port && mm_port_qmi_peek_client (port,
QMI_SERVICE_PDS, QMI_SERVICE_PDS,
MM_PORT_QMI_FLAG_DEFAULT)) MM_PORT_QMI_FLAG_DEFAULT))
sources |= (MM_MODEM_LOCATION_SOURCE_GPS_NMEA | MM_MODEM_LOCATION_SOURCE_GPS_RAW); sources |= (MM_MODEM_LOCATION_SOURCE_GPS_NMEA |
MM_MODEM_LOCATION_SOURCE_GPS_RAW |
MM_MODEM_LOCATION_SOURCE_AGPS);
/* If the modem is CDMA, we have support for CDMA BS location */ /* If the modem is CDMA, we have support for CDMA BS location */
if (mm_iface_modem_is_cdma (MM_IFACE_MODEM (self))) if (mm_iface_modem_is_cdma (MM_IFACE_MODEM (self)))