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

broadband-modem-mbim: update to use mbim_message_device_service_subscribe_list

Browse Source 
libmbim renames 'MBIM_CID_DEVICE_SERVICE_SUBSCRIBER_LIST' to
'MBIM_CID_DEVICE_SERVICE_SUBSCRIBE_LIST' to be consistent with the MBIM
specification. This patch updates MMBroadbandModemMbim accordingly.
This commit is contained in:
Ben Chan
2014-02-18 12:43:26 -08:00
committed by Dan Williams
parent 1bd939d4b8
commit 8327db70b9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -201,9 +201,9 @@ AC_ARG_WITH(mbim, AS_HELP_STRING([--without-mbim], [Build without MBIM support])
AM_CONDITIONAL(WITH_MBIM, test "x$with_mbim" = "xyes") AM_CONDITIONAL(WITH_MBIM, test "x$with_mbim" = "xyes")
case $with_mbim in case $with_mbim in
yes) yes)
PKG_CHECK_MODULES(MBIM, [mbim-glib >= 1.4], [have_mbim=yes],[have_mbim=no]) PKG_CHECK_MODULES(MBIM, [mbim-glib >= 1.7], [have_mbim=yes],[have_mbim=no])
if test "x$have_mbim" = "xno"; then if test "x$have_mbim" = "xno"; then
AC_MSG_ERROR([Couldn't find libmbim-glib. Install it, or otherwise configure using --without-mbim to disable MBIM support.]) AC_MSG_ERROR([Couldn't find libmbim-glib >= 1.7. Install it, or otherwise configure using --without-mbim to disable MBIM support.])
else else
AC_DEFINE(WITH_MBIM, 1, [Define if you want MBIM support]) AC_DEFINE(WITH_MBIM, 1, [Define if you want MBIM support])
AC_SUBST(MBIM_CFLAGS) AC_SUBST(MBIM_CFLAGS)

10
src/mm-broadband-modem-mbim.c
View File

@@ -1897,9 +1897,9 @@ common_enable_disable_unsolicited_events_finish (MMBroadbandModemMbim *self,
} }
static void static void
subscriber_list_set_ready_cb (MbimDevice *device, subscribe_list_set_ready_cb (MbimDevice *device,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GSimpleAsyncResult *simple)
{ {
MbimMessage *response; MbimMessage *response;
GError *error = NULL; GError *error = NULL;
@@ -1970,7 +1970,7 @@ common_enable_disable_unsolicited_events (MMBroadbandModemMbim *self,
n_entries++; n_entries++;
} }
request = (mbim_message_device_service_subscriber_list_set_new ( request = (mbim_message_device_service_subscribe_list_set_new (
n_entries, n_entries,
(const MbimEventEntry *const *)entries, (const MbimEventEntry *const *)entries,
NULL)); NULL));
@@ -1978,7 +1978,7 @@ common_enable_disable_unsolicited_events (MMBroadbandModemMbim *self,
request, request,
10, 10,
NULL, NULL,
(GAsyncReadyCallback)subscriber_list_set_ready_cb, (GAsyncReadyCallback)subscribe_list_set_ready_cb,
result); result);
mbim_message_unref (request); mbim_message_unref (request);
mbim_event_entry_array_free (entries); mbim_event_entry_array_free (entries);