diff -Nru libmbim-1.6.0/aclocal.m4 libmbim-1.10.0/aclocal.m4 --- libmbim-1.6.0/aclocal.m4 2013-12-10 20:25:09.000000000 +0000 +++ libmbim-1.10.0/aclocal.m4 2014-08-04 13:00:30.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -247,10 +247,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,7 +266,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -633,6 +633,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -741,7 +747,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -749,7 +796,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -897,38 +943,6 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -999,6 +1013,53 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + # Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru libmbim-1.6.0/AUTHORS libmbim-1.10.0/AUTHORS --- libmbim-1.6.0/AUTHORS 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/AUTHORS 2014-07-31 16:41:35.000000000 +0000 @@ -1 +1,14 @@ -Aleksander Morgado +Maintainers: +Aleksander Morgado +Dan Williams + +Other authors: +Ben Chan +Bjørn Mork +Greg Suarez +Prathmesh Prabhu +Shawn J. Goff +Arnaud Desmier +Marius B. Kotsbak +Nagaraju Kadiri +Scott Lee diff -Nru libmbim-1.6.0/build-aux/Makefile.in libmbim-1.10.0/build-aux/Makefile.in --- libmbim-1.6.0/build-aux/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/build-aux/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -200,6 +200,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -226,6 +227,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ diff -Nru libmbim-1.6.0/build-aux/mbim-codegen/Makefile.in libmbim-1.10.0/build-aux/mbim-codegen/Makefile.in --- libmbim-1.6.0/build-aux/mbim-codegen/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/build-aux/mbim-codegen/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -140,6 +140,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -166,6 +167,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ diff -Nru libmbim-1.6.0/build-aux/mbim-codegen/Message.py libmbim-1.10.0/build-aux/mbim-codegen/Message.py --- libmbim-1.6.0/build-aux/mbim-codegen/Message.py 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/build-aux/mbim-codegen/Message.py 2014-07-31 16:41:35.000000000 +0000 @@ -15,7 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright (C) 2013 Aleksander Morgado +# Copyright (C) 2013 - 2014 Aleksander Morgado # import string diff -Nru libmbim-1.6.0/build-aux/mbim-codegen/ObjectList.py libmbim-1.10.0/build-aux/mbim-codegen/ObjectList.py --- libmbim-1.6.0/build-aux/mbim-codegen/ObjectList.py 2013-05-21 15:34:26.000000000 +0000 +++ libmbim-1.10.0/build-aux/mbim-codegen/ObjectList.py 2014-07-31 16:41:35.000000000 +0000 @@ -15,7 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright (C) 2013 Aleksander Morgado +# Copyright (C) 2013 - 2014 Aleksander Morgado # import string diff -Nru libmbim-1.6.0/build-aux/mbim-codegen/Struct.py libmbim-1.10.0/build-aux/mbim-codegen/Struct.py --- libmbim-1.6.0/build-aux/mbim-codegen/Struct.py 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/build-aux/mbim-codegen/Struct.py 2014-07-31 16:41:35.000000000 +0000 @@ -15,7 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright (C) 2013 Aleksander Morgado +# Copyright (C) 2013 - 2014 Aleksander Morgado # import string diff -Nru libmbim-1.6.0/build-aux/mbim-codegen/utils.py libmbim-1.10.0/build-aux/mbim-codegen/utils.py --- libmbim-1.6.0/build-aux/mbim-codegen/utils.py 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/build-aux/mbim-codegen/utils.py 2014-07-31 16:41:35.000000000 +0000 @@ -16,7 +16,7 @@ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # Copyright (C) 2012 Lanedo GmbH -# Copyright (C) 2013 Aleksander Morgado +# Copyright (C) 2013 - 2014 Aleksander Morgado # # Implementation originally developed in 'libqmi'. # @@ -48,7 +48,7 @@ " * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n" " * Boston, MA 02110-1301 USA.\n" " *\n" - " * Copyright (C) 2013 Aleksander Morgado \n" + " * Copyright (C) 2013 - 2014 Aleksander Morgado \n" " */\n" "\n"); diff -Nru libmbim-1.6.0/build-aux/templates/Makefile.in libmbim-1.10.0/build-aux/templates/Makefile.in --- libmbim-1.6.0/build-aux/templates/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/build-aux/templates/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -140,6 +140,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -166,6 +167,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ diff -Nru libmbim-1.6.0/config.guess libmbim-1.10.0/config.guess --- libmbim-1.6.0/config.guess 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/config.guess 2014-08-04 13:00:32.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-11-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -26,7 +24,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -52,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -136,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -857,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -884,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -955,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1235,19 +1256,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff -Nru libmbim-1.6.0/config.h.in libmbim-1.10.0/config.h.in --- libmbim-1.6.0/config.h.in 2013-12-10 20:25:11.000000000 +0000 +++ libmbim-1.10.0/config.h.in 2014-08-04 13:00:32.000000000 +0000 @@ -34,9 +34,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff -Nru libmbim-1.6.0/config.sub libmbim-1.10.0/config.sub --- libmbim-1.6.0/config.sub 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/config.sub 2014-08-04 13:00:32.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-10-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -70,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,12 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -269,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -290,16 +287,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -327,7 +325,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -369,13 +367,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -384,6 +382,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -407,12 +406,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -796,7 +796,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -832,7 +832,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1008,7 +1008,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1354,7 +1354,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1500,9 +1500,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1551,6 +1548,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1594,6 +1594,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru libmbim-1.6.0/configure libmbim-1.10.0/configure --- libmbim-1.6.0/configure 2013-12-10 20:25:10.000000000 +0000 +++ libmbim-1.10.0/configure 2014-08-04 13:00:31.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libmbim 1.6.0. +# Generated by GNU Autoconf 2.69 for libmbim 1.10.0. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libmbim' PACKAGE_TARNAME='libmbim' -PACKAGE_VERSION='1.6.0' -PACKAGE_STRING='libmbim 1.6.0' +PACKAGE_VERSION='1.10.0' +PACKAGE_STRING='libmbim 1.10.0' PACKAGE_BUGREPORT='libmbim-devel@lists.freedesktop.org' PACKAGE_URL='' @@ -649,13 +649,18 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE GTKDOC_DEPS_LIBS GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK GLIB_MKENUMS +MBIMPROXY_LIBS +MBIMPROXY_CFLAGS MBIMCLI_LIBS MBIMCLI_CFLAGS LIBMBIM_GLIB_LIBS @@ -820,6 +825,8 @@ LIBMBIM_GLIB_LIBS MBIMCLI_CFLAGS MBIMCLI_LIBS +MBIMPROXY_CFLAGS +MBIMPROXY_LIBS GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS' @@ -1362,7 +1369,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libmbim 1.6.0 to adapt to many kinds of systems. +\`configure' configures libmbim 1.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1432,7 +1439,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libmbim 1.6.0:";; + short | recursive ) echo "Configuration of libmbim 1.10.0:";; esac cat <<\_ACEOF @@ -1491,6 +1498,10 @@ C compiler flags for MBIMCLI, overriding pkg-config MBIMCLI_LIBS linker flags for MBIMCLI, overriding pkg-config + MBIMPROXY_CFLAGS + C compiler flags for MBIMPROXY, overriding pkg-config + MBIMPROXY_LIBS + linker flags for MBIMPROXY, overriding pkg-config GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS @@ -1562,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libmbim configure 1.6.0 +libmbim configure 1.10.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1840,7 +1851,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libmbim $as_me 1.6.0, which was +It was created by libmbim $as_me 1.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2193,7 +2204,7 @@ -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2708,7 +2719,7 @@ # Define the identity of the package. PACKAGE='libmbim' - VERSION='1.6.0' + VERSION='1.10.0' # Some tools Automake needs. @@ -2866,6 +2877,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -3718,6 +3770,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3910,131 +4021,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - @@ -6449,7 +6435,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6467,10 +6453,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6489,10 +6472,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -10642,14 +10622,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11695,17 +11671,17 @@ MBIM_MAJOR_VERSION=1 -MBIM_MINOR_VERSION=6 +MBIM_MINOR_VERSION=10 MBIM_MICRO_VERSION=0 -MBIM_VERSION=1.6.0 +MBIM_VERSION=1.10.0 -MBIM_GLIB_LT_CURRENT=2 -MBIM_GLIB_LT_REVISION=1 -MBIM_GLIB_LT_AGE=2 +MBIM_GLIB_LT_CURRENT=4 +MBIM_GLIB_LT_REVISION=0 +MBIM_GLIB_LT_AGE=0 @@ -11842,10 +11818,12 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -11853,6 +11831,7 @@ pkg_cv_LIBMBIM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -11868,10 +11847,12 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -11879,6 +11860,7 @@ pkg_cv_LIBMBIM_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -11903,11 +11885,13 @@ LIBMBIM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147" 2>&1` else LIBMBIM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -11916,6 +11900,7 @@ as_fn_error $? "Package requirements (glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147) were not met: $LIBMBIM_GLIB_PKG_ERRORS @@ -12063,22 +12048,196 @@ + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MBIMPROXY" >&5 +$as_echo_n "checking for MBIMPROXY... " >&6; } + +if test -n "$MBIMPROXY_CFLAGS"; then + pkg_cv_MBIMPROXY_CFLAGS="$MBIMPROXY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MBIMPROXY_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$MBIMPROXY_LIBS"; then + pkg_cv_MBIMPROXY_LIBS="$MBIMPROXY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MBIMPROXY_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MBIMPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0" 2>&1` + else + MBIMPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MBIMPROXY_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0) were not met: + +$MBIMPROXY_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables MBIMPROXY_CFLAGS +and MBIMPROXY_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables MBIMPROXY_CFLAGS +and MBIMPROXY_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + MBIMPROXY_CFLAGS=$pkg_cv_MBIMPROXY_CFLAGS + MBIMPROXY_LIBS=$pkg_cv_MBIMPROXY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + gtk_doc_requires="gtk-doc >= 1.0" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12088,7 +12247,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12099,10 +12258,10 @@ ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12215,18 +12374,19 @@ fi - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -else - as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 -fi - if test "x$PACKAGE_NAME" != "xglib"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 @@ -12298,14 +12458,8 @@ $as_echo "yes" >&6; } fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : enableval=$enable_gtk_doc_html; @@ -12330,6 +12484,14 @@ fi + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' @@ -12422,7 +12584,7 @@ fi -ac_config_files="$ac_config_files Makefile build-aux/Makefile build-aux/templates/Makefile build-aux/mbim-codegen/Makefile data/Makefile data/pkg-config/Makefile data/pkg-config/mbim-glib.pc src/Makefile src/libmbim-glib/Makefile src/libmbim-glib/mbim-version.h src/libmbim-glib/generated/Makefile src/libmbim-glib/test/Makefile src/mbimcli/Makefile utils/Makefile docs/Makefile docs/reference/Makefile docs/reference/libmbim-glib/Makefile docs/reference/libmbim-glib/version.xml docs/man/Makefile" +ac_config_files="$ac_config_files Makefile build-aux/Makefile build-aux/templates/Makefile build-aux/mbim-codegen/Makefile data/Makefile data/pkg-config/Makefile data/pkg-config/mbim-glib.pc src/Makefile src/libmbim-glib/Makefile src/libmbim-glib/mbim-version.h src/libmbim-glib/generated/Makefile src/libmbim-glib/test/Makefile src/mbimcli/Makefile src/mbim-proxy/Makefile utils/Makefile docs/Makefile docs/reference/Makefile docs/reference/libmbim-glib/Makefile docs/reference/libmbim-glib/version.xml docs/man/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12561,6 +12723,10 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -12982,7 +13148,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libmbim $as_me 1.6.0, which was +This file was extended by libmbim $as_me 1.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13048,7 +13214,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libmbim config.status 1.6.0 +libmbim config.status 1.10.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13470,6 +13636,7 @@ "src/libmbim-glib/generated/Makefile") CONFIG_FILES="$CONFIG_FILES src/libmbim-glib/generated/Makefile" ;; "src/libmbim-glib/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/libmbim-glib/test/Makefile" ;; "src/mbimcli/Makefile") CONFIG_FILES="$CONFIG_FILES src/mbimcli/Makefile" ;; + "src/mbim-proxy/Makefile") CONFIG_FILES="$CONFIG_FILES src/mbim-proxy/Makefile" ;; "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; diff -Nru libmbim-1.6.0/configure.ac libmbim-1.10.0/configure.ac --- libmbim-1.6.0/configure.ac 2013-12-10 20:24:56.000000000 +0000 +++ libmbim-1.10.0/configure.ac 2014-08-04 12:58:47.000000000 +0000 @@ -3,7 +3,7 @@ dnl The libmbim version number m4_define([mbim_major_version], [1]) -m4_define([mbim_minor_version], [6]) +m4_define([mbim_minor_version], [10]) m4_define([mbim_micro_version], [0]) m4_define([mbim_version], [mbim_major_version.mbim_minor_version.mbim_micro_version]) @@ -16,9 +16,9 @@ dnl with old code), increment a. dnl If the interface has changed in an incompatible way (that is, dnl functions have changed or been removed), then zero a. -m4_define([mbim_glib_lt_current], [2]) -m4_define([mbim_glib_lt_revision], [1]) -m4_define([mbim_glib_lt_age], [2]) +m4_define([mbim_glib_lt_current], [4]) +m4_define([mbim_glib_lt_revision], [0]) +m4_define([mbim_glib_lt_age], [0]) AC_INIT([libmbim], [mbim_version], [libmbim-devel@lists.freedesktop.org]) @@ -69,6 +69,7 @@ glib-2.0 >= 2.32 gobject-2.0 gio-2.0 + gio-unix-2.0 gudev-1.0 >= 147) AC_SUBST(LIBMBIM_GLIB_CFLAGS) AC_SUBST(LIBMBIM_GLIB_LIBS) @@ -81,6 +82,14 @@ AC_SUBST(MBIMCLI_CFLAGS) AC_SUBST(MBIMCLI_LIBS) +dnl General dependencies for mbim-proxy +PKG_CHECK_MODULES(MBIMPROXY, + glib-2.0 >= 2.32 + gobject-2.0 + gio-2.0) +AC_SUBST(MBIMPROXY_CFLAGS) +AC_SUBST(MBIMPROXY_LIBS) + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` AC_SUBST(GLIB_MKENUMS) @@ -104,6 +113,7 @@ src/libmbim-glib/generated/Makefile src/libmbim-glib/test/Makefile src/mbimcli/Makefile + src/mbim-proxy/Makefile utils/Makefile docs/Makefile docs/reference/Makefile diff -Nru libmbim-1.6.0/COPYING libmbim-1.10.0/COPYING --- libmbim-1.6.0/COPYING 2013-09-13 14:27:28.000000000 +0000 +++ libmbim-1.10.0/COPYING 2014-03-05 10:14:34.000000000 +0000 @@ -1,397 +1,221 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE +modification follow. + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". - Activities other than copying, distribution and modification are not +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, +identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of +on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. +entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or -collective works based on the Library. +collective works based on the Program. -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. - 9. You are not required to accept this License, since you have not + 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are +distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying -the Library or works based on it. +the Program or works based on it. - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with +You are not responsible for enforcing compliance by third parties to this License. - - 11. If, as a consequence of a court judgment or allegation of patent + + 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. +refrain entirely from distribution of the Program. -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is +integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that @@ -402,101 +226,114 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - 12. If the distribution and/or use of the Library is restricted in + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. NO WARRANTY - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. - + Copyright (C) - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This library is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if +school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. - , 1 April 1990 + , 1 April 1989 Ty Coon, President of Vice -That's all there is to it! +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru libmbim-1.6.0/COPYING.LIB libmbim-1.10.0/COPYING.LIB --- libmbim-1.6.0/COPYING.LIB 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/COPYING.LIB 2014-03-05 10:23:39.000000000 +0000 @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff -Nru libmbim-1.6.0/data/Makefile.am libmbim-1.10.0/data/Makefile.am --- libmbim-1.6.0/data/Makefile.am 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/data/Makefile.am 2014-08-04 09:17:29.000000000 +0000 @@ -7,4 +7,7 @@ mbim-service-auth.json \ mbim-service-phonebook.json \ mbim-service-stk.json \ - mbim-service-dss.json + mbim-service-dss.json \ + mbim-service-ms-firmware-id.json \ + mbim-service-ms-host-shutdown.json \ + mbim-service-proxy-control.json diff -Nru libmbim-1.6.0/data/Makefile.in libmbim-1.10.0/data/Makefile.in --- libmbim-1.6.0/data/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/data/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -200,6 +200,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -226,6 +227,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -317,7 +320,10 @@ mbim-service-auth.json \ mbim-service-phonebook.json \ mbim-service-stk.json \ - mbim-service-dss.json + mbim-service-dss.json \ + mbim-service-ms-firmware-id.json \ + mbim-service-ms-host-shutdown.json \ + mbim-service-proxy-control.json all: all-recursive diff -Nru libmbim-1.6.0/data/mbim-service-basic-connect.json libmbim-1.10.0/data/mbim-service-basic-connect.json --- libmbim-1.6.0/data/mbim-service-basic-connect.json 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/data/mbim-service-basic-connect.json 2014-03-06 10:32:57.000000000 +0000 @@ -53,7 +53,7 @@ "response" : [ { "name" : "ReadyState", "format" : "guint32", "public-format" : "MbimSubscriberReadyState" }, - { "name" : "SubscriberID", + { "name" : "SubscriberId", "format" : "string" }, { "name" : "SimIccId", "format" : "string" }, @@ -64,7 +64,22 @@ "format" : "guint32" }, { "name" : "TelephoneNumbers", "format" : "string-array", - "array-size-field" : "TelephoneNumbersCount" } ] }, + "array-size-field" : "TelephoneNumbersCount" } ], + "notification" : [ { "name" : "ReadyState", + "format" : "guint32", + "public-format" : "MbimSubscriberReadyState" }, + { "name" : "SubscriberId", + "format" : "string" }, + { "name" : "SimIccId", + "format" : "string" }, + { "name" : "ReadyInfo", + "format" : "guint32", + "public-format" : "MbimReadyInfoFlag" }, + { "name" : "TelephoneNumbersCount", + "format" : "guint32" }, + { "name" : "TelephoneNumbers", + "format" : "string-array", + "array-size-field" : "TelephoneNumbersCount" } ] }, // ********************************************************************************* { "name" : "Radio State", @@ -77,13 +92,13 @@ "response" : [ { "name" : "HwRadioState", "format" : "guint32", "public-format" : "MbimRadioSwitchState" }, - { "name" : "SwRadioState", + { "name" : "SwRadioState", "format" : "guint32", "public-format" : "MbimRadioSwitchState" } ], "notification" : [ { "name" : "HwRadioState", "format" : "guint32", "public-format" : "MbimRadioSwitchState" }, - { "name" : "SwRadioState", + { "name" : "SwRadioState", "format" : "guint32", "public-format" : "MbimRadioSwitchState" } ] }, @@ -173,7 +188,7 @@ { "name" : "CellularClass", "format" : "guint32", "public-format" : "MbimCellularClass" }, - { "name" : "RSSI", + { "name" : "Rssi", "format" : "guint32" }, { "name" : "ErrorRate", "format" : "guint32" } ] }, @@ -206,12 +221,12 @@ "format" : "ref-struct-array" , "struct-type" : "MbimProvider", "array-size-field" : "ProvidersCount" } ], - "indication" : [ { "name" : "ProvidersCount", - "format" : "guint32" }, - { "name" : "Providers", - "format" : "ref-struct-array" , - "struct-type" : "MbimProvider", - "array-size-field" : "ProvidersCount" } ] }, + "notification" : [ { "name" : "ProvidersCount", + "format" : "guint32" }, + { "name" : "Providers", + "format" : "ref-struct-array" , + "struct-type" : "MbimProvider", + "array-size-field" : "ProvidersCount" } ] }, // ********************************************************************************* { "name" : "Visible Providers", @@ -667,7 +682,7 @@ "format" : "guint32-array", "array-size-field" : "CidsCount" } ] }, - { "name" : "Device Service Subscriber List", + { "name" : "Device Service Subscribe List", "service" : "Basic Connect", "type" : "Command", "set" : [ { "name" : "EventsCount", @@ -727,7 +742,10 @@ "public-format" : "MbimEmergencyModeState" } ], "response" : [ { "name" : "State", "format" : "guint32", - "public-format" : "MbimEmergencyModeState" } ] }, + "public-format" : "MbimEmergencyModeState" } ], + "notification" : [ { "name" : "State", + "format" : "guint32", + "public-format" : "MbimEmergencyModeState" } ] }, // ********************************************************************************* { "name" : "MbimPacketFilter", @@ -786,11 +804,11 @@ "format" : "ref-struct-array" , "struct-type" : "MbimProvider", "array-size-field" : "ProvidersCount" } ], - "indication" : [ { "name" : "ProvidersCount", - "format" : "guint32" }, - { "name" : "Providers", - "format" : "ref-struct-array" , - "struct-type" : "MbimProvider", - "array-size-field" : "ProvidersCount" } ] } + "notification" : [ { "name" : "ProvidersCount", + "format" : "guint32" }, + { "name" : "Providers", + "format" : "ref-struct-array" , + "struct-type" : "MbimProvider", + "array-size-field" : "ProvidersCount" } ] } ] diff -Nru libmbim-1.6.0/data/mbim-service-ms-firmware-id.json libmbim-1.10.0/data/mbim-service-ms-firmware-id.json --- libmbim-1.6.0/data/mbim-service-ms-firmware-id.json 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/data/mbim-service-ms-firmware-id.json 2014-02-27 08:42:37.000000000 +0000 @@ -0,0 +1,13 @@ +[ + // ********************************************************************************* + { "type" : "Service", + "name" : "MS Firmware ID" }, + + // ********************************************************************************* + { "name" : "Get", + "service" : "MS Firmware ID", + "type" : "Command", + "query" : [], + "response" : [ { "name" : "FirmwareId", + "format" : "uuid" } ] } +] diff -Nru libmbim-1.6.0/data/mbim-service-ms-host-shutdown.json libmbim-1.10.0/data/mbim-service-ms-host-shutdown.json --- libmbim-1.6.0/data/mbim-service-ms-host-shutdown.json 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/data/mbim-service-ms-host-shutdown.json 2014-03-05 09:52:02.000000000 +0000 @@ -0,0 +1,11 @@ +[ + // ********************************************************************************* + { "type" : "Service", + "name" : "MS Host Shutdown" }, + + // ********************************************************************************* + { "name" : "Notify", + "service" : "MS Host Shutdown", + "type" : "Command", + "set" : [] } +] diff -Nru libmbim-1.6.0/data/mbim-service-proxy-control.json libmbim-1.10.0/data/mbim-service-proxy-control.json --- libmbim-1.6.0/data/mbim-service-proxy-control.json 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/data/mbim-service-proxy-control.json 2014-07-31 16:44:12.000000000 +0000 @@ -0,0 +1,17 @@ + +[ + // ********************************************************************************* + { "type" : "Service", + "name" : "Proxy Control" }, + + // ********************************************************************************* + { "name" : "Configuration", + "service" : "Proxy Control", + "type" : "Command", + "set" : [ { "name" : "DevicePath", + "format" : "string" }, + { "name" : "Timeout", + "format" : "guint32" } ], + "response" : [] } + +] diff -Nru libmbim-1.6.0/data/mbim-service-stk.json libmbim-1.10.0/data/mbim-service-stk.json --- libmbim-1.6.0/data/mbim-service-stk.json 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/data/mbim-service-stk.json 2014-02-20 08:56:18.000000000 +0000 @@ -1,15 +1,15 @@ [ - // ********************************************************************************* - { "type" : "Service", - "name" : "STK" }, + // ********************************************************************************* + { "type" : "Service", + "name" : "STK" }, // ********************************************************************************* { "name" : "Pac", "service" : "STK", "type" : "Command", "query" : [], - "set" : [ { "name" : "PacHostcontrol", + "set" : [ { "name" : "PacHostControl", "format" : "byte-array", "array-size" : "32" } ], diff -Nru libmbim-1.6.0/data/pkg-config/Makefile.in libmbim-1.10.0/data/pkg-config/Makefile.in --- libmbim-1.6.0/data/pkg-config/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/data/pkg-config/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -171,6 +171,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -197,6 +198,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ diff -Nru libmbim-1.6.0/debian/changelog libmbim-1.10.0/debian/changelog --- libmbim-1.6.0/debian/changelog 2013-12-22 12:21:48.000000000 +0000 +++ libmbim-1.10.0/debian/changelog 2014-12-29 20:18:31.000000000 +0000 @@ -1,3 +1,52 @@ +libmbim (1.10.0-2.1~ubuntu14.04.1~ppa1) trusty; urgency=medium + + * No-change backport to trusty + + -- Marius B. Kotsbak Mon, 29 Dec 2014 21:18:31 +0100 + +libmbim (1.10.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply patch from Boris Egorov to fix bashisms (Closes: #772325) + + -- Jonathan Wiltshire Fri, 19 Dec 2014 20:25:16 +0000 + +libmbim (1.10.0-2) unstable; urgency=medium + + * Team upload. + * Use a strictly versioned dependency between libmbim-proxy and + libmbim-glib4, so the two packages don't get out of sync. + * Make any package linking against libmbim-glib4 get an explicit dependency + on libmbim-proxy. The mbim-proxy binary is used internally by + libmbim-glib4 and the package split is an implementation detail to + properly support multi-arch. Convince lintian that this is intentional. + + -- Michael Biebl Tue, 16 Sep 2014 23:03:20 +0200 + +libmbim (1.10.0-1) unstable; urgency=low + + * Team upload. + + [ Marius B. Kotsbak ] + * New upstream release. + * Rename libmbim-glib0 → libmbim-glib4 for the soname bump. + * Add new package libmbim-proxy holding mbim-proxy binary. + * Add debug info package libmbim-glib4-dbg. + + [ Michael Biebl ] + * Use dh_install --list-missing to show uninstalled files. + * Install man pages via dh_install. + * Drop obsolete --with-tests configure option. + + -- Michael Biebl Sun, 14 Sep 2014 03:13:18 +0200 + +libmbim (1.8.0-1) unstable; urgency=medium + + * New upstream release. + * Update debian/libmbim-glib0.symbols. + + -- Thomas Bechtold Tue, 25 Mar 2014 07:51:28 +0100 + libmbim (1.6.0-2) unstable; urgency=medium * debian/copyright: Mention GFDL-1.3+ license which is used for diff -Nru libmbim-1.6.0/debian/control libmbim-1.10.0/debian/control --- libmbim-1.6.0/debian/control 2013-12-21 14:57:07.000000000 +0000 +++ libmbim-1.10.0/debian/control 2014-09-16 21:03:34.000000000 +0000 @@ -14,7 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/libmbim.git;a=summary Homepage: http://www.freedesktop.org/wiki/Software/libmbim/ -Package: libmbim-glib0 +Package: libmbim-glib4 Section: libs Architecture: any Multi-Arch: same @@ -24,11 +24,19 @@ libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +Package: libmbim-glib4-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libmbim-glib4 (= ${binary:Version}), ${misc:Depends} +Description: Support library to use the MBIM protocol + This package contains detached debugging symbols. + Package: libmbim-glib-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libmbim-glib0 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev +Depends: libmbim-glib4 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev Suggests: libmbim-glib-doc Description: Header files for adding MBIM support to applications that use glib libmbim is a glib-based library for talking to WWAN modems and devices @@ -60,3 +68,15 @@ . This package contains the utilities that make it easier to use MBIM functionality from the command line. + +Package: libmbim-proxy +Section: net +Architecture: any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends}, libmbim-glib4 (= ${binary:Version}) +Description: Proxy to communicate with MBIM ports + libmbim is a glib-based library for talking to WWAN modems and devices + which speak the Mobile Interface Broadband Model (MBIM) protocol. + . + This package contains the binary mbim-proxy used by libmbim to allow multiple + clients to use the same MBIM port simultaneously. diff -Nru libmbim-1.6.0/debian/libmbim-glib0.docs libmbim-1.10.0/debian/libmbim-glib0.docs --- libmbim-1.6.0/debian/libmbim-glib0.docs 2013-12-16 06:28:08.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-glib0.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -NEWS diff -Nru libmbim-1.6.0/debian/libmbim-glib0.install libmbim-1.10.0/debian/libmbim-glib0.install --- libmbim-1.6.0/debian/libmbim-glib0.install 2013-12-16 06:28:08.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-glib0.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/lib*.so.* diff -Nru libmbim-1.6.0/debian/libmbim-glib0.symbols libmbim-1.10.0/debian/libmbim-glib0.symbols --- libmbim-1.6.0/debian/libmbim-glib0.symbols 2013-12-16 06:28:08.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-glib0.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,316 +0,0 @@ -libmbim-glib.so.0 libmbim-glib0 #MINVER# - mbim_activation_command_get_string@Base 1.4.0 - mbim_activation_command_get_type@Base 1.4.0 - mbim_activation_state_get_string@Base 1.4.0 - mbim_activation_state_get_type@Base 1.4.0 - mbim_auth_protocol_get_string@Base 1.4.0 - mbim_auth_protocol_get_type@Base 1.4.0 - mbim_cellular_class_build_string_from_mask@Base 1.4.0 - mbim_cellular_class_get_type@Base 1.4.0 - mbim_cid_auth_get_string@Base 1.4.0 - mbim_cid_auth_get_type@Base 1.4.0 - mbim_cid_basic_connect_get_string@Base 1.4.0 - mbim_cid_basic_connect_get_type@Base 1.4.0 - mbim_cid_can_notify@Base 1.4.0 - mbim_cid_can_query@Base 1.4.0 - mbim_cid_can_set@Base 1.4.0 - mbim_cid_dss_get_string@Base 1.4.0 - mbim_cid_dss_get_type@Base 1.4.0 - mbim_cid_get_printable@Base 1.4.0 - mbim_cid_phonebook_get_string@Base 1.4.0 - mbim_cid_phonebook_get_type@Base 1.4.0 - mbim_cid_sms_get_string@Base 1.4.0 - mbim_cid_sms_get_type@Base 1.4.0 - mbim_cid_stk_get_string@Base 1.4.0 - mbim_cid_stk_get_type@Base 1.4.0 - mbim_cid_ussd_get_string@Base 1.4.0 - mbim_cid_ussd_get_type@Base 1.4.0 - mbim_compression_get_string@Base 1.4.0 - mbim_compression_get_type@Base 1.4.0 - mbim_context_ip_type_get_string@Base 1.4.0 - mbim_context_ip_type_get_type@Base 1.4.0 - mbim_context_type_get_string@Base 1.4.0 - mbim_context_type_get_type@Base 1.4.0 - mbim_core_error_get_string@Base 1.4.0 - mbim_core_error_get_type@Base 1.4.0 - mbim_core_error_quark@Base 1.4.0 - mbim_ctrl_caps_build_string_from_mask@Base 1.4.0 - mbim_ctrl_caps_get_type@Base 1.4.0 - mbim_data_class_build_string_from_mask@Base 1.4.0 - mbim_data_class_get_type@Base 1.4.0 - mbim_device_close@Base 1.4.0 - mbim_device_close_finish@Base 1.4.0 - mbim_device_close_force@Base 1.4.0 - mbim_device_command@Base 1.4.0 - mbim_device_command_finish@Base 1.4.0 - mbim_device_get_file@Base 1.4.0 - mbim_device_get_next_transaction_id@Base 1.4.0 - mbim_device_get_path@Base 1.4.0 - mbim_device_get_path_display@Base 1.4.0 - mbim_device_get_type@Base 1.4.0 - mbim_device_is_open@Base 1.4.0 - mbim_device_new@Base 1.4.0 - mbim_device_new_finish@Base 1.4.0 - mbim_device_open@Base 1.4.0 - mbim_device_open_finish@Base 1.4.0 - mbim_device_peek_file@Base 1.4.0 - mbim_device_service_element_array_free@Base 1.4.0 - mbim_device_type_get_string@Base 1.4.0 - mbim_device_type_get_type@Base 1.4.0 - mbim_dss_link_state_get_string@Base 1.4.0 - mbim_dss_link_state_get_type@Base 1.4.0 - mbim_emergency_mode_state_get_string@Base 1.4.0 - mbim_emergency_mode_state_get_type@Base 1.4.0 - mbim_event_entry_array_free@Base 1.4.0 - mbim_ip_configuration_available_flag_build_string_from_mask@Base 1.4.0 - mbim_ip_configuration_available_flag_get_type@Base 1.4.0 - mbim_ipv4_element_array_free@Base 1.4.0 - mbim_ipv6_element_array_free@Base 1.4.0 - mbim_message_auth_aka_query_new@Base 1.4.0 - mbim_message_auth_aka_response_parse@Base 1.4.0 - mbim_message_auth_akap_query_new@Base 1.4.0 - mbim_message_auth_akap_response_parse@Base 1.4.0 - mbim_message_auth_sim_query_new@Base 1.4.0 - mbim_message_auth_sim_response_parse@Base 1.4.0 - mbim_message_close_done_get_result@Base 1.4.0 - mbim_message_close_done_get_status_code@Base 1.4.0 - mbim_message_close_new@Base 1.4.0 - mbim_message_command_append@Base 1.4.0 - mbim_message_command_done_get_cid@Base 1.4.0 - mbim_message_command_done_get_raw_information_buffer@Base 1.4.0 - mbim_message_command_done_get_result@Base 1.4.0 - mbim_message_command_done_get_service@Base 1.4.0 - mbim_message_command_done_get_service_id@Base 1.4.0 - mbim_message_command_done_get_status_code@Base 1.4.0 - mbim_message_command_get_cid@Base 1.4.0 - mbim_message_command_get_command_type@Base 1.4.0 - mbim_message_command_get_raw_information_buffer@Base 1.4.0 - mbim_message_command_get_service@Base 1.4.0 - mbim_message_command_get_service_id@Base 1.4.0 - mbim_message_command_new@Base 1.4.0 - mbim_message_command_type_get_string@Base 1.4.0 - mbim_message_command_type_get_type@Base 1.4.0 - mbim_message_connect_notification_parse@Base 1.4.0 - mbim_message_connect_query_new@Base 1.4.0 - mbim_message_connect_response_parse@Base 1.4.0 - mbim_message_connect_set_new@Base 1.4.0 - mbim_message_device_caps_query_new@Base 1.4.0 - mbim_message_device_caps_response_parse@Base 1.4.0 - mbim_message_device_service_subscriber_list_response_parse@Base 1.4.0 - mbim_message_device_service_subscriber_list_set_new@Base 1.4.0 - mbim_message_device_services_query_new@Base 1.4.0 - mbim_message_device_services_response_parse@Base 1.4.0 - mbim_message_dss_connect_response_parse@Base 1.4.0 - mbim_message_dss_connect_set_new@Base 1.4.0 - mbim_message_dup@Base 1.4.0 - mbim_message_emergency_mode_query_new@Base 1.4.0 - mbim_message_emergency_mode_response_parse@Base 1.4.0 - mbim_message_emergency_mode_set_new@Base 1.4.0 - mbim_message_error_get_error@Base 1.4.0 - mbim_message_error_get_error_status_code@Base 1.4.0 - mbim_message_error_new@Base 1.4.0 - mbim_message_get_message_length@Base 1.4.0 - mbim_message_get_message_type@Base 1.4.0 - mbim_message_get_printable@Base 1.4.0 - mbim_message_get_raw@Base 1.4.0 - mbim_message_get_transaction_id@Base 1.4.0 - mbim_message_get_type@Base 1.4.0 - mbim_message_home_provider_query_new@Base 1.4.0 - mbim_message_home_provider_response_parse@Base 1.4.0 - mbim_message_home_provider_set_new@Base 1.4.0 - mbim_message_indicate_status_get_cid@Base 1.4.0 - mbim_message_indicate_status_get_raw_information_buffer@Base 1.4.0 - mbim_message_indicate_status_get_service@Base 1.4.0 - mbim_message_indicate_status_get_service_id@Base 1.4.0 - mbim_message_ip_configuration_notification_parse@Base 1.4.0 - mbim_message_ip_configuration_query_new@Base 1.4.0 - mbim_message_ip_configuration_response_parse@Base 1.4.0 - mbim_message_ip_packet_filters_query_new@Base 1.4.0 - mbim_message_ip_packet_filters_response_parse@Base 1.4.0 - mbim_message_ip_packet_filters_set_new@Base 1.4.0 - mbim_message_multicarrier_providers_query_new@Base 1.4.0 - mbim_message_multicarrier_providers_response_parse@Base 1.4.0 - mbim_message_multicarrier_providers_set_new@Base 1.4.0 - mbim_message_network_idle_hint_query_new@Base 1.4.0 - mbim_message_network_idle_hint_response_parse@Base 1.4.0 - mbim_message_network_idle_hint_set_new@Base 1.4.0 - mbim_message_new@Base 1.4.0 - mbim_message_open_done_get_result@Base 1.4.0 - mbim_message_open_done_get_status_code@Base 1.4.0 - mbim_message_open_get_max_control_transfer@Base 1.4.0 - mbim_message_open_new@Base 1.4.0 - mbim_message_packet_service_notification_parse@Base 1.4.0 - mbim_message_packet_service_query_new@Base 1.4.0 - mbim_message_packet_service_response_parse@Base 1.4.0 - mbim_message_packet_service_set_new@Base 1.4.0 - mbim_message_packet_statistics_query_new@Base 1.4.0 - mbim_message_packet_statistics_response_parse@Base 1.4.0 - mbim_message_phonebook_configuration_notification_parse@Base 1.4.0 - mbim_message_phonebook_configuration_query_new@Base 1.4.0 - mbim_message_phonebook_configuration_response_parse@Base 1.4.0 - mbim_message_phonebook_delete_response_parse@Base 1.4.0 - mbim_message_phonebook_delete_set_new@Base 1.4.0 - mbim_message_phonebook_read_query_new@Base 1.4.0 - mbim_message_phonebook_read_response_parse@Base 1.4.0 - mbim_message_phonebook_write_response_parse@Base 1.4.0 - mbim_message_phonebook_write_set_new@Base 1.4.0 - mbim_message_pin_list_query_new@Base 1.4.0 - mbim_message_pin_list_response_parse@Base 1.4.0 - mbim_message_pin_query_new@Base 1.4.0 - mbim_message_pin_response_parse@Base 1.4.0 - mbim_message_pin_set_new@Base 1.4.0 - mbim_message_preferred_providers_query_new@Base 1.4.0 - mbim_message_preferred_providers_response_parse@Base 1.4.0 - mbim_message_preferred_providers_set_new@Base 1.4.0 - mbim_message_provisioned_contexts_notification_parse@Base 1.4.0 - mbim_message_provisioned_contexts_query_new@Base 1.4.0 - mbim_message_provisioned_contexts_response_parse@Base 1.4.0 - mbim_message_provisioned_contexts_set_new@Base 1.4.0 - mbim_message_radio_state_notification_parse@Base 1.4.0 - mbim_message_radio_state_query_new@Base 1.4.0 - mbim_message_radio_state_response_parse@Base 1.4.0 - mbim_message_radio_state_set_new@Base 1.4.0 - mbim_message_ref@Base 1.4.0 - mbim_message_register_state_notification_parse@Base 1.4.0 - mbim_message_register_state_query_new@Base 1.4.0 - mbim_message_register_state_response_parse@Base 1.4.0 - mbim_message_register_state_set_new@Base 1.4.0 - mbim_message_service_activation_response_parse@Base 1.4.0 - mbim_message_service_activation_set_new@Base 1.4.0 - mbim_message_set_transaction_id@Base 1.4.0 - mbim_message_signal_state_notification_parse@Base 1.4.0 - mbim_message_signal_state_query_new@Base 1.4.0 - mbim_message_signal_state_response_parse@Base 1.4.0 - mbim_message_signal_state_set_new@Base 1.4.0 - mbim_message_sms_configuration_query_new@Base 1.4.0 - mbim_message_sms_configuration_response_parse@Base 1.4.0 - mbim_message_sms_configuration_set_new@Base 1.4.0 - mbim_message_sms_delete_response_parse@Base 1.4.0 - mbim_message_sms_delete_set_new@Base 1.4.0 - mbim_message_sms_message_store_status_notification_parse@Base 1.4.0 - mbim_message_sms_message_store_status_query_new@Base 1.4.0 - mbim_message_sms_message_store_status_response_parse@Base 1.4.0 - mbim_message_sms_read_notification_parse@Base 1.4.0 - mbim_message_sms_read_query_new@Base 1.4.0 - mbim_message_sms_read_response_parse@Base 1.4.0 - mbim_message_sms_send_response_parse@Base 1.4.0 - mbim_message_sms_send_set_new@Base 1.4.0 - mbim_message_stk_envelope_query_new@Base 1.4.0 - mbim_message_stk_envelope_response_parse@Base 1.4.0 - mbim_message_stk_envelope_set_new@Base 1.4.0 - mbim_message_stk_pac_notification_parse@Base 1.4.0 - mbim_message_stk_pac_query_new@Base 1.4.0 - mbim_message_stk_pac_response_parse@Base 1.4.0 - mbim_message_stk_pac_set_new@Base 1.4.0 - mbim_message_stk_terminal_response_response_parse@Base 1.4.0 - mbim_message_stk_terminal_response_set_new@Base 1.4.0 - mbim_message_subscriber_ready_status_query_new@Base 1.4.0 - mbim_message_subscriber_ready_status_response_parse@Base 1.4.0 - mbim_message_type_get_string@Base 1.4.0 - mbim_message_type_get_type@Base 1.4.0 - mbim_message_unref@Base 1.4.0 - mbim_message_ussd_notification_parse@Base 1.4.0 - mbim_message_ussd_response_parse@Base 1.4.0 - mbim_message_ussd_set_new@Base 1.4.0 - mbim_message_visible_providers_query_new@Base 1.4.0 - mbim_message_visible_providers_response_parse@Base 1.4.0 - mbim_network_idle_hint_state_get_string@Base 1.4.0 - mbim_network_idle_hint_state_get_type@Base 1.4.0 - mbim_nw_error_get_string@Base 1.4.0 - mbim_nw_error_get_type@Base 1.4.0 - mbim_packet_filter_array_free@Base 1.4.0 - mbim_packet_service_action_get_string@Base 1.4.0 - mbim_packet_service_action_get_type@Base 1.4.0 - mbim_packet_service_state_get_string@Base 1.4.0 - mbim_packet_service_state_get_type@Base 1.4.0 - mbim_phonebook_entry_array_free@Base 1.4.0 - mbim_phonebook_flag_get_string@Base 1.4.0 - mbim_phonebook_flag_get_type@Base 1.4.0 - mbim_phonebook_state_get_string@Base 1.4.0 - mbim_phonebook_state_get_type@Base 1.4.0 - mbim_phonebook_write_flag_get_string@Base 1.4.0 - mbim_phonebook_write_flag_get_type@Base 1.4.0 - mbim_pin_desc_free@Base 1.4.0 - mbim_pin_format_get_string@Base 1.4.0 - mbim_pin_format_get_type@Base 1.4.0 - mbim_pin_mode_get_string@Base 1.4.0 - mbim_pin_mode_get_type@Base 1.4.0 - mbim_pin_operation_get_string@Base 1.4.0 - mbim_pin_operation_get_type@Base 1.4.0 - mbim_pin_state_get_string@Base 1.4.0 - mbim_pin_state_get_type@Base 1.4.0 - mbim_pin_type_get_string@Base 1.4.0 - mbim_pin_type_get_type@Base 1.4.0 - mbim_protocol_error_get_string@Base 1.4.0 - mbim_protocol_error_get_type@Base 1.4.0 - mbim_protocol_error_quark@Base 1.4.0 - mbim_provider_array_free@Base 1.4.0 - mbim_provider_free@Base 1.4.0 - mbim_provider_state_build_string_from_mask@Base 1.4.0 - mbim_provider_state_get_type@Base 1.4.0 - mbim_provisioned_context_element_array_free@Base 1.4.0 - mbim_radio_switch_state_get_string@Base 1.4.0 - mbim_radio_switch_state_get_type@Base 1.4.0 - mbim_ready_info_flag_build_string_from_mask@Base 1.4.0 - mbim_ready_info_flag_get_type@Base 1.4.0 - mbim_register_action_get_string@Base 1.4.0 - mbim_register_action_get_type@Base 1.4.0 - mbim_register_mode_get_string@Base 1.4.0 - mbim_register_mode_get_type@Base 1.4.0 - mbim_register_state_get_string@Base 1.4.0 - mbim_register_state_get_type@Base 1.4.0 - mbim_registration_flag_build_string_from_mask@Base 1.4.0 - mbim_registration_flag_get_type@Base 1.4.0 - mbim_service_get_string@Base 1.4.0 - mbim_service_get_type@Base 1.4.0 - mbim_sim_class_build_string_from_mask@Base 1.4.0 - mbim_sim_class_get_type@Base 1.4.0 - mbim_sms_caps_build_string_from_mask@Base 1.4.0 - mbim_sms_caps_get_type@Base 1.4.0 - mbim_sms_cdma_encoding_get_string@Base 1.4.0 - mbim_sms_cdma_encoding_get_type@Base 1.4.0 - mbim_sms_cdma_lang_get_string@Base 1.4.0 - mbim_sms_cdma_lang_get_type@Base 1.4.0 - mbim_sms_cdma_read_record_array_free@Base 1.4.0 - mbim_sms_cdma_send_record_free@Base 1.4.0 - mbim_sms_flag_get_string@Base 1.4.0 - mbim_sms_flag_get_type@Base 1.4.0 - mbim_sms_format_get_string@Base 1.4.0 - mbim_sms_format_get_type@Base 1.4.0 - mbim_sms_pdu_read_record_array_free@Base 1.4.0 - mbim_sms_pdu_send_record_free@Base 1.4.0 - mbim_sms_status_flag_get_string@Base 1.4.0 - mbim_sms_status_flag_get_type@Base 1.4.0 - mbim_sms_status_get_string@Base 1.4.0 - mbim_sms_status_get_type@Base 1.4.0 - mbim_sms_storage_state_get_string@Base 1.4.0 - mbim_sms_storage_state_get_type@Base 1.4.0 - mbim_status_error_get_string@Base 1.4.0 - mbim_status_error_get_type@Base 1.4.0 - mbim_status_error_quark@Base 1.4.0 - mbim_stk_pac_profile_get_string@Base 1.4.0 - mbim_stk_pac_profile_get_type@Base 1.4.0 - mbim_stk_pac_type_get_string@Base 1.4.0 - mbim_stk_pac_type_get_type@Base 1.4.0 - mbim_subscriber_ready_state_get_string@Base 1.4.0 - mbim_subscriber_ready_state_get_type@Base 1.4.0 - mbim_ussd_action_get_string@Base 1.4.0 - mbim_ussd_action_get_type@Base 1.4.0 - mbim_ussd_response_get_string@Base 1.4.0 - mbim_ussd_response_get_type@Base 1.4.0 - mbim_ussd_session_state_get_string@Base 1.4.0 - mbim_ussd_session_state_get_type@Base 1.4.0 - mbim_utils_get_traces_enabled@Base 1.4.0 - mbim_utils_set_traces_enabled@Base 1.4.0 - mbim_uuid_cmp@Base 1.4.0 - mbim_uuid_from_context_type@Base 1.4.0 - mbim_uuid_from_service@Base 1.4.0 - mbim_uuid_get_printable@Base 1.4.0 - mbim_uuid_to_context_type@Base 1.4.0 - mbim_uuid_to_service@Base 1.4.0 - mbim_visible_providers_action_get_string@Base 1.4.0 - mbim_visible_providers_action_get_type@Base 1.4.0 - mbim_voice_call_state_get_string@Base 1.4.0 - mbim_voice_call_state_get_type@Base 1.4.0 - mbim_voice_class_get_string@Base 1.4.0 - mbim_voice_class_get_type@Base 1.4.0 diff -Nru libmbim-1.6.0/debian/libmbim-glib4.docs libmbim-1.10.0/debian/libmbim-glib4.docs --- libmbim-1.6.0/debian/libmbim-glib4.docs 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-glib4.docs 2014-09-16 21:03:34.000000000 +0000 @@ -0,0 +1 @@ +NEWS diff -Nru libmbim-1.6.0/debian/libmbim-glib4.install libmbim-1.10.0/debian/libmbim-glib4.install --- libmbim-1.6.0/debian/libmbim-glib4.install 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-glib4.install 2014-09-16 21:03:34.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff -Nru libmbim-1.6.0/debian/libmbim-glib4.lintian-overrides libmbim-1.10.0/debian/libmbim-glib4.lintian-overrides --- libmbim-1.6.0/debian/libmbim-glib4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-glib4.lintian-overrides 2014-09-16 21:03:34.000000000 +0000 @@ -0,0 +1,6 @@ +# libmbim-glib uses the mbim-proxy binary internally which was split out into +# a separate package when converting to multi-arch. As we don't want to +# create a circular dependency by making libmbim-glib depend on libmbim-proxy, +# we instead make every package linking against libmbim-glib have an explicit +# dependency on libmbim-proxy. +libmbim-glib4: symbols-declares-dependency-on-other-package libmbim-proxy diff -Nru libmbim-1.6.0/debian/libmbim-glib4.symbols libmbim-1.10.0/debian/libmbim-glib4.symbols --- libmbim-1.6.0/debian/libmbim-glib4.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-glib4.symbols 2014-09-16 21:03:34.000000000 +0000 @@ -0,0 +1,346 @@ +libmbim-glib.so.4 libmbim-glib4 #MINVER#, libmbim-proxy + mbim_activation_command_get_string@Base 1.10.0 + mbim_activation_command_get_type@Base 1.10.0 + mbim_activation_state_get_string@Base 1.10.0 + mbim_activation_state_get_type@Base 1.10.0 + mbim_auth_protocol_get_string@Base 1.10.0 + mbim_auth_protocol_get_type@Base 1.10.0 + mbim_cellular_class_build_string_from_mask@Base 1.10.0 + mbim_cellular_class_get_type@Base 1.10.0 + mbim_cid_auth_get_string@Base 1.10.0 + mbim_cid_auth_get_type@Base 1.10.0 + mbim_cid_basic_connect_get_string@Base 1.10.0 + mbim_cid_basic_connect_get_type@Base 1.10.0 + mbim_cid_can_notify@Base 1.10.0 + mbim_cid_can_query@Base 1.10.0 + mbim_cid_can_set@Base 1.10.0 + mbim_cid_dss_get_string@Base 1.10.0 + mbim_cid_dss_get_type@Base 1.10.0 + mbim_cid_get_printable@Base 1.10.0 + mbim_cid_ms_firmware_id_get_string@Base 1.10.0 + mbim_cid_ms_firmware_id_get_type@Base 1.10.0 + mbim_cid_ms_host_shutdown_get_string@Base 1.10.0 + mbim_cid_ms_host_shutdown_get_type@Base 1.10.0 + mbim_cid_phonebook_get_string@Base 1.10.0 + mbim_cid_phonebook_get_type@Base 1.10.0 + mbim_cid_proxy_control_get_string@Base 1.10.0 + mbim_cid_proxy_control_get_type@Base 1.10.0 + mbim_cid_sms_get_string@Base 1.10.0 + mbim_cid_sms_get_type@Base 1.10.0 + mbim_cid_stk_get_string@Base 1.10.0 + mbim_cid_stk_get_type@Base 1.10.0 + mbim_cid_ussd_get_string@Base 1.10.0 + mbim_cid_ussd_get_type@Base 1.10.0 + mbim_compression_get_string@Base 1.10.0 + mbim_compression_get_type@Base 1.10.0 + mbim_context_ip_type_get_string@Base 1.10.0 + mbim_context_ip_type_get_type@Base 1.10.0 + mbim_context_type_get_string@Base 1.10.0 + mbim_context_type_get_type@Base 1.10.0 + mbim_core_error_get_string@Base 1.10.0 + mbim_core_error_get_type@Base 1.10.0 + mbim_core_error_quark@Base 1.10.0 + mbim_ctrl_caps_build_string_from_mask@Base 1.10.0 + mbim_ctrl_caps_get_type@Base 1.10.0 + mbim_data_class_build_string_from_mask@Base 1.10.0 + mbim_data_class_get_type@Base 1.10.0 + mbim_device_close@Base 1.10.0 + mbim_device_close_finish@Base 1.10.0 + mbim_device_close_force@Base 1.10.0 + mbim_device_command@Base 1.10.0 + mbim_device_command_finish@Base 1.10.0 + mbim_device_get_file@Base 1.10.0 + mbim_device_get_next_transaction_id@Base 1.10.0 + mbim_device_get_path@Base 1.10.0 + mbim_device_get_path_display@Base 1.10.0 + mbim_device_get_type@Base 1.10.0 + mbim_device_is_open@Base 1.10.0 + mbim_device_new@Base 1.10.0 + mbim_device_new_finish@Base 1.10.0 + mbim_device_open@Base 1.10.0 + mbim_device_open_finish@Base 1.10.0 + mbim_device_open_full@Base 1.10.0 + mbim_device_open_full_finish@Base 1.10.0 + mbim_device_peek_file@Base 1.10.0 + mbim_device_service_element_array_free@Base 1.10.0 + mbim_device_type_get_string@Base 1.10.0 + mbim_device_type_get_type@Base 1.10.0 + mbim_dss_link_state_get_string@Base 1.10.0 + mbim_dss_link_state_get_type@Base 1.10.0 + mbim_emergency_mode_state_get_string@Base 1.10.0 + mbim_emergency_mode_state_get_type@Base 1.10.0 + mbim_event_entry_array_free@Base 1.10.0 + mbim_ip_configuration_available_flag_build_string_from_mask@Base 1.10.0 + mbim_ip_configuration_available_flag_get_type@Base 1.10.0 + mbim_ipv4_element_array_free@Base 1.10.0 + mbim_ipv6_element_array_free@Base 1.10.0 + mbim_message_auth_aka_query_new@Base 1.10.0 + mbim_message_auth_aka_response_parse@Base 1.10.0 + mbim_message_auth_akap_query_new@Base 1.10.0 + mbim_message_auth_akap_response_parse@Base 1.10.0 + mbim_message_auth_sim_query_new@Base 1.10.0 + mbim_message_auth_sim_response_parse@Base 1.10.0 + mbim_message_close_done_get_result@Base 1.10.0 + mbim_message_close_done_get_status_code@Base 1.10.0 + mbim_message_close_done_new@Base 1.10.0 + mbim_message_close_new@Base 1.10.0 + mbim_message_command_append@Base 1.10.0 + mbim_message_command_done_get_cid@Base 1.10.0 + mbim_message_command_done_get_raw_information_buffer@Base 1.10.0 + mbim_message_command_done_get_result@Base 1.10.0 + mbim_message_command_done_get_service@Base 1.10.0 + mbim_message_command_done_get_service_id@Base 1.10.0 + mbim_message_command_done_get_status_code@Base 1.10.0 + mbim_message_command_get_cid@Base 1.10.0 + mbim_message_command_get_command_type@Base 1.10.0 + mbim_message_command_get_raw_information_buffer@Base 1.10.0 + mbim_message_command_get_service@Base 1.10.0 + mbim_message_command_get_service_id@Base 1.10.0 + mbim_message_command_new@Base 1.10.0 + mbim_message_command_type_get_string@Base 1.10.0 + mbim_message_command_type_get_type@Base 1.10.0 + mbim_message_connect_notification_parse@Base 1.10.0 + mbim_message_connect_query_new@Base 1.10.0 + mbim_message_connect_response_parse@Base 1.10.0 + mbim_message_connect_set_new@Base 1.10.0 + mbim_message_device_caps_query_new@Base 1.10.0 + mbim_message_device_caps_response_parse@Base 1.10.0 + mbim_message_device_service_subscribe_list_response_parse@Base 1.10.0 + mbim_message_device_service_subscribe_list_set_new@Base 1.10.0 + mbim_message_device_service_subscriber_list_response_parse@Base 1.10.0 + mbim_message_device_service_subscriber_list_set_new@Base 1.10.0 + mbim_message_device_services_query_new@Base 1.10.0 + mbim_message_device_services_response_parse@Base 1.10.0 + mbim_message_dss_connect_response_parse@Base 1.10.0 + mbim_message_dss_connect_set_new@Base 1.10.0 + mbim_message_dup@Base 1.10.0 + mbim_message_emergency_mode_notification_parse@Base 1.10.0 + mbim_message_emergency_mode_query_new@Base 1.10.0 + mbim_message_emergency_mode_response_parse@Base 1.10.0 + mbim_message_emergency_mode_set_new@Base 1.10.0 + mbim_message_error_get_error@Base 1.10.0 + mbim_message_error_get_error_status_code@Base 1.10.0 + mbim_message_error_new@Base 1.10.0 + mbim_message_get_message_length@Base 1.10.0 + mbim_message_get_message_type@Base 1.10.0 + mbim_message_get_printable@Base 1.10.0 + mbim_message_get_raw@Base 1.10.0 + mbim_message_get_transaction_id@Base 1.10.0 + mbim_message_get_type@Base 1.10.0 + mbim_message_home_provider_query_new@Base 1.10.0 + mbim_message_home_provider_response_parse@Base 1.10.0 + mbim_message_home_provider_set_new@Base 1.10.0 + mbim_message_indicate_status_get_cid@Base 1.10.0 + mbim_message_indicate_status_get_raw_information_buffer@Base 1.10.0 + mbim_message_indicate_status_get_service@Base 1.10.0 + mbim_message_indicate_status_get_service_id@Base 1.10.0 + mbim_message_ip_configuration_notification_parse@Base 1.10.0 + mbim_message_ip_configuration_query_new@Base 1.10.0 + mbim_message_ip_configuration_response_parse@Base 1.10.0 + mbim_message_ip_packet_filters_query_new@Base 1.10.0 + mbim_message_ip_packet_filters_response_parse@Base 1.10.0 + mbim_message_ip_packet_filters_set_new@Base 1.10.0 + mbim_message_ms_firmware_id_get_query_new@Base 1.10.0 + mbim_message_ms_firmware_id_get_response_parse@Base 1.10.0 + mbim_message_ms_host_shutdown_notify_set_new@Base 1.10.0 + mbim_message_multicarrier_providers_notification_parse@Base 1.10.0 + mbim_message_multicarrier_providers_query_new@Base 1.10.0 + mbim_message_multicarrier_providers_response_parse@Base 1.10.0 + mbim_message_multicarrier_providers_set_new@Base 1.10.0 + mbim_message_network_idle_hint_query_new@Base 1.10.0 + mbim_message_network_idle_hint_response_parse@Base 1.10.0 + mbim_message_network_idle_hint_set_new@Base 1.10.0 + mbim_message_new@Base 1.10.0 + mbim_message_open_done_get_result@Base 1.10.0 + mbim_message_open_done_get_status_code@Base 1.10.0 + mbim_message_open_done_new@Base 1.10.0 + mbim_message_open_get_max_control_transfer@Base 1.10.0 + mbim_message_open_new@Base 1.10.0 + mbim_message_packet_service_notification_parse@Base 1.10.0 + mbim_message_packet_service_query_new@Base 1.10.0 + mbim_message_packet_service_response_parse@Base 1.10.0 + mbim_message_packet_service_set_new@Base 1.10.0 + mbim_message_packet_statistics_query_new@Base 1.10.0 + mbim_message_packet_statistics_response_parse@Base 1.10.0 + mbim_message_phonebook_configuration_notification_parse@Base 1.10.0 + mbim_message_phonebook_configuration_query_new@Base 1.10.0 + mbim_message_phonebook_configuration_response_parse@Base 1.10.0 + mbim_message_phonebook_delete_response_parse@Base 1.10.0 + mbim_message_phonebook_delete_set_new@Base 1.10.0 + mbim_message_phonebook_read_query_new@Base 1.10.0 + mbim_message_phonebook_read_response_parse@Base 1.10.0 + mbim_message_phonebook_write_response_parse@Base 1.10.0 + mbim_message_phonebook_write_set_new@Base 1.10.0 + mbim_message_pin_list_query_new@Base 1.10.0 + mbim_message_pin_list_response_parse@Base 1.10.0 + mbim_message_pin_query_new@Base 1.10.0 + mbim_message_pin_response_parse@Base 1.10.0 + mbim_message_pin_set_new@Base 1.10.0 + mbim_message_preferred_providers_notification_parse@Base 1.10.0 + mbim_message_preferred_providers_query_new@Base 1.10.0 + mbim_message_preferred_providers_response_parse@Base 1.10.0 + mbim_message_preferred_providers_set_new@Base 1.10.0 + mbim_message_provisioned_contexts_notification_parse@Base 1.10.0 + mbim_message_provisioned_contexts_query_new@Base 1.10.0 + mbim_message_provisioned_contexts_response_parse@Base 1.10.0 + mbim_message_provisioned_contexts_set_new@Base 1.10.0 + mbim_message_proxy_control_configuration_response_parse@Base 1.10.0 + mbim_message_proxy_control_configuration_set_new@Base 1.10.0 + mbim_message_radio_state_notification_parse@Base 1.10.0 + mbim_message_radio_state_query_new@Base 1.10.0 + mbim_message_radio_state_response_parse@Base 1.10.0 + mbim_message_radio_state_set_new@Base 1.10.0 + mbim_message_ref@Base 1.10.0 + mbim_message_register_state_notification_parse@Base 1.10.0 + mbim_message_register_state_query_new@Base 1.10.0 + mbim_message_register_state_response_parse@Base 1.10.0 + mbim_message_register_state_set_new@Base 1.10.0 + mbim_message_service_activation_response_parse@Base 1.10.0 + mbim_message_service_activation_set_new@Base 1.10.0 + mbim_message_set_transaction_id@Base 1.10.0 + mbim_message_signal_state_notification_parse@Base 1.10.0 + mbim_message_signal_state_query_new@Base 1.10.0 + mbim_message_signal_state_response_parse@Base 1.10.0 + mbim_message_signal_state_set_new@Base 1.10.0 + mbim_message_sms_configuration_query_new@Base 1.10.0 + mbim_message_sms_configuration_response_parse@Base 1.10.0 + mbim_message_sms_configuration_set_new@Base 1.10.0 + mbim_message_sms_delete_response_parse@Base 1.10.0 + mbim_message_sms_delete_set_new@Base 1.10.0 + mbim_message_sms_message_store_status_notification_parse@Base 1.10.0 + mbim_message_sms_message_store_status_query_new@Base 1.10.0 + mbim_message_sms_message_store_status_response_parse@Base 1.10.0 + mbim_message_sms_read_notification_parse@Base 1.10.0 + mbim_message_sms_read_query_new@Base 1.10.0 + mbim_message_sms_read_response_parse@Base 1.10.0 + mbim_message_sms_send_response_parse@Base 1.10.0 + mbim_message_sms_send_set_new@Base 1.10.0 + mbim_message_stk_envelope_query_new@Base 1.10.0 + mbim_message_stk_envelope_response_parse@Base 1.10.0 + mbim_message_stk_envelope_set_new@Base 1.10.0 + mbim_message_stk_pac_notification_parse@Base 1.10.0 + mbim_message_stk_pac_query_new@Base 1.10.0 + mbim_message_stk_pac_response_parse@Base 1.10.0 + mbim_message_stk_pac_set_new@Base 1.10.0 + mbim_message_stk_terminal_response_response_parse@Base 1.10.0 + mbim_message_stk_terminal_response_set_new@Base 1.10.0 + mbim_message_subscriber_ready_status_notification_parse@Base 1.10.0 + mbim_message_subscriber_ready_status_query_new@Base 1.10.0 + mbim_message_subscriber_ready_status_response_parse@Base 1.10.0 + mbim_message_type_get_string@Base 1.10.0 + mbim_message_type_get_type@Base 1.10.0 + mbim_message_unref@Base 1.10.0 + mbim_message_ussd_notification_parse@Base 1.10.0 + mbim_message_ussd_response_parse@Base 1.10.0 + mbim_message_ussd_set_new@Base 1.10.0 + mbim_message_visible_providers_query_new@Base 1.10.0 + mbim_message_visible_providers_response_parse@Base 1.10.0 + mbim_network_idle_hint_state_get_string@Base 1.10.0 + mbim_network_idle_hint_state_get_type@Base 1.10.0 + mbim_nw_error_get_string@Base 1.10.0 + mbim_nw_error_get_type@Base 1.10.0 + mbim_packet_filter_array_free@Base 1.10.0 + mbim_packet_service_action_get_string@Base 1.10.0 + mbim_packet_service_action_get_type@Base 1.10.0 + mbim_packet_service_state_get_string@Base 1.10.0 + mbim_packet_service_state_get_type@Base 1.10.0 + mbim_phonebook_entry_array_free@Base 1.10.0 + mbim_phonebook_flag_get_string@Base 1.10.0 + mbim_phonebook_flag_get_type@Base 1.10.0 + mbim_phonebook_state_get_string@Base 1.10.0 + mbim_phonebook_state_get_type@Base 1.10.0 + mbim_phonebook_write_flag_get_string@Base 1.10.0 + mbim_phonebook_write_flag_get_type@Base 1.10.0 + mbim_pin_desc_free@Base 1.10.0 + mbim_pin_format_get_string@Base 1.10.0 + mbim_pin_format_get_type@Base 1.10.0 + mbim_pin_mode_get_string@Base 1.10.0 + mbim_pin_mode_get_type@Base 1.10.0 + mbim_pin_operation_get_string@Base 1.10.0 + mbim_pin_operation_get_type@Base 1.10.0 + mbim_pin_state_get_string@Base 1.10.0 + mbim_pin_state_get_type@Base 1.10.0 + mbim_pin_type_get_string@Base 1.10.0 + mbim_pin_type_get_type@Base 1.10.0 + mbim_protocol_error_get_string@Base 1.10.0 + mbim_protocol_error_get_type@Base 1.10.0 + mbim_protocol_error_quark@Base 1.10.0 + mbim_provider_array_free@Base 1.10.0 + mbim_provider_free@Base 1.10.0 + mbim_provider_state_build_string_from_mask@Base 1.10.0 + mbim_provider_state_get_type@Base 1.10.0 + mbim_provisioned_context_element_array_free@Base 1.10.0 + mbim_proxy_get_n_clients@Base 1.10.0 + mbim_proxy_get_n_devices@Base 1.10.0 + mbim_proxy_get_type@Base 1.10.0 + mbim_proxy_new@Base 1.10.0 + mbim_radio_switch_state_get_string@Base 1.10.0 + mbim_radio_switch_state_get_type@Base 1.10.0 + mbim_ready_info_flag_build_string_from_mask@Base 1.10.0 + mbim_ready_info_flag_get_type@Base 1.10.0 + mbim_register_action_get_string@Base 1.10.0 + mbim_register_action_get_type@Base 1.10.0 + mbim_register_custom_service@Base 1.10.0 + mbim_register_mode_get_string@Base 1.10.0 + mbim_register_mode_get_type@Base 1.10.0 + mbim_register_state_get_string@Base 1.10.0 + mbim_register_state_get_type@Base 1.10.0 + mbim_registration_flag_build_string_from_mask@Base 1.10.0 + mbim_registration_flag_get_type@Base 1.10.0 + mbim_service_get_string@Base 1.10.0 + mbim_service_get_type@Base 1.10.0 + mbim_service_id_is_custom@Base 1.10.0 + mbim_service_lookup_name@Base 1.10.0 + mbim_sim_class_build_string_from_mask@Base 1.10.0 + mbim_sim_class_get_type@Base 1.10.0 + mbim_sms_caps_build_string_from_mask@Base 1.10.0 + mbim_sms_caps_get_type@Base 1.10.0 + mbim_sms_cdma_encoding_get_string@Base 1.10.0 + mbim_sms_cdma_encoding_get_type@Base 1.10.0 + mbim_sms_cdma_lang_get_string@Base 1.10.0 + mbim_sms_cdma_lang_get_type@Base 1.10.0 + mbim_sms_cdma_read_record_array_free@Base 1.10.0 + mbim_sms_cdma_send_record_free@Base 1.10.0 + mbim_sms_flag_get_string@Base 1.10.0 + mbim_sms_flag_get_type@Base 1.10.0 + mbim_sms_format_get_string@Base 1.10.0 + mbim_sms_format_get_type@Base 1.10.0 + mbim_sms_pdu_read_record_array_free@Base 1.10.0 + mbim_sms_pdu_send_record_free@Base 1.10.0 + mbim_sms_status_flag_get_string@Base 1.10.0 + mbim_sms_status_flag_get_type@Base 1.10.0 + mbim_sms_status_get_string@Base 1.10.0 + mbim_sms_status_get_type@Base 1.10.0 + mbim_sms_storage_state_get_string@Base 1.10.0 + mbim_sms_storage_state_get_type@Base 1.10.0 + mbim_status_error_get_string@Base 1.10.0 + mbim_status_error_get_type@Base 1.10.0 + mbim_status_error_quark@Base 1.10.0 + mbim_stk_pac_profile_get_string@Base 1.10.0 + mbim_stk_pac_profile_get_type@Base 1.10.0 + mbim_stk_pac_type_get_string@Base 1.10.0 + mbim_stk_pac_type_get_type@Base 1.10.0 + mbim_subscriber_ready_state_get_string@Base 1.10.0 + mbim_subscriber_ready_state_get_type@Base 1.10.0 + mbim_unregister_custom_service@Base 1.10.0 + mbim_ussd_action_get_string@Base 1.10.0 + mbim_ussd_action_get_type@Base 1.10.0 + mbim_ussd_response_get_string@Base 1.10.0 + mbim_ussd_response_get_type@Base 1.10.0 + mbim_ussd_session_state_get_string@Base 1.10.0 + mbim_ussd_session_state_get_type@Base 1.10.0 + mbim_utils_get_traces_enabled@Base 1.10.0 + mbim_utils_set_traces_enabled@Base 1.10.0 + mbim_uuid_cmp@Base 1.10.0 + mbim_uuid_from_context_type@Base 1.10.0 + mbim_uuid_from_printable@Base 1.10.0 + mbim_uuid_from_service@Base 1.10.0 + mbim_uuid_get_printable@Base 1.10.0 + mbim_uuid_to_context_type@Base 1.10.0 + mbim_uuid_to_service@Base 1.10.0 + mbim_visible_providers_action_get_string@Base 1.10.0 + mbim_visible_providers_action_get_type@Base 1.10.0 + mbim_voice_call_state_get_string@Base 1.10.0 + mbim_voice_call_state_get_type@Base 1.10.0 + mbim_voice_class_get_string@Base 1.10.0 + mbim_voice_class_get_type@Base 1.10.0 diff -Nru libmbim-1.6.0/debian/libmbim-proxy.install libmbim-1.10.0/debian/libmbim-proxy.install --- libmbim-1.6.0/debian/libmbim-proxy.install 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-proxy.install 2014-09-16 21:03:34.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libmbim/ diff -Nru libmbim-1.6.0/debian/libmbim-utils.install libmbim-1.10.0/debian/libmbim-utils.install --- libmbim-1.6.0/debian/libmbim-utils.install 2013-12-16 06:34:48.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-utils.install 2014-09-16 21:03:34.000000000 +0000 @@ -1,2 +1,4 @@ usr/bin/mbimcli usr/bin/mbim-network +usr/share/man/man1/mbim-network.1 +usr/share/man/man1/mbimcli.1 diff -Nru libmbim-1.6.0/debian/libmbim-utils.manpages libmbim-1.10.0/debian/libmbim-utils.manpages --- libmbim-1.6.0/debian/libmbim-utils.manpages 2013-12-16 06:41:41.000000000 +0000 +++ libmbim-1.10.0/debian/libmbim-utils.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian/tmp/usr/share/man/man1/mbim-network.1 -debian/tmp/usr/share/man/man1/mbimcli.1 diff -Nru libmbim-1.6.0/debian/patches/bashisms.patch libmbim-1.10.0/debian/patches/bashisms.patch --- libmbim-1.6.0/debian/patches/bashisms.patch 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/debian/patches/bashisms.patch 2014-12-19 20:24:59.000000000 +0000 @@ -0,0 +1,22 @@ +Subject: Bashisms in mbim-network script +Author: Boris Egorov +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=87093 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772325 +Forwarded: not-needed +Last-update: 2014-12-19 + +--- libmbim-1.10.0.orig/utils/mbim-network.in ++++ libmbim-1.10.0/utils/mbim-network.in +@@ -50,10 +50,10 @@ + } + + if [ $# -ne 2 ]; then +- if [ $1 == "--help" ]; then ++ if [ "$1" = "--help" ]; then + help + exit 0 +- elif [ $1 == "--version" ]; then ++ elif [ "$1" = "--version" ]; then + version + exit 0 + fi diff -Nru libmbim-1.6.0/debian/patches/series libmbim-1.10.0/debian/patches/series --- libmbim-1.6.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/debian/patches/series 2014-12-19 20:23:43.000000000 +0000 @@ -0,0 +1 @@ +bashisms.patch diff -Nru libmbim-1.6.0/debian/rules libmbim-1.10.0/debian/rules --- libmbim-1.6.0/debian/rules 2013-12-16 06:44:22.000000000 +0000 +++ libmbim-1.10.0/debian/rules 2014-09-16 21:03:34.000000000 +0000 @@ -5,9 +5,12 @@ override_dh_auto_configure: dh_auto_configure -- \ - --with-tests \ --enable-gtk-doc \ - --enable-gtk-doc-html + --enable-gtk-doc-html \ + --libexecdir=/usr/lib/libmbim -#override_dh_strip: -# dh_strip --dbg-package=libqmi-glib0-dbg +override_dh_install: + dh_install -X.la --list-missing + +override_dh_strip: + dh_strip --dbg-package=libmbim-glib4-dbg diff -Nru libmbim-1.6.0/docs/Makefile.in libmbim-1.10.0/docs/Makefile.in --- libmbim-1.6.0/docs/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/docs/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -200,6 +200,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -226,6 +227,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ diff -Nru libmbim-1.6.0/docs/man/Makefile.in libmbim-1.10.0/docs/man/Makefile.in --- libmbim-1.6.0/docs/man/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/docs/man/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -172,6 +172,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -198,6 +199,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ diff -Nru libmbim-1.6.0/docs/man/mbimcli.1 libmbim-1.10.0/docs/man/mbimcli.1 --- libmbim-1.6.0/docs/man/mbimcli.1 2013-12-10 20:25:30.000000000 +0000 +++ libmbim-1.10.0/docs/man/mbimcli.1 2014-08-04 13:00:58.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. -.TH MBIMCLI "1" "December 2013" "mbimcli " "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. +.TH MBIMCLI "1" "August 2014" "mbimcli " "User Commands" .SH NAME mbimcli \- Control MBIM devices .SH DESCRIPTION @@ -19,6 +19,15 @@ .TP \fB\-\-help\-phonebook\fR Show Phonebook Service options +.TP +\fB\-\-help\-dss\fR +Show Device Service Stream options +.TP +\fB\-\-help\-ms\-firmware\-id\fR +Show Microsoft Firmware ID Service options +.TP +\fB\-\-help\-ms\-host\-shutdown\fR +Show Microsoft Host Shutdown Service options .PP Basic Connect options .TP @@ -31,6 +40,9 @@ \fB\-\-query\-radio\-state\fR Query radio state .TP +\fB\-\-set\-radio\-state\fR=\fI[\fR(on|off)] +Set radio state +.TP \fB\-\-query\-device\-services\fR Query device services .TP @@ -110,11 +122,32 @@ .TP \fB\-\-phonebook\-delete\-all\fR Delete all phonebook entries +.PP +Device Service Stream options +.TP +\fB\-\-dss\-connect\fR=\fI[\fR(UUID),(Session ID)] +Connect DSS session +.TP +\fB\-\-dss\-disconnect\fR=\fI[\fR(UUID),(Session ID)] +Disconnect DSS session +.PP +Microsoft Firmware ID options +.TP +\fB\-\-ms\-query\-firmware\-id\fR +Query firmware ID +.PP +Microsoft Host Shutdown options +.TP +\fB\-\-ms\-notify\-host\-shutdown\fR +Notify that host is shutting down .SS "Application Options:" .TP \fB\-d\fR, \fB\-\-device\fR=\fI[PATH]\fR Specify device path .TP +\fB\-p\fR, \fB\-\-device\-open\-proxy\fR +Request to use the 'mbim\-proxy' proxy +.TP \fB\-\-no\-open\fR=\fI[Transaction\fR ID] Do not explicitly open the MBIM device before running the command .TP @@ -133,8 +166,8 @@ \fB\-V\fR, \fB\-\-version\fR Print version .PP -mbimcli 1.6.0 -Copyright (2013) Aleksander Morgado +mbimcli 1.10.0 +Copyright (2013\-2014) Aleksander Morgado License GPLv2+: GNU GPL version 2 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. diff -Nru libmbim-1.6.0/docs/man/mbim-network.1 libmbim-1.10.0/docs/man/mbim-network.1 --- libmbim-1.6.0/docs/man/mbim-network.1 2013-12-10 20:25:30.000000000 +0000 +++ libmbim-1.10.0/docs/man/mbim-network.1 2014-08-04 13:00:58.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. -.TH MBIM-NETWORK "1" "December 2013" "mbim-network 1.6.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. +.TH MBIM-NETWORK "1" "August 2014" "mbim-network 1.10.0" "User Commands" .SH NAME mbim-network \- Simple network management of MBIM devices .SH SYNOPSIS diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/annotation-glossary.html libmbim-1.10.0/docs/reference/libmbim-glib/html/annotation-glossary.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/annotation-glossary.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/annotation-glossary.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,29 +2,24 @@ -Annotation Glossary +libmbim-glib Reference Manual: Annotation Glossary - - + + - - - - - - - - - - + + + + + + +

Annotation Glossary

@@ -39,6 +34,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/api-index-full.html libmbim-1.10.0/docs/reference/libmbim-glib/html/api-index-full.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/api-index-full.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/api-index-full.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,85 +2,80 @@ -API Index +libmbim-glib Reference Manual: API Index - - + + - - - - - - - - - - + + + + + + +

API Index

A

-MbimActivationCommand, enum in Enumerations and Flags +MbimActivationCommand, enum in Enumerations and Flags
-MbimActivationState, enum in Enumerations and Flags +MbimActivationState, enum in Enumerations and Flags
-mbim_activation_command_get_string, function in Enumerations and Flags +mbim_activation_command_get_string, function in Enumerations and Flags
-mbim_activation_state_get_string, function in Enumerations and Flags +mbim_activation_state_get_string, function in Enumerations and Flags
-MbimAuthProtocol, enum in Enumerations and Flags +MbimAuthProtocol, enum in Enumerations and Flags
-mbim_auth_protocol_get_string, function in Enumerations and Flags +mbim_auth_protocol_get_string, function in Enumerations and Flags

C

-MbimCellularClass, enum in Enumerations and Flags +MbimCellularClass, enum in Enumerations and Flags
-mbim_cellular_class_build_string_from_mask, function in Enumerations and Flags +mbim_cellular_class_build_string_from_mask, function in Enumerations and Flags
@@ -88,124 +83,152 @@
-MbimCidAuth, enum in Command IDs +MbimCidAuth, enum in Command IDs
-MbimCidBasicConnect, enum in Command IDs +MbimCidBasicConnect, enum in Command IDs
-MbimCidDss, enum in Command IDs +MbimCidDss, enum in Command IDs
-MbimCidPhonebook, enum in Command IDs +MbimCidMsFirmwareId, enum in Command IDs
-MbimCidSms, enum in Command IDs +MbimCidMsHostShutdown, enum in Command IDs
-MbimCidStk, enum in Command IDs +MbimCidPhonebook, enum in Command IDs
-MbimCidUssd, enum in Command IDs +MbimCidProxyControl, enum in Command IDs
-mbim_cid_auth_get_string, function in Command IDs +MbimCidSms, enum in Command IDs
-mbim_cid_basic_connect_get_string, function in Command IDs +MbimCidStk, enum in Command IDs
-mbim_cid_can_notify, function in Command IDs +MbimCidUssd, enum in Command IDs
-mbim_cid_can_query, function in Command IDs +mbim_cid_auth_get_string, function in Command IDs
-mbim_cid_can_set, function in Command IDs +MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST, macro in Deprecated API
-mbim_cid_dss_get_string, function in Command IDs +mbim_cid_basic_connect_get_string, function in Command IDs
-mbim_cid_get_printable, function in Command IDs +mbim_cid_can_notify, function in Command IDs
-mbim_cid_phonebook_get_string, function in Command IDs +mbim_cid_can_query, function in Command IDs
-mbim_cid_sms_get_string, function in Command IDs +mbim_cid_can_set, function in Command IDs
-mbim_cid_stk_get_string, function in Command IDs +mbim_cid_dss_get_string, function in Command IDs
-mbim_cid_ussd_get_string, function in Command IDs +mbim_cid_get_printable, function in Command IDs
-MbimCompression, enum in Enumerations and Flags +mbim_cid_ms_firmware_id_get_string, function in Command IDs
-mbim_compression_get_string, function in Enumerations and Flags +mbim_cid_ms_host_shutdown_get_string, function in Command IDs
-MbimContextIpType, enum in Enumerations and Flags +mbim_cid_phonebook_get_string, function in Command IDs
-MbimContextType, enum in UUIDs +mbim_cid_proxy_control_get_string, function in Command IDs
-mbim_context_ip_type_get_string, function in Enumerations and Flags +mbim_cid_sms_get_string, function in Command IDs
-mbim_context_type_get_string, function in UUIDs +mbim_cid_stk_get_string, function in Command IDs
-MbimCoreError, enum in Errors +mbim_cid_ussd_get_string, function in Command IDs
-mbim_core_error_get_string, function in Errors +MbimCompression, enum in Enumerations and Flags
-MbimCtrlCaps, enum in Enumerations and Flags +mbim_compression_get_string, function in Enumerations and Flags
-mbim_ctrl_caps_build_string_from_mask, function in Enumerations and Flags +MbimContextIpType, enum in Enumerations and Flags +
+
+
+MbimContextType, enum in UUIDs +
+
+
+mbim_context_ip_type_get_string, function in Enumerations and Flags +
+
+
+mbim_context_type_get_string, function in UUIDs +
+
+
+MbimCoreError, enum in Errors +
+
+
+mbim_core_error_get_string, function in Errors +
+
+
+MbimCtrlCaps, enum in Enumerations and Flags +
+
+
+mbim_ctrl_caps_build_string_from_mask, function in Enumerations and Flags

D

-MbimDataClass, enum in Enumerations and Flags +MbimDataClass, enum in Enumerations and Flags
-mbim_data_class_build_string_from_mask, function in Enumerations and Flags +mbim_data_class_build_string_from_mask, function in Enumerations and Flags
@@ -213,23 +236,31 @@
-MbimDevice::device-error, object signal in MbimDevice +MbimDevice::device-error, object signal in MbimDevice +
+
+
+MbimDevice::device-indicate-status, object signal in MbimDevice +
+
+
+MbimDevice::device-removed, object signal in MbimDevice
-MbimDevice::device-indicate-status, object signal in MbimDevice +MbimDevice:device-file, object property in MbimDevice
-MbimDevice:device-file, object property in MbimDevice +MbimDevice:device-in-session, object property in MbimDevice
-MbimDevice:device-in-session, object property in MbimDevice +MbimDevice:device-transaction-id, object property in MbimDevice
-MbimDevice:device-transaction-id, object property in MbimDevice +MbimDeviceOpenFlags, enum in MbimDevice
@@ -237,92 +268,124 @@
-MbimDeviceType, enum in Enumerations and Flags +MbimDeviceType, enum in Enumerations and Flags +
+
+
+mbim_device_close, function in MbimDevice +
+
+
+mbim_device_close_finish, function in MbimDevice
-mbim_device_close, function in MbimDevice +mbim_device_close_force, function in MbimDevice
-mbim_device_close_finish, function in MbimDevice +mbim_device_command, function in MbimDevice
-mbim_device_close_force, function in MbimDevice +mbim_device_command_finish, function in MbimDevice
-mbim_device_command, function in MbimDevice +MBIM_DEVICE_FILE, macro in MbimDevice
-mbim_device_command_finish, function in MbimDevice +mbim_device_get_file, function in MbimDevice
-mbim_device_get_file, function in MbimDevice +mbim_device_get_next_transaction_id, function in MbimDevice
-mbim_device_get_next_transaction_id, function in MbimDevice +mbim_device_get_path, function in MbimDevice
-mbim_device_get_path, function in MbimDevice +mbim_device_get_path_display, function in MbimDevice
-mbim_device_get_path_display, function in MbimDevice +MBIM_DEVICE_IN_SESSION, macro in MbimDevice
-mbim_device_is_open, function in MbimDevice +mbim_device_is_open, function in MbimDevice
-mbim_device_new, function in MbimDevice +mbim_device_new, function in MbimDevice
-mbim_device_new_finish, function in MbimDevice +mbim_device_new_finish, function in MbimDevice
-mbim_device_open, function in MbimDevice +mbim_device_open, function in MbimDevice
-mbim_device_open_finish, function in MbimDevice +mbim_device_open_finish, function in MbimDevice
-mbim_device_peek_file, function in MbimDevice +mbim_device_open_full, function in MbimDevice
-mbim_device_service_element_array_free, function in Basic Connect +mbim_device_open_full_finish, function in MbimDevice
-mbim_device_type_get_string, function in Enumerations and Flags +mbim_device_peek_file, function in MbimDevice
-MbimDssLinkState, enum in Enumerations and Flags +mbim_device_service_element_array_free, function in Basic Connect
-mbim_dss_link_state_get_string, function in Enumerations and Flags +MBIM_DEVICE_SIGNAL_ERROR, macro in MbimDevice +
+
+
+MBIM_DEVICE_SIGNAL_INDICATE_STATUS, macro in MbimDevice +
+
+
+MBIM_DEVICE_SIGNAL_REMOVED, macro in MbimDevice +
+
+
+MBIM_DEVICE_TRANSACTION_ID, macro in MbimDevice +
+
+
+mbim_device_type_get_string, function in Enumerations and Flags +
+
+
+MbimDssLinkState, enum in Enumerations and Flags +
+
+
+mbim_dss_link_state_get_string, function in Enumerations and Flags

E

-MbimEmergencyModeState, enum in Enumerations and Flags +MbimEmergencyModeState, enum in Enumerations and Flags
-mbim_emergency_mode_state_get_string, function in Enumerations and Flags +mbim_emergency_mode_state_get_string, function in Enumerations and Flags
@@ -330,12 +393,12 @@
-mbim_event_entry_array_free, function in Basic Connect +mbim_event_entry_array_free, function in Basic Connect

I

-MbimIPConfigurationAvailableFlag, enum in Enumerations and Flags +MbimIPConfigurationAvailableFlag, enum in Enumerations and Flags
@@ -347,7 +410,7 @@
-mbim_ipv4_element_array_free, function in Basic Connect +mbim_ipv4_element_array_free, function in Basic Connect
@@ -359,11 +422,11 @@
-mbim_ipv6_element_array_free, function in Basic Connect +mbim_ipv6_element_array_free, function in Basic Connect
-mbim_ip_configuration_available_flag_build_string_from_mask, function in Enumerations and Flags +mbim_ip_configuration_available_flag_build_string_from_mask, function in Enumerations and Flags

M

@@ -376,591 +439,627 @@
-MbimMessageCommandType, enum in MbimMessage +MbimMessageCommandType, enum in MbimMessage +
+
+
+MbimMessageType, enum in MbimMessage +
+
+
+mbim_message_auth_akap_query_new, function in Auth +
+
+
+mbim_message_auth_akap_response_parse, function in Auth +
+
+
+mbim_message_auth_aka_query_new, function in Auth +
+
+
+mbim_message_auth_aka_response_parse, function in Auth
-MbimMessageType, enum in MbimMessage +mbim_message_auth_sim_query_new, function in Auth
-mbim_message_auth_akap_query_new, function in Auth +mbim_message_auth_sim_response_parse, function in Auth
-mbim_message_auth_akap_response_parse, function in Auth +mbim_message_close_done_get_result, function in MbimMessage
-mbim_message_auth_aka_query_new, function in Auth +mbim_message_close_done_get_status_code, function in MbimMessage
-mbim_message_auth_aka_response_parse, function in Auth +mbim_message_close_new, function in MbimMessage
-mbim_message_auth_sim_query_new, function in Auth +mbim_message_command_append, function in MbimMessage
-mbim_message_auth_sim_response_parse, function in Auth +mbim_message_command_done_get_cid, function in MbimMessage
-mbim_message_close_done_get_result, function in MbimMessage +mbim_message_command_done_get_raw_information_buffer, function in MbimMessage
-mbim_message_close_done_get_status_code, function in MbimMessage +mbim_message_command_done_get_result, function in MbimMessage
-mbim_message_close_new, function in MbimMessage +mbim_message_command_done_get_service, function in MbimMessage
-mbim_message_command_append, function in MbimMessage +mbim_message_command_done_get_service_id, function in MbimMessage
-mbim_message_command_done_get_cid, function in MbimMessage +mbim_message_command_done_get_status_code, function in MbimMessage
-mbim_message_command_done_get_raw_information_buffer, function in MbimMessage +mbim_message_command_get_cid, function in MbimMessage
-mbim_message_command_done_get_result, function in MbimMessage +mbim_message_command_get_command_type, function in MbimMessage
-mbim_message_command_done_get_service, function in MbimMessage +mbim_message_command_get_raw_information_buffer, function in MbimMessage
-mbim_message_command_done_get_service_id, function in MbimMessage +mbim_message_command_get_service, function in MbimMessage
-mbim_message_command_done_get_status_code, function in MbimMessage +mbim_message_command_get_service_id, function in MbimMessage
-mbim_message_command_get_cid, function in MbimMessage +mbim_message_command_new, function in MbimMessage
-mbim_message_command_get_command_type, function in MbimMessage +mbim_message_command_type_get_string, function in MbimMessage
-mbim_message_command_get_raw_information_buffer, function in MbimMessage +mbim_message_connect_notification_parse, function in Basic Connect
-mbim_message_command_get_service, function in MbimMessage +mbim_message_connect_query_new, function in Basic Connect
-mbim_message_command_get_service_id, function in MbimMessage +mbim_message_connect_response_parse, function in Basic Connect
-mbim_message_command_new, function in MbimMessage +mbim_message_connect_set_new, function in Basic Connect
-mbim_message_command_type_get_string, function in MbimMessage +mbim_message_device_caps_query_new, function in Basic Connect
-mbim_message_connect_notification_parse, function in Basic Connect +mbim_message_device_caps_response_parse, function in Basic Connect
-mbim_message_connect_query_new, function in Basic Connect +mbim_message_device_services_query_new, function in Basic Connect
-mbim_message_connect_response_parse, function in Basic Connect +mbim_message_device_services_response_parse, function in Basic Connect
-mbim_message_connect_set_new, function in Basic Connect +mbim_message_device_service_subscriber_list_response_parse, function in Deprecated API
-mbim_message_device_caps_query_new, function in Basic Connect +mbim_message_device_service_subscriber_list_set_new, function in Deprecated API
-mbim_message_device_caps_response_parse, function in Basic Connect +mbim_message_device_service_subscribe_list_response_parse, function in Basic Connect
-mbim_message_device_services_query_new, function in Basic Connect +mbim_message_device_service_subscribe_list_set_new, function in Basic Connect
-mbim_message_device_services_response_parse, function in Basic Connect +mbim_message_dss_connect_response_parse, function in DSS
-mbim_message_device_service_subscriber_list_response_parse, function in Basic Connect +mbim_message_dss_connect_set_new, function in DSS
-mbim_message_device_service_subscriber_list_set_new, function in Basic Connect +mbim_message_dup, function in MbimMessage
-mbim_message_dss_connect_response_parse, function in DSS +mbim_message_emergency_mode_notification_parse, function in Basic Connect
-mbim_message_dss_connect_set_new, function in DSS +mbim_message_emergency_mode_query_new, function in Basic Connect
-mbim_message_dup, function in MbimMessage +mbim_message_emergency_mode_response_parse, function in Basic Connect
-mbim_message_emergency_mode_query_new, function in Basic Connect +mbim_message_emergency_mode_set_new, function in Basic Connect
-mbim_message_emergency_mode_response_parse, function in Basic Connect +mbim_message_error_get_error, function in MbimMessage
-mbim_message_emergency_mode_set_new, function in Basic Connect +mbim_message_error_get_error_status_code, function in MbimMessage
-mbim_message_error_get_error, function in MbimMessage +mbim_message_error_new, function in MbimMessage
-mbim_message_error_get_error_status_code, function in MbimMessage +mbim_message_get_message_length, function in MbimMessage
-mbim_message_error_new, function in MbimMessage +mbim_message_get_message_type, function in MbimMessage
-mbim_message_get_message_length, function in MbimMessage +mbim_message_get_printable, function in MbimMessage
-mbim_message_get_message_type, function in MbimMessage +mbim_message_get_raw, function in MbimMessage
-mbim_message_get_printable, function in MbimMessage +mbim_message_get_transaction_id, function in MbimMessage
-mbim_message_get_raw, function in MbimMessage +mbim_message_home_provider_query_new, function in Basic Connect
-mbim_message_get_transaction_id, function in MbimMessage +mbim_message_home_provider_response_parse, function in Basic Connect
-mbim_message_home_provider_query_new, function in Basic Connect +mbim_message_home_provider_set_new, function in Basic Connect
-mbim_message_home_provider_response_parse, function in Basic Connect +mbim_message_indicate_status_get_cid, function in MbimMessage
-mbim_message_home_provider_set_new, function in Basic Connect +mbim_message_indicate_status_get_raw_information_buffer, function in MbimMessage
-mbim_message_indicate_status_get_cid, function in MbimMessage +mbim_message_indicate_status_get_service, function in MbimMessage
-mbim_message_indicate_status_get_raw_information_buffer, function in MbimMessage +mbim_message_indicate_status_get_service_id, function in MbimMessage
-mbim_message_indicate_status_get_service, function in MbimMessage +mbim_message_ip_configuration_notification_parse, function in Basic Connect
-mbim_message_indicate_status_get_service_id, function in MbimMessage +mbim_message_ip_configuration_query_new, function in Basic Connect
-mbim_message_ip_configuration_notification_parse, function in Basic Connect +mbim_message_ip_configuration_response_parse, function in Basic Connect
-mbim_message_ip_configuration_query_new, function in Basic Connect +mbim_message_ip_packet_filters_query_new, function in Basic Connect
-mbim_message_ip_configuration_response_parse, function in Basic Connect +mbim_message_ip_packet_filters_response_parse, function in Basic Connect
-mbim_message_ip_packet_filters_query_new, function in Basic Connect +mbim_message_ip_packet_filters_set_new, function in Basic Connect
-mbim_message_ip_packet_filters_response_parse, function in Basic Connect +mbim_message_ms_firmware_id_get_query_new, function in MS Firmware ID
-mbim_message_ip_packet_filters_set_new, function in Basic Connect +mbim_message_ms_firmware_id_get_response_parse, function in MS Firmware ID
-mbim_message_multicarrier_providers_query_new, function in Basic Connect +mbim_message_ms_host_shutdown_notify_set_new, function in MS Host Shutdown
-mbim_message_multicarrier_providers_response_parse, function in Basic Connect +mbim_message_multicarrier_providers_notification_parse, function in Basic Connect
-mbim_message_multicarrier_providers_set_new, function in Basic Connect +mbim_message_multicarrier_providers_query_new, function in Basic Connect
-mbim_message_network_idle_hint_query_new, function in Basic Connect +mbim_message_multicarrier_providers_response_parse, function in Basic Connect
-mbim_message_network_idle_hint_response_parse, function in Basic Connect +mbim_message_multicarrier_providers_set_new, function in Basic Connect
-mbim_message_network_idle_hint_set_new, function in Basic Connect +mbim_message_network_idle_hint_query_new, function in Basic Connect
-mbim_message_new, function in MbimMessage +mbim_message_network_idle_hint_response_parse, function in Basic Connect
-mbim_message_open_done_get_result, function in MbimMessage +mbim_message_network_idle_hint_set_new, function in Basic Connect
-mbim_message_open_done_get_status_code, function in MbimMessage +mbim_message_new, function in MbimMessage
-mbim_message_open_get_max_control_transfer, function in MbimMessage +mbim_message_open_done_get_result, function in MbimMessage
-mbim_message_open_new, function in MbimMessage +mbim_message_open_done_get_status_code, function in MbimMessage
-mbim_message_packet_service_notification_parse, function in Basic Connect +mbim_message_open_get_max_control_transfer, function in MbimMessage
-mbim_message_packet_service_query_new, function in Basic Connect +mbim_message_open_new, function in MbimMessage
-mbim_message_packet_service_response_parse, function in Basic Connect +mbim_message_packet_service_notification_parse, function in Basic Connect
-mbim_message_packet_service_set_new, function in Basic Connect +mbim_message_packet_service_query_new, function in Basic Connect
-mbim_message_packet_statistics_query_new, function in Basic Connect +mbim_message_packet_service_response_parse, function in Basic Connect
-mbim_message_packet_statistics_response_parse, function in Basic Connect +mbim_message_packet_service_set_new, function in Basic Connect
-mbim_message_phonebook_configuration_notification_parse, function in Phonebook +mbim_message_packet_statistics_query_new, function in Basic Connect
-mbim_message_phonebook_configuration_query_new, function in Phonebook +mbim_message_packet_statistics_response_parse, function in Basic Connect
-mbim_message_phonebook_configuration_response_parse, function in Phonebook +mbim_message_phonebook_configuration_notification_parse, function in Phonebook
-mbim_message_phonebook_delete_response_parse, function in Phonebook +mbim_message_phonebook_configuration_query_new, function in Phonebook
-mbim_message_phonebook_delete_set_new, function in Phonebook +mbim_message_phonebook_configuration_response_parse, function in Phonebook
-mbim_message_phonebook_read_query_new, function in Phonebook +mbim_message_phonebook_delete_response_parse, function in Phonebook
-mbim_message_phonebook_read_response_parse, function in Phonebook +mbim_message_phonebook_delete_set_new, function in Phonebook
-mbim_message_phonebook_write_response_parse, function in Phonebook +mbim_message_phonebook_read_query_new, function in Phonebook
-mbim_message_phonebook_write_set_new, function in Phonebook +mbim_message_phonebook_read_response_parse, function in Phonebook
-mbim_message_pin_list_query_new, function in Basic Connect +mbim_message_phonebook_write_response_parse, function in Phonebook
-mbim_message_pin_list_response_parse, function in Basic Connect +mbim_message_phonebook_write_set_new, function in Phonebook
-mbim_message_pin_query_new, function in Basic Connect +mbim_message_pin_list_query_new, function in Basic Connect
-mbim_message_pin_response_parse, function in Basic Connect +mbim_message_pin_list_response_parse, function in Basic Connect
-mbim_message_pin_set_new, function in Basic Connect +mbim_message_pin_query_new, function in Basic Connect
-mbim_message_preferred_providers_query_new, function in Basic Connect +mbim_message_pin_response_parse, function in Basic Connect
-mbim_message_preferred_providers_response_parse, function in Basic Connect +mbim_message_pin_set_new, function in Basic Connect
-mbim_message_preferred_providers_set_new, function in Basic Connect +mbim_message_preferred_providers_notification_parse, function in Basic Connect
-mbim_message_provisioned_contexts_notification_parse, function in Basic Connect +mbim_message_preferred_providers_query_new, function in Basic Connect
-mbim_message_provisioned_contexts_query_new, function in Basic Connect +mbim_message_preferred_providers_response_parse, function in Basic Connect
-mbim_message_provisioned_contexts_response_parse, function in Basic Connect +mbim_message_preferred_providers_set_new, function in Basic Connect
-mbim_message_provisioned_contexts_set_new, function in Basic Connect +mbim_message_provisioned_contexts_notification_parse, function in Basic Connect
-mbim_message_radio_state_notification_parse, function in Basic Connect +mbim_message_provisioned_contexts_query_new, function in Basic Connect
-mbim_message_radio_state_query_new, function in Basic Connect +mbim_message_provisioned_contexts_response_parse, function in Basic Connect
-mbim_message_radio_state_response_parse, function in Basic Connect +mbim_message_provisioned_contexts_set_new, function in Basic Connect
-mbim_message_radio_state_set_new, function in Basic Connect +mbim_message_radio_state_notification_parse, function in Basic Connect
-mbim_message_ref, function in MbimMessage +mbim_message_radio_state_query_new, function in Basic Connect
-mbim_message_register_state_notification_parse, function in Basic Connect +mbim_message_radio_state_response_parse, function in Basic Connect
-mbim_message_register_state_query_new, function in Basic Connect +mbim_message_radio_state_set_new, function in Basic Connect
-mbim_message_register_state_response_parse, function in Basic Connect +mbim_message_ref, function in MbimMessage
-mbim_message_register_state_set_new, function in Basic Connect +mbim_message_register_state_notification_parse, function in Basic Connect
-mbim_message_service_activation_response_parse, function in Basic Connect +mbim_message_register_state_query_new, function in Basic Connect
-mbim_message_service_activation_set_new, function in Basic Connect +mbim_message_register_state_response_parse, function in Basic Connect
-mbim_message_set_transaction_id, function in MbimMessage +mbim_message_register_state_set_new, function in Basic Connect
-mbim_message_signal_state_notification_parse, function in Basic Connect +mbim_message_service_activation_response_parse, function in Basic Connect
-mbim_message_signal_state_query_new, function in Basic Connect +mbim_message_service_activation_set_new, function in Basic Connect
-mbim_message_signal_state_response_parse, function in Basic Connect +mbim_message_set_transaction_id, function in MbimMessage
-mbim_message_signal_state_set_new, function in Basic Connect +mbim_message_signal_state_notification_parse, function in Basic Connect
-mbim_message_sms_configuration_query_new, function in SMS +mbim_message_signal_state_query_new, function in Basic Connect
-mbim_message_sms_configuration_response_parse, function in SMS +mbim_message_signal_state_response_parse, function in Basic Connect
-mbim_message_sms_configuration_set_new, function in SMS +mbim_message_signal_state_set_new, function in Basic Connect
-mbim_message_sms_delete_response_parse, function in SMS +mbim_message_sms_configuration_query_new, function in SMS
-mbim_message_sms_delete_set_new, function in SMS +mbim_message_sms_configuration_response_parse, function in SMS
-mbim_message_sms_message_store_status_notification_parse, function in SMS +mbim_message_sms_configuration_set_new, function in SMS
-mbim_message_sms_message_store_status_query_new, function in SMS +mbim_message_sms_delete_response_parse, function in SMS
-mbim_message_sms_message_store_status_response_parse, function in SMS +mbim_message_sms_delete_set_new, function in SMS
-mbim_message_sms_read_notification_parse, function in SMS +mbim_message_sms_message_store_status_notification_parse, function in SMS
-mbim_message_sms_read_query_new, function in SMS +mbim_message_sms_message_store_status_query_new, function in SMS
-mbim_message_sms_read_response_parse, function in SMS +mbim_message_sms_message_store_status_response_parse, function in SMS
-mbim_message_sms_send_response_parse, function in SMS +mbim_message_sms_read_notification_parse, function in SMS
-mbim_message_sms_send_set_new, function in SMS +mbim_message_sms_read_query_new, function in SMS
-mbim_message_stk_envelope_query_new, function in STK +mbim_message_sms_read_response_parse, function in SMS
-mbim_message_stk_envelope_response_parse, function in STK +mbim_message_sms_send_response_parse, function in SMS
-mbim_message_stk_envelope_set_new, function in STK +mbim_message_sms_send_set_new, function in SMS
-mbim_message_stk_pac_notification_parse, function in STK +mbim_message_stk_envelope_query_new, function in STK
-mbim_message_stk_pac_query_new, function in STK +mbim_message_stk_envelope_response_parse, function in STK
-mbim_message_stk_pac_response_parse, function in STK +mbim_message_stk_envelope_set_new, function in STK
-mbim_message_stk_pac_set_new, function in STK +mbim_message_stk_pac_notification_parse, function in STK
-mbim_message_stk_terminal_response_response_parse, function in STK +mbim_message_stk_pac_query_new, function in STK
-mbim_message_stk_terminal_response_set_new, function in STK +mbim_message_stk_pac_response_parse, function in STK
-mbim_message_subscriber_ready_status_query_new, function in Basic Connect +mbim_message_stk_pac_set_new, function in STK
-mbim_message_subscriber_ready_status_response_parse, function in Basic Connect +mbim_message_stk_terminal_response_response_parse, function in STK
-mbim_message_type_get_string, function in MbimMessage +mbim_message_stk_terminal_response_set_new, function in STK
-mbim_message_unref, function in MbimMessage +mbim_message_subscriber_ready_status_notification_parse, function in Basic Connect
-mbim_message_ussd_notification_parse, function in USSD +mbim_message_subscriber_ready_status_query_new, function in Basic Connect
-mbim_message_ussd_response_parse, function in USSD +mbim_message_subscriber_ready_status_response_parse, function in Basic Connect
-mbim_message_ussd_set_new, function in USSD +mbim_message_type_get_string, function in MbimMessage
-mbim_message_visible_providers_query_new, function in Basic Connect +mbim_message_unref, function in MbimMessage
-mbim_message_visible_providers_response_parse, function in Basic Connect +mbim_message_ussd_notification_parse, function in USSD +
+
+
+mbim_message_ussd_response_parse, function in USSD +
+
+
+mbim_message_ussd_set_new, function in USSD +
+
+
+mbim_message_visible_providers_query_new, function in Basic Connect +
+
+
+mbim_message_visible_providers_response_parse, function in Basic Connect
@@ -973,19 +1072,19 @@

N

-MbimNetworkIdleHintState, enum in Enumerations and Flags +MbimNetworkIdleHintState, enum in Enumerations and Flags
-mbim_network_idle_hint_state_get_string, function in Enumerations and Flags +mbim_network_idle_hint_state_get_string, function in Enumerations and Flags
-MbimNwError, enum in Enumerations and Flags +MbimNwError, enum in Enumerations and Flags
-mbim_nw_error_get_string, function in Enumerations and Flags +mbim_nw_error_get_string, function in Enumerations and Flags

P

@@ -994,23 +1093,23 @@
-MbimPacketServiceAction, enum in Enumerations and Flags +MbimPacketServiceAction, enum in Enumerations and Flags
-MbimPacketServiceState, enum in Enumerations and Flags +MbimPacketServiceState, enum in Enumerations and Flags
-mbim_packet_filter_array_free, function in Basic Connect +mbim_packet_filter_array_free, function in Basic Connect
-mbim_packet_service_action_get_string, function in Enumerations and Flags +mbim_packet_service_action_get_string, function in Enumerations and Flags
-mbim_packet_service_state_get_string, function in Enumerations and Flags +mbim_packet_service_state_get_string, function in Enumerations and Flags
@@ -1018,31 +1117,31 @@
-MbimPhonebookFlag, enum in Enumerations and Flags +MbimPhonebookFlag, enum in Enumerations and Flags
-MbimPhonebookState, enum in Enumerations and Flags +MbimPhonebookState, enum in Enumerations and Flags
-MbimPhonebookWriteFlag, enum in Enumerations and Flags +MbimPhonebookWriteFlag, enum in Enumerations and Flags
-mbim_phonebook_entry_array_free, function in Phonebook +mbim_phonebook_entry_array_free, function in Phonebook
-mbim_phonebook_flag_get_string, function in Enumerations and Flags +mbim_phonebook_flag_get_string, function in Enumerations and Flags
-mbim_phonebook_state_get_string, function in Enumerations and Flags +mbim_phonebook_state_get_string, function in Enumerations and Flags
-mbim_phonebook_write_flag_get_string, function in Enumerations and Flags +mbim_phonebook_write_flag_get_string, function in Enumerations and Flags
@@ -1050,55 +1149,55 @@
-MbimPinFormat, enum in Enumerations and Flags +MbimPinFormat, enum in Enumerations and Flags
-MbimPinMode, enum in Enumerations and Flags +MbimPinMode, enum in Enumerations and Flags
-MbimPinOperation, enum in Enumerations and Flags +MbimPinOperation, enum in Enumerations and Flags
-MbimPinState, enum in Enumerations and Flags +MbimPinState, enum in Enumerations and Flags
-MbimPinType, enum in Enumerations and Flags +MbimPinType, enum in Enumerations and Flags
-mbim_pin_desc_free, function in Basic Connect +mbim_pin_desc_free, function in Basic Connect
-mbim_pin_format_get_string, function in Enumerations and Flags +mbim_pin_format_get_string, function in Enumerations and Flags
-mbim_pin_mode_get_string, function in Enumerations and Flags +mbim_pin_mode_get_string, function in Enumerations and Flags
-mbim_pin_operation_get_string, function in Enumerations and Flags +mbim_pin_operation_get_string, function in Enumerations and Flags
-mbim_pin_state_get_string, function in Enumerations and Flags +mbim_pin_state_get_string, function in Enumerations and Flags
-mbim_pin_type_get_string, function in Enumerations and Flags +mbim_pin_type_get_string, function in Enumerations and Flags
-MbimProtocolError, enum in Errors +MbimProtocolError, enum in Errors
-mbim_protocol_error_get_string, function in Errors +mbim_protocol_error_get_string, function in Errors
@@ -1106,19 +1205,19 @@
-MbimProviderState, enum in Enumerations and Flags +MbimProviderState, enum in Enumerations and Flags
-mbim_provider_array_free, function in Basic Connect +mbim_provider_array_free, function in Basic Connect
-mbim_provider_free, function in Basic Connect +mbim_provider_free, function in Basic Connect
-mbim_provider_state_build_string_from_mask, function in Enumerations and Flags +mbim_provider_state_build_string_from_mask, function in Enumerations and Flags
@@ -1126,81 +1225,133 @@
-mbim_provisioned_context_element_array_free, function in Basic Connect +mbim_provisioned_context_element_array_free, function in Basic Connect +
+
+
+MbimProxy, struct in MbimProxy +
+
+
+MbimProxy:mbim-proxy-n-clients, object property in MbimProxy +
+
+
+MbimProxy:mbim-proxy-n-devices, object property in MbimProxy +
+
+
+mbim_proxy_get_n_clients, function in MbimProxy +
+
+
+mbim_proxy_get_n_devices, function in MbimProxy +
+
+
+mbim_proxy_new, function in MbimProxy +
+
+
+MBIM_PROXY_N_CLIENTS, macro in MbimProxy +
+
+
+MBIM_PROXY_N_DEVICES, macro in MbimProxy +
+
+
+MBIM_PROXY_SOCKET_PATH, macro in MbimProxy

R

-MbimRadioSwitchState, enum in Enumerations and Flags +MbimRadioSwitchState, enum in Enumerations and Flags +
+
+
+mbim_radio_switch_state_get_string, function in Enumerations and Flags
-mbim_radio_switch_state_get_string, function in Enumerations and Flags +MbimReadyInfoFlag, enum in Enumerations and Flags
-MbimReadyInfoFlag, enum in Enumerations and Flags +mbim_ready_info_flag_build_string_from_mask, function in Enumerations and Flags
-mbim_ready_info_flag_build_string_from_mask, function in Enumerations and Flags +MbimRegisterAction, enum in Enumerations and Flags
-MbimRegisterAction, enum in Enumerations and Flags +MbimRegisterMode, enum in Enumerations and Flags
-MbimRegisterMode, enum in Enumerations and Flags +MbimRegisterState, enum in Enumerations and Flags
-MbimRegisterState, enum in Enumerations and Flags +mbim_register_action_get_string, function in Enumerations and Flags
-mbim_register_action_get_string, function in Enumerations and Flags +mbim_register_custom_service, function in UUIDs
-mbim_register_mode_get_string, function in Enumerations and Flags +mbim_register_mode_get_string, function in Enumerations and Flags
-mbim_register_state_get_string, function in Enumerations and Flags +mbim_register_state_get_string, function in Enumerations and Flags
-MbimRegistrationFlag, enum in Enumerations and Flags +MbimRegistrationFlag, enum in Enumerations and Flags +
+
+
+MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH, macro in Deprecated API

S

-MbimService, enum in UUIDs +MbimService, enum in UUIDs +
+
+
+mbim_service_get_string, function in UUIDs
-mbim_service_get_string, function in UUIDs +mbim_service_id_is_custom, function in UUIDs
-MbimSimClass, enum in Enumerations and Flags +mbim_service_lookup_name, function in UUIDs
-mbim_sim_class_build_string_from_mask, function in Enumerations and Flags +MbimSimClass, enum in Enumerations and Flags
-MbimSmsCaps, enum in Enumerations and Flags +mbim_sim_class_build_string_from_mask, function in Enumerations and Flags
-MbimSmsCdmaEncoding, enum in Enumerations and Flags +MbimSmsCaps, enum in Enumerations and Flags
-MbimSmsCdmaLang, enum in Enumerations and Flags +MbimSmsCdmaEncoding, enum in Enumerations and Flags +
+
+
+MbimSmsCdmaLang, enum in Enumerations and Flags
@@ -1212,11 +1363,11 @@
-MbimSmsFlag, enum in Enumerations and Flags +MbimSmsFlag, enum in Enumerations and Flags
-MbimSmsFormat, enum in Enumerations and Flags +MbimSmsFormat, enum in Enumerations and Flags
@@ -1228,128 +1379,132 @@
-MbimSmsStatus, enum in Enumerations and Flags +MbimSmsStatus, enum in Enumerations and Flags
-MbimSmsStatusFlag, enum in Enumerations and Flags +MbimSmsStatusFlag, enum in Enumerations and Flags
-MbimSmsStorageState, enum in Enumerations and Flags +MbimSmsStorageState, enum in Enumerations and Flags
-mbim_sms_caps_build_string_from_mask, function in Enumerations and Flags +mbim_sms_caps_build_string_from_mask, function in Enumerations and Flags
-mbim_sms_cdma_encoding_get_string, function in Enumerations and Flags +mbim_sms_cdma_encoding_get_string, function in Enumerations and Flags
-mbim_sms_cdma_lang_get_string, function in Enumerations and Flags +mbim_sms_cdma_lang_get_string, function in Enumerations and Flags
-mbim_sms_cdma_read_record_array_free, function in SMS +mbim_sms_cdma_read_record_array_free, function in SMS
-mbim_sms_cdma_send_record_free, function in SMS +mbim_sms_cdma_send_record_free, function in SMS
-mbim_sms_flag_get_string, function in Enumerations and Flags +mbim_sms_flag_get_string, function in Enumerations and Flags
-mbim_sms_format_get_string, function in Enumerations and Flags +mbim_sms_format_get_string, function in Enumerations and Flags
-mbim_sms_pdu_read_record_array_free, function in SMS +mbim_sms_pdu_read_record_array_free, function in SMS
-mbim_sms_pdu_send_record_free, function in SMS +mbim_sms_pdu_send_record_free, function in SMS
-mbim_sms_status_flag_get_string, function in Enumerations and Flags +mbim_sms_status_flag_get_string, function in Enumerations and Flags
-mbim_sms_status_get_string, function in Enumerations and Flags +mbim_sms_status_get_string, function in Enumerations and Flags
-mbim_sms_storage_state_get_string, function in Enumerations and Flags +mbim_sms_storage_state_get_string, function in Enumerations and Flags
-MbimStatusError, enum in Errors +MbimStatusError, enum in Errors
-mbim_status_error_get_string, function in Errors +mbim_status_error_get_string, function in Errors
-MbimStkPacProfile, enum in Enumerations and Flags +MbimStkPacProfile, enum in Enumerations and Flags
-MbimStkPacType, enum in Enumerations and Flags +MbimStkPacType, enum in Enumerations and Flags
-mbim_stk_pac_profile_get_string, function in Enumerations and Flags +mbim_stk_pac_profile_get_string, function in Enumerations and Flags
-mbim_stk_pac_type_get_string, function in Enumerations and Flags +mbim_stk_pac_type_get_string, function in Enumerations and Flags
-MbimSubscriberReadyState, enum in Enumerations and Flags +MbimSubscriberReadyState, enum in Enumerations and Flags
-mbim_subscriber_ready_state_get_string, function in Enumerations and Flags +mbim_subscriber_ready_state_get_string, function in Enumerations and Flags

U

-MbimUssdAction, enum in Enumerations and Flags +mbim_unregister_custom_service, function in UUIDs +
+
+
+MbimUssdAction, enum in Enumerations and Flags
-MbimUssdResponse, enum in Enumerations and Flags +MbimUssdResponse, enum in Enumerations and Flags
-MbimUssdSessionState, enum in Enumerations and Flags +MbimUssdSessionState, enum in Enumerations and Flags
-mbim_ussd_action_get_string, function in Enumerations and Flags +mbim_ussd_action_get_string, function in Enumerations and Flags
-mbim_ussd_response_get_string, function in Enumerations and Flags +mbim_ussd_response_get_string, function in Enumerations and Flags
-mbim_ussd_session_state_get_string, function in Enumerations and Flags +mbim_ussd_session_state_get_string, function in Enumerations and Flags
-mbim_utils_get_traces_enabled, function in Common utilities +mbim_utils_get_traces_enabled, function in Common utilities
-mbim_utils_set_traces_enabled, function in Common utilities +mbim_utils_set_traces_enabled, function in Common utilities
@@ -1365,7 +1520,7 @@
-mbim_uuid_cmp, function in UUIDs +mbim_uuid_cmp, function in UUIDs
@@ -1373,15 +1528,19 @@
-mbim_uuid_from_context_type, function in UUIDs +mbim_uuid_from_context_type, function in UUIDs
-mbim_uuid_from_service, function in UUIDs +mbim_uuid_from_printable, function in UUIDs
-mbim_uuid_get_printable, function in UUIDs +mbim_uuid_from_service, function in UUIDs +
+
+
+mbim_uuid_get_printable, function in UUIDs
@@ -1389,10 +1548,22 @@
+MBIM_UUID_MS_FIRMWARE_ID, macro in UUIDs +
+
+
+MBIM_UUID_MS_HOST_SHUTDOWN, macro in UUIDs +
+
+
MBIM_UUID_PHONEBOOK, macro in UUIDs
+MBIM_UUID_PROXY_CONTROL, macro in UUIDs +
+
+
MBIM_UUID_SMS, macro in UUIDs
@@ -1401,11 +1572,11 @@
-mbim_uuid_to_context_type, function in UUIDs +mbim_uuid_to_context_type, function in UUIDs
-mbim_uuid_to_service, function in UUIDs +mbim_uuid_to_service, function in UUIDs
@@ -1414,32 +1585,32 @@

V

-MbimVisibleProvidersAction, enum in Enumerations and Flags +MbimVisibleProvidersAction, enum in Enumerations and Flags
-mbim_visible_providers_action_get_string, function in Enumerations and Flags +mbim_visible_providers_action_get_string, function in Enumerations and Flags
-MbimVoiceCallState, enum in Enumerations and Flags +MbimVoiceCallState, enum in Enumerations and Flags
-MbimVoiceClass, enum in Enumerations and Flags +MbimVoiceClass, enum in Enumerations and Flags
-mbim_voice_call_state_get_string, function in Enumerations and Flags +mbim_voice_call_state_get_string, function in Enumerations and Flags
-mbim_voice_class_get_string, function in Enumerations and Flags +mbim_voice_class_get_string, function in Enumerations and Flags
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/ch01.html libmbim-1.10.0/docs/reference/libmbim-glib/html/ch01.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/ch01.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/ch01.html 2014-08-04 13:06:12.000000000 +0000 @@ -2,22 +2,22 @@ -Core +libmbim-glib Reference Manual: Core - + - - - - - - + + + + + +

@@ -27,10 +27,10 @@ Version checks — Version information in the API.
-UUIDs +UUIDs — Generic UUID handling routines.
-Command IDs +Command IDs — Generic command handling routines.
MbimMessage — Generic MBIM message handling routines @@ -39,10 +39,13 @@ MbimDevice — Generic MBIM device handling routines
-Enumerations and Flags +MbimProxy
-Errors +Enumerations and Flags — Common enumeration and flag types. +
+
+Errors — Common error types.
Common utilities @@ -51,6 +54,6 @@

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/ch02.html libmbim-1.10.0/docs/reference/libmbim-glib/html/ch02.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/ch02.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/ch02.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,26 +2,26 @@ -Services +libmbim-glib Reference Manual: Generic Services - + - - - - - - + + + + + +

-Services

+Generic Services
Basic Connect @@ -48,6 +48,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/ch03.html libmbim-1.10.0/docs/reference/libmbim-glib/html/ch03.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/ch03.html 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/ch03.html 2014-08-04 13:06:13.000000000 +0000 @@ -0,0 +1,38 @@ + + + + +libmbim-glib Reference Manual: Other Services + + + + + + + + + + + + + + + + +
+

+Other Services

+
+
+MS Firmware ID +
+
+MS Host Shutdown +
+
+
+
+
+ Generated by GTK-Doc V1.20
+ + \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/ch04.html libmbim-1.10.0/docs/reference/libmbim-glib/html/ch04.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/ch04.html 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/ch04.html 2014-08-04 13:06:12.000000000 +0000 @@ -0,0 +1,33 @@ + + + + +libmbim-glib Reference Manual: Compatibility + + + + + + + + + + + + + + + + +
+

+Compatibility

+
+Deprecated API — Types and functions flagged as deprecated. +
+
+
+
+ Generated by GTK-Doc V1.20
+ + \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/deprecated-api-index.html libmbim-1.10.0/docs/reference/libmbim-glib/html/deprecated-api-index.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/deprecated-api-index.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/deprecated-api-index.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - - - - -Index of deprecated API - - - - - - - - - - - - - - - - -
-

-Index of deprecated API

- -
-
-
- Generated by GTK-Doc V1.19
- - \ No newline at end of file Binary files /tmp/kEtYJx4gkH/libmbim-1.6.0/docs/reference/libmbim-glib/html/home.png and /tmp/HmEfIG1rvy/libmbim-1.10.0/docs/reference/libmbim-glib/html/home.png differ diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/index.html libmbim-1.10.0/docs/reference/libmbim-glib/html/index.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/index.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/index.html 2014-08-04 13:06:12.000000000 +0000 @@ -2,11 +2,11 @@ -libmbim-glib Reference Manual +libmbim-glib Reference Manual: libmbim-glib Reference Manual - + @@ -14,9 +14,9 @@
-

for libmbim-glib 1.6.0 +

for libmbim-glib 1.10.0

-

Copyright © 2013 The libmbim-glib authors

+

Copyright © 2013-2014 The libmbim-glib authors

Permission is granted to copy, distribute and/or modify this @@ -48,10 +48,10 @@ Version checks — Version information in the API.

-UUIDs +UUIDs — Generic UUID handling routines.
-Command IDs +Command IDs — Generic command handling routines.
MbimMessage — Generic MBIM message handling routines @@ -60,16 +60,19 @@ MbimDevice — Generic MBIM device handling routines
-Enumerations and Flags +MbimProxy
-Errors +Enumerations and Flags — Common enumeration and flag types. +
+
+Errors — Common error types.
Common utilities
-
Services
+
Generic Services
Basic Connect @@ -93,14 +96,26 @@ DSS
+
Other Services
+
+
+MS Firmware ID +
+
+MS Host Shutdown +
+
+
Compatibility
+
+Deprecated API — Types and functions flagged as deprecated. +
Object Hierarchy
API Index
-
Index of deprecated API
Annotation Glossary
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/index.sgml libmbim-1.10.0/docs/reference/libmbim-glib/html/index.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/html/index.sgml 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/index.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -1,38 +1,35 @@ - + + - + + - - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -42,79 +39,15 @@ - - - - - - - - + + + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,31 +59,26 @@ + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - + @@ -190,15 +118,21 @@ + + + + + + - - - + + + + - - + @@ -208,12 +142,23 @@ + + + + + + + + + + + @@ -221,322 +166,31 @@ + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -585,109 +239,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + - + + - + + + - - + - - - - - - - + @@ -703,6 +345,7 @@ + @@ -732,8 +375,8 @@ - - + + @@ -742,23 +385,32 @@ + + + + + + + + + + + - + + + - - + - - - @@ -773,28 +425,38 @@ + + + + + - + + - + + - + + - + + - + + + - - + @@ -805,10 +467,13 @@ + + - + + - + @@ -818,12 +483,41 @@ + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/kEtYJx4gkH/libmbim-1.6.0/docs/reference/libmbim-glib/html/left-insensitive.png and /tmp/HmEfIG1rvy/libmbim-1.10.0/docs/reference/libmbim-glib/html/left-insensitive.png differ Binary files /tmp/kEtYJx4gkH/libmbim-1.6.0/docs/reference/libmbim-glib/html/left.png and /tmp/HmEfIG1rvy/libmbim-1.10.0/docs/reference/libmbim-glib/html/left.png differ diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Auth.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Auth.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Auth.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Auth.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -Auth +libmbim-glib Reference Manual: Auth - + - + - - - - - - - - - - + + + + + + +
@@ -33,50 +30,70 @@

Auth

Auth

- +
-
-

Synopsis

-
MbimMessage *       mbim_message_auth_aka_query_new     (const guint8 *rand,
-                                                         const guint8 *autn,
-                                                         GError **error);
-gboolean            mbim_message_auth_aka_response_parse
-                                                        (const MbimMessage *message,
-                                                         const guint8 **res,
-                                                         guint32 *res_len,
-                                                         const guint8 **integrating_key,
-                                                         const guint8 **ciphering_key,
-                                                         const guint8 **auts,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_auth_akap_query_new    (const guint8 *rand,
-                                                         const guint8 *autn,
-                                                         const gchar *network_name,
-                                                         GError **error);
-gboolean            mbim_message_auth_akap_response_parse
-                                                        (const MbimMessage *message,
-                                                         const guint8 **res,
-                                                         guint32 *res_len,
-                                                         const guint8 **integrating_key,
-                                                         const guint8 **ciphering_key,
-                                                         const guint8 **auts,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_auth_sim_query_new     (const guint8 *rand1,
-                                                         const guint8 *rand2,
-                                                         const guint8 *rand3,
-                                                         guint32 n,
-                                                         GError **error);
-gboolean            mbim_message_auth_sim_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *sres1,
-                                                         guint64 *kc1,
-                                                         guint32 *sres2,
-                                                         guint64 *kc2,
-                                                         guint32 *sres3,
-                                                         guint64 *kc3,
-                                                         guint32 *n,
-                                                         GError **error);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+MbimMessage *
+
+mbim_message_auth_aka_query_new ()
+

+gboolean
+
+mbim_message_auth_aka_response_parse ()
+

+MbimMessage *
+
+mbim_message_auth_akap_query_new ()
+

+gboolean
+
+mbim_message_auth_akap_response_parse ()
+

+MbimMessage *
+
+mbim_message_auth_sim_query_new ()
+

+gboolean
+
+mbim_message_auth_sim_response_parse ()
+

+

+

+
Object Hierarchy

+
 

 

 

@@ -85,305 +102,372 @@
 

 

 

-
Details

+
Functions

 

-
mbim_message_auth_aka_query_new ()

-
MbimMessage *       mbim_message_auth_aka_query_new     (const guint8 *rand,
-                                                         const guint8 *autn,
-                                                         GError **error);

-

-Create a new request for the 'Aka' query command in the 'Auth' service.
-

-

+
mbim_message_auth_aka_query_new ()

+
MbimMessage *
+mbim_message_auth_aka_query_new (const guint8 *rand,
+                                 const guint8 *autn,
+                                 GError **error);

+
Create a new request for the 'Aka' query command in the 'Auth' service.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
rand :
the 'Rand' field, given as an array of 16 guint8 values.
rand
the 'Rand' field, given as an array of 16 guint8 values.
 
 

 
autn :
the 'Autn' field, given as an array of 16 guint8 values.
autn
the 'Autn' field, given as an array of 16 guint8 values.
 
 

 
error :
return location for error or NULL.
Returns :
a newly allocated MbimMessage, which should be freed with mbim_message_unref().
error
return location for error or NULL.
 
 

 
 

 

+

+
Returns

+
 a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+

+

 

 

-
mbim_message_auth_aka_response_parse ()

-
gboolean            mbim_message_auth_aka_response_parse
-                                                        (const MbimMessage *message,
-                                                         const guint8 **res,
-                                                         guint32 *res_len,
-                                                         const guint8 **integrating_key,
-                                                         const guint8 **ciphering_key,
-                                                         const guint8 **auts,
-                                                         GError **error);

-

-Create a new request for the 'Auts' response command in the 'Auth' service.
-

-

+
mbim_message_auth_aka_response_parse ()

+
gboolean
+mbim_message_auth_aka_response_parse (const MbimMessage *message,
+                                      const guint8 **res,
+                                      guint32 *res_len,
+                                      const guint8 **integrating_key,
+                                      const guint8 **ciphering_key,
+                                      const guint8 **auts,
+                                      GError **error);

+
Create a new request for the 'Auts' response command in the 'Auth' service.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
message :
the MbimMessage.
message
the MbimMessage.
 
 

 
res :
return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message.
res
return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message
+.
 
 

 
res_len :
return location for a guint32, or NULL if the 'ResLen' field is not needed.
res_len
return location for a guint32, or NULL if the 'ResLen' field is not needed.
 
 

 
integrating_key :
return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message.
integrating_key
return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message
+.
 
 

 
ciphering_key :
return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message.
ciphering_key
return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message
+.
 
 

 
auts :
return location for an array of 14 guint8 values. Do not free the returned value, it is owned by message.
auts
return location for an array of 14 guint8 values. Do not free the returned value, it is owned by message
+.
 
 

 
error :
return location for error or NULL.
Returns :

-TRUE if the message was correctly parsed, FALSE if error is set.
error
return location for error or NULL.
 
 

 
 

 

+

+
Returns

+
 TRUE if the message was correctly parsed, FALSE if error
+is set.

+

+

+
-

mbim_message_auth_akap_query_new ()

-
MbimMessage *       mbim_message_auth_akap_query_new    (const guint8 *rand,
-                                                         const guint8 *autn,
-                                                         const gchar *network_name,
-                                                         GError **error);
-

-Create a new request for the 'Akap' query command in the 'Auth' service. -

-
+

mbim_message_auth_akap_query_new ()

+
MbimMessage *
+mbim_message_auth_akap_query_new (const guint8 *rand,
+                                  const guint8 *autn,
+                                  const gchar *network_name,
+                                  GError **error);
+

Create a new request for the 'Akap' query command in the 'Auth' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - - - - - + + +

rand :

the 'Rand' field, given as an array of 16 guint8 values.

rand

the 'Rand' field, given as an array of 16 guint8 values.

 

autn :

the 'Autn' field, given as an array of 16 guint8 values.

autn

the 'Autn' field, given as an array of 16 guint8 values.

 

network_name :

the 'NetworkName' field, given as a string.

network_name

the 'NetworkName' field, given as a string.

 

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_auth_akap_response_parse ()

-
gboolean            mbim_message_auth_akap_response_parse
-                                                        (const MbimMessage *message,
-                                                         const guint8 **res,
-                                                         guint32 *res_len,
-                                                         const guint8 **integrating_key,
-                                                         const guint8 **ciphering_key,
-                                                         const guint8 **auts,
-                                                         GError **error);
-

-Create a new request for the 'Auts' response command in the 'Auth' service. -

-
+

mbim_message_auth_akap_response_parse ()

+
gboolean
+mbim_message_auth_akap_response_parse (const MbimMessage *message,
+                                       const guint8 **res,
+                                       guint32 *res_len,
+                                       const guint8 **integrating_key,
+                                       const guint8 **ciphering_key,
+                                       const guint8 **auts,
+                                       GError **error);
+

Create a new request for the 'Auts' response command in the 'Auth' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - - - - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

res :

return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message.

res

return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message +.

 

res_len :

return location for a guint32, or NULL if the 'ResLen' field is not needed.

res_len

return location for a guint32, or NULL if the 'ResLen' field is not needed.

 

integrating_key :

return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message.

integrating_key

return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message +.

 

ciphering_key :

return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message.

ciphering_key

return location for an array of 16 guint8 values. Do not free the returned value, it is owned by message +.

 

auts :

return location for an array of 14 guint8 values. Do not free the returned value, it is owned by message.

auts

return location for an array of 14 guint8 values. Do not free the returned value, it is owned by message +.

 

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_auth_sim_query_new ()

-
MbimMessage *       mbim_message_auth_sim_query_new     (const guint8 *rand1,
-                                                         const guint8 *rand2,
-                                                         const guint8 *rand3,
-                                                         guint32 n,
-                                                         GError **error);
-

-Create a new request for the 'Sim' query command in the 'Auth' service. -

-
+

mbim_message_auth_sim_query_new ()

+
MbimMessage *
+mbim_message_auth_sim_query_new (const guint8 *rand1,
+                                 const guint8 *rand2,
+                                 const guint8 *rand3,
+                                 guint32 n,
+                                 GError **error);
+

Create a new request for the 'Sim' query command in the 'Auth' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + + - - - - - - + + +

rand1 :

the 'Rand1' field, given as an array of 16 guint8 values.

rand1

the 'Rand1' field, given as an array of 16 guint8 values.

 

rand2 :

the 'Rand2' field, given as an array of 16 guint8 values.

rand2

the 'Rand2' field, given as an array of 16 guint8 values.

 

rand3 :

the 'Rand3' field, given as an array of 16 guint8 values.

rand3

the 'Rand3' field, given as an array of 16 guint8 values.

 

n :

the 'N' field, given as a guint32.

n

the 'N' field, given as a guint32.

 

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_auth_sim_response_parse ()

-
gboolean            mbim_message_auth_sim_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *sres1,
-                                                         guint64 *kc1,
-                                                         guint32 *sres2,
-                                                         guint64 *kc2,
-                                                         guint32 *sres3,
-                                                         guint64 *kc3,
-                                                         guint32 *n,
-                                                         GError **error);
-

-Create a new request for the 'N' response command in the 'Auth' service. -

-
+

mbim_message_auth_sim_response_parse ()

+
gboolean
+mbim_message_auth_sim_response_parse (const MbimMessage *message,
+                                      guint32 *sres1,
+                                      guint64 *kc1,
+                                      guint32 *sres2,
+                                      guint64 *kc2,
+                                      guint32 *sres3,
+                                      guint64 *kc3,
+                                      guint32 *n,
+                                      GError **error);
+

Create a new request for the 'N' response command in the 'Auth' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

sres1 :

return location for a guint32, or NULL if the 'Sres1' field is not needed.

message

the MbimMessage.

 

kc1 :

return location for a guint64, or NULL if the 'Kc1' field is not needed.

sres1

return location for a guint32, or NULL if the 'Sres1' field is not needed.

 

sres2 :

return location for a guint32, or NULL if the 'Sres2' field is not needed.

kc1

return location for a guint64, or NULL if the 'Kc1' field is not needed.

 

kc2 :

return location for a guint64, or NULL if the 'Kc2' field is not needed.

sres2

return location for a guint32, or NULL if the 'Sres2' field is not needed.

 

sres3 :

return location for a guint32, or NULL if the 'Sres3' field is not needed.

kc2

return location for a guint64, or NULL if the 'Kc2' field is not needed.

 

kc3 :

return location for a guint64, or NULL if the 'Kc3' field is not needed.

sres3

return location for a guint32, or NULL if the 'Sres3' field is not needed.

 

n :

return location for a guint32, or NULL if the 'N' field is not needed.

kc3

return location for a guint64, or NULL if the 'Kc3' field is not needed.

 

error :

return location for error or NULL.

n

return location for a guint32, or NULL if the 'N' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+ + +
+

Types and Values

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Basic-Connect.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Basic-Connect.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Basic-Connect.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Basic-Connect.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -Basic Connect +libmbim-glib Reference Manual: Basic Connect - - + + - + - - - - - - - - - - + + + + + + +
@@ -33,3704 +30,4820 @@

Basic Connect

Basic Connect

- +
-
-

Synopsis

-
                    MbimPinDesc;
-void                mbim_pin_desc_free                  (MbimPinDesc *var);
-
-                    MbimProvider;
-void                mbim_provider_free                  (MbimProvider *var);
-void                mbim_provider_array_free            (MbimProvider **array);
-
-                    MbimProvisionedContextElement;
-void                mbim_provisioned_context_element_array_free
-                                                        (MbimProvisionedContextElement **array);
-
-                    MbimIPv4Element;
-void                mbim_ipv4_element_array_free        (MbimIPv4Element **array);
-
-                    MbimIPv6Element;
-void                mbim_ipv6_element_array_free        (MbimIPv6Element **array);
-
-                    MbimDeviceServiceElement;
-void                mbim_device_service_element_array_free
-                                                        (MbimDeviceServiceElement **array);
-
-                    MbimEventEntry;
-void                mbim_event_entry_array_free         (MbimEventEntry **array);
-
-                    MbimPacketFilter;
-void                mbim_packet_filter_array_free       (MbimPacketFilter **array);
-
-MbimMessage *       mbim_message_device_caps_query_new  (GError **error);
-gboolean            mbim_message_device_caps_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimDeviceType *device_type,
-                                                         MbimCellularClass *cellular_class,
-                                                         MbimVoiceClass *voice_class,
-                                                         MbimSimClass *sim_class,
-                                                         MbimDataClass *data_class,
-                                                         MbimSmsCaps *sms_caps,
-                                                         MbimCtrlCaps *control_caps,
-                                                         guint32 *max_sessions,
-                                                         gchar **custom_data_class,
-                                                         gchar **device_id,
-                                                         gchar **firmware_info,
-                                                         gchar **hardware_info,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_subscriber_ready_status_query_new
-                                                        (GError **error);
-gboolean            mbim_message_subscriber_ready_status_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSubscriberReadyState *ready_state,
-                                                         gchar **subscriber_id,
-                                                         gchar **sim_icc_id,
-                                                         MbimReadyInfoFlag *ready_info,
-                                                         guint32 *telephone_numbers_count,
-                                                         gchar ***telephone_numbers,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_radio_state_query_new  (GError **error);
-MbimMessage *       mbim_message_radio_state_set_new    (MbimRadioSwitchState radio_state,
-                                                         GError **error);
-gboolean            mbim_message_radio_state_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimRadioSwitchState *hw_radio_state,
-                                                         MbimRadioSwitchState *sw_radio_state,
-                                                         GError **error);
-gboolean            mbim_message_radio_state_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimRadioSwitchState *hw_radio_state,
-                                                         MbimRadioSwitchState *sw_radio_state,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_pin_query_new          (GError **error);
-MbimMessage *       mbim_message_pin_set_new            (MbimPinType pin_type,
-                                                         MbimPinOperation pin_operation,
-                                                         const gchar *pin,
-                                                         const gchar *new_pin,
-                                                         GError **error);
-gboolean            mbim_message_pin_response_parse     (const MbimMessage *message,
-                                                         MbimPinType *pin_type,
-                                                         MbimPinState *pin_state,
-                                                         guint32 *remaining_attempts,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_pin_list_query_new     (GError **error);
-gboolean            mbim_message_pin_list_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimPinDesc **pin_desc_pin1,
-                                                         MbimPinDesc **pin_desc_pin2,
-                                                         MbimPinDesc **pin_desc_device_sim_pin,
-                                                         MbimPinDesc **pin_desc_device_first_sim_pin,
-                                                         MbimPinDesc **pin_desc_network_pin,
-                                                         MbimPinDesc **pin_desc_network_subset_pin,
-                                                         MbimPinDesc **pin_desc_service_provider_pin,
-                                                         MbimPinDesc **pin_desc_corporate_pin,
-                                                         MbimPinDesc **pin_desc_subsidy_lock,
-                                                         MbimPinDesc **pin_desc_custom,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_home_provider_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_home_provider_set_new  (const MbimProvider *provider,
-                                                         GError **error);
-gboolean            mbim_message_home_provider_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimProvider **provider,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_preferred_providers_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_preferred_providers_set_new
-                                                        (guint32 providers_count,
-                                                         const MbimProvider *const *providers,
-                                                         GError **error);
-gboolean            mbim_message_preferred_providers_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *providers_count,
-                                                         MbimProvider ***providers,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_visible_providers_query_new
-                                                        (MbimVisibleProvidersAction action,
-                                                         GError **error);
-gboolean            mbim_message_visible_providers_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *providers_count,
-                                                         MbimProvider ***providers,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_register_state_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_register_state_set_new (const gchar *provider_id,
-                                                         MbimRegisterAction register_action,
-                                                         MbimDataClass data_class,
-                                                         GError **error);
-gboolean            mbim_message_register_state_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNwError *nw_error,
-                                                         MbimRegisterState *register_state,
-                                                         MbimRegisterMode *register_mode,
-                                                         MbimDataClass *available_data_classes,
-                                                         MbimCellularClass *current_cellular_class,
-                                                         gchar **provider_id,
-                                                         gchar **provider_name,
-                                                         gchar **roaming_text,
-                                                         MbimRegistrationFlag *registration_flag,
-                                                         GError **error);
-gboolean            mbim_message_register_state_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNwError *nw_error,
-                                                         MbimRegisterState *register_state,
-                                                         MbimRegisterMode *register_mode,
-                                                         MbimDataClass *available_data_classes,
-                                                         MbimCellularClass *current_cellular_class,
-                                                         gchar **provider_id,
-                                                         gchar **provider_name,
-                                                         gchar **roaming_text,
-                                                         MbimRegistrationFlag *registration_flag,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_signal_state_query_new (GError **error);
-MbimMessage *       mbim_message_signal_state_set_new   (guint32 signal_strength_interval,
-                                                         guint32 rssi_threshold,
-                                                         guint32 error_rate_threshold,
-                                                         GError **error);
-gboolean            mbim_message_signal_state_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *rssi,
-                                                         guint32 *error_rate,
-                                                         guint32 *signal_strength_interval,
-                                                         guint32 *rssi_threshold,
-                                                         guint32 *error_rate_threshold,
-                                                         GError **error);
-gboolean            mbim_message_signal_state_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *rssi,
-                                                         guint32 *error_rate,
-                                                         guint32 *signal_strength_interval,
-                                                         guint32 *rssi_threshold,
-                                                         guint32 *error_rate_threshold,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_packet_service_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_packet_service_set_new (MbimPacketServiceAction packet_service_action,
-                                                         GError **error);
-gboolean            mbim_message_packet_service_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *nw_error,
-                                                         MbimPacketServiceState *packet_service_state,
-                                                         MbimDataClass *highest_available_data_class,
-                                                         guint64 *uplink_speed,
-                                                         guint64 *downlink_speed,
-                                                         GError **error);
-gboolean            mbim_message_packet_service_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *nw_error,
-                                                         MbimPacketServiceState *packet_service_state,
-                                                         MbimDataClass *highest_available_data_class,
-                                                         guint64 *uplink_speed,
-                                                         guint64 *downlink_speed,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_connect_query_new      (guint32 session_id,
-                                                         MbimActivationState activation_state,
-                                                         MbimVoiceCallState voice_call_state,
-                                                         MbimContextIpType ip_type,
-                                                         const MbimUuid *context_type,
-                                                         guint32 nw_error,
-                                                         GError **error);
-MbimMessage *       mbim_message_connect_set_new        (guint32 session_id,
-                                                         MbimActivationCommand activation_command,
-                                                         const gchar *access_string,
-                                                         const gchar *user_name,
-                                                         const gchar *password,
-                                                         MbimCompression compression,
-                                                         MbimAuthProtocol auth_protocol,
-                                                         MbimContextIpType ip_type,
-                                                         const MbimUuid *context_type,
-                                                         GError **error);
-gboolean            mbim_message_connect_response_parse (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimActivationState *activation_state,
-                                                         MbimVoiceCallState *voice_call_state,
-                                                         MbimContextIpType *ip_type,
-                                                         const MbimUuid **context_type,
-                                                         guint32 *nw_error,
-                                                         GError **error);
-gboolean            mbim_message_connect_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimActivationState *activation_state,
-                                                         MbimVoiceCallState *voice_call_state,
-                                                         MbimContextIpType *ip_type,
-                                                         const MbimUuid **context_type,
-                                                         guint32 *nw_error,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_provisioned_contexts_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_provisioned_contexts_set_new
-                                                        (guint32 context_id,
-                                                         const MbimUuid *context_type,
-                                                         const gchar *access_string,
-                                                         const gchar *user_name,
-                                                         const gchar *password,
-                                                         MbimCompression compression,
-                                                         MbimAuthProtocol auth_protocol,
-                                                         const gchar *provider_id,
-                                                         GError **error);
-gboolean            mbim_message_provisioned_contexts_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *provisioned_contexts_count,
-                                                         MbimProvisionedContextElement ***provisioned_contexts,
-                                                         GError **error);
-gboolean            mbim_message_provisioned_contexts_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *provisioned_contexts_count,
-                                                         MbimProvisionedContextElement ***provisioned_contexts,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_service_activation_set_new
-                                                        (const guint32 buffer_size,
-                                                         const guint8 *buffer,
-                                                         GError **error);
-gboolean            mbim_message_service_activation_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNwError *nw_error,
-                                                         guint32 *buffer_size,
-                                                         const guint8 **buffer,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_ip_configuration_query_new
-                                                        (guint32 session_id,
-                                                         MbimIPConfigurationAvailableFlag ipv4_configuration_available,
-                                                         MbimIPConfigurationAvailableFlag ipv6_configuration_available,
-                                                         guint32 ipv4_address_count,
-                                                         const MbimIPv4Element *const *ipv4_address,
-                                                         guint32 ipv6_address_count,
-                                                         const MbimIPv6Element *const *ipv6_address,
-                                                         const MbimIPv4 *ipv4_gateway,
-                                                         const MbimIPv6 *ipv6_gateway,
-                                                         guint32 ipv4_dns_server_count,
-                                                         const MbimIPv4 *ipv4_dns_server,
-                                                         guint32 ipv6_dns_server_count,
-                                                         const MbimIPv6 *ipv6_dns_server,
-                                                         guint32 ipv4_mtu,
-                                                         guint32 ipv6_mtu,
-                                                         GError **error);
-gboolean            mbim_message_ip_configuration_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimIPConfigurationAvailableFlag *ipv4_configuration_available,
-                                                         MbimIPConfigurationAvailableFlag *ipv6_configuration_available,
-                                                         guint32 *ipv4_address_count,
-                                                         MbimIPv4Element ***ipv4_address,
-                                                         guint32 *ipv6_address_count,
-                                                         MbimIPv6Element ***ipv6_address,
-                                                         const MbimIPv4 **ipv4_gateway,
-                                                         const MbimIPv6 **ipv6_gateway,
-                                                         guint32 *ipv4_dns_server_count,
-                                                         MbimIPv4 **ipv4_dns_server,
-                                                         guint32 *ipv6_dns_server_count,
-                                                         MbimIPv6 **ipv6_dns_server,
-                                                         guint32 *ipv4_mtu,
-                                                         guint32 *ipv6_mtu,
-                                                         GError **error);
-gboolean            mbim_message_ip_configuration_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimIPConfigurationAvailableFlag *ipv4_configuration_available,
-                                                         MbimIPConfigurationAvailableFlag *ipv6_configuration_available,
-                                                         guint32 *ipv4_address_count,
-                                                         MbimIPv4Element ***ipv4_address,
-                                                         guint32 *ipv6_address_count,
-                                                         MbimIPv6Element ***ipv6_address,
-                                                         const MbimIPv4 **ipv4_gateway,
-                                                         const MbimIPv6 **ipv6_gateway,
-                                                         guint32 *ipv4_dns_server_count,
-                                                         MbimIPv4 **ipv4_dns_server,
-                                                         guint32 *ipv6_dns_server_count,
-                                                         MbimIPv6 **ipv6_dns_server,
-                                                         guint32 *ipv4_mtu,
-                                                         guint32 *ipv6_mtu,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_device_services_query_new
-                                                        (GError **error);
-gboolean            mbim_message_device_services_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *device_services_count,
-                                                         guint32 *max_dss_sessions,
-                                                         MbimDeviceServiceElement ***device_services,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_device_service_subscriber_list_set_new
-                                                        (guint32 events_count,
-                                                         const MbimEventEntry *const *events,
-                                                         GError **error);
-gboolean            mbim_message_device_service_subscriber_list_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *events_count,
-                                                         MbimEventEntry ***events,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_packet_statistics_query_new
-                                                        (GError **error);
-gboolean            mbim_message_packet_statistics_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *in_discards,
-                                                         guint32 *in_errors,
-                                                         guint64 *in_octets,
-                                                         guint64 *in_packets,
-                                                         guint64 *out_octets,
-                                                         guint64 *out_packets,
-                                                         guint32 *out_errors,
-                                                         guint32 *out_discards,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_network_idle_hint_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_network_idle_hint_set_new
-                                                        (MbimNetworkIdleHintState state,
-                                                         GError **error);
-gboolean            mbim_message_network_idle_hint_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNetworkIdleHintState *state,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_emergency_mode_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_emergency_mode_set_new (MbimEmergencyModeState state,
-                                                         GError **error);
-gboolean            mbim_message_emergency_mode_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimEmergencyModeState *state,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_ip_packet_filters_query_new
-                                                        (guint32 session_id,
-                                                         guint32 packet_filters_count,
-                                                         const MbimPacketFilter *const *packet_filters,
-                                                         GError **error);
-MbimMessage *       mbim_message_ip_packet_filters_set_new
-                                                        (guint32 session_id,
-                                                         guint32 packet_filters_count,
-                                                         const MbimPacketFilter *const *packet_filters,
-                                                         GError **error);
-gboolean            mbim_message_ip_packet_filters_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         guint32 *packet_filters_count,
-                                                         MbimPacketFilter ***packet_filters,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_multicarrier_providers_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_multicarrier_providers_set_new
-                                                        (guint32 providers_count,
-                                                         const MbimProvider *const *providers,
-                                                         GError **error);
-gboolean            mbim_message_multicarrier_providers_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *providers_count,
-                                                         MbimProvider ***providers,
-                                                         GError **error);
-
-
-

Description

-

-

-
-
-

Details

-
-

MbimPinDesc

-
typedef struct {
-    guint32 pin_mode;
-    guint32 pin_format;
-    guint32 pin_length_min;
-    guint32 pin_length_max;
-} MbimPinDesc;
-
-
+

Functions

+
--++ - - + + - - + + - - + + - - + + - -

guint32 pin_mode;

a guint32. +void + +mbim_pin_desc_free () +

guint32 pin_format;

a guint32. +void + +mbim_provider_free () +

guint32 pin_length_min;

a guint32. +void + +mbim_provider_array_free () +

guint32 pin_length_max;

a guint32. +void + +mbim_provisioned_context_element_array_free () +
-
-
-
-

mbim_pin_desc_free ()

-
void                mbim_pin_desc_free                  (MbimPinDesc *var);
-

-Frees the memory allocated for the MbimPinDesc. -

-
---- - - - - -

var :

a MbimPinDesc.
-
-
-
-

MbimProvider

-
typedef struct {
-    gchar *provider_id;
-    guint32 provider_state;
-    gchar *provider_name;
-    guint32 cellular_class;
-    guint32 rssi;
-    guint32 error_rate;
-} MbimProvider;
-
-
---- - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -

gchar *provider_id;

a string. +void + +mbim_ipv4_element_array_free () +

guint32 provider_state;

a guint32. +void + +mbim_ipv6_element_array_free () +

gchar *provider_name;

a string. +void + +mbim_device_service_element_array_free () +

guint32 cellular_class;

a guint32. +void + +mbim_event_entry_array_free () +

guint32 rssi;

a guint32. +void + +mbim_packet_filter_array_free () +

guint32 error_rate;

a guint32. +MbimMessage * + +mbim_message_device_caps_query_new () +
+gboolean + +mbim_message_device_caps_response_parse () +
+MbimMessage * + +mbim_message_subscriber_ready_status_query_new () +
+gboolean + +mbim_message_subscriber_ready_status_response_parse () +
+gboolean + +mbim_message_subscriber_ready_status_notification_parse () +
+MbimMessage * + +mbim_message_radio_state_query_new () +
+MbimMessage * + +mbim_message_radio_state_set_new () +
+gboolean + +mbim_message_radio_state_response_parse () +
+gboolean + +mbim_message_radio_state_notification_parse () +
-
-
-
-

mbim_provider_free ()

-
void                mbim_provider_free                  (MbimProvider *var);
-

-Frees the memory allocated for the MbimProvider. -

-
---- - - - - -

var :

a MbimProvider.
-
-
-
-

mbim_provider_array_free ()

-
void                mbim_provider_array_free            (MbimProvider **array);
-

-Frees the memory allocated for the array of MbimProviders. -

-
---- - - - - -

array :

a NULL terminated array of MbimProvider structs.
-
-
-
-

MbimProvisionedContextElement

-
typedef struct {
-    guint32 context_id;
-    MbimUuid context_type;
-    gchar *access_string;
-    gchar *user_name;
-    gchar *password;
-    guint32 compression;
-    guint32 auth_protocol;
-} MbimProvisionedContextElement;
-
-
---- - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

guint32 context_id;

a guint32. +MbimMessage * + +mbim_message_pin_query_new () +
+MbimMessage * + +mbim_message_pin_set_new () +

MbimUuid context_type;

a MbimUuid. +gboolean + +mbim_message_pin_response_parse () +

gchar *access_string;

a string. +MbimMessage * + +mbim_message_pin_list_query_new () +

gchar *user_name;

a string. +gboolean + +mbim_message_pin_list_response_parse () +

gchar *password;

a string. +MbimMessage * + +mbim_message_home_provider_query_new () +

guint32 compression;

a guint32. +MbimMessage * + +mbim_message_home_provider_set_new () +

guint32 auth_protocol;

a guint32. +gboolean + +mbim_message_home_provider_response_parse () +
+MbimMessage * + +mbim_message_preferred_providers_query_new () +
+MbimMessage * + +mbim_message_preferred_providers_set_new () +
+gboolean + +mbim_message_preferred_providers_response_parse () +
+gboolean + +mbim_message_preferred_providers_notification_parse () +
+MbimMessage * + +mbim_message_visible_providers_query_new () +
+gboolean + +mbim_message_visible_providers_response_parse () +
+MbimMessage * + +mbim_message_register_state_query_new () +
+MbimMessage * + +mbim_message_register_state_set_new () +
+gboolean + +mbim_message_register_state_response_parse () +
+gboolean + +mbim_message_register_state_notification_parse () +
+MbimMessage * + +mbim_message_signal_state_query_new () +
+MbimMessage * + +mbim_message_signal_state_set_new () +
+gboolean + +mbim_message_signal_state_response_parse () +
+gboolean + +mbim_message_signal_state_notification_parse () +
+MbimMessage * + +mbim_message_packet_service_query_new () +
+MbimMessage * + +mbim_message_packet_service_set_new () +
+gboolean + +mbim_message_packet_service_response_parse () +
+gboolean + +mbim_message_packet_service_notification_parse () +
+MbimMessage * + +mbim_message_connect_query_new () +
+MbimMessage * + +mbim_message_connect_set_new () +
+gboolean + +mbim_message_connect_response_parse () +
+gboolean + +mbim_message_connect_notification_parse () +
+MbimMessage * + +mbim_message_provisioned_contexts_query_new () +
+MbimMessage * + +mbim_message_provisioned_contexts_set_new () +
+gboolean + +mbim_message_provisioned_contexts_response_parse () +
+gboolean + +mbim_message_provisioned_contexts_notification_parse () +
+MbimMessage * + +mbim_message_service_activation_set_new () +
+gboolean + +mbim_message_service_activation_response_parse () +
+MbimMessage * + +mbim_message_ip_configuration_query_new () +
+gboolean + +mbim_message_ip_configuration_response_parse () +
+gboolean + +mbim_message_ip_configuration_notification_parse () +
+MbimMessage * + +mbim_message_device_services_query_new () +
+gboolean + +mbim_message_device_services_response_parse () +
+MbimMessage * + +mbim_message_device_service_subscribe_list_set_new () +
+gboolean + +mbim_message_device_service_subscribe_list_response_parse () +
+MbimMessage * + +mbim_message_packet_statistics_query_new () +
+gboolean + +mbim_message_packet_statistics_response_parse () +
+MbimMessage * + +mbim_message_network_idle_hint_query_new () +
+MbimMessage * + +mbim_message_network_idle_hint_set_new () +
+gboolean + +mbim_message_network_idle_hint_response_parse () +
+MbimMessage * + +mbim_message_emergency_mode_query_new () +
+MbimMessage * + +mbim_message_emergency_mode_set_new () +
+gboolean + +mbim_message_emergency_mode_response_parse () +
+gboolean + +mbim_message_emergency_mode_notification_parse () +
+MbimMessage * + +mbim_message_ip_packet_filters_query_new () +
+MbimMessage * + +mbim_message_ip_packet_filters_set_new () +
+gboolean + +mbim_message_ip_packet_filters_response_parse () +
+MbimMessage * + +mbim_message_multicarrier_providers_query_new () +
+MbimMessage * + +mbim_message_multicarrier_providers_set_new () +
+gboolean + +mbim_message_multicarrier_providers_response_parse () +
+gboolean + +mbim_message_multicarrier_providers_notification_parse () +
-
-
-

mbim_provisioned_context_element_array_free ()

-
void                mbim_provisioned_context_element_array_free
-                                                        (MbimProvisionedContextElement **array);
-

-Frees the memory allocated for the array of MbimProvisionedContextElements. -

-
---- - - - - -

array :

a NULL terminated array of MbimProvisionedContextElement structs.
-
-
-
-

MbimIPv4Element

-
typedef struct {
-    guint32 on_link_prefix_length;
-    MbimIPv4 ipv4_address;
-} MbimIPv4Element;
-
-
+
+

Types and Values

+
--++ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + +

guint32 on_link_prefix_length;

a guint32. MbimPinDesc

MbimIPv4 ipv4_address;

a MbimIPv4. MbimProvider
 MbimProvisionedContextElement
 MbimIPv4Element
 MbimIPv6Element
 MbimDeviceServiceElement
 MbimEventEntry
 MbimPacketFilter
-
-
-

mbim_ipv4_element_array_free ()

-
void                mbim_ipv4_element_array_free        (MbimIPv4Element **array);
+
+

Object Hierarchy

+
+
+
+
+

Description

-Frees the memory allocated for the array of MbimIPv4Elements.

-
---+ +
+

Functions

+
+

mbim_pin_desc_free ()

+
void
+mbim_pin_desc_free (MbimPinDesc *var);
+

Frees the memory allocated for the MbimPinDesc.

+
+

Parameters

+
++++ - - + + + -

array :

a NULL terminated array of MbimIPv4Element structs.

var

a MbimPinDesc.

 
-
-
-
-

MbimIPv6Element

-
typedef struct {
-    guint32 on_link_prefix_length;
-    MbimIPv6 ipv6_address;
-} MbimIPv6Element;
-
-
---+
+
+
+
+
+

mbim_provider_free ()

+
void
+mbim_provider_free (MbimProvider *var);
+

Frees the memory allocated for the MbimProvider.

+
+

Parameters

+
++++ - - - - - - - - - - + + + + +

guint32 on_link_prefix_length;

a guint32.

MbimIPv6 ipv6_address;

a MbimIPv6 -

var

a MbimProvider.

 
+
-

mbim_ipv6_element_array_free ()

-
void                mbim_ipv6_element_array_free        (MbimIPv6Element **array);
-

-Frees the memory allocated for the array of MbimIPv6Elements. -

-
---+

mbim_provider_array_free ()

+
void
+mbim_provider_array_free (MbimProvider **array);
+

Frees the memory allocated for the array of MbimProviders.

+
+

Parameters

+
++++ - - + + +

array :

a NULL terminated array of MbimIPv6Element structs.

array

a NULL terminated array of MbimProvider structs.

 
+
-

MbimDeviceServiceElement

-
typedef struct {
-    MbimUuid device_service_id;
-    guint32 dss_payload;
-    guint32 max_dss_instances;
-    guint32 cids_count;
-    guint32 *cids;
-} MbimDeviceServiceElement;
-
-
---+

mbim_provisioned_context_element_array_free ()

+
void
+mbim_provisioned_context_element_array_free
+                               (MbimProvisionedContextElement **array);
+

Frees the memory allocated for the array of MbimProvisionedContextElements.

+
+

Parameters

+
++++ - - - - - - - - - - - - - - - - - - - - - - + + + + +

MbimUuid device_service_id;

a MbimUuid.

guint32 dss_payload;

a guint32.

guint32 max_dss_instances;

a guint32.

guint32 cids_count;

a guint32.

guint32 *cids;

an array of guint32 values.

array

a NULL terminated array of MbimProvisionedContextElement structs.

 
+
-

mbim_device_service_element_array_free ()

-
void                mbim_device_service_element_array_free
-                                                        (MbimDeviceServiceElement **array);
-

-Frees the memory allocated for the array of MbimDeviceServiceElements. -

-
---+

mbim_ipv4_element_array_free ()

+
void
+mbim_ipv4_element_array_free (MbimIPv4Element **array);
+

Frees the memory allocated for the array of MbimIPv4Elements.

+
+

Parameters

+
++++ - - + + +

array :

a NULL terminated array of MbimDeviceServiceElement structs.

array

a NULL terminated array of MbimIPv4Element structs.

 
+
-

MbimEventEntry

-
typedef struct {
-    MbimUuid device_service_id;
-    guint32 cids_count;
-    guint32 *cids;
-} MbimEventEntry;
-
-
---+

mbim_ipv6_element_array_free ()

+
void
+mbim_ipv6_element_array_free (MbimIPv6Element **array);
+

Frees the memory allocated for the array of MbimIPv6Elements.

+
+

Parameters

+
++++ - - - - - - - - - - - - - - + + + + +

MbimUuid device_service_id;

a MbimUuid.

guint32 cids_count;

a guint32.

guint32 *cids;

an array of guint32 values.

array

a NULL terminated array of MbimIPv6Element structs.

 
+
-

mbim_event_entry_array_free ()

-
void                mbim_event_entry_array_free         (MbimEventEntry **array);
-

-Frees the memory allocated for the array of MbimEventEntrys. -

-
---+

mbim_device_service_element_array_free ()

+
void
+mbim_device_service_element_array_free
+                               (MbimDeviceServiceElement **array);
+

Frees the memory allocated for the array of MbimDeviceServiceElements.

+
+

Parameters

+
++++ - - + + +

array :

a NULL terminated array of MbimEventEntry structs.

array

a NULL terminated array of MbimDeviceServiceElement structs.

 
+
-

MbimPacketFilter

-
typedef struct {
-    guint32 filter_size;
-    guint8 *packet_filter;
-    guint8 *packet_mask;
-} MbimPacketFilter;
-
-
---+

mbim_event_entry_array_free ()

+
void
+mbim_event_entry_array_free (MbimEventEntry **array);
+

Frees the memory allocated for the array of MbimEventEntrys.

+
+

Parameters

+
++++ - - - - - - - - - - - - - - + + + + +

guint32 filter_size;

a guint32.

guint8 *packet_filter;

an array of guint8 values.

guint8 *packet_mask;

an array of guint8 values.

array

a NULL terminated array of MbimEventEntry structs.

 
+
-

mbim_packet_filter_array_free ()

-
void                mbim_packet_filter_array_free       (MbimPacketFilter **array);
-

-Frees the memory allocated for the array of MbimPacketFilters. -

-
---+

mbim_packet_filter_array_free ()

+
void
+mbim_packet_filter_array_free (MbimPacketFilter **array);
+

Frees the memory allocated for the array of MbimPacketFilters.

+
+

Parameters

+
++++ - - + + +

array :

a NULL terminated array of MbimPacketFilter structs.

array

a NULL terminated array of MbimPacketFilter structs.

 
+
-

mbim_message_device_caps_query_new ()

-
MbimMessage *       mbim_message_device_caps_query_new  (GError **error);
-

-Create a new request for the 'Device Caps' query command in the 'Basic Connect' service. -

-
---+

mbim_message_device_caps_query_new ()

+
MbimMessage *
+mbim_message_device_caps_query_new (GError **error);
+

Create a new request for the 'Device Caps' query command in the 'Basic Connect' service.

+
+

Parameters

+
++++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_device_caps_response_parse ()

-
gboolean            mbim_message_device_caps_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimDeviceType *device_type,
-                                                         MbimCellularClass *cellular_class,
-                                                         MbimVoiceClass *voice_class,
-                                                         MbimSimClass *sim_class,
-                                                         MbimDataClass *data_class,
-                                                         MbimSmsCaps *sms_caps,
-                                                         MbimCtrlCaps *control_caps,
-                                                         guint32 *max_sessions,
-                                                         gchar **custom_data_class,
-                                                         gchar **device_id,
-                                                         gchar **firmware_info,
-                                                         gchar **hardware_info,
-                                                         GError **error);
-

-Create a new request for the 'HardwareInfo' response command in the 'Basic Connect' service. -

-
+

mbim_message_device_caps_response_parse ()

+
gboolean
+mbim_message_device_caps_response_parse
+                               (const MbimMessage *message,
+                                MbimDeviceType *device_type,
+                                MbimCellularClass *cellular_class,
+                                MbimVoiceClass *voice_class,
+                                MbimSimClass *sim_class,
+                                MbimDataClass *data_class,
+                                MbimSmsCaps *sms_caps,
+                                MbimCtrlCaps *control_caps,
+                                guint32 *max_sessions,
+                                gchar **custom_data_class,
+                                gchar **device_id,
+                                gchar **firmware_info,
+                                gchar **hardware_info,
+                                GError **error);
+

Create a new request for the 'HardwareInfo' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

device_type :

return location for a MbimDeviceType, or NULL if the 'DeviceType' field is not needed.

message

the MbimMessage.

 

cellular_class :

return location for a MbimCellularClass, or NULL if the 'CellularClass' field is not needed.

device_type

return location for a MbimDeviceType, or NULL if the 'DeviceType' field is not needed.

 

voice_class :

return location for a MbimVoiceClass, or NULL if the 'VoiceClass' field is not needed.

cellular_class

return location for a MbimCellularClass, or NULL if the 'CellularClass' field is not needed.

 

sim_class :

return location for a MbimSimClass, or NULL if the 'SimClass' field is not needed.

voice_class

return location for a MbimVoiceClass, or NULL if the 'VoiceClass' field is not needed.

 

data_class :

return location for a MbimDataClass, or NULL if the 'DataClass' field is not needed.

sim_class

return location for a MbimSimClass, or NULL if the 'SimClass' field is not needed.

 

sms_caps :

return location for a MbimSmsCaps, or NULL if the 'SmsCaps' field is not needed.

data_class

return location for a MbimDataClass, or NULL if the 'DataClass' field is not needed.

 

control_caps :

return location for a MbimCtrlCaps, or NULL if the 'ControlCaps' field is not needed.

sms_caps

return location for a MbimSmsCaps, or NULL if the 'SmsCaps' field is not needed.

 

max_sessions :

return location for a guint32, or NULL if the 'MaxSessions' field is not needed.

control_caps

return location for a MbimCtrlCaps, or NULL if the 'ControlCaps' field is not needed.

 

custom_data_class :

return location for a newly allocated string, or NULL if the 'CustomDataClass' field is not needed. Free the returned value with g_free().

max_sessions

return location for a guint32, or NULL if the 'MaxSessions' field is not needed.

 

device_id :

return location for a newly allocated string, or NULL if the 'DeviceId' field is not needed. Free the returned value with g_free().

custom_data_class

return location for a newly allocated string, or NULL if the 'CustomDataClass' field is not needed. Free the returned value with g_free().

 

firmware_info :

return location for a newly allocated string, or NULL if the 'FirmwareInfo' field is not needed. Free the returned value with g_free().

device_id

return location for a newly allocated string, or NULL if the 'DeviceId' field is not needed. Free the returned value with g_free().

 

hardware_info :

return location for a newly allocated string, or NULL if the 'HardwareInfo' field is not needed. Free the returned value with g_free().

firmware_info

return location for a newly allocated string, or NULL if the 'FirmwareInfo' field is not needed. Free the returned value with g_free().

 

error :

return location for error or NULL.

hardware_info

return location for a newly allocated string, or NULL if the 'HardwareInfo' field is not needed. Free the returned value with g_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_subscriber_ready_status_query_new ()

-
MbimMessage *       mbim_message_subscriber_ready_status_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Subscriber Ready Status' query command in the 'Basic Connect' service. -

-
+

mbim_message_subscriber_ready_status_query_new ()

+
MbimMessage *
+mbim_message_subscriber_ready_status_query_new
+                               (GError **error);
+

Create a new request for the 'Subscriber Ready Status' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_subscriber_ready_status_response_parse ()

-
gboolean            mbim_message_subscriber_ready_status_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSubscriberReadyState *ready_state,
-                                                         gchar **subscriber_id,
-                                                         gchar **sim_icc_id,
-                                                         MbimReadyInfoFlag *ready_info,
-                                                         guint32 *telephone_numbers_count,
-                                                         gchar ***telephone_numbers,
-                                                         GError **error);
-

-Create a new request for the 'TelephoneNumbers' response command in the 'Basic Connect' service. -

-
+

mbim_message_subscriber_ready_status_response_parse ()

+
gboolean
+mbim_message_subscriber_ready_status_response_parse
+                               (const MbimMessage *message,
+                                MbimSubscriberReadyState *ready_state,
+                                gchar **subscriber_id,
+                                gchar **sim_icc_id,
+                                MbimReadyInfoFlag *ready_info,
+                                guint32 *telephone_numbers_count,
+                                gchar ***telephone_numbers,
+                                GError **error);
+

Create a new request for the 'TelephoneNumbers' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

ready_state :

return location for a MbimSubscriberReadyState, or NULL if the 'ReadyState' field is not needed.

message

the MbimMessage.

 

subscriber_id :

return location for a newly allocated string, or NULL if the 'SubscriberID' field is not needed. Free the returned value with g_free().

ready_state

return location for a MbimSubscriberReadyState, or NULL if the 'ReadyState' field is not needed.

 

sim_icc_id :

return location for a newly allocated string, or NULL if the 'SimIccId' field is not needed. Free the returned value with g_free().

subscriber_id

return location for a newly allocated string, or NULL if the 'SubscriberId' field is not needed. Free the returned value with g_free().

 

ready_info :

return location for a MbimReadyInfoFlag, or NULL if the 'ReadyInfo' field is not needed.

sim_icc_id

return location for a newly allocated string, or NULL if the 'SimIccId' field is not needed. Free the returned value with g_free().

 

telephone_numbers_count :

return location for a guint32, or NULL if the 'TelephoneNumbersCount' field is not needed.

ready_info

return location for a MbimReadyInfoFlag, or NULL if the 'ReadyInfo' field is not needed.

 

telephone_numbers :

return location for a newly allocated array of strings, or NULL if the 'TelephoneNumbers' field is not needed. Free the returned value with g_strfreev().

telephone_numbers_count

return location for a guint32, or NULL if the 'TelephoneNumbersCount' field is not needed.

 

error :

return location for error or NULL.

telephone_numbers

return location for a newly allocated array of strings, or NULL if the 'TelephoneNumbers' field is not needed. Free the returned value with g_strfreev().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_radio_state_query_new ()

-
MbimMessage *       mbim_message_radio_state_query_new  (GError **error);
-

-Create a new request for the 'Radio State' query command in the 'Basic Connect' service. -

-
+

mbim_message_subscriber_ready_status_notification_parse ()

+
gboolean
+mbim_message_subscriber_ready_status_notification_parse
+                               (const MbimMessage *message,
+                                MbimSubscriberReadyState *ready_state,
+                                gchar **subscriber_id,
+                                gchar **sim_icc_id,
+                                MbimReadyInfoFlag *ready_info,
+                                guint32 *telephone_numbers_count,
+                                gchar ***telephone_numbers,
+                                GError **error);
+

Create a new request for the 'TelephoneNumbers' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + +

error :

return location for error or NULL.

message

the MbimMessage.

 

ready_state

return location for a MbimSubscriberReadyState, or NULL if the 'ReadyState' field is not needed.

 

subscriber_id

return location for a newly allocated string, or NULL if the 'SubscriberId' field is not needed. Free the returned value with g_free().

 

sim_icc_id

return location for a newly allocated string, or NULL if the 'SimIccId' field is not needed. Free the returned value with g_free().

 

ready_info

return location for a MbimReadyInfoFlag, or NULL if the 'ReadyInfo' field is not needed.

 

telephone_numbers_count

return location for a guint32, or NULL if the 'TelephoneNumbersCount' field is not needed.

 

telephone_numbers

return location for a newly allocated array of strings, or NULL if the 'TelephoneNumbers' field is not needed. Free the returned value with g_strfreev().

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_radio_state_set_new ()

-
MbimMessage *       mbim_message_radio_state_set_new    (MbimRadioSwitchState radio_state,
-                                                         GError **error);
-

-Create a new request for the 'Radio State' set command in the 'Basic Connect' service. -

-
+

mbim_message_radio_state_query_new ()

+
MbimMessage *
+mbim_message_radio_state_query_new (GError **error);
+

Create a new request for the 'Radio State' query command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_radio_state_set_new ()

+
MbimMessage *
+mbim_message_radio_state_set_new (MbimRadioSwitchState radio_state,
+                                  GError **error);
+

Create a new request for the 'Radio State' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

radio_state :

the 'RadioState' field, given as a MbimRadioSwitchState.

error :

return location for error or NULL.

radio_state

the 'RadioState' field, given as a MbimRadioSwitchState.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_radio_state_response_parse ()

-
gboolean            mbim_message_radio_state_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimRadioSwitchState *hw_radio_state,
-                                                         MbimRadioSwitchState *sw_radio_state,
-                                                         GError **error);
-

-Create a new request for the 'SwRadioState' response command in the 'Basic Connect' service. -

-
+

mbim_message_radio_state_response_parse ()

+
gboolean
+mbim_message_radio_state_response_parse
+                               (const MbimMessage *message,
+                                MbimRadioSwitchState *hw_radio_state,
+                                MbimRadioSwitchState *sw_radio_state,
+                                GError **error);
+

Create a new request for the 'SwRadioState' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

hw_radio_state :

return location for a MbimRadioSwitchState, or NULL if the 'HwRadioState' field is not needed.

message

the MbimMessage.

 

sw_radio_state :

return location for a MbimRadioSwitchState, or NULL if the 'SwRadioState' field is not needed.

hw_radio_state

return location for a MbimRadioSwitchState, or NULL if the 'HwRadioState' field is not needed.

 

error :

return location for error or NULL.

sw_radio_state

return location for a MbimRadioSwitchState, or NULL if the 'SwRadioState' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_radio_state_notification_parse ()

-
gboolean            mbim_message_radio_state_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimRadioSwitchState *hw_radio_state,
-                                                         MbimRadioSwitchState *sw_radio_state,
-                                                         GError **error);
-

-Create a new request for the 'SwRadioState' notification command in the 'Basic Connect' service. -

-
+

mbim_message_radio_state_notification_parse ()

+
gboolean
+mbim_message_radio_state_notification_parse
+                               (const MbimMessage *message,
+                                MbimRadioSwitchState *hw_radio_state,
+                                MbimRadioSwitchState *sw_radio_state,
+                                GError **error);
+

Create a new request for the 'SwRadioState' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

hw_radio_state :

return location for a MbimRadioSwitchState, or NULL if the 'HwRadioState' field is not needed.

message

the MbimMessage.

 

sw_radio_state :

return location for a MbimRadioSwitchState, or NULL if the 'SwRadioState' field is not needed.

hw_radio_state

return location for a MbimRadioSwitchState, or NULL if the 'HwRadioState' field is not needed.

 

error :

return location for error or NULL.

sw_radio_state

return location for a MbimRadioSwitchState, or NULL if the 'SwRadioState' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_pin_query_new ()

-
MbimMessage *       mbim_message_pin_query_new          (GError **error);
-

-Create a new request for the 'Pin' query command in the 'Basic Connect' service. -

-
+

mbim_message_pin_query_new ()

+
MbimMessage *
+mbim_message_pin_query_new (GError **error);
+

Create a new request for the 'Pin' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_pin_set_new ()

-
MbimMessage *       mbim_message_pin_set_new            (MbimPinType pin_type,
-                                                         MbimPinOperation pin_operation,
-                                                         const gchar *pin,
-                                                         const gchar *new_pin,
-                                                         GError **error);
-

-Create a new request for the 'Pin' set command in the 'Basic Connect' service. -

-
+

mbim_message_pin_set_new ()

+
MbimMessage *
+mbim_message_pin_set_new (MbimPinType pin_type,
+                          MbimPinOperation pin_operation,
+                          const gchar *pin,
+                          const gchar *new_pin,
+                          GError **error);
+

Create a new request for the 'Pin' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + +

pin_type :

the 'PinType' field, given as a MbimPinType.

pin_operation :

the 'PinOperation' field, given as a MbimPinOperation.

pin_type

the 'PinType' field, given as a MbimPinType.

 

pin :

the 'Pin' field, given as a string.

pin_operation

the 'PinOperation' field, given as a MbimPinOperation.

 

new_pin :

the 'NewPin' field, given as a string.

pin

the 'Pin' field, given as a string.

 

error :

return location for error or NULL.

new_pin

the 'NewPin' field, given as a string.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_pin_response_parse ()

-
gboolean            mbim_message_pin_response_parse     (const MbimMessage *message,
-                                                         MbimPinType *pin_type,
-                                                         MbimPinState *pin_state,
-                                                         guint32 *remaining_attempts,
-                                                         GError **error);
-

-Create a new request for the 'RemainingAttempts' response command in the 'Basic Connect' service. -

-
+

mbim_message_pin_response_parse ()

+
gboolean
+mbim_message_pin_response_parse (const MbimMessage *message,
+                                 MbimPinType *pin_type,
+                                 MbimPinState *pin_state,
+                                 guint32 *remaining_attempts,
+                                 GError **error);
+

Create a new request for the 'RemainingAttempts' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

pin_type :

return location for a MbimPinType, or NULL if the 'PinType' field is not needed.

message

the MbimMessage.

 

pin_state :

return location for a MbimPinState, or NULL if the 'PinState' field is not needed.

pin_type

return location for a MbimPinType, or NULL if the 'PinType' field is not needed.

 

remaining_attempts :

return location for a guint32, or NULL if the 'RemainingAttempts' field is not needed.

pin_state

return location for a MbimPinState, or NULL if the 'PinState' field is not needed.

 

error :

return location for error or NULL.

remaining_attempts

return location for a guint32, or NULL if the 'RemainingAttempts' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_pin_list_query_new ()

-
MbimMessage *       mbim_message_pin_list_query_new     (GError **error);
-

-Create a new request for the 'Pin List' query command in the 'Basic Connect' service. -

-
+

mbim_message_pin_list_query_new ()

+
MbimMessage *
+mbim_message_pin_list_query_new (GError **error);
+

Create a new request for the 'Pin List' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_pin_list_response_parse ()

-
gboolean            mbim_message_pin_list_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimPinDesc **pin_desc_pin1,
-                                                         MbimPinDesc **pin_desc_pin2,
-                                                         MbimPinDesc **pin_desc_device_sim_pin,
-                                                         MbimPinDesc **pin_desc_device_first_sim_pin,
-                                                         MbimPinDesc **pin_desc_network_pin,
-                                                         MbimPinDesc **pin_desc_network_subset_pin,
-                                                         MbimPinDesc **pin_desc_service_provider_pin,
-                                                         MbimPinDesc **pin_desc_corporate_pin,
-                                                         MbimPinDesc **pin_desc_subsidy_lock,
-                                                         MbimPinDesc **pin_desc_custom,
-                                                         GError **error);
-

-Create a new request for the 'PinDescCustom' response command in the 'Basic Connect' service. -

-
+

mbim_message_pin_list_response_parse ()

+
gboolean
+mbim_message_pin_list_response_parse (const MbimMessage *message,
+                                      MbimPinDesc **pin_desc_pin1,
+                                      MbimPinDesc **pin_desc_pin2,
+                                      MbimPinDesc **pin_desc_device_sim_pin,
+                                      MbimPinDesc **pin_desc_device_first_sim_pin,
+                                      MbimPinDesc **pin_desc_network_pin,
+                                      MbimPinDesc **pin_desc_network_subset_pin,
+                                      MbimPinDesc **pin_desc_service_provider_pin,
+                                      MbimPinDesc **pin_desc_corporate_pin,
+                                      MbimPinDesc **pin_desc_subsidy_lock,
+                                      MbimPinDesc **pin_desc_custom,
+                                      GError **error);
+

Create a new request for the 'PinDescCustom' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

pin_desc_pin1 :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescPin1' field is not needed. Free the returned value with mbim_pin_desc_free().

message

the MbimMessage.

 

pin_desc_pin2 :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescPin2' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_pin1

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescPin1' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_device_sim_pin :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescDeviceSimPin' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_pin2

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescPin2' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_device_first_sim_pin :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescDeviceFirstSimPin' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_device_sim_pin

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescDeviceSimPin' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_network_pin :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescNetworkPin' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_device_first_sim_pin

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescDeviceFirstSimPin' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_network_subset_pin :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescNetworkSubsetPin' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_network_pin

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescNetworkPin' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_service_provider_pin :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescServiceProviderPin' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_network_subset_pin

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescNetworkSubsetPin' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_corporate_pin :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescCorporatePin' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_service_provider_pin

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescServiceProviderPin' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_subsidy_lock :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescSubsidyLock' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_corporate_pin

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescCorporatePin' field is not needed. Free the returned value with mbim_pin_desc_free().

 

pin_desc_custom :

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescCustom' field is not needed. Free the returned value with mbim_pin_desc_free().

pin_desc_subsidy_lock

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescSubsidyLock' field is not needed. Free the returned value with mbim_pin_desc_free().

 

error :

return location for error or NULL.

pin_desc_custom

return location for a newly allocated MbimPinDesc, or NULL if the 'PinDescCustom' field is not needed. Free the returned value with mbim_pin_desc_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_home_provider_query_new ()

-
MbimMessage *       mbim_message_home_provider_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Home Provider' query command in the 'Basic Connect' service. -

-
+

mbim_message_home_provider_query_new ()

+
MbimMessage *
+mbim_message_home_provider_query_new (GError **error);
+

Create a new request for the 'Home Provider' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_home_provider_set_new ()

-
MbimMessage *       mbim_message_home_provider_set_new  (const MbimProvider *provider,
-                                                         GError **error);
-

-Create a new request for the 'Home Provider' set command in the 'Basic Connect' service. -

-
+

mbim_message_home_provider_set_new ()

+
MbimMessage *
+mbim_message_home_provider_set_new (const MbimProvider *provider,
+                                    GError **error);
+

Create a new request for the 'Home Provider' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

provider :

the 'Provider' field, given as a MbimProvider.

error :

return location for error or NULL.

provider

the 'Provider' field, given as a MbimProvider.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_home_provider_response_parse ()

-
gboolean            mbim_message_home_provider_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimProvider **provider,
-                                                         GError **error);
-

-Create a new request for the 'Provider' response command in the 'Basic Connect' service. -

-
+

mbim_message_home_provider_response_parse ()

+
gboolean
+mbim_message_home_provider_response_parse
+                               (const MbimMessage *message,
+                                MbimProvider **provider,
+                                GError **error);
+

Create a new request for the 'Provider' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + +

message :

the MbimMessage.

provider :

return location for a newly allocated MbimProvider, or NULL if the 'Provider' field is not needed. Free the returned value with mbim_provider_free().

message

the MbimMessage.

 

error :

return location for error or NULL.

provider

return location for a newly allocated MbimProvider, or NULL if the 'Provider' field is not needed. Free the returned value with mbim_provider_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+ +
+
+

mbim_message_preferred_providers_query_new ()

+
MbimMessage *
+mbim_message_preferred_providers_query_new
+                               (GError **error);
+

Create a new request for the 'Preferred Providers' query command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_preferred_providers_query_new ()

-
MbimMessage *       mbim_message_preferred_providers_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Preferred Providers' query command in the 'Basic Connect' service. -

-
+

mbim_message_preferred_providers_set_new ()

+
MbimMessage *
+mbim_message_preferred_providers_set_new
+                               (guint32 providers_count,
+                                const MbimProvider *const *providers,
+                                GError **error);
+

Create a new request for the 'Preferred Providers' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + + + + + + - - + + +

error :

return location for error or NULL.

providers_count

the 'ProvidersCount' field, given as a guint32.

 

providers

the 'Providers' field, given as an array of MbimProviders.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_preferred_providers_set_new ()

-
MbimMessage *       mbim_message_preferred_providers_set_new
-                                                        (guint32 providers_count,
-                                                         const MbimProvider *const *providers,
-                                                         GError **error);
-

-Create a new request for the 'Preferred Providers' set command in the 'Basic Connect' service. -

-
+

mbim_message_preferred_providers_response_parse ()

+
gboolean
+mbim_message_preferred_providers_response_parse
+                               (const MbimMessage *message,
+                                guint32 *providers_count,
+                                MbimProvider ***providers,
+                                GError **error);
+

Create a new request for the 'Providers' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + +

providers_count :

the 'ProvidersCount' field, given as a guint32.

message

the MbimMessage.

 

providers :

the 'Providers' field, given as an array of MbimProviders.

providers_count

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

 

error :

return location for error or NULL.

providers

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_preferred_providers_response_parse ()

-
gboolean            mbim_message_preferred_providers_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *providers_count,
-                                                         MbimProvider ***providers,
-                                                         GError **error);
-

-Create a new request for the 'Providers' response command in the 'Basic Connect' service. -

-
+

mbim_message_preferred_providers_notification_parse ()

+
gboolean
+mbim_message_preferred_providers_notification_parse
+                               (const MbimMessage *message,
+                                guint32 *providers_count,
+                                MbimProvider ***providers,
+                                GError **error);
+

Create a new request for the 'Providers' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

providers_count :

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

message

the MbimMessage.

 

providers :

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

providers_count

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

 

error :

return location for error or NULL.

providers

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_visible_providers_query_new ()

-
MbimMessage *       mbim_message_visible_providers_query_new
-                                                        (MbimVisibleProvidersAction action,
-                                                         GError **error);
-

-Create a new request for the 'Visible Providers' query command in the 'Basic Connect' service. -

-
+

mbim_message_visible_providers_query_new ()

+
MbimMessage *
+mbim_message_visible_providers_query_new
+                               (MbimVisibleProvidersAction action,
+                                GError **error);
+

Create a new request for the 'Visible Providers' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

action :

the 'Action' field, given as a MbimVisibleProvidersAction.

error :

return location for error or NULL.

action

the 'Action' field, given as a MbimVisibleProvidersAction.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_visible_providers_response_parse ()

-
gboolean            mbim_message_visible_providers_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *providers_count,
-                                                         MbimProvider ***providers,
-                                                         GError **error);
-

-Create a new request for the 'Providers' response command in the 'Basic Connect' service. -

-
+

mbim_message_visible_providers_response_parse ()

+
gboolean
+mbim_message_visible_providers_response_parse
+                               (const MbimMessage *message,
+                                guint32 *providers_count,
+                                MbimProvider ***providers,
+                                GError **error);
+

Create a new request for the 'Providers' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

providers_count :

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

message

the MbimMessage.

 

providers :

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

providers_count

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

 

error :

return location for error or NULL.

providers

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_register_state_query_new ()

-
MbimMessage *       mbim_message_register_state_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Register State' query command in the 'Basic Connect' service. -

-
+

mbim_message_register_state_query_new ()

+
MbimMessage *
+mbim_message_register_state_query_new (GError **error);
+

Create a new request for the 'Register State' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_register_state_set_new ()

-
MbimMessage *       mbim_message_register_state_set_new (const gchar *provider_id,
-                                                         MbimRegisterAction register_action,
-                                                         MbimDataClass data_class,
-                                                         GError **error);
-

-Create a new request for the 'Register State' set command in the 'Basic Connect' service. -

-
+

mbim_message_register_state_set_new ()

+
MbimMessage *
+mbim_message_register_state_set_new (const gchar *provider_id,
+                                     MbimRegisterAction register_action,
+                                     MbimDataClass data_class,
+                                     GError **error);
+

Create a new request for the 'Register State' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + +

provider_id :

the 'ProviderId' field, given as a string.

register_action :

the 'RegisterAction' field, given as a MbimRegisterAction.

provider_id

the 'ProviderId' field, given as a string.

 

data_class :

the 'DataClass' field, given as a MbimDataClass.

register_action

the 'RegisterAction' field, given as a MbimRegisterAction.

 

error :

return location for error or NULL.

data_class

the 'DataClass' field, given as a MbimDataClass.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_register_state_response_parse ()

-
gboolean            mbim_message_register_state_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNwError *nw_error,
-                                                         MbimRegisterState *register_state,
-                                                         MbimRegisterMode *register_mode,
-                                                         MbimDataClass *available_data_classes,
-                                                         MbimCellularClass *current_cellular_class,
-                                                         gchar **provider_id,
-                                                         gchar **provider_name,
-                                                         gchar **roaming_text,
-                                                         MbimRegistrationFlag *registration_flag,
-                                                         GError **error);
-

-Create a new request for the 'RegistrationFlag' response command in the 'Basic Connect' service. -

-
+

mbim_message_register_state_response_parse ()

+
gboolean
+mbim_message_register_state_response_parse
+                               (const MbimMessage *message,
+                                MbimNwError *nw_error,
+                                MbimRegisterState *register_state,
+                                MbimRegisterMode *register_mode,
+                                MbimDataClass *available_data_classes,
+                                MbimCellularClass *current_cellular_class,
+                                gchar **provider_id,
+                                gchar **provider_name,
+                                gchar **roaming_text,
+                                MbimRegistrationFlag *registration_flag,
+                                GError **error);
+

Create a new request for the 'RegistrationFlag' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

nw_error :

return location for a MbimNwError, or NULL if the 'NwError' field is not needed.

message

the MbimMessage.

 

register_state :

return location for a MbimRegisterState, or NULL if the 'RegisterState' field is not needed.

nw_error

return location for a MbimNwError, or NULL if the 'NwError' field is not needed.

 

register_mode :

return location for a MbimRegisterMode, or NULL if the 'RegisterMode' field is not needed.

register_state

return location for a MbimRegisterState, or NULL if the 'RegisterState' field is not needed.

 

available_data_classes :

return location for a MbimDataClass, or NULL if the 'AvailableDataClasses' field is not needed.

register_mode

return location for a MbimRegisterMode, or NULL if the 'RegisterMode' field is not needed.

 

current_cellular_class :

return location for a MbimCellularClass, or NULL if the 'CurrentCellularClass' field is not needed.

available_data_classes

return location for a MbimDataClass, or NULL if the 'AvailableDataClasses' field is not needed.

 

provider_id :

return location for a newly allocated string, or NULL if the 'ProviderId' field is not needed. Free the returned value with g_free().

current_cellular_class

return location for a MbimCellularClass, or NULL if the 'CurrentCellularClass' field is not needed.

 

provider_name :

return location for a newly allocated string, or NULL if the 'ProviderName' field is not needed. Free the returned value with g_free().

provider_id

return location for a newly allocated string, or NULL if the 'ProviderId' field is not needed. Free the returned value with g_free().

 

roaming_text :

return location for a newly allocated string, or NULL if the 'RoamingText' field is not needed. Free the returned value with g_free().

provider_name

return location for a newly allocated string, or NULL if the 'ProviderName' field is not needed. Free the returned value with g_free().

 

registration_flag :

return location for a MbimRegistrationFlag, or NULL if the 'RegistrationFlag' field is not needed.

roaming_text

return location for a newly allocated string, or NULL if the 'RoamingText' field is not needed. Free the returned value with g_free().

 

error :

return location for error or NULL.

registration_flag

return location for a MbimRegistrationFlag, or NULL if the 'RegistrationFlag' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_register_state_notification_parse ()

-
gboolean            mbim_message_register_state_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNwError *nw_error,
-                                                         MbimRegisterState *register_state,
-                                                         MbimRegisterMode *register_mode,
-                                                         MbimDataClass *available_data_classes,
-                                                         MbimCellularClass *current_cellular_class,
-                                                         gchar **provider_id,
-                                                         gchar **provider_name,
-                                                         gchar **roaming_text,
-                                                         MbimRegistrationFlag *registration_flag,
-                                                         GError **error);
-

-Create a new request for the 'RegistrationFlag' notification command in the 'Basic Connect' service. -

-
+

mbim_message_register_state_notification_parse ()

+
gboolean
+mbim_message_register_state_notification_parse
+                               (const MbimMessage *message,
+                                MbimNwError *nw_error,
+                                MbimRegisterState *register_state,
+                                MbimRegisterMode *register_mode,
+                                MbimDataClass *available_data_classes,
+                                MbimCellularClass *current_cellular_class,
+                                gchar **provider_id,
+                                gchar **provider_name,
+                                gchar **roaming_text,
+                                MbimRegistrationFlag *registration_flag,
+                                GError **error);
+

Create a new request for the 'RegistrationFlag' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

nw_error :

return location for a MbimNwError, or NULL if the 'NwError' field is not needed.

message

the MbimMessage.

 

register_state :

return location for a MbimRegisterState, or NULL if the 'RegisterState' field is not needed.

nw_error

return location for a MbimNwError, or NULL if the 'NwError' field is not needed.

 

register_mode :

return location for a MbimRegisterMode, or NULL if the 'RegisterMode' field is not needed.

register_state

return location for a MbimRegisterState, or NULL if the 'RegisterState' field is not needed.

 

available_data_classes :

return location for a MbimDataClass, or NULL if the 'AvailableDataClasses' field is not needed.

register_mode

return location for a MbimRegisterMode, or NULL if the 'RegisterMode' field is not needed.

 

current_cellular_class :

return location for a MbimCellularClass, or NULL if the 'CurrentCellularClass' field is not needed.

available_data_classes

return location for a MbimDataClass, or NULL if the 'AvailableDataClasses' field is not needed.

 

provider_id :

return location for a newly allocated string, or NULL if the 'ProviderId' field is not needed. Free the returned value with g_free().

current_cellular_class

return location for a MbimCellularClass, or NULL if the 'CurrentCellularClass' field is not needed.

 

provider_name :

return location for a newly allocated string, or NULL if the 'ProviderName' field is not needed. Free the returned value with g_free().

provider_id

return location for a newly allocated string, or NULL if the 'ProviderId' field is not needed. Free the returned value with g_free().

 

roaming_text :

return location for a newly allocated string, or NULL if the 'RoamingText' field is not needed. Free the returned value with g_free().

provider_name

return location for a newly allocated string, or NULL if the 'ProviderName' field is not needed. Free the returned value with g_free().

 

registration_flag :

return location for a MbimRegistrationFlag, or NULL if the 'RegistrationFlag' field is not needed.

roaming_text

return location for a newly allocated string, or NULL if the 'RoamingText' field is not needed. Free the returned value with g_free().

 

error :

return location for error or NULL.

registration_flag

return location for a MbimRegistrationFlag, or NULL if the 'RegistrationFlag' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_signal_state_query_new ()

-
MbimMessage *       mbim_message_signal_state_query_new (GError **error);
-

-Create a new request for the 'Signal State' query command in the 'Basic Connect' service. -

-
+

mbim_message_signal_state_query_new ()

+
MbimMessage *
+mbim_message_signal_state_query_new (GError **error);
+

Create a new request for the 'Signal State' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_signal_state_set_new ()

-
MbimMessage *       mbim_message_signal_state_set_new   (guint32 signal_strength_interval,
-                                                         guint32 rssi_threshold,
-                                                         guint32 error_rate_threshold,
-                                                         GError **error);
-

-Create a new request for the 'Signal State' set command in the 'Basic Connect' service. -

-
+

mbim_message_signal_state_set_new ()

+
MbimMessage *
+mbim_message_signal_state_set_new (guint32 signal_strength_interval,
+                                   guint32 rssi_threshold,
+                                   guint32 error_rate_threshold,
+                                   GError **error);
+

Create a new request for the 'Signal State' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + +

signal_strength_interval :

the 'SignalStrengthInterval' field, given as a guint32.

rssi_threshold :

the 'RssiThreshold' field, given as a guint32.

signal_strength_interval

the 'SignalStrengthInterval' field, given as a guint32.

 

error_rate_threshold :

the 'ErrorRateThreshold' field, given as a guint32.

rssi_threshold

the 'RssiThreshold' field, given as a guint32.

 

error :

return location for error or NULL.

error_rate_threshold

the 'ErrorRateThreshold' field, given as a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_signal_state_response_parse ()

-
gboolean            mbim_message_signal_state_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *rssi,
-                                                         guint32 *error_rate,
-                                                         guint32 *signal_strength_interval,
-                                                         guint32 *rssi_threshold,
-                                                         guint32 *error_rate_threshold,
-                                                         GError **error);
-

-Create a new request for the 'ErrorRateThreshold' response command in the 'Basic Connect' service. -

-
+

mbim_message_signal_state_response_parse ()

+
gboolean
+mbim_message_signal_state_response_parse
+                               (const MbimMessage *message,
+                                guint32 *rssi,
+                                guint32 *error_rate,
+                                guint32 *signal_strength_interval,
+                                guint32 *rssi_threshold,
+                                guint32 *error_rate_threshold,
+                                GError **error);
+

Create a new request for the 'ErrorRateThreshold' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

rssi :

return location for a guint32, or NULL if the 'Rssi' field is not needed.

message

the MbimMessage.

 

error_rate :

return location for a guint32, or NULL if the 'ErrorRate' field is not needed.

rssi

return location for a guint32, or NULL if the 'Rssi' field is not needed.

 

signal_strength_interval :

return location for a guint32, or NULL if the 'SignalStrengthInterval' field is not needed.

error_rate

return location for a guint32, or NULL if the 'ErrorRate' field is not needed.

 

rssi_threshold :

return location for a guint32, or NULL if the 'RssiThreshold' field is not needed.

signal_strength_interval

return location for a guint32, or NULL if the 'SignalStrengthInterval' field is not needed.

 

error_rate_threshold :

return location for a guint32, or NULL if the 'ErrorRateThreshold' field is not needed.

rssi_threshold

return location for a guint32, or NULL if the 'RssiThreshold' field is not needed.

 

error :

return location for error or NULL.

error_rate_threshold

return location for a guint32, or NULL if the 'ErrorRateThreshold' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_signal_state_notification_parse ()

-
gboolean            mbim_message_signal_state_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *rssi,
-                                                         guint32 *error_rate,
-                                                         guint32 *signal_strength_interval,
-                                                         guint32 *rssi_threshold,
-                                                         guint32 *error_rate_threshold,
-                                                         GError **error);
-

-Create a new request for the 'ErrorRateThreshold' notification command in the 'Basic Connect' service. -

-
+

mbim_message_signal_state_notification_parse ()

+
gboolean
+mbim_message_signal_state_notification_parse
+                               (const MbimMessage *message,
+                                guint32 *rssi,
+                                guint32 *error_rate,
+                                guint32 *signal_strength_interval,
+                                guint32 *rssi_threshold,
+                                guint32 *error_rate_threshold,
+                                GError **error);
+

Create a new request for the 'ErrorRateThreshold' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

rssi :

return location for a guint32, or NULL if the 'Rssi' field is not needed.

message

the MbimMessage.

 

error_rate :

return location for a guint32, or NULL if the 'ErrorRate' field is not needed.

rssi

return location for a guint32, or NULL if the 'Rssi' field is not needed.

 

signal_strength_interval :

return location for a guint32, or NULL if the 'SignalStrengthInterval' field is not needed.

error_rate

return location for a guint32, or NULL if the 'ErrorRate' field is not needed.

 

rssi_threshold :

return location for a guint32, or NULL if the 'RssiThreshold' field is not needed.

signal_strength_interval

return location for a guint32, or NULL if the 'SignalStrengthInterval' field is not needed.

 

error_rate_threshold :

return location for a guint32, or NULL if the 'ErrorRateThreshold' field is not needed.

rssi_threshold

return location for a guint32, or NULL if the 'RssiThreshold' field is not needed.

 

error :

return location for error or NULL.

error_rate_threshold

return location for a guint32, or NULL if the 'ErrorRateThreshold' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_packet_service_query_new ()

-
MbimMessage *       mbim_message_packet_service_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Packet Service' query command in the 'Basic Connect' service. -

-
+

mbim_message_packet_service_query_new ()

+
MbimMessage *
+mbim_message_packet_service_query_new (GError **error);
+

Create a new request for the 'Packet Service' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_packet_service_set_new ()

-
MbimMessage *       mbim_message_packet_service_set_new (MbimPacketServiceAction packet_service_action,
-                                                         GError **error);
-

-Create a new request for the 'Packet Service' set command in the 'Basic Connect' service. -

-
+

mbim_message_packet_service_set_new ()

+
MbimMessage *
+mbim_message_packet_service_set_new (MbimPacketServiceAction packet_service_action,
+                                     GError **error);
+

Create a new request for the 'Packet Service' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

packet_service_action :

the 'PacketServiceAction' field, given as a MbimPacketServiceAction.

error :

return location for error or NULL.

packet_service_action

the 'PacketServiceAction' field, given as a MbimPacketServiceAction.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_packet_service_response_parse ()

-
gboolean            mbim_message_packet_service_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *nw_error,
-                                                         MbimPacketServiceState *packet_service_state,
-                                                         MbimDataClass *highest_available_data_class,
-                                                         guint64 *uplink_speed,
-                                                         guint64 *downlink_speed,
-                                                         GError **error);
-

-Create a new request for the 'DownlinkSpeed' response command in the 'Basic Connect' service. -

-
+

mbim_message_packet_service_response_parse ()

+
gboolean
+mbim_message_packet_service_response_parse
+                               (const MbimMessage *message,
+                                guint32 *nw_error,
+                                MbimPacketServiceState *packet_service_state,
+                                MbimDataClass *highest_available_data_class,
+                                guint64 *uplink_speed,
+                                guint64 *downlink_speed,
+                                GError **error);
+

Create a new request for the 'DownlinkSpeed' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

nw_error :

return location for a guint32, or NULL if the 'NwError' field is not needed.

message

the MbimMessage.

 

packet_service_state :

return location for a MbimPacketServiceState, or NULL if the 'PacketServiceState' field is not needed.

nw_error

return location for a guint32, or NULL if the 'NwError' field is not needed.

 

highest_available_data_class :

return location for a MbimDataClass, or NULL if the 'HighestAvailableDataClass' field is not needed.

packet_service_state

return location for a MbimPacketServiceState, or NULL if the 'PacketServiceState' field is not needed.

 

uplink_speed :

return location for a guint64, or NULL if the 'UplinkSpeed' field is not needed.

highest_available_data_class

return location for a MbimDataClass, or NULL if the 'HighestAvailableDataClass' field is not needed.

 

downlink_speed :

return location for a guint64, or NULL if the 'DownlinkSpeed' field is not needed.

uplink_speed

return location for a guint64, or NULL if the 'UplinkSpeed' field is not needed.

 

error :

return location for error or NULL.

downlink_speed

return location for a guint64, or NULL if the 'DownlinkSpeed' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_packet_service_notification_parse ()

-
gboolean            mbim_message_packet_service_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *nw_error,
-                                                         MbimPacketServiceState *packet_service_state,
-                                                         MbimDataClass *highest_available_data_class,
-                                                         guint64 *uplink_speed,
-                                                         guint64 *downlink_speed,
-                                                         GError **error);
-

-Create a new request for the 'DownlinkSpeed' notification command in the 'Basic Connect' service. -

-
+

mbim_message_packet_service_notification_parse ()

+
gboolean
+mbim_message_packet_service_notification_parse
+                               (const MbimMessage *message,
+                                guint32 *nw_error,
+                                MbimPacketServiceState *packet_service_state,
+                                MbimDataClass *highest_available_data_class,
+                                guint64 *uplink_speed,
+                                guint64 *downlink_speed,
+                                GError **error);
+

Create a new request for the 'DownlinkSpeed' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

nw_error :

return location for a guint32, or NULL if the 'NwError' field is not needed.

message

the MbimMessage.

 

packet_service_state :

return location for a MbimPacketServiceState, or NULL if the 'PacketServiceState' field is not needed.

nw_error

return location for a guint32, or NULL if the 'NwError' field is not needed.

 

highest_available_data_class :

return location for a MbimDataClass, or NULL if the 'HighestAvailableDataClass' field is not needed.

packet_service_state

return location for a MbimPacketServiceState, or NULL if the 'PacketServiceState' field is not needed.

 

uplink_speed :

return location for a guint64, or NULL if the 'UplinkSpeed' field is not needed.

highest_available_data_class

return location for a MbimDataClass, or NULL if the 'HighestAvailableDataClass' field is not needed.

 

downlink_speed :

return location for a guint64, or NULL if the 'DownlinkSpeed' field is not needed.

uplink_speed

return location for a guint64, or NULL if the 'UplinkSpeed' field is not needed.

 

error :

return location for error or NULL.

downlink_speed

return location for a guint64, or NULL if the 'DownlinkSpeed' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_connect_query_new ()

-
MbimMessage *       mbim_message_connect_query_new      (guint32 session_id,
-                                                         MbimActivationState activation_state,
-                                                         MbimVoiceCallState voice_call_state,
-                                                         MbimContextIpType ip_type,
-                                                         const MbimUuid *context_type,
-                                                         guint32 nw_error,
-                                                         GError **error);
-

-Create a new request for the 'Connect' query command in the 'Basic Connect' service. -

-
+

mbim_message_connect_query_new ()

+
MbimMessage *
+mbim_message_connect_query_new (guint32 session_id,
+                                MbimActivationState activation_state,
+                                MbimVoiceCallState voice_call_state,
+                                MbimContextIpType ip_type,
+                                const MbimUuid *context_type,
+                                guint32 nw_error,
+                                GError **error);
+

Create a new request for the 'Connect' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

session_id :

the 'SessionId' field, given as a guint32.

activation_state :

the 'ActivationState' field, given as a MbimActivationState.

session_id

the 'SessionId' field, given as a guint32.

 

voice_call_state :

the 'VoiceCallState' field, given as a MbimVoiceCallState.

activation_state

the 'ActivationState' field, given as a MbimActivationState.

 

ip_type :

the 'IpType' field, given as a MbimContextIpType.

voice_call_state

the 'VoiceCallState' field, given as a MbimVoiceCallState.

 

context_type :

the 'ContextType' field, given as a MbimUuid.

ip_type

the 'IpType' field, given as a MbimContextIpType.

 

nw_error :

the 'NwError' field, given as a guint32.

context_type

the 'ContextType' field, given as a MbimUuid.

 

error :

return location for error or NULL.

nw_error

the 'NwError' field, given as a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_connect_set_new ()

-
MbimMessage *       mbim_message_connect_set_new        (guint32 session_id,
-                                                         MbimActivationCommand activation_command,
-                                                         const gchar *access_string,
-                                                         const gchar *user_name,
-                                                         const gchar *password,
-                                                         MbimCompression compression,
-                                                         MbimAuthProtocol auth_protocol,
-                                                         MbimContextIpType ip_type,
-                                                         const MbimUuid *context_type,
-                                                         GError **error);
-

-Create a new request for the 'Connect' set command in the 'Basic Connect' service. -

-
+

mbim_message_connect_set_new ()

+
MbimMessage *
+mbim_message_connect_set_new (guint32 session_id,
+                              MbimActivationCommand activation_command,
+                              const gchar *access_string,
+                              const gchar *user_name,
+                              const gchar *password,
+                              MbimCompression compression,
+                              MbimAuthProtocol auth_protocol,
+                              MbimContextIpType ip_type,
+                              const MbimUuid *context_type,
+                              GError **error);
+

Create a new request for the 'Connect' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

session_id :

the 'SessionId' field, given as a guint32.

activation_command :

the 'ActivationCommand' field, given as a MbimActivationCommand.

session_id

the 'SessionId' field, given as a guint32.

 

access_string :

the 'AccessString' field, given as a string.

activation_command

the 'ActivationCommand' field, given as a MbimActivationCommand.

 

user_name :

the 'UserName' field, given as a string.

access_string

the 'AccessString' field, given as a string.

 

password :

the 'Password' field, given as a string.

user_name

the 'UserName' field, given as a string.

 

compression :

the 'Compression' field, given as a MbimCompression.

password

the 'Password' field, given as a string.

 

auth_protocol :

the 'AuthProtocol' field, given as a MbimAuthProtocol.

compression

the 'Compression' field, given as a MbimCompression.

 

ip_type :

the 'IpType' field, given as a MbimContextIpType.

auth_protocol

the 'AuthProtocol' field, given as a MbimAuthProtocol.

 

context_type :

the 'ContextType' field, given as a MbimUuid.

ip_type

the 'IpType' field, given as a MbimContextIpType.

 

error :

return location for error or NULL.

context_type

the 'ContextType' field, given as a MbimUuid.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_connect_response_parse ()

-
gboolean            mbim_message_connect_response_parse (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimActivationState *activation_state,
-                                                         MbimVoiceCallState *voice_call_state,
-                                                         MbimContextIpType *ip_type,
-                                                         const MbimUuid **context_type,
-                                                         guint32 *nw_error,
-                                                         GError **error);
-

-Create a new request for the 'NwError' response command in the 'Basic Connect' service. -

-
+

mbim_message_connect_response_parse ()

+
gboolean
+mbim_message_connect_response_parse (const MbimMessage *message,
+                                     guint32 *session_id,
+                                     MbimActivationState *activation_state,
+                                     MbimVoiceCallState *voice_call_state,
+                                     MbimContextIpType *ip_type,
+                                     const MbimUuid **context_type,
+                                     guint32 *nw_error,
+                                     GError **error);
+

Create a new request for the 'NwError' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

session_id :

return location for a guint32, or NULL if the 'SessionId' field is not needed.

message

the MbimMessage.

 

activation_state :

return location for a MbimActivationState, or NULL if the 'ActivationState' field is not needed.

session_id

return location for a guint32, or NULL if the 'SessionId' field is not needed.

 

voice_call_state :

return location for a MbimVoiceCallState, or NULL if the 'VoiceCallState' field is not needed.

activation_state

return location for a MbimActivationState, or NULL if the 'ActivationState' field is not needed.

 

ip_type :

return location for a MbimContextIpType, or NULL if the 'IpType' field is not needed.

voice_call_state

return location for a MbimVoiceCallState, or NULL if the 'VoiceCallState' field is not needed.

 

context_type :

return location for a MbimUuid, or NULL if the 'ContextType' field is not needed. Do not free the returned value, it is owned by message.

ip_type

return location for a MbimContextIpType, or NULL if the 'IpType' field is not needed.

 

nw_error :

return location for a guint32, or NULL if the 'NwError' field is not needed.

context_type

return location for a MbimUuid, or NULL if the 'ContextType' field is not needed. Do not free the returned value, it is owned by message +.

 

error :

return location for error or NULL.

nw_error

return location for a guint32, or NULL if the 'NwError' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_connect_notification_parse ()

-
gboolean            mbim_message_connect_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimActivationState *activation_state,
-                                                         MbimVoiceCallState *voice_call_state,
-                                                         MbimContextIpType *ip_type,
-                                                         const MbimUuid **context_type,
-                                                         guint32 *nw_error,
-                                                         GError **error);
-

-Create a new request for the 'NwError' notification command in the 'Basic Connect' service. -

-
+

mbim_message_connect_notification_parse ()

+
gboolean
+mbim_message_connect_notification_parse
+                               (const MbimMessage *message,
+                                guint32 *session_id,
+                                MbimActivationState *activation_state,
+                                MbimVoiceCallState *voice_call_state,
+                                MbimContextIpType *ip_type,
+                                const MbimUuid **context_type,
+                                guint32 *nw_error,
+                                GError **error);
+

Create a new request for the 'NwError' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

session_id :

return location for a guint32, or NULL if the 'SessionId' field is not needed.

message

the MbimMessage.

 

activation_state :

return location for a MbimActivationState, or NULL if the 'ActivationState' field is not needed.

session_id

return location for a guint32, or NULL if the 'SessionId' field is not needed.

 

voice_call_state :

return location for a MbimVoiceCallState, or NULL if the 'VoiceCallState' field is not needed.

activation_state

return location for a MbimActivationState, or NULL if the 'ActivationState' field is not needed.

 

ip_type :

return location for a MbimContextIpType, or NULL if the 'IpType' field is not needed.

voice_call_state

return location for a MbimVoiceCallState, or NULL if the 'VoiceCallState' field is not needed.

 

context_type :

return location for a MbimUuid, or NULL if the 'ContextType' field is not needed. Do not free the returned value, it is owned by message.

ip_type

return location for a MbimContextIpType, or NULL if the 'IpType' field is not needed.

 

nw_error :

return location for a guint32, or NULL if the 'NwError' field is not needed.

context_type

return location for a MbimUuid, or NULL if the 'ContextType' field is not needed. Do not free the returned value, it is owned by message +.

 

error :

return location for error or NULL.

nw_error

return location for a guint32, or NULL if the 'NwError' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_provisioned_contexts_query_new ()

-
MbimMessage *       mbim_message_provisioned_contexts_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Provisioned Contexts' query command in the 'Basic Connect' service. -

-
+

mbim_message_provisioned_contexts_query_new ()

+
MbimMessage *
+mbim_message_provisioned_contexts_query_new
+                               (GError **error);
+

Create a new request for the 'Provisioned Contexts' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_provisioned_contexts_set_new ()

-
MbimMessage *       mbim_message_provisioned_contexts_set_new
-                                                        (guint32 context_id,
-                                                         const MbimUuid *context_type,
-                                                         const gchar *access_string,
-                                                         const gchar *user_name,
-                                                         const gchar *password,
-                                                         MbimCompression compression,
-                                                         MbimAuthProtocol auth_protocol,
-                                                         const gchar *provider_id,
-                                                         GError **error);
-

-Create a new request for the 'Provisioned Contexts' set command in the 'Basic Connect' service. -

-
+

mbim_message_provisioned_contexts_set_new ()

+
MbimMessage *
+mbim_message_provisioned_contexts_set_new
+                               (guint32 context_id,
+                                const MbimUuid *context_type,
+                                const gchar *access_string,
+                                const gchar *user_name,
+                                const gchar *password,
+                                MbimCompression compression,
+                                MbimAuthProtocol auth_protocol,
+                                const gchar *provider_id,
+                                GError **error);
+

Create a new request for the 'Provisioned Contexts' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

context_id :

the 'ContextId' field, given as a guint32.

context_type :

the 'ContextType' field, given as a MbimUuid.

context_id

the 'ContextId' field, given as a guint32.

 

access_string :

the 'AccessString' field, given as a string.

context_type

the 'ContextType' field, given as a MbimUuid.

 

user_name :

the 'UserName' field, given as a string.

access_string

the 'AccessString' field, given as a string.

 

password :

the 'Password' field, given as a string.

user_name

the 'UserName' field, given as a string.

 

compression :

the 'Compression' field, given as a MbimCompression.

password

the 'Password' field, given as a string.

 

auth_protocol :

the 'AuthProtocol' field, given as a MbimAuthProtocol.

compression

the 'Compression' field, given as a MbimCompression.

 

provider_id :

the 'ProviderId' field, given as a string.

auth_protocol

the 'AuthProtocol' field, given as a MbimAuthProtocol.

 

error :

return location for error or NULL.

provider_id

the 'ProviderId' field, given as a string.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_provisioned_contexts_response_parse ()

-
gboolean            mbim_message_provisioned_contexts_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *provisioned_contexts_count,
-                                                         MbimProvisionedContextElement ***provisioned_contexts,
-                                                         GError **error);
-

-Create a new request for the 'ProvisionedContexts' response command in the 'Basic Connect' service. -

-
+

mbim_message_provisioned_contexts_response_parse ()

+
gboolean
+mbim_message_provisioned_contexts_response_parse
+                               (const MbimMessage *message,
+                                guint32 *provisioned_contexts_count,
+                                MbimProvisionedContextElement ***provisioned_contexts,
+                                GError **error);
+

Create a new request for the 'ProvisionedContexts' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

provisioned_contexts_count :

return location for a guint32, or NULL if the 'ProvisionedContextsCount' field is not needed.

message

the MbimMessage.

 

provisioned_contexts :

return location for a newly allocated array of MbimProvisionedContextElements, or NULL if the 'ProvisionedContexts' field is not needed. Free the returned value with mbim_provisioned_context_element_array_free().

provisioned_contexts_count

return location for a guint32, or NULL if the 'ProvisionedContextsCount' field is not needed.

 

error :

return location for error or NULL.

provisioned_contexts

return location for a newly allocated array of MbimProvisionedContextElements, or NULL if the 'ProvisionedContexts' field is not needed. Free the returned value with mbim_provisioned_context_element_array_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_provisioned_contexts_notification_parse ()

-
gboolean            mbim_message_provisioned_contexts_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *provisioned_contexts_count,
-                                                         MbimProvisionedContextElement ***provisioned_contexts,
-                                                         GError **error);
-

-Create a new request for the 'ProvisionedContexts' notification command in the 'Basic Connect' service. -

-
+

mbim_message_provisioned_contexts_notification_parse ()

+
gboolean
+mbim_message_provisioned_contexts_notification_parse
+                               (const MbimMessage *message,
+                                guint32 *provisioned_contexts_count,
+                                MbimProvisionedContextElement ***provisioned_contexts,
+                                GError **error);
+

Create a new request for the 'ProvisionedContexts' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + + + + + + + + + + + - - + + + + +

message :

the MbimMessage.

message

the MbimMessage.

 

provisioned_contexts_count

return location for a guint32, or NULL if the 'ProvisionedContextsCount' field is not needed.

 

provisioned_contexts

return location for a newly allocated array of MbimProvisionedContextElements, or NULL if the 'ProvisionedContexts' field is not needed. Free the returned value with mbim_provisioned_context_element_array_free().

 

provisioned_contexts_count :

return location for a guint32, or NULL if the 'ProvisionedContextsCount' field is not needed.

error

return location for error or NULL.

 
+
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+ +
+
+

mbim_message_service_activation_set_new ()

+
MbimMessage *
+mbim_message_service_activation_set_new
+                               (const guint32 buffer_size,
+                                const guint8 *buffer,
+                                GError **error);
+

Create a new request for the 'Service Activation' set command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + - - + + + - - + + + - - + + +

provisioned_contexts :

return location for a newly allocated array of MbimProvisionedContextElements, or NULL if the 'ProvisionedContexts' field is not needed. Free the returned value with mbim_provisioned_context_element_array_free().

buffer_size

size of the buffer array.

 

error :

return location for error or NULL.

buffer

the 'Buffer' field, given as an array of guint8 values.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_service_activation_set_new ()

-
MbimMessage *       mbim_message_service_activation_set_new
-                                                        (const guint32 buffer_size,
-                                                         const guint8 *buffer,
-                                                         GError **error);
-

-Create a new request for the 'Service Activation' set command in the 'Basic Connect' service. -

-
+

mbim_message_service_activation_response_parse ()

+
gboolean
+mbim_message_service_activation_response_parse
+                               (const MbimMessage *message,
+                                MbimNwError *nw_error,
+                                guint32 *buffer_size,
+                                const guint8 **buffer,
+                                GError **error);
+

Create a new request for the 'Buffer' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + + + + + + - - + + + - - + + + - - + + +

buffer_size :

size of the buffer array.

message

the MbimMessage.

 

nw_error

return location for a MbimNwError, or NULL if the 'NwError' field is not needed.

 

buffer :

the 'Buffer' field, given as an array of guint8 values.

buffer_size

return location for the size of the buffer array.

 

error :

return location for error or NULL.

buffer

return location for an array of guint8 values. Do not free the returned value, it is owned by message +.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_service_activation_response_parse ()

-
gboolean            mbim_message_service_activation_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNwError *nw_error,
-                                                         guint32 *buffer_size,
-                                                         const guint8 **buffer,
-                                                         GError **error);
-

-Create a new request for the 'Buffer' response command in the 'Basic Connect' service. -

-
+

mbim_message_ip_configuration_query_new ()

+
MbimMessage *
+mbim_message_ip_configuration_query_new
+                               (guint32 session_id,
+                                MbimIPConfigurationAvailableFlag ipv4_configuration_available,
+                                MbimIPConfigurationAvailableFlag ipv6_configuration_available,
+                                guint32 ipv4_address_count,
+                                const MbimIPv4Element *const *ipv4_address,
+                                guint32 ipv6_address_count,
+                                const MbimIPv6Element *const *ipv6_address,
+                                const MbimIPv4 *ipv4_gateway,
+                                const MbimIPv6 *ipv6_gateway,
+                                guint32 ipv4_dns_server_count,
+                                const MbimIPv4 *ipv4_dns_server,
+                                guint32 ipv6_dns_server_count,
+                                const MbimIPv6 *ipv6_dns_server,
+                                guint32 ipv4_mtu,
+                                guint32 ipv6_mtu,
+                                GError **error);
+

Create a new request for the 'IP Configuration' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

session_id

the 'SessionId' field, given as a guint32.

 

ipv4_configuration_available

the 'IPv4ConfigurationAvailable' field, given as a MbimIPConfigurationAvailableFlag.

 

ipv6_configuration_available

the 'IPv6ConfigurationAvailable' field, given as a MbimIPConfigurationAvailableFlag.

 

ipv4_address_count

the 'IPv4AddressCount' field, given as a guint32.

 

ipv4_address

the 'IPv4Address' field, given as an array of MbimIPv4Elements.

 

ipv6_address_count

the 'IPv6AddressCount' field, given as a guint32.

 

ipv6_address

the 'IPv6Address' field, given as an array of MbimIPv6Elements.

 

ipv4_gateway

the 'IPv4Gateway' field, given as a MbimIPv4.

 

ipv6_gateway

the 'IPv6Gateway' field, given as a MbimIPv6.

 

ipv4_dns_server_count

the 'IPv4DnsServerCount' field, given as a guint32.

 

ipv4_dns_server

the 'IPv4DnsServer' field, given as an array of MbimIPv4.

 

nw_error :

return location for a MbimNwError, or NULL if the 'NwError' field is not needed.

ipv6_dns_server_count

the 'IPv6DnsServerCount' field, given as a guint32.

 

buffer_size :

return location for the size of the buffer array.

ipv6_dns_server

the 'IPv6DnsServer' field, given as an array of MbimIPv6.

 

buffer :

return location for an array of guint8 values. Do not free the returned value, it is owned by message.

ipv4_mtu

the 'IPv4Mtu' field, given as a guint32.

 

error :

return location for error or NULL.

ipv6_mtu

the 'IPv6Mtu' field, given as a guint32.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_ip_configuration_query_new ()

-
MbimMessage *       mbim_message_ip_configuration_query_new
-                                                        (guint32 session_id,
-                                                         MbimIPConfigurationAvailableFlag ipv4_configuration_available,
-                                                         MbimIPConfigurationAvailableFlag ipv6_configuration_available,
-                                                         guint32 ipv4_address_count,
-                                                         const MbimIPv4Element *const *ipv4_address,
-                                                         guint32 ipv6_address_count,
-                                                         const MbimIPv6Element *const *ipv6_address,
-                                                         const MbimIPv4 *ipv4_gateway,
-                                                         const MbimIPv6 *ipv6_gateway,
-                                                         guint32 ipv4_dns_server_count,
-                                                         const MbimIPv4 *ipv4_dns_server,
-                                                         guint32 ipv6_dns_server_count,
-                                                         const MbimIPv6 *ipv6_dns_server,
-                                                         guint32 ipv4_mtu,
-                                                         guint32 ipv6_mtu,
-                                                         GError **error);
-

-Create a new request for the 'IP Configuration' query command in the 'Basic Connect' service. -

-
+

mbim_message_ip_configuration_response_parse ()

+
gboolean
+mbim_message_ip_configuration_response_parse
+                               (const MbimMessage *message,
+                                guint32 *session_id,
+                                MbimIPConfigurationAvailableFlag *ipv4_configuration_available,
+                                MbimIPConfigurationAvailableFlag *ipv6_configuration_available,
+                                guint32 *ipv4_address_count,
+                                MbimIPv4Element ***ipv4_address,
+                                guint32 *ipv6_address_count,
+                                MbimIPv6Element ***ipv6_address,
+                                const MbimIPv4 **ipv4_gateway,
+                                const MbimIPv6 **ipv6_gateway,
+                                guint32 *ipv4_dns_server_count,
+                                MbimIPv4 **ipv4_dns_server,
+                                guint32 *ipv6_dns_server_count,
+                                MbimIPv6 **ipv6_dns_server,
+                                guint32 *ipv4_mtu,
+                                guint32 *ipv6_mtu,
+                                GError **error);
+

Create a new request for the 'IPv6Mtu' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

session_id :

the 'SessionId' field, given as a guint32.

message

the MbimMessage.

 

ipv4_configuration_available :

the 'IPv4ConfigurationAvailable' field, given as a MbimIPConfigurationAvailableFlag.

session_id

return location for a guint32, or NULL if the 'SessionId' field is not needed.

 

ipv6_configuration_available :

the 'IPv6ConfigurationAvailable' field, given as a MbimIPConfigurationAvailableFlag.

ipv4_configuration_available

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv4ConfigurationAvailable' field is not needed.

 

ipv4_address_count :

the 'IPv4AddressCount' field, given as a guint32.

ipv6_configuration_available

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv6ConfigurationAvailable' field is not needed.

 

ipv4_address :

the 'IPv4Address' field, given as an array of MbimIPv4Elements.

ipv4_address_count

return location for a guint32, or NULL if the 'IPv4AddressCount' field is not needed.

 

ipv6_address_count :

the 'IPv6AddressCount' field, given as a guint32.

ipv4_address

return location for a newly allocated array of MbimIPv4Elements, or NULL if the 'IPv4Address' field is not needed. Free the returned value with mbim_ipv4_element_array_free().

 

ipv6_address :

the 'IPv6Address' field, given as an array of MbimIPv6Elements.

ipv6_address_count

return location for a guint32, or NULL if the 'IPv6AddressCount' field is not needed.

 

ipv4_gateway :

the 'IPv4Gateway' field, given as a MbimIPv4.

ipv6_address

return location for a newly allocated array of MbimIPv6Elements, or NULL if the 'IPv6Address' field is not needed. Free the returned value with mbim_ipv6_element_array_free().

 

ipv6_gateway :

the 'IPv6Gateway' field, given as a MbimIPv6.

ipv4_gateway

return location for a MbimIPv4, or NULL if the 'IPv4Gateway' field is not needed. Do not free the returned value, it is owned by message +.

 

ipv4_dns_server_count :

the 'IPv4DnsServerCount' field, given as a guint32.

ipv6_gateway

return location for a MbimIPv6, or NULL if the 'IPv6Gateway' field is not needed. Do not free the returned value, it is owned by message +.

 

ipv4_dns_server :

the 'IPv4DnsServer' field, given as an array of MbimIPv4.

ipv4_dns_server_count

return location for a guint32, or NULL if the 'IPv4DnsServerCount' field is not needed.

 

ipv6_dns_server_count :

the 'IPv6DnsServerCount' field, given as a guint32.

ipv4_dns_server

return location for a newly allocated array of MbimIPv4s, or NULL if the 'IPv4DnsServer' field is not needed. Free the returned value with g_free().

 

ipv6_dns_server :

the 'IPv6DnsServer' field, given as an array of MbimIPv6.

ipv6_dns_server_count

return location for a guint32, or NULL if the 'IPv6DnsServerCount' field is not needed.

 

ipv4_mtu :

the 'IPv4Mtu' field, given as a guint32.

ipv6_dns_server

return location for a newly allocated array of MbimIPv6s, or NULL if the 'IPv6DnsServer' field is not needed. Free the returned value with g_free().

 

ipv6_mtu :

the 'IPv6Mtu' field, given as a guint32.

ipv4_mtu

return location for a guint32, or NULL if the 'IPv4Mtu' field is not needed.

 

error :

return location for error or NULL.

ipv6_mtu

return location for a guint32, or NULL if the 'IPv6Mtu' field is not needed.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_ip_configuration_response_parse ()

-
gboolean            mbim_message_ip_configuration_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimIPConfigurationAvailableFlag *ipv4_configuration_available,
-                                                         MbimIPConfigurationAvailableFlag *ipv6_configuration_available,
-                                                         guint32 *ipv4_address_count,
-                                                         MbimIPv4Element ***ipv4_address,
-                                                         guint32 *ipv6_address_count,
-                                                         MbimIPv6Element ***ipv6_address,
-                                                         const MbimIPv4 **ipv4_gateway,
-                                                         const MbimIPv6 **ipv6_gateway,
-                                                         guint32 *ipv4_dns_server_count,
-                                                         MbimIPv4 **ipv4_dns_server,
-                                                         guint32 *ipv6_dns_server_count,
-                                                         MbimIPv6 **ipv6_dns_server,
-                                                         guint32 *ipv4_mtu,
-                                                         guint32 *ipv6_mtu,
-                                                         GError **error);
-

-Create a new request for the 'IPv6Mtu' response command in the 'Basic Connect' service. -

-
+

mbim_message_ip_configuration_notification_parse ()

+
gboolean
+mbim_message_ip_configuration_notification_parse
+                               (const MbimMessage *message,
+                                guint32 *session_id,
+                                MbimIPConfigurationAvailableFlag *ipv4_configuration_available,
+                                MbimIPConfigurationAvailableFlag *ipv6_configuration_available,
+                                guint32 *ipv4_address_count,
+                                MbimIPv4Element ***ipv4_address,
+                                guint32 *ipv6_address_count,
+                                MbimIPv6Element ***ipv6_address,
+                                const MbimIPv4 **ipv4_gateway,
+                                const MbimIPv6 **ipv6_gateway,
+                                guint32 *ipv4_dns_server_count,
+                                MbimIPv4 **ipv4_dns_server,
+                                guint32 *ipv6_dns_server_count,
+                                MbimIPv6 **ipv6_dns_server,
+                                guint32 *ipv4_mtu,
+                                guint32 *ipv6_mtu,
+                                GError **error);
+

Create a new request for the 'IPv6Mtu' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

session_id :

return location for a guint32, or NULL if the 'SessionId' field is not needed.

message

the MbimMessage.

 

ipv4_configuration_available :

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv4ConfigurationAvailable' field is not needed.

session_id

return location for a guint32, or NULL if the 'SessionId' field is not needed.

 

ipv6_configuration_available :

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv6ConfigurationAvailable' field is not needed.

ipv4_configuration_available

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv4ConfigurationAvailable' field is not needed.

 

ipv4_address_count :

return location for a guint32, or NULL if the 'IPv4AddressCount' field is not needed.

ipv6_configuration_available

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv6ConfigurationAvailable' field is not needed.

 

ipv4_address :

return location for a newly allocated array of MbimIPv4Elements, or NULL if the 'IPv4Address' field is not needed. Free the returned value with mbim_ipv4_element_array_free().

ipv4_address_count

return location for a guint32, or NULL if the 'IPv4AddressCount' field is not needed.

 

ipv6_address_count :

return location for a guint32, or NULL if the 'IPv6AddressCount' field is not needed.

ipv4_address

return location for a newly allocated array of MbimIPv4Elements, or NULL if the 'IPv4Address' field is not needed. Free the returned value with mbim_ipv4_element_array_free().

 

ipv6_address :

return location for a newly allocated array of MbimIPv6Elements, or NULL if the 'IPv6Address' field is not needed. Free the returned value with mbim_ipv6_element_array_free().

ipv6_address_count

return location for a guint32, or NULL if the 'IPv6AddressCount' field is not needed.

 

ipv4_gateway :

return location for a MbimIPv4, or NULL if the 'IPv4Gateway' field is not needed. Do not free the returned value, it is owned by message.

ipv6_address

return location for a newly allocated array of MbimIPv6Elements, or NULL if the 'IPv6Address' field is not needed. Free the returned value with mbim_ipv6_element_array_free().

 

ipv6_gateway :

return location for a MbimIPv6, or NULL if the 'IPv6Gateway' field is not needed. Do not free the returned value, it is owned by message.

ipv4_gateway

return location for a MbimIPv4, or NULL if the 'IPv4Gateway' field is not needed. Do not free the returned value, it is owned by message +.

 

ipv4_dns_server_count :

return location for a guint32, or NULL if the 'IPv4DnsServerCount' field is not needed.

ipv6_gateway

return location for a MbimIPv6, or NULL if the 'IPv6Gateway' field is not needed. Do not free the returned value, it is owned by message +.

 

ipv4_dns_server :

return location for a newly allocated array of MbimIPv4s, or NULL if the 'IPv4DnsServer' field is not needed. Free the returned value with g_free().

ipv4_dns_server_count

return location for a guint32, or NULL if the 'IPv4DnsServerCount' field is not needed.

 

ipv6_dns_server_count :

return location for a guint32, or NULL if the 'IPv6DnsServerCount' field is not needed.

ipv4_dns_server

return location for a newly allocated array of MbimIPv4s, or NULL if the 'IPv4DnsServer' field is not needed. Free the returned value with g_free().

 

ipv6_dns_server :

return location for a newly allocated array of MbimIPv6s, or NULL if the 'IPv6DnsServer' field is not needed. Free the returned value with g_free().

ipv6_dns_server_count

return location for a guint32, or NULL if the 'IPv6DnsServerCount' field is not needed.

 

ipv4_mtu :

return location for a guint32, or NULL if the 'IPv4Mtu' field is not needed.

ipv6_dns_server

return location for a newly allocated array of MbimIPv6s, or NULL if the 'IPv6DnsServer' field is not needed. Free the returned value with g_free().

 

ipv6_mtu :

return location for a guint32, or NULL if the 'IPv6Mtu' field is not needed.

ipv4_mtu

return location for a guint32, or NULL if the 'IPv4Mtu' field is not needed.

 

error :

return location for error or NULL.

ipv6_mtu

return location for a guint32, or NULL if the 'IPv6Mtu' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_ip_configuration_notification_parse ()

-
gboolean            mbim_message_ip_configuration_notification_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         MbimIPConfigurationAvailableFlag *ipv4_configuration_available,
-                                                         MbimIPConfigurationAvailableFlag *ipv6_configuration_available,
-                                                         guint32 *ipv4_address_count,
-                                                         MbimIPv4Element ***ipv4_address,
-                                                         guint32 *ipv6_address_count,
-                                                         MbimIPv6Element ***ipv6_address,
-                                                         const MbimIPv4 **ipv4_gateway,
-                                                         const MbimIPv6 **ipv6_gateway,
-                                                         guint32 *ipv4_dns_server_count,
-                                                         MbimIPv4 **ipv4_dns_server,
-                                                         guint32 *ipv6_dns_server_count,
-                                                         MbimIPv6 **ipv6_dns_server,
-                                                         guint32 *ipv4_mtu,
-                                                         guint32 *ipv6_mtu,
-                                                         GError **error);
-

-Create a new request for the 'IPv6Mtu' notification command in the 'Basic Connect' service. -

-
+

mbim_message_device_services_query_new ()

+
MbimMessage *
+mbim_message_device_services_query_new
+                               (GError **error);
+

Create a new request for the 'Device Services' query command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_device_services_response_parse ()

+
gboolean
+mbim_message_device_services_response_parse
+                               (const MbimMessage *message,
+                                guint32 *device_services_count,
+                                guint32 *max_dss_sessions,
+                                MbimDeviceServiceElement ***device_services,
+                                GError **error);
+

Create a new request for the 'DeviceServices' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + + +

message :

the MbimMessage.

message

the MbimMessage.

 

device_services_count

return location for a guint32, or NULL if the 'DeviceServicesCount' field is not needed.

 

max_dss_sessions

return location for a guint32, or NULL if the 'MaxDssSessions' field is not needed.

 

device_services

return location for a newly allocated array of MbimDeviceServiceElements, or NULL if the 'DeviceServices' field is not needed. Free the returned value with mbim_device_service_element_array_free().

 

error

return location for error or NULL.

 
+
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
+
+
+

mbim_message_device_service_subscribe_list_set_new ()

+
MbimMessage *
+mbim_message_device_service_subscribe_list_set_new
+                               (guint32 events_count,
+                                const MbimEventEntry *const *events,
+                                GError **error);
+

Create a new request for the 'Device Service Subscribe List' set command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + - - + + + - - + + + - - + + + + +

session_id :

return location for a guint32, or NULL if the 'SessionId' field is not needed.

events_count

the 'EventsCount' field, given as a guint32.

 

ipv4_configuration_available :

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv4ConfigurationAvailable' field is not needed.

events

the 'Events' field, given as an array of MbimEventEntrys.

 

ipv6_configuration_available :

return location for a MbimIPConfigurationAvailableFlag, or NULL if the 'IPv6ConfigurationAvailable' field is not needed.

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
+
+
+

mbim_message_device_service_subscribe_list_response_parse ()

+
gboolean
+mbim_message_device_service_subscribe_list_response_parse
+                               (const MbimMessage *message,
+                                guint32 *events_count,
+                                MbimEventEntry ***events,
+                                GError **error);
+

Create a new request for the 'Events' response command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + - - + + + - - + + + - - + + + - - + + + + +

ipv4_address_count :

return location for a guint32, or NULL if the 'IPv4AddressCount' field is not needed.

message

the MbimMessage.

 

ipv4_address :

return location for a newly allocated array of MbimIPv4Elements, or NULL if the 'IPv4Address' field is not needed. Free the returned value with mbim_ipv4_element_array_free().

events_count

return location for a guint32, or NULL if the 'EventsCount' field is not needed.

 

ipv6_address_count :

return location for a guint32, or NULL if the 'IPv6AddressCount' field is not needed.

events

return location for a newly allocated array of MbimEventEntrys, or NULL if the 'Events' field is not needed. Free the returned value with mbim_event_entry_array_free().

 

ipv6_address :

return location for a newly allocated array of MbimIPv6Elements, or NULL if the 'IPv6Address' field is not needed. Free the returned value with mbim_ipv6_element_array_free().

error

return location for error or NULL.

 
+
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
+
+
+

mbim_message_packet_statistics_query_new ()

+
MbimMessage *
+mbim_message_packet_statistics_query_new
+                               (GError **error);
+

Create a new request for the 'Packet Statistics' query command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
+
+
+

mbim_message_packet_statistics_response_parse ()

+
gboolean
+mbim_message_packet_statistics_response_parse
+                               (const MbimMessage *message,
+                                guint32 *in_discards,
+                                guint32 *in_errors,
+                                guint64 *in_octets,
+                                guint64 *in_packets,
+                                guint64 *out_octets,
+                                guint64 *out_packets,
+                                guint32 *out_errors,
+                                guint32 *out_discards,
+                                GError **error);
+

Create a new request for the 'OutDiscards' response command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

ipv4_gateway :

return location for a MbimIPv4, or NULL if the 'IPv4Gateway' field is not needed. Do not free the returned value, it is owned by message.

message

the MbimMessage.

 

ipv6_gateway :

return location for a MbimIPv6, or NULL if the 'IPv6Gateway' field is not needed. Do not free the returned value, it is owned by message.

in_discards

return location for a guint32, or NULL if the 'InDiscards' field is not needed.

 

ipv4_dns_server_count :

return location for a guint32, or NULL if the 'IPv4DnsServerCount' field is not needed.

in_errors

return location for a guint32, or NULL if the 'InErrors' field is not needed.

 

ipv4_dns_server :

return location for a newly allocated array of MbimIPv4s, or NULL if the 'IPv4DnsServer' field is not needed. Free the returned value with g_free().

in_octets

return location for a guint64, or NULL if the 'InOctets' field is not needed.

 

ipv6_dns_server_count :

return location for a guint32, or NULL if the 'IPv6DnsServerCount' field is not needed.

in_packets

return location for a guint64, or NULL if the 'InPackets' field is not needed.

 

ipv6_dns_server :

return location for a newly allocated array of MbimIPv6s, or NULL if the 'IPv6DnsServer' field is not needed. Free the returned value with g_free().

out_octets

return location for a guint64, or NULL if the 'OutOctets' field is not needed.

 

ipv4_mtu :

return location for a guint32, or NULL if the 'IPv4Mtu' field is not needed.

out_packets

return location for a guint64, or NULL if the 'OutPackets' field is not needed.

 

ipv6_mtu :

return location for a guint32, or NULL if the 'IPv6Mtu' field is not needed.

out_errors

return location for a guint32, or NULL if the 'OutErrors' field is not needed.

 

error :

return location for error or NULL.

out_discards

return location for a guint32, or NULL if the 'OutDiscards' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_device_services_query_new ()

-
MbimMessage *       mbim_message_device_services_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Device Services' query command in the 'Basic Connect' service. -

-
+

mbim_message_network_idle_hint_query_new ()

+
MbimMessage *
+mbim_message_network_idle_hint_query_new
+                               (GError **error);
+

Create a new request for the 'Network Idle Hint' query command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_network_idle_hint_set_new ()

+
MbimMessage *
+mbim_message_network_idle_hint_set_new
+                               (MbimNetworkIdleHintState state,
+                                GError **error);
+

Create a new request for the 'Network Idle Hint' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + - - + + +

error :

return location for error or NULL.

state

the 'State' field, given as a MbimNetworkIdleHintState.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_device_services_response_parse ()

-
gboolean            mbim_message_device_services_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *device_services_count,
-                                                         guint32 *max_dss_sessions,
-                                                         MbimDeviceServiceElement ***device_services,
-                                                         GError **error);
-

-Create a new request for the 'DeviceServices' response command in the 'Basic Connect' service. -

-
+

mbim_message_network_idle_hint_response_parse ()

+
gboolean
+mbim_message_network_idle_hint_response_parse
+                               (const MbimMessage *message,
+                                MbimNetworkIdleHintState *state,
+                                GError **error);
+

Create a new request for the 'State' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + + +

message :

the MbimMessage.

device_services_count :

return location for a guint32, or NULL if the 'DeviceServicesCount' field is not needed.

message

the MbimMessage.

 

max_dss_sessions :

return location for a guint32, or NULL if the 'MaxDssSessions' field is not needed.

state

return location for a MbimNetworkIdleHintState, or NULL if the 'State' field is not needed.

 

device_services :

return location for a newly allocated array of MbimDeviceServiceElements, or NULL if the 'DeviceServices' field is not needed. Free the returned value with mbim_device_service_element_array_free().

error

return location for error or NULL.

 
+
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+ +
+
+

mbim_message_emergency_mode_query_new ()

+
MbimMessage *
+mbim_message_emergency_mode_query_new (GError **error);
+

Create a new request for the 'Emergency Mode' query command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
+
+
+

mbim_message_emergency_mode_set_new ()

+
MbimMessage *
+mbim_message_emergency_mode_set_new (MbimEmergencyModeState state,
+                                     GError **error);
+

Create a new request for the 'Emergency Mode' set command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + - - + + + - - + + +

error :

return location for error or NULL.

state

the 'State' field, given as a MbimEmergencyModeState.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_device_service_subscriber_list_set_new ()

-
MbimMessage *       mbim_message_device_service_subscriber_list_set_new
-                                                        (guint32 events_count,
-                                                         const MbimEventEntry *const *events,
-                                                         GError **error);
-

-Create a new request for the 'Device Service Subscriber List' set command in the 'Basic Connect' service. -

-
+

mbim_message_emergency_mode_response_parse ()

+
gboolean
+mbim_message_emergency_mode_response_parse
+                               (const MbimMessage *message,
+                                MbimEmergencyModeState *state,
+                                GError **error);
+

Create a new request for the 'State' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + +

events_count :

the 'EventsCount' field, given as a guint32.

events :

the 'Events' field, given as an array of MbimEventEntrys.

message

the MbimMessage.

 

error :

return location for error or NULL.

state

return location for a MbimEmergencyModeState, or NULL if the 'State' field is not needed.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_device_service_subscriber_list_response_parse ()

-
gboolean            mbim_message_device_service_subscriber_list_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *events_count,
-                                                         MbimEventEntry ***events,
-                                                         GError **error);
-

-Create a new request for the 'Events' response command in the 'Basic Connect' service. -

-
+

mbim_message_emergency_mode_notification_parse ()

+
gboolean
+mbim_message_emergency_mode_notification_parse
+                               (const MbimMessage *message,
+                                MbimEmergencyModeState *state,
+                                GError **error);
+

Create a new request for the 'State' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + - - + + + - - + + +

message :

the MbimMessage.

events_count :

return location for a guint32, or NULL if the 'EventsCount' field is not needed.

events :

return location for a newly allocated array of MbimEventEntrys, or NULL if the 'Events' field is not needed. Free the returned value with mbim_event_entry_array_free().

message

the MbimMessage.

 

error :

return location for error or NULL.

state

return location for a MbimEmergencyModeState, or NULL if the 'State' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_packet_statistics_query_new ()

-
MbimMessage *       mbim_message_packet_statistics_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Packet Statistics' query command in the 'Basic Connect' service. -

-
+

mbim_message_ip_packet_filters_query_new ()

+
MbimMessage *
+mbim_message_ip_packet_filters_query_new
+                               (guint32 session_id,
+                                guint32 packet_filters_count,
+                                const MbimPacketFilter *const *packet_filters,
+                                GError **error);
+

Create a new request for the 'IP Packet Filters' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + + + + + + + + + + + - - + + +

error :

return location for error or NULL.

session_id

the 'SessionId' field, given as a guint32.

 

packet_filters_count

the 'PacketFiltersCount' field, given as a guint32.

 

packet_filters

the 'PacketFilters' field, given as an array of MbimPacketFilters.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_packet_statistics_response_parse ()

-
gboolean            mbim_message_packet_statistics_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *in_discards,
-                                                         guint32 *in_errors,
-                                                         guint64 *in_octets,
-                                                         guint64 *in_packets,
-                                                         guint64 *out_octets,
-                                                         guint64 *out_packets,
-                                                         guint32 *out_errors,
-                                                         guint32 *out_discards,
-                                                         GError **error);
-

-Create a new request for the 'OutDiscards' response command in the 'Basic Connect' service. -

-
+

mbim_message_ip_packet_filters_set_new ()

+
MbimMessage *
+mbim_message_ip_packet_filters_set_new
+                               (guint32 session_id,
+                                guint32 packet_filters_count,
+                                const MbimPacketFilter *const *packet_filters,
+                                GError **error);
+

Create a new request for the 'IP Packet Filters' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + - - + + + - - + + + - - + + + + +

message :

the MbimMessage.

in_discards :

return location for a guint32, or NULL if the 'InDiscards' field is not needed.

in_errors :

return location for a guint32, or NULL if the 'InErrors' field is not needed.

session_id

the 'SessionId' field, given as a guint32.

 

in_octets :

return location for a guint64, or NULL if the 'InOctets' field is not needed.

packet_filters_count

the 'PacketFiltersCount' field, given as a guint32.

 

in_packets :

return location for a guint64, or NULL if the 'InPackets' field is not needed.

packet_filters

the 'PacketFilters' field, given as an array of MbimPacketFilters.

 

out_octets :

return location for a guint64, or NULL if the 'OutOctets' field is not needed.

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_ip_packet_filters_response_parse ()

+
gboolean
+mbim_message_ip_packet_filters_response_parse
+                               (const MbimMessage *message,
+                                guint32 *session_id,
+                                guint32 *packet_filters_count,
+                                MbimPacketFilter ***packet_filters,
+                                GError **error);
+

Create a new request for the 'PacketFilters' response command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + - - + + + - - + + + - - + + + - - + + + - - + + +

out_packets :

return location for a guint64, or NULL if the 'OutPackets' field is not needed.

message

the MbimMessage.

 

out_errors :

return location for a guint32, or NULL if the 'OutErrors' field is not needed.

session_id

return location for a guint32, or NULL if the 'SessionId' field is not needed.

 

out_discards :

return location for a guint32, or NULL if the 'OutDiscards' field is not needed.

packet_filters_count

return location for a guint32, or NULL if the 'PacketFiltersCount' field is not needed.

 

error :

return location for error or NULL.

packet_filters

return location for a newly allocated array of MbimPacketFilters, or NULL if the 'PacketFilters' field is not needed. Free the returned value with mbim_packet_filter_array_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_network_idle_hint_query_new ()

-
MbimMessage *       mbim_message_network_idle_hint_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Network Idle Hint' query command in the 'Basic Connect' service. -

-
+

mbim_message_multicarrier_providers_query_new ()

+
MbimMessage *
+mbim_message_multicarrier_providers_query_new
+                               (GError **error);
+

Create a new request for the 'Multicarrier Providers' query command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_network_idle_hint_set_new ()

-
MbimMessage *       mbim_message_network_idle_hint_set_new
-                                                        (MbimNetworkIdleHintState state,
-                                                         GError **error);
-

-Create a new request for the 'Network Idle Hint' set command in the 'Basic Connect' service. -

-
+

mbim_message_multicarrier_providers_set_new ()

+
MbimMessage *
+mbim_message_multicarrier_providers_set_new
+                               (guint32 providers_count,
+                                const MbimProvider *const *providers,
+                                GError **error);
+

Create a new request for the 'Multicarrier Providers' set command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

state :

the 'State' field, given as a MbimNetworkIdleHintState.

providers_count

the 'ProvidersCount' field, given as a guint32.

 

error :

return location for error or NULL.

providers

the 'Providers' field, given as an array of MbimProviders.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_network_idle_hint_response_parse ()

-
gboolean            mbim_message_network_idle_hint_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimNetworkIdleHintState *state,
-                                                         GError **error);
-

-Create a new request for the 'State' response command in the 'Basic Connect' service. -

-
+

mbim_message_multicarrier_providers_response_parse ()

+
gboolean
+mbim_message_multicarrier_providers_response_parse
+                               (const MbimMessage *message,
+                                guint32 *providers_count,
+                                MbimProvider ***providers,
+                                GError **error);
+

Create a new request for the 'Providers' response command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

state :

return location for a MbimNetworkIdleHintState, or NULL if the 'State' field is not needed.

providers_count

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

 

error :

return location for error or NULL.

providers

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_emergency_mode_query_new ()

-
MbimMessage *       mbim_message_emergency_mode_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Emergency Mode' query command in the 'Basic Connect' service. -

-
+

mbim_message_multicarrier_providers_notification_parse ()

+
gboolean
+mbim_message_multicarrier_providers_notification_parse
+                               (const MbimMessage *message,
+                                guint32 *providers_count,
+                                MbimProvider ***providers,
+                                GError **error);
+

Create a new request for the 'Providers' notification command in the 'Basic Connect' service.

+
+

Parameters

+
--+++ - - - - - - + + + - -

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

message

the MbimMessage.

 
-
-
-
-

mbim_message_emergency_mode_set_new ()

-
MbimMessage *       mbim_message_emergency_mode_set_new (MbimEmergencyModeState state,
-                                                         GError **error);
-

-Create a new request for the 'Emergency Mode' set command in the 'Basic Connect' service. -

-
---- - - - + + + - - + + + - - + + +

state :

the 'State' field, given as a MbimEmergencyModeState.

providers_count

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

 

error :

return location for error or NULL.

providers

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
-
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+ + +
+

Types and Values

-

mbim_message_emergency_mode_response_parse ()

-
gboolean            mbim_message_emergency_mode_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimEmergencyModeState *state,
-                                                         GError **error);
-

-Create a new request for the 'State' response command in the 'Basic Connect' service. -

-
+

MbimPinDesc

+
typedef struct {
+    guint32 pin_mode;
+    guint32 pin_format;
+    guint32 pin_length_min;
+    guint32 pin_length_max;
+} MbimPinDesc;
+
+
+

Members

+
--+++ - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

guint32 pin_mode;

a guint32.

 

state :

return location for a MbimEmergencyModeState, or NULL if the 'State' field is not needed.

guint32 pin_format;

a guint32.

 

error :

return location for error or NULL.

guint32 pin_length_min;

a guint32.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

guint32 pin_length_max;

a guint32.

 
+
-

mbim_message_ip_packet_filters_query_new ()

-
MbimMessage *       mbim_message_ip_packet_filters_query_new
-                                                        (guint32 session_id,
-                                                         guint32 packet_filters_count,
-                                                         const MbimPacketFilter *const *packet_filters,
-                                                         GError **error);
-

-Create a new request for the 'IP Packet Filters' query command in the 'Basic Connect' service. -

-
+

MbimProvider

+
typedef struct {
+    gchar *provider_id;
+    guint32 provider_state;
+    gchar *provider_name;
+    guint32 cellular_class;
+    guint32 rssi;
+    guint32 error_rate;
+} MbimProvider;
+
+
+

Members

+
--+++ - - + + + + + + + + - - + + + - - + + + - - + + + - - + + +

session_id :

the 'SessionId' field, given as a guint32.

gchar *provider_id;

a string.

 

guint32 provider_state;

a guint32.

 

packet_filters_count :

the 'PacketFiltersCount' field, given as a guint32.

gchar *provider_name;

a string.

 

packet_filters :

the 'PacketFilters' field, given as an array of MbimPacketFilters.

guint32 cellular_class;

a guint32.

 

error :

return location for error or NULL.

guint32 rssi;

a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

guint32 error_rate;

a guint32.

 
+
-

mbim_message_ip_packet_filters_set_new ()

-
MbimMessage *       mbim_message_ip_packet_filters_set_new
-                                                        (guint32 session_id,
-                                                         guint32 packet_filters_count,
-                                                         const MbimPacketFilter *const *packet_filters,
-                                                         GError **error);
-

-Create a new request for the 'IP Packet Filters' set command in the 'Basic Connect' service. -

-
+

MbimProvisionedContextElement

+
typedef struct {
+    guint32 context_id;
+    MbimUuid context_type;
+    gchar *access_string;
+    gchar *user_name;
+    gchar *password;
+    guint32 compression;
+    guint32 auth_protocol;
+} MbimProvisionedContextElement;
+
+
+

Members

+
--+++ - - + + + + + + + + + + + + + - - + + + - - + + + - - + + + - - + + +

session_id :

the 'SessionId' field, given as a guint32.

guint32 context_id;

a guint32.

 

MbimUuid context_type;

a MbimUuid.

 

gchar *access_string;

a string.

 

packet_filters_count :

the 'PacketFiltersCount' field, given as a guint32.

gchar *user_name;

a string.

 

packet_filters :

the 'PacketFilters' field, given as an array of MbimPacketFilters.

gchar *password;

a string.

 

error :

return location for error or NULL.

guint32 compression;

a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

guint32 auth_protocol;

a guint32.

 
+
-

mbim_message_ip_packet_filters_response_parse ()

-
gboolean            mbim_message_ip_packet_filters_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *session_id,
-                                                         guint32 *packet_filters_count,
-                                                         MbimPacketFilter ***packet_filters,
-                                                         GError **error);
-

-Create a new request for the 'PacketFilters' response command in the 'Basic Connect' service. -

-
+

MbimIPv4Element

+
typedef struct {
+    guint32 on_link_prefix_length;
+    MbimIPv4 ipv4_address;
+} MbimIPv4Element;
+
+
+

Members

+
--+++ - - - - - - - - - - + + + - - - - - - - - - - + + +

message :

the MbimMessage.

session_id :

return location for a guint32, or NULL if the 'SessionId' field is not needed.

packet_filters_count :

return location for a guint32, or NULL if the 'PacketFiltersCount' field is not needed.

guint32 on_link_prefix_length;

a guint32.

 

packet_filters :

return location for a newly allocated array of MbimPacketFilters, or NULL if the 'PacketFilters' field is not needed. Free the returned value with mbim_packet_filter_array_free().

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

MbimIPv4 ipv4_address;

a MbimIPv4.

 
+
-

mbim_message_multicarrier_providers_query_new ()

-
MbimMessage *       mbim_message_multicarrier_providers_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Multicarrier Providers' query command in the 'Basic Connect' service. -

-
+

MbimIPv6Element

+
typedef struct {
+    guint32 on_link_prefix_length;
+    MbimIPv6 ipv6_address;
+} MbimIPv6Element;
+
+
+

Members

+
--+++ - - + + + - - + + +

error :

return location for error or NULL.

guint32 on_link_prefix_length;

a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

MbimIPv6 ipv6_address;

a MbimIPv6

 
+
-

mbim_message_multicarrier_providers_set_new ()

-
MbimMessage *       mbim_message_multicarrier_providers_set_new
-                                                        (guint32 providers_count,
-                                                         const MbimProvider *const *providers,
-                                                         GError **error);
-

-Create a new request for the 'Multicarrier Providers' set command in the 'Basic Connect' service. -

-
+

MbimDeviceServiceElement

+
typedef struct {
+    MbimUuid device_service_id;
+    guint32 dss_payload;
+    guint32 max_dss_instances;
+    guint32 cids_count;
+    guint32 *cids;
+} MbimDeviceServiceElement;
+
+
+

Members

+
--+++ - - + + + + + + + + - - + + + - - + + + - - + + +

providers_count :

the 'ProvidersCount' field, given as a guint32.

MbimUuid device_service_id;

a MbimUuid.

 

guint32 dss_payload;

a guint32.

 

providers :

the 'Providers' field, given as an array of MbimProviders.

guint32 max_dss_instances;

a guint32.

 

error :

return location for error or NULL.

guint32 cids_count;

a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

guint32 *cids;

an array of guint32 values.

 
+
-

mbim_message_multicarrier_providers_response_parse ()

-
gboolean            mbim_message_multicarrier_providers_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *providers_count,
-                                                         MbimProvider ***providers,
-                                                         GError **error);
-

-Create a new request for the 'Providers' response command in the 'Basic Connect' service. -

-
+

MbimEventEntry

+
typedef struct {
+    MbimUuid device_service_id;
+    guint32 cids_count;
+    guint32 *cids;
+} MbimEventEntry;
+
+
+

Members

+
--+++ - - + + + + + + + + - - + + + + +

message :

the MbimMessage.

MbimUuid device_service_id;

a MbimUuid.

 

guint32 cids_count;

a guint32.

 

providers_count :

return location for a guint32, or NULL if the 'ProvidersCount' field is not needed.

guint32 *cids;

an array of guint32 values.

 
+
+ +
+
+

MbimPacketFilter

+
typedef struct {
+    guint32 filter_size;
+    guint8 *packet_filter;
+    guint8 *packet_mask;
+} MbimPacketFilter;
+
+
+

Members

+
+++++ + - - + + + - - + + + - - + + +

providers :

return location for a newly allocated array of MbimProviders, or NULL if the 'Providers' field is not needed. Free the returned value with mbim_provider_array_free().

guint32 filter_size;

a guint32.

 

error :

return location for error or NULL.

guint8 *packet_filter;

an array of guint8 values.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

guint8 *packet_mask;

an array of guint8 values.

 
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Command-IDs.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Command-IDs.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Command-IDs.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Command-IDs.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,809 +2,1182 @@ -Command IDs +libmbim-glib Reference Manual: Command IDs - + - - - - - - - - - - + + + + + + +
- +

Command IDs

-

Command IDs

+

Command IDs — Generic command handling routines.
-
-

Synopsis

-
enum                MbimCidBasicConnect;
-enum                MbimCidSms;
-enum                MbimCidUssd;
-enum                MbimCidPhonebook;
-enum                MbimCidStk;
-enum                MbimCidAuth;
-enum                MbimCidDss;
-
-gboolean            mbim_cid_can_set                    (MbimService service,
-                                                         guint cid);
-gboolean            mbim_cid_can_query                  (MbimService service,
-                                                         guint cid);
-gboolean            mbim_cid_can_notify                 (MbimService service,
-                                                         guint cid);
-const gchar *       mbim_cid_get_printable              (MbimService service,
-                                                         guint cid);
-const gchar *       mbim_cid_basic_connect_get_string   (MbimCidBasicConnect val);
-const gchar *       mbim_cid_sms_get_string             (MbimCidSms val);
-const gchar *       mbim_cid_ussd_get_string            (MbimCidUssd val);
-const gchar *       mbim_cid_phonebook_get_string       (MbimCidPhonebook val);
-const gchar *       mbim_cid_stk_get_string             (MbimCidStk val);
-const gchar *       mbim_cid_auth_get_string            (MbimCidAuth val);
-const gchar *       mbim_cid_dss_get_string             (MbimCidDss val);
-
-
-
-

Object Hierarchy

-
-  GEnum
-   +----MbimCidBasicConnect
-
-
-  GEnum
-   +----MbimCidSms
-
-
-  GEnum
-   +----MbimCidUssd
-
-
-  GEnum
-   +----MbimCidPhonebook
-
-
-  GEnum
-   +----MbimCidStk
-
-
-  GEnum
-   +----MbimCidAuth
-
-
-  GEnum
-   +----MbimCidDss
-
-
-

Description

-

-This section defines the interface of the known command IDs. -

-
-
-

Details

-
-

enum MbimCidBasicConnect

-
typedef enum {
-    MBIM_CID_BASIC_CONNECT_UNKNOWN                        = 0,
-    MBIM_CID_BASIC_CONNECT_DEVICE_CAPS                    = 1,
-    MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS        = 2,
-    MBIM_CID_BASIC_CONNECT_RADIO_STATE                    = 3,
-    MBIM_CID_BASIC_CONNECT_PIN                            = 4,
-    MBIM_CID_BASIC_CONNECT_PIN_LIST                       = 5,
-    MBIM_CID_BASIC_CONNECT_HOME_PROVIDER                  = 6,
-    MBIM_CID_BASIC_CONNECT_PREFERRED_PROVIDERS            = 7,
-    MBIM_CID_BASIC_CONNECT_VISIBLE_PROVIDERS              = 8,
-    MBIM_CID_BASIC_CONNECT_REGISTER_STATE                 = 9,
-    MBIM_CID_BASIC_CONNECT_PACKET_SERVICE                 = 10,
-    MBIM_CID_BASIC_CONNECT_SIGNAL_STATE                   = 11,
-    MBIM_CID_BASIC_CONNECT_CONNECT                        = 12,
-    MBIM_CID_BASIC_CONNECT_PROVISIONED_CONTEXTS           = 13,
-    MBIM_CID_BASIC_CONNECT_SERVICE_ACTIVATION             = 14,
-    MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION               = 15,
-    MBIM_CID_BASIC_CONNECT_DEVICE_SERVICES                = 16,
-    /* 17, 18 reserved */
-    MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST = 19,
-    MBIM_CID_BASIC_CONNECT_PACKET_STATISTICS              = 20,
-    MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT              = 21,
-    MBIM_CID_BASIC_CONNECT_EMERGENCY_MODE                 = 22,
-    MBIM_CID_BASIC_CONNECT_IP_PACKET_FILTERS              = 23,
-    MBIM_CID_BASIC_CONNECT_MULTICARRIER_PROVIDERS         = 24,
-} MbimCidBasicConnect;
-
-

-MBIM commands in the MBIM_SERVICE_BASIC_CONNECT service. -

-
+

Functions

+
--++ - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + + +

MBIM_CID_BASIC_CONNECT_UNKNOWN

Unknown command. + +gboolean + +mbim_cid_can_set ()

MBIM_CID_BASIC_CONNECT_DEVICE_CAPS

Device capabilities. + +gboolean + +mbim_cid_can_query ()

MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS

Subscriber ready status. + +gboolean + +mbim_cid_can_notify ()

MBIM_CID_BASIC_CONNECT_RADIO_STATE

Radio state. +const gchar * + +mbim_cid_get_printable ()

MBIM_CID_BASIC_CONNECT_PIN

PIN. +const gchar * + +mbim_cid_basic_connect_get_string ()

MBIM_CID_BASIC_CONNECT_PIN_LIST

PIN list. +const gchar * + +mbim_cid_sms_get_string ()

MBIM_CID_BASIC_CONNECT_HOME_PROVIDER

Home provider. +const gchar * + +mbim_cid_ussd_get_string ()

MBIM_CID_BASIC_CONNECT_PREFERRED_PROVIDERS

Preferred providers. +const gchar * + +mbim_cid_phonebook_get_string ()

MBIM_CID_BASIC_CONNECT_VISIBLE_PROVIDERS

Visible providers. +const gchar * + +mbim_cid_stk_get_string ()

MBIM_CID_BASIC_CONNECT_REGISTER_STATE

Register state. +const gchar * + +mbim_cid_auth_get_string ()

MBIM_CID_BASIC_CONNECT_PACKET_SERVICE

Packet service. +const gchar * + +mbim_cid_dss_get_string ()

MBIM_CID_BASIC_CONNECT_SIGNAL_STATE

Signal state. +const gchar * + +mbim_cid_ms_firmware_id_get_string ()

MBIM_CID_BASIC_CONNECT_CONNECT

Connect. +const gchar * + +mbim_cid_ms_host_shutdown_get_string ()

MBIM_CID_BASIC_CONNECT_PROVISIONED_CONTEXTS

Provisioned contexts. +const gchar * + +mbim_cid_proxy_control_get_string ()
+
+
+

Types and Values

+
++++ + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + +

MBIM_CID_BASIC_CONNECT_SERVICE_ACTIVATION

Service activation. -enumMbimCidBasicConnect

MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION

IP configuration. -enumMbimCidSms

MBIM_CID_BASIC_CONNECT_DEVICE_SERVICES

Device services. -enumMbimCidUssd

MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST

Device service subscriber list. -enumMbimCidPhonebook

MBIM_CID_BASIC_CONNECT_PACKET_STATISTICS

Packet statistics. -enumMbimCidStk

MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT

Network idle hint. -enumMbimCidAuth

MBIM_CID_BASIC_CONNECT_EMERGENCY_MODE

Emergency mode. -enumMbimCidDss

MBIM_CID_BASIC_CONNECT_IP_PACKET_FILTERS

IP packet filters. -enumMbimCidMsFirmwareId

MBIM_CID_BASIC_CONNECT_MULTICARRIER_PROVIDERS

Multicarrier providers. -enumMbimCidMsHostShutdown
enumMbimCidProxyControl
-
-
-

enum MbimCidSms

-
typedef enum {
-    MBIM_CID_SMS_UNKNOWN              = 0,
-    MBIM_CID_SMS_CONFIGURATION        = 1,
-    MBIM_CID_SMS_READ                 = 2,
-    MBIM_CID_SMS_SEND                 = 3,
-    MBIM_CID_SMS_DELETE               = 4,
-    MBIM_CID_SMS_MESSAGE_STORE_STATUS = 5,
-} MbimCidSms;
+

+
Object Hierarchy

+
    GEnum
+    ├── MbimCidAuth
+    ├── MbimCidBasicConnect
+    ├── MbimCidDss
+    ├── MbimCidMsFirmwareId
+    ├── MbimCidMsHostShutdown
+    ├── MbimCidPhonebook
+    ├── MbimCidProxyControl
+    ├── MbimCidSms
+    ├── MbimCidStk
+    ╰── MbimCidUssd
 

-

-MBIM commands in the MBIM_SERVICE_SMS service.
-

-

+
+

+
Description

+
This section defines the interface of the known command IDs.

+

+

+
Functions

+

+
mbim_cid_can_set ()

+
gboolean
+mbim_cid_can_set (MbimService service,
+                  guint cid);

+
Checks whether the given command allows setting.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
+
+

 





 
 
 
MBIM_CID_SMS_UNKNOWN
Unknown command.
-
service
a MbimService.
 
 

 
MBIM_CID_SMS_CONFIGURATION
SMS configuration.
-
cid
a command ID.
 
 

+

+

+
Returns

+
 TRUE if the command allows setting, FALSE otherwise.

+

+

+
+
+
+

mbim_cid_can_query ()

+
gboolean
+mbim_cid_can_query (MbimService service,
+                    guint cid);
+

Checks whether the given command allows querying.

+
+

Parameters

+
+++++ + - - + + + - - + + + + +

MBIM_CID_SMS_READ

Read. -

service

a MbimService.

 

MBIM_CID_SMS_SEND

Send. -

cid

a command ID.

 
+
+
+

Returns

+

TRUE if the command allows querying, FALSE otherwise.

+

+
+
+
+
+

mbim_cid_can_notify ()

+
gboolean
+mbim_cid_can_notify (MbimService service,
+                     guint cid);
+

Checks whether the given command allows notifying.

+
+

Parameters

+
+++++ + - - + + + - - + + +

MBIM_CID_SMS_DELETE

Delete. -

service

a MbimService.

 

MBIM_CID_SMS_MESSAGE_STORE_STATUS

Store message status. -

cid

a command ID.

 
+
+

Returns

+

TRUE if the command allows notifying, FALSE otherwise.

+

+
+
-

enum MbimCidUssd

-
typedef enum {
-    MBIM_CID_USSD_UNKNOWN = 0,
-    MBIM_CID_USSD         = 1,
-} MbimCidUssd;
-
-

-MBIM commands in the MBIM_SERVICE_USSD service. -

-
+

mbim_cid_get_printable ()

+
const gchar *
+mbim_cid_get_printable (MbimService service,
+                        guint cid);
+

Gets a printable string for the command specified by the service + and the +cid +.

+
+

Parameters

+
--+++ - - + + + - - + + +

MBIM_CID_USSD_UNKNOWN

Unknown command. -

service

a MbimService.

 

MBIM_CID_USSD

USSD operation. -

cid

a command ID.

 
+
+

Returns

+

a constant string.

+

[transfer none]

+
+
-

enum MbimCidPhonebook

-
typedef enum {
-    MBIM_CID_PHONEBOOK_UNKNOWN       = 0,
-    MBIM_CID_PHONEBOOK_CONFIGURATION = 1,
-    MBIM_CID_PHONEBOOK_READ          = 2,
-    MBIM_CID_PHONEBOOK_DELETE        = 3,
-    MBIM_CID_PHONEBOOK_WRITE         = 4,
-} MbimCidPhonebook;
-
-

-MBIM commands in the MBIM_SERVICE_PHONEBOOK service. -

-
+

mbim_cid_basic_connect_get_string ()

+
const gchar *
+mbim_cid_basic_connect_get_string (MbimCidBasicConnect val);
+

Gets the nickname string for the MbimCidBasicConnect specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidBasicConnect.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_sms_get_string ()

+
const gchar *
+mbim_cid_sms_get_string (MbimCidSms val);
+

Gets the nickname string for the MbimCidSms specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidSms.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_ussd_get_string ()

+
const gchar *
+mbim_cid_ussd_get_string (MbimCidUssd val);
+

Gets the nickname string for the MbimCidUssd specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidUssd.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_phonebook_get_string ()

+
const gchar *
+mbim_cid_phonebook_get_string (MbimCidPhonebook val);
+

Gets the nickname string for the MbimCidPhonebook specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidPhonebook.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_stk_get_string ()

+
const gchar *
+mbim_cid_stk_get_string (MbimCidStk val);
+

Gets the nickname string for the MbimCidStk specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidStk.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_auth_get_string ()

+
const gchar *
+mbim_cid_auth_get_string (MbimCidAuth val);
+

Gets the nickname string for the MbimCidAuth specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidAuth.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_dss_get_string ()

+
const gchar *
+mbim_cid_dss_get_string (MbimCidDss val);
+

Gets the nickname string for the MbimCidDss specified at val +.

+
+

Parameters

+
--++++ + + + + + +

val

a MbimCidDss.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_ms_firmware_id_get_string ()

+
const gchar *
+mbim_cid_ms_firmware_id_get_string (MbimCidMsFirmwareId val);
+

Gets the nickname string for the MbimCidMsFirmwareId specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidMsFirmwareId.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_ms_host_shutdown_get_string ()

+
const gchar *
+mbim_cid_ms_host_shutdown_get_string (MbimCidMsHostShutdown val);
+

Gets the nickname string for the MbimCidMsHostShutdown specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidMsHostShutdown.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_cid_proxy_control_get_string ()

+
const gchar *
+mbim_cid_proxy_control_get_string (MbimCidProxyControl val);
+

Gets the nickname string for the MbimCidProxyControl specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCidProxyControl.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+ +
+

Types and Values

+
+

enum MbimCidBasicConnect

+

MBIM commands in the MBIM_SERVICE_BASIC_CONNECT service.

+
+

Members

+
++++ - - + + - - + + - - + + - - + + - - + + - -

MBIM_CID_PHONEBOOK_UNKNOWN

Unknown command. +

MBIM_CID_BASIC_CONNECT_UNKNOWN

 +

Unknown command.

 

MBIM_CID_PHONEBOOK_CONFIGURATION

Configuration. +

MBIM_CID_BASIC_CONNECT_DEVICE_CAPS

 +

Device capabilities.

 

MBIM_CID_PHONEBOOK_READ

Read. +

MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS

 +

Subscriber ready status.

 

MBIM_CID_PHONEBOOK_DELETE

Delete. +

MBIM_CID_BASIC_CONNECT_RADIO_STATE

 +

Radio state.

 

MBIM_CID_PHONEBOOK_WRITE

Write. +

MBIM_CID_BASIC_CONNECT_PIN

 +

PIN.

 
-
-
-
-

enum MbimCidStk

-
typedef enum {
-    MBIM_CID_STK_UNKNOWN           = 0,
-    MBIM_CID_STK_PAC               = 1,
-    MBIM_CID_STK_TERMINAL_RESPONSE = 2,
-    MBIM_CID_STK_ENVELOPE          = 3,
-} MbimCidStk;
-
-

-MBIM commands in the MBIM_SERVICE_STK service. -

-
---- - - - + + - - + + - - + + - - + + - -

MBIM_CID_STK_UNKNOWN

Unknown command. +

MBIM_CID_BASIC_CONNECT_PIN_LIST

 +

PIN list.

 

MBIM_CID_STK_PAC

PAC. +

MBIM_CID_BASIC_CONNECT_HOME_PROVIDER

 +

Home provider.

 

MBIM_CID_STK_TERMINAL_RESPONSE

Terminal response. +

MBIM_CID_BASIC_CONNECT_PREFERRED_PROVIDERS

 +

Preferred providers.

 

MBIM_CID_STK_ENVELOPE

Envelope. +

MBIM_CID_BASIC_CONNECT_VISIBLE_PROVIDERS

 +

Visible providers.

 
-
-
-
-

enum MbimCidAuth

-
typedef enum {
-    MBIM_CID_AUTH_UNKNOWN = 0,
-    MBIM_CID_AUTH_AKA     = 1,
-    MBIM_CID_AUTH_AKAP    = 2,
-    MBIM_CID_AUTH_SIM     = 3,
-} MbimCidAuth;
-
-

-MBIM commands in the MBIM_SERVICE_AUTH service. -

-
---- - - - + + - - + + - - + + - - + + - -

MBIM_CID_AUTH_UNKNOWN

Unknow command +

MBIM_CID_BASIC_CONNECT_REGISTER_STATE

 +

Register state.

 

MBIM_CID_AUTH_AKA

AKA. +

MBIM_CID_BASIC_CONNECT_PACKET_SERVICE

 +

Packet service.

 

MBIM_CID_AUTH_AKAP

AKAP. +

MBIM_CID_BASIC_CONNECT_SIGNAL_STATE

 +

Signal state.

 

MBIM_CID_AUTH_SIM

SIM. +

MBIM_CID_BASIC_CONNECT_CONNECT

 +

Connect.

 
-
-
-
-

enum MbimCidDss

-
typedef enum {
-    MBIM_CID_DSS_UNKNOWN = 0,
-    MBIM_CID_DSS_CONNECT = 1
-} MbimCidDss;
-
-

-MBIM commands in the MBIM_SERVICE_DSS service. -

-
---- - - - + + - - + + - -

MBIM_CID_DSS_UNKNOWN

Unknown command. +

MBIM_CID_BASIC_CONNECT_PROVISIONED_CONTEXTS

 +

Provisioned contexts.

 

MBIM_CID_DSS_CONNECT

Connect. +

MBIM_CID_BASIC_CONNECT_SERVICE_ACTIVATION

 +

Service activation.

 
-
-
-
-

mbim_cid_can_set ()

-
gboolean            mbim_cid_can_set                    (MbimService service,
-                                                         guint cid);
-

-Checks whether the given command allows setting. -

-
---- - - - + + + - - + + + - - + + + + + + + + - -

service :

a MbimService.

MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION

 +

IP configuration.

+		 

cid :

a command ID.

MBIM_CID_BASIC_CONNECT_DEVICE_SERVICES

 +

Device services.

+		 

Returns :

 -TRUE if the command allows setting, FALSE otherwise.

MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST

 +

Device service subscribe list.

+		 

MBIM_CID_BASIC_CONNECT_PACKET_STATISTICS

 +

Packet statistics.

+		 
-
-
-
-

mbim_cid_can_query ()

-
gboolean            mbim_cid_can_query                  (MbimService service,
-                                                         guint cid);
-

-Checks whether the given command allows querying. -

-
---- - - - + + + - - + + + - - + + + + + + + +

service :

a MbimService.

MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT

 +

Network idle hint.

+		 

cid :

a command ID.

MBIM_CID_BASIC_CONNECT_EMERGENCY_MODE

 +

Emergency mode.

+		 

Returns :

 -TRUE if the command allows querying, FALSE otherwise.

MBIM_CID_BASIC_CONNECT_IP_PACKET_FILTERS

 +

IP packet filters.

+		 

MBIM_CID_BASIC_CONNECT_MULTICARRIER_PROVIDERS

 +

Multicarrier providers.

+		 
+
-

mbim_cid_can_notify ()

-
gboolean            mbim_cid_can_notify                 (MbimService service,
-                                                         guint cid);
-

-Checks whether the given command allows notifying. -

-
+

enum MbimCidSms

+

MBIM commands in the MBIM_SERVICE_SMS service.

+
+

Members

+
--+++ - - + + + - - + + + + + + + + - - + + + + + + + + + + + + +

service :

a MbimService.

MBIM_CID_SMS_UNKNOWN

 +

Unknown command.

+		 

cid :

a command ID.

MBIM_CID_SMS_CONFIGURATION

 +

SMS configuration.

+		 

MBIM_CID_SMS_READ

 +

Read.

+		 

Returns :

 -TRUE if the command allows notifying, FALSE otherwise.

MBIM_CID_SMS_SEND

 +

Send.

+		 

MBIM_CID_SMS_DELETE

 +

Delete.

+		 

MBIM_CID_SMS_MESSAGE_STORE_STATUS

 +

Store message status.

+		 
+
-

mbim_cid_get_printable ()

-
const gchar *       mbim_cid_get_printable              (MbimService service,
-                                                         guint cid);
-

-Gets a printable string for the command specified by the service and the -cid. -

-
+

enum MbimCidUssd

+

MBIM commands in the MBIM_SERVICE_USSD service.

+
+

Members

+
--+++ - - - - - - + + + - - + +

service :

a MbimService.

cid :

a command ID.

MBIM_CID_USSD_UNKNOWN

 +

Unknown command.

+		 

Returns :

a constant string. [transfer none] +

MBIM_CID_USSD

 +

USSD operation.

 
+
-

mbim_cid_basic_connect_get_string ()

-
const gchar *       mbim_cid_basic_connect_get_string   (MbimCidBasicConnect val);
-

-Gets the nickname string for the MbimCidBasicConnect specified at val. -

-
+

enum MbimCidPhonebook

+

MBIM commands in the MBIM_SERVICE_PHONEBOOK service.

+
+

Members

+
--+++ - - + + + + + + + + + + + + + + + + + + - - + +

val :

a MbimCidBasicConnect.

MBIM_CID_PHONEBOOK_UNKNOWN

 +

Unknown command.

+		 

MBIM_CID_PHONEBOOK_CONFIGURATION

 +

Configuration.

+		 

MBIM_CID_PHONEBOOK_READ

 +

Read.

+		 

MBIM_CID_PHONEBOOK_DELETE

 +

Delete.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CID_PHONEBOOK_WRITE

 +

Write.

 
+
-

mbim_cid_sms_get_string ()

-
const gchar *       mbim_cid_sms_get_string             (MbimCidSms val);
-

-Gets the nickname string for the MbimCidSms specified at val. -

-
+

enum MbimCidStk

+

MBIM commands in the MBIM_SERVICE_STK service.

+
+

Members

+
--+++ - - + + + + + + + + + + + + + - - + +

val :

a MbimCidSms.

MBIM_CID_STK_UNKNOWN

 +

Unknown command.

+		 

MBIM_CID_STK_PAC

 +

PAC.

+		 

MBIM_CID_STK_TERMINAL_RESPONSE

 +

Terminal response.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CID_STK_ENVELOPE

 +

Envelope.

 
+
-

mbim_cid_ussd_get_string ()

-
const gchar *       mbim_cid_ussd_get_string            (MbimCidUssd val);
-

-Gets the nickname string for the MbimCidUssd specified at val. -

-
+

enum MbimCidAuth

+

MBIM commands in the MBIM_SERVICE_AUTH service.

+
+

Members

+
--+++ - - + + + + + + + + - - + + + + + + +

val :

a MbimCidUssd.

MBIM_CID_AUTH_UNKNOWN

 +

Unknow command

+		 

MBIM_CID_AUTH_AKA

 +

AKA.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CID_AUTH_AKAP

 +

AKAP.

 

MBIM_CID_AUTH_SIM

 +

SIM.

+		 
+
-

mbim_cid_phonebook_get_string ()

-
const gchar *       mbim_cid_phonebook_get_string       (MbimCidPhonebook val);
-

-Gets the nickname string for the MbimCidPhonebook specified at val. -

-
+

enum MbimCidDss

+

MBIM commands in the MBIM_SERVICE_DSS service.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimCidPhonebook.

MBIM_CID_DSS_UNKNOWN

 +

Unknown command.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CID_DSS_CONNECT

 +

Connect.

 
+
-

mbim_cid_stk_get_string ()

-
const gchar *       mbim_cid_stk_get_string             (MbimCidStk val);
-

-Gets the nickname string for the MbimCidStk specified at val. -

-
+

enum MbimCidMsFirmwareId

+

MBIM commands in the MBIM_SERVICE_MS_FIRMWARE_ID service.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimCidStk.

MBIM_CID_MS_FIRMWARE_ID_UNKNOWN

 +

Unknown command.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CID_MS_FIRMWARE_ID_GET

 +

Get Firmware ID.

 
+
-

mbim_cid_auth_get_string ()

-
const gchar *       mbim_cid_auth_get_string            (MbimCidAuth val);
-

-Gets the nickname string for the MbimCidAuth specified at val. -

-
+

enum MbimCidMsHostShutdown

+

MBIM commands in the MBIM_SERVICE_MS_HOST_SHUTDOWN service.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimCidAuth.

MBIM_CID_MS_HOST_SHUTDOWN_UNKNOWN

 +

Unknown command.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY

 +

Notify that the host is shutting down.

 
+
-

mbim_cid_dss_get_string ()

-
const gchar *       mbim_cid_dss_get_string             (MbimCidDss val);
-

-Gets the nickname string for the MbimCidDss specified at val. -

-
+

enum MbimCidProxyControl

+

MBIM commands in the MBIM_SERVICE_PROXY_CONTROL service.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimCidDss.

MBIM_CID_PROXY_CONTROL_UNKNOWN

 +

Unknown command.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CID_PROXY_CONTROL_CONFIGURATION

 +

Configuration.

 
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Common-utilities.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Common-utilities.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Common-utilities.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Common-utilities.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -Common utilities +libmbim-glib Reference Manual: Common utilities - - + + - - - - - - - - - - + + + + + + +
@@ -33,64 +30,87 @@

Common utilities

Common utilities

- +
-
-

Synopsis

-
gboolean            mbim_utils_get_traces_enabled       (void);
-void                mbim_utils_set_traces_enabled       (gboolean enabled);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+





+gboolean
+
+mbim_utils_get_traces_enabled ()
+

+void
+
+mbim_utils_set_traces_enabled ()
+

+

+

+
Object Hierarchy

+
 

 

 

 
Description

-

-This section exposes a set of common utilities that may be used to work
-with the MBIM library.
-

+
This section exposes a set of common utilities that may be used to work
+with the MBIM library.

 

 

-
Details

+
Functions

 

-
mbim_utils_get_traces_enabled ()

-
gboolean            mbim_utils_get_traces_enabled       (void);

-

-Checks whether MBIM message traces are currently enabled.
-

-

----
-
-
-
-
-




Returns :

-TRUE if traces are enabled, FALSE otherwise.

+
mbim_utils_get_traces_enabled ()

+
gboolean
+mbim_utils_get_traces_enabled (void);

+
Checks whether MBIM message traces are currently enabled.

+

+
Returns

+
 TRUE if traces are enabled, FALSE otherwise.

+

+

 

 

 

-
mbim_utils_set_traces_enabled ()

-
void                mbim_utils_set_traces_enabled       (gboolean enabled);

-

-Sets whether MBIM message traces are enabled or disabled.
-

-

+
mbim_utils_set_traces_enabled ()

+
void
+mbim_utils_set_traces_enabled (gboolean enabled);

+
Sets whether MBIM message traces are enabled or disabled.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
enabled :

-TRUE to enable traces, FALSE to disable them.
enabled
TRUE to enable traces, FALSE to disable them.
 
+
+

Types and Values

+
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Deprecated-API.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Deprecated-API.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Deprecated-API.html 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Deprecated-API.html 2014-08-04 13:06:13.000000000 +0000 @@ -0,0 +1,220 @@ + + + + +libmbim-glib Reference Manual: Deprecated API + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Deprecated API

+

Deprecated API — Types and functions flagged as deprecated.

+
+
+

Functions

+
++++ + + + + + + + + + + +
+gboolean + +mbim_message_device_service_subscriber_list_response_parse () +
+MbimMessage * + +mbim_message_device_service_subscriber_list_set_new () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + +
#defineMBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST
#defineMBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+

This section defines types and functions that have been deprecated.

+
+
+

Functions

+
+

mbim_message_device_service_subscriber_list_response_parse ()

+
gboolean
+mbim_message_device_service_subscriber_list_response_parse
+                               (const MbimMessage *message,
+                                guint32 *events_count,
+                                MbimEventEntry ***events,
+                                GError **error);
+
+

mbim_message_device_service_subscriber_list_response_parse has been deprecated since version 1.8.0 and should not be used in newly-written code.

+

Use mbim_message_device_service_subscribe_list_response_parse() instead.

+
+

Create a new request for the 'Events' response command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

message

the MbimMessage.

 

events_count

return location for a guint32, or NULL if the 'EventsCount' field is not needed.

 

events

return location for a newly allocated array of MbimEventEntrys, or NULL if the 'Events' field is not needed. Free the returned value with mbim_event_entry_array_free().

 

error

return location for error or NULL.

 
+
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
+
+
+

mbim_message_device_service_subscriber_list_set_new ()

+
MbimMessage *
+mbim_message_device_service_subscriber_list_set_new
+                               (guint32 events_count,
+                                const MbimEventEntry *const *events,
+                                GError **error);
+
+

mbim_message_device_service_subscriber_list_set_new has been deprecated since version 1.8.0 and should not be used in newly-written code.

+

Use mbim_message_device_service_subscribe_list_set_new() instead.

+
+

Create a new request for the 'Device Service Subscribe List' set command in the 'Basic Connect' service.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

events_count

the 'EventsCount' field, given as a guint32.

 

events

the 'Events' field, given as an array of MbimEventEntrys.

 

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
+
+
+

Types and Values

+
+

MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST

+
#define MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST
+
+
+

MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST has been deprecated since version 1.8.0 and should not be used in newly-written code.

+

Use MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST instead.

+
+

Device service subscribe list.

+
+
+
+

MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH

+
#define MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH
+
+
+

MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH has been deprecated since version 1.8.0 and should not be used in newly-written code.

+

Use MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH instead.

+
+

Modem should auto-attach to the network after registration.

+
+
+
+
+
+ Generated by GTK-Doc V1.20
+ + \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib.devhelp2 libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib.devhelp2 --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib.devhelp2 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib.devhelp2 2014-08-04 13:06:12.000000000 +0000 @@ -8,11 +8,12 @@ + - + @@ -21,9 +22,15 @@ + + + + + + + - @@ -31,8 +38,21 @@ - - + + + + + + + + + + + + + + + @@ -42,682 +62,365 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-DSS.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-DSS.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-DSS.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-DSS.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -DSS +libmbim-glib Reference Manual: DSS - + - - + + - - - - - - - - - - + + + + + + +
@@ -33,17 +30,38 @@

DSS

DSS

- +
-
-

Synopsis

-
MbimMessage *       mbim_message_dss_connect_set_new    (const MbimUuid *device_service_id,
-                                                         guint32 dss_session_id,
-                                                         MbimDssLinkState dss_link_state,
-                                                         GError **error);
-gboolean            mbim_message_dss_connect_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+





+MbimMessage *
+
+mbim_message_dss_connect_set_new ()
+

+gboolean
+
+mbim_message_dss_connect_response_parse ()
+

+

+

+
Object Hierarchy

+
 

 

 

@@ -52,80 +70,97 @@
 

 

 

-
Details

+
Functions

 

-
mbim_message_dss_connect_set_new ()

-
MbimMessage *       mbim_message_dss_connect_set_new    (const MbimUuid *device_service_id,
-                                                         guint32 dss_session_id,
-                                                         MbimDssLinkState dss_link_state,
-                                                         GError **error);

-

-Create a new request for the 'Connect' set command in the 'DSS' service.
-

-

+
mbim_message_dss_connect_set_new ()

+
MbimMessage *
+mbim_message_dss_connect_set_new (const MbimUuid *device_service_id,
+                                  guint32 dss_session_id,
+                                  MbimDssLinkState dss_link_state,
+                                  GError **error);

+
Create a new request for the 'Connect' set command in the 'DSS' service.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
device_service_id :
the 'DeviceServiceId' field, given as a MbimUuid.
dss_session_id :
the 'DssSessionId' field, given as a guint32.
device_service_id
the 'DeviceServiceId' field, given as a MbimUuid.
 
 

 
dss_link_state :
the 'DssLinkState' field, given as a MbimDssLinkState.
dss_session_id
the 'DssSessionId' field, given as a guint32.
 
 

 
error :
return location for error or NULL.
dss_link_state
the 'DssLinkState' field, given as a MbimDssLinkState.
 
 

 
Returns :
a newly allocated MbimMessage, which should be freed with mbim_message_unref().
error
return location for error or NULL.
 
 

 
 

 

+

+
Returns

+
 a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+

+

 

 

-
mbim_message_dss_connect_response_parse ()

-
gboolean            mbim_message_dss_connect_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);

-

-Create a new request for the 'Connect' response command in the 'DSS' service.
-

-

+
mbim_message_dss_connect_response_parse ()

+
gboolean
+mbim_message_dss_connect_response_parse
+                               (const MbimMessage *message,
+                                GError **error);

+
Create a new request for the 'Connect' response command in the 'DSS' service.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
message :
the MbimMessage.
error :
return location for error or NULL.
message
the MbimMessage.
 
 

 
Returns :

-TRUE if the message was correctly parsed, FALSE if error is set.
error
return location for error or NULL.
 
 

 
 

 

+

+
Returns

+
 TRUE if the message was correctly parsed, FALSE if error
+is set.

+

+

+
+
+
+

Types and Values

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Enumerations-and-Flags.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Enumerations-and-Flags.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Enumerations-and-Flags.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Enumerations-and-Flags.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,3747 +2,4501 @@ -Enumerations and Flags +libmbim-glib Reference Manual: Enumerations and Flags - + - + - - - - - - - - - - + + + + + + +
- +

Enumerations and Flags

-

Enumerations and Flags

+

Enumerations and Flags — Common enumeration and flag types.
-
-

Synopsis

-
enum                MbimDeviceType;
-enum                MbimCellularClass;
-enum                MbimVoiceClass;
-enum                MbimSimClass;
-enum                MbimDataClass;
-enum                MbimSmsCaps;
-enum                MbimCtrlCaps;
-enum                MbimSubscriberReadyState;
-enum                MbimReadyInfoFlag;
-enum                MbimRadioSwitchState;
-enum                MbimPinType;
-enum                MbimPinState;
-enum                MbimPinOperation;
-enum                MbimPinMode;
-enum                MbimPinFormat;
-enum                MbimProviderState;
-enum                MbimVisibleProvidersAction;
-enum                MbimNwError;
-enum                MbimRegisterAction;
-enum                MbimRegisterState;
-enum                MbimRegisterMode;
-enum                MbimRegistrationFlag;
-enum                MbimPacketServiceAction;
-enum                MbimPacketServiceState;
-enum                MbimActivationCommand;
-enum                MbimCompression;
-enum                MbimAuthProtocol;
-enum                MbimContextIpType;
-enum                MbimActivationState;
-enum                MbimVoiceCallState;
-enum                MbimIPConfigurationAvailableFlag;
-enum                MbimSmsStorageState;
-enum                MbimSmsFormat;
-enum                MbimSmsFlag;
-enum                MbimSmsCdmaLang;
-enum                MbimSmsCdmaEncoding;
-enum                MbimSmsStatus;
-enum                MbimSmsStatusFlag;
-enum                MbimUssdAction;
-enum                MbimUssdResponse;
-enum                MbimUssdSessionState;
-enum                MbimPhonebookFlag;
-enum                MbimPhonebookState;
-enum                MbimPhonebookWriteFlag;
-enum                MbimStkPacProfile;
-enum                MbimStkPacType;
-enum                MbimNetworkIdleHintState;
-enum                MbimEmergencyModeState;
-enum                MbimDssLinkState;
-
-const gchar *       mbim_device_type_get_string         (MbimDeviceType val);
-gchar *             mbim_cellular_class_build_string_from_mask
-                                                        (MbimCellularClass mask);
-const gchar *       mbim_voice_class_get_string         (MbimVoiceClass val);
-gchar *             mbim_sim_class_build_string_from_mask
-                                                        (MbimSimClass mask);
-gchar *             mbim_data_class_build_string_from_mask
-                                                        (MbimDataClass mask);
-gchar *             mbim_sms_caps_build_string_from_mask
-                                                        (MbimSmsCaps mask);
-gchar *             mbim_ctrl_caps_build_string_from_mask
-                                                        (MbimCtrlCaps mask);
-const gchar *       mbim_subscriber_ready_state_get_string
-                                                        (MbimSubscriberReadyState val);
-gchar *             mbim_ready_info_flag_build_string_from_mask
-                                                        (MbimReadyInfoFlag mask);
-const gchar *       mbim_radio_switch_state_get_string  (MbimRadioSwitchState val);
-const gchar *       mbim_pin_type_get_string            (MbimPinType val);
-const gchar *       mbim_pin_state_get_string           (MbimPinState val);
-const gchar *       mbim_pin_operation_get_string       (MbimPinOperation val);
-const gchar *       mbim_pin_mode_get_string            (MbimPinMode val);
-const gchar *       mbim_pin_format_get_string          (MbimPinFormat val);
-gchar *             mbim_provider_state_build_string_from_mask
-                                                        (MbimProviderState mask);
-const gchar *       mbim_visible_providers_action_get_string
-                                                        (MbimVisibleProvidersAction val);
-const gchar *       mbim_nw_error_get_string            (MbimNwError val);
-const gchar *       mbim_register_action_get_string     (MbimRegisterAction val);
-const gchar *       mbim_register_state_get_string      (MbimRegisterState val);
-const gchar *       mbim_register_mode_get_string       (MbimRegisterMode val);
-const gchar *       mbim_packet_service_action_get_string
-                                                        (MbimPacketServiceAction val);
-const gchar *       mbim_packet_service_state_get_string
-                                                        (MbimPacketServiceState val);
-const gchar *       mbim_activation_command_get_string  (MbimActivationCommand val);
-const gchar *       mbim_compression_get_string         (MbimCompression val);
-const gchar *       mbim_auth_protocol_get_string       (MbimAuthProtocol val);
-const gchar *       mbim_context_ip_type_get_string     (MbimContextIpType val);
-const gchar *       mbim_activation_state_get_string    (MbimActivationState val);
-const gchar *       mbim_voice_call_state_get_string    (MbimVoiceCallState val);
-gchar *             mbim_ip_configuration_available_flag_build_string_from_mask
-                                                        (MbimIPConfigurationAvailableFlag mask);
-const gchar *       mbim_sms_storage_state_get_string   (MbimSmsStorageState val);
-const gchar *       mbim_sms_format_get_string          (MbimSmsFormat val);
-const gchar *       mbim_sms_flag_get_string            (MbimSmsFlag val);
-const gchar *       mbim_sms_cdma_lang_get_string       (MbimSmsCdmaLang val);
-const gchar *       mbim_sms_cdma_encoding_get_string   (MbimSmsCdmaEncoding val);
-const gchar *       mbim_sms_status_get_string          (MbimSmsStatus val);
-const gchar *       mbim_sms_status_flag_get_string     (MbimSmsStatusFlag val);
-const gchar *       mbim_ussd_action_get_string         (MbimUssdAction val);
-const gchar *       mbim_ussd_response_get_string       (MbimUssdResponse val);
-const gchar *       mbim_ussd_session_state_get_string  (MbimUssdSessionState val);
-const gchar *       mbim_phonebook_flag_get_string      (MbimPhonebookFlag val);
-const gchar *       mbim_phonebook_state_get_string     (MbimPhonebookState val);
-const gchar *       mbim_phonebook_write_flag_get_string
-                                                        (MbimPhonebookWriteFlag val);
-const gchar *       mbim_stk_pac_profile_get_string     (MbimStkPacProfile val);
-const gchar *       mbim_stk_pac_type_get_string        (MbimStkPacType val);
-const gchar *       mbim_network_idle_hint_state_get_string
-                                                        (MbimNetworkIdleHintState val);
-const gchar *       mbim_emergency_mode_state_get_string
-                                                        (MbimEmergencyModeState val);
-const gchar *       mbim_dss_link_state_get_string      (MbimDssLinkState val);
-
-
-
-

Object Hierarchy

-
-  GEnum
-   +----MbimDeviceType
-
-
-  GFlags
-   +----MbimCellularClass
-
-
-  GEnum
-   +----MbimVoiceClass
-
-
-  GFlags
-   +----MbimSimClass
-
-
-  GFlags
-   +----MbimDataClass
-
-
-  GFlags
-   +----MbimSmsCaps
-
-
-  GFlags
-   +----MbimCtrlCaps
-
-
-  GEnum
-   +----MbimSubscriberReadyState
-
-
-  GFlags
-   +----MbimReadyInfoFlag
-
-
-  GEnum
-   +----MbimRadioSwitchState
-
-
-  GEnum
-   +----MbimPinType
-
-
-  GEnum
-   +----MbimPinState
-
-
-  GEnum
-   +----MbimPinOperation
-
-
-  GEnum
-   +----MbimPinMode
-
-
-  GEnum
-   +----MbimPinFormat
-
-
-  GFlags
-   +----MbimProviderState
-
-
-  GEnum
-   +----MbimVisibleProvidersAction
-
-
-  GEnum
-   +----MbimNwError
-
-
-  GEnum
-   +----MbimRegisterAction
-
-
-  GEnum
-   +----MbimRegisterState
-
-
-  GEnum
-   +----MbimRegisterMode
-
-
-  GFlags
-   +----MbimRegistrationFlag
-
-
-  GEnum
-   +----MbimPacketServiceAction
-
-
-  GEnum
-   +----MbimPacketServiceState
-
-
-  GEnum
-   +----MbimActivationCommand
-
-
-  GEnum
-   +----MbimCompression
-
-
-  GEnum
-   +----MbimAuthProtocol
-
-
-  GEnum
-   +----MbimContextIpType
-
-
-  GEnum
-   +----MbimActivationState
-
-
-  GEnum
-   +----MbimVoiceCallState
-
-
-  GFlags
-   +----MbimIPConfigurationAvailableFlag
-
-
-  GEnum
-   +----MbimSmsStorageState
-
-
-  GEnum
-   +----MbimSmsFormat
-
-
-  GEnum
-   +----MbimSmsFlag
-
-
-  GEnum
-   +----MbimSmsCdmaLang
-
-
-  GEnum
-   +----MbimSmsCdmaEncoding
-
-
-  GEnum
-   +----MbimSmsStatus
-
-
-  GEnum
-   +----MbimSmsStatusFlag
-
-
-  GEnum
-   +----MbimUssdAction
-
-
-  GEnum
-   +----MbimUssdResponse
-
-
-  GEnum
-   +----MbimUssdSessionState
-
-
-  GEnum
-   +----MbimPhonebookFlag
-
-
-  GEnum
-   +----MbimPhonebookState
-
-
-  GEnum
-   +----MbimPhonebookWriteFlag
-
-
-  GEnum
-   +----MbimStkPacProfile
-
-
-  GEnum
-   +----MbimStkPacType
-
-
-  GEnum
-   +----MbimNetworkIdleHintState
-
-
-  GEnum
-   +----MbimEmergencyModeState
-
-
-  GEnum
-   +----MbimDssLinkState
-
-
-
-

Description

-

-This section defines common enum and flag types used in the interface. -

-
-

Details

-
-

enum MbimDeviceType

-
typedef enum {
-    MBIM_DEVICE_TYPE_UNKNOWN   = 0,
-    MBIM_DEVICE_TYPE_EMBEDDED  = 1,
-    MBIM_DEVICE_TYPE_REMOVABLE = 2,
-    MBIM_DEVICE_TYPE_REMOTE    = 3
-} MbimDeviceType;
-
-

-Type of device. -

-
+

Functions

+
--++ - - + - - + - - + - - + - -

MBIM_DEVICE_TYPE_UNKNOWN

Unknown type. +const gchar * + +mbim_device_type_get_string ()

MBIM_DEVICE_TYPE_EMBEDDED

Device is embedded in the system. + +gchar * + +mbim_cellular_class_build_string_from_mask ()

MBIM_DEVICE_TYPE_REMOVABLE

Device is removable. +const gchar * + +mbim_voice_class_get_string ()

MBIM_DEVICE_TYPE_REMOTE

Device is remote. + +gchar * + +mbim_sim_class_build_string_from_mask ()
-
-
-
-

enum MbimCellularClass

-
typedef enum {
-    MBIM_CELLULAR_CLASS_GSM  = 1 << 0,
-    MBIM_CELLULAR_CLASS_CDMA = 1 << 1
-} MbimCellularClass;
-
-

-Cellular class. -

-
---- - - - + - - + - -

MBIM_CELLULAR_CLASS_GSM

Device is 3GPP. + +gchar * + +mbim_data_class_build_string_from_mask ()

MBIM_CELLULAR_CLASS_CDMA

Device is 3GPP2. + +gchar * + +mbim_sms_caps_build_string_from_mask ()
-
-
-
-

enum MbimVoiceClass

-
typedef enum {
-    MBIM_VOICE_CLASS_UNKNOWN                 = 0,
-    MBIM_VOICE_CLASS_NO_VOICE                = 1,
-    MBIM_VOICE_CLASS_SEPARATED_VOICE_DATA    = 2,
-    MBIM_VOICE_CLASS_SIMULTANEOUS_VOICE_DATA = 3
-} MbimVoiceClass;
-
-

-Voice class. -

-
---- - - - + - - + - - + - - + - -

MBIM_VOICE_CLASS_UNKNOWN

Unknown voice class. + +gchar * + +mbim_ctrl_caps_build_string_from_mask ()

MBIM_VOICE_CLASS_NO_VOICE

Device doesn't support voice. +const gchar * + +mbim_subscriber_ready_state_get_string ()

MBIM_VOICE_CLASS_SEPARATED_VOICE_DATA

Device supports separate voice and data connections. + +gchar * + +mbim_ready_info_flag_build_string_from_mask ()

MBIM_VOICE_CLASS_SIMULTANEOUS_VOICE_DATA

Device supports simultaneous voice and data connections. +const gchar * + +mbim_radio_switch_state_get_string ()
-
-
-
-

enum MbimSimClass

-
typedef enum {
-    MBIM_SIM_CLASS_LOGICAL   = 1 << 0,
-    MBIM_SIM_CLASS_REMOVABLE = 1 << 1
-} MbimSimClass;
-
-

-SIM class. -

-
---- - - - + - - + - -

MBIM_SIM_CLASS_LOGICAL

No physical SIM. +const gchar * + +mbim_pin_type_get_string ()

MBIM_SIM_CLASS_REMOVABLE

Physical removable SIM. +const gchar * + +mbim_pin_state_get_string ()
-
-
-
-

enum MbimDataClass

-
typedef enum {
-    MBIM_DATA_CLASS_GPRS        = 1 << 0,
-    MBIM_DATA_CLASS_EDGE        = 1 << 1,
-    MBIM_DATA_CLASS_UMTS        = 1 << 2,
-    MBIM_DATA_CLASS_HSDPA       = 1 << 3,
-    MBIM_DATA_CLASS_HSUPA       = 1 << 4,
-    MBIM_DATA_CLASS_LTE         = 1 << 5,
-    /* Bits 6 to 15 reserved for future 3GPP classes */
-    MBIM_DATA_CLASS_1XRTT       = 1 << 16,
-    MBIM_DATA_CLASS_1XEVDO      = 1 << 17,
-    MBIM_DATA_CLASS_1XEVDO_REVA = 1 << 18,
-    MBIM_DATA_CLASS_1XEVDV      = 1 << 19,
-    MBIM_DATA_CLASS_3XRTT       = 1 << 20,
-    MBIM_DATA_CLASS_1XEVDO_REVB = 1 << 21,
-    MBIM_DATA_CLASS_UMB         = 1 << 22,
-    /* Bits 23 to 30 reserved for future 3GPP2 classes */
-    MBIM_DATA_CLASS_CUSTOM      = 1 << 31
-} MbimDataClass;
-
-

-Data class. -

-
---- - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - -

MBIM_DATA_CLASS_GPRS

GPRS. +const gchar * + +mbim_pin_operation_get_string ()

MBIM_DATA_CLASS_EDGE

EDGE. +const gchar * + +mbim_pin_mode_get_string ()

MBIM_DATA_CLASS_UMTS

UMTS. +const gchar * + +mbim_pin_format_get_string ()

MBIM_DATA_CLASS_HSDPA

HSDPA. + +gchar * + +mbim_provider_state_build_string_from_mask ()

MBIM_DATA_CLASS_HSUPA

HSUPA. +const gchar * + +mbim_visible_providers_action_get_string ()

MBIM_DATA_CLASS_LTE

LTE. +const gchar * + +mbim_nw_error_get_string ()

MBIM_DATA_CLASS_1XRTT

1xRTT. +const gchar * + +mbim_register_action_get_string ()

MBIM_DATA_CLASS_1XEVDO

1xEV-DO. +const gchar * + +mbim_register_state_get_string ()

MBIM_DATA_CLASS_1XEVDO_REVA

1xEV-DO RevA +const gchar * + +mbim_register_mode_get_string ()

MBIM_DATA_CLASS_1XEVDV

1xEV-DV. +const gchar * + +mbim_packet_service_action_get_string ()

MBIM_DATA_CLASS_3XRTT

3xRTT. +const gchar * + +mbim_packet_service_state_get_string ()

MBIM_DATA_CLASS_1XEVDO_REVB

1xEV-DO RevB. +const gchar * + +mbim_activation_command_get_string ()

MBIM_DATA_CLASS_UMB

UMB. +const gchar * + +mbim_compression_get_string ()

MBIM_DATA_CLASS_CUSTOM

Custom. +const gchar * + +mbim_auth_protocol_get_string ()
-
-
-
-

enum MbimSmsCaps

-
typedef enum {
-    MBIM_SMS_CAPS_PDU_RECEIVE  = 1 << 0,
-    MBIM_SMS_CAPS_PDU_SEND     = 1 << 1,
-    MBIM_SMS_CAPS_TEXT_RECEIVE = 1 << 2,
-    MBIM_SMS_CAPS_TEXT_SEND    = 1 << 3
-} MbimSmsCaps;
-
-

-SMS capabilities. -

-
---- - - - + - - + - - + - - + - -

MBIM_SMS_CAPS_PDU_RECEIVE

Can receive in PDU mode. +const gchar * + +mbim_context_ip_type_get_string ()

MBIM_SMS_CAPS_PDU_SEND

Can send in PDU mode. +const gchar * + +mbim_activation_state_get_string ()

MBIM_SMS_CAPS_TEXT_RECEIVE

Can receive in text mode. +const gchar * + +mbim_voice_call_state_get_string ()

MBIM_SMS_CAPS_TEXT_SEND

Can send in text mode. + +gchar * + +mbim_ip_configuration_available_flag_build_string_from_mask ()
-
-
-
-

enum MbimCtrlCaps

-
typedef enum {
-    MBIM_CTRL_CAPS_REG_MANUAL      = 1 << 0,
-    MBIM_CTRL_CAPS_HW_RADIO_SWITCH = 1 << 1,
-    MBIM_CTRL_CAPS_CDMA_MOBILE_IP  = 1 << 2,
-    MBIM_CTRL_CAPS_CDMA_SIMPLE_IP  = 1 << 3,
-    MBIM_CTRL_CAPS_MULTI_CARRIER   = 1 << 4
-} MbimCtrlCaps;
-
-

-Control capabilities. -

-
---- - - - + - - + - - + - - + - - + + + + + - -

MBIM_CTRL_CAPS_REG_MANUAL

Device allows manual network selection. +const gchar * + +mbim_sms_storage_state_get_string ()

MBIM_CTRL_CAPS_HW_RADIO_SWITCH

Device has a hardware radio power switch. +const gchar * + +mbim_sms_format_get_string ()

MBIM_CTRL_CAPS_CDMA_MOBILE_IP

The CDMA function supports Mobile IP. +const gchar * + +mbim_sms_flag_get_string ()

MBIM_CTRL_CAPS_CDMA_SIMPLE_IP

The CDMA function supports Simple IP. +const gchar * + +mbim_sms_cdma_lang_get_string ()

MBIM_CTRL_CAPS_MULTI_CARRIER

Device can work with multiple providers. +const gchar * + +mbim_sms_cdma_encoding_get_string () +
const gchar * + +mbim_sms_status_get_string ()
-
-
-
-

enum MbimSubscriberReadyState

-
typedef enum {
-    MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED  = 0,
-    MBIM_SUBSCRIBER_READY_STATE_INITIALIZED      = 1,
-    MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED = 2,
-    MBIM_SUBSCRIBER_READY_STATE_BAD_SIM          = 3,
-    MBIM_SUBSCRIBER_READY_STATE_FAILURE          = 4,
-    MBIM_SUBSCRIBER_READY_STATE_NOT_ACTIVATED    = 5,
-    MBIM_SUBSCRIBER_READY_STATE_DEVICE_LOCKED    = 6,
-} MbimSubscriberReadyState;
-
-

-Ready state of the subscriber. -

-
---- - - - + - - + - - + - - + - - + - - + - - + - -

MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED

Not initialized. +const gchar * + +mbim_sms_status_flag_get_string ()

MBIM_SUBSCRIBER_READY_STATE_INITIALIZED

Initialized. +const gchar * + +mbim_ussd_action_get_string ()

MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED

SIM not inserted. +const gchar * + +mbim_ussd_response_get_string ()

MBIM_SUBSCRIBER_READY_STATE_BAD_SIM

Bad SIM. +const gchar * + +mbim_ussd_session_state_get_string ()

MBIM_SUBSCRIBER_READY_STATE_FAILURE

Failure. +const gchar * + +mbim_phonebook_flag_get_string ()

MBIM_SUBSCRIBER_READY_STATE_NOT_ACTIVATED

Not activated. +const gchar * + +mbim_phonebook_state_get_string ()

MBIM_SUBSCRIBER_READY_STATE_DEVICE_LOCKED

Device locked. +const gchar * + +mbim_phonebook_write_flag_get_string ()
-
-
-
-

enum MbimReadyInfoFlag

-
typedef enum {
-    MBIM_READY_INFO_FLAG_PROTECT_UNIQUE_ID = 1 << 0
-} MbimReadyInfoFlag;
-
-
---- - - - + - -

MBIM_READY_INFO_FLAG_PROTECT_UNIQUE_ID

Request to avoid displaying subscriber ID. +
const gchar *
-
-
-
-

enum MbimRadioSwitchState

-
typedef enum {
-    MBIM_RADIO_SWITCH_STATE_OFF = 0,
-    MBIM_RADIO_SWITCH_STATE_ON  = 1
-} MbimRadioSwitchState;
-
-

-Radio switch state. -

-
---- - + + + + + + + + + + - - + - - +
+mbim_stk_pac_profile_get_string () +
const gchar * + +mbim_stk_pac_type_get_string () +
const gchar * + +mbim_network_idle_hint_state_get_string () +

MBIM_RADIO_SWITCH_STATE_OFF

Radio is off. +const gchar * + +mbim_emergency_mode_state_get_string ()

MBIM_RADIO_SWITCH_STATE_ON

Radio is on. +const gchar * + +mbim_dss_link_state_get_string ()
-
-
-

enum MbimPinType

-
typedef enum {
-    MBIM_PIN_TYPE_UNKNOWN              = 0,
-    MBIM_PIN_TYPE_CUSTOM               = 1,
-    MBIM_PIN_TYPE_PIN1                 = 2,
-    MBIM_PIN_TYPE_PIN2                 = 3,
-    MBIM_PIN_TYPE_DEVICE_SIM_PIN       = 4,
-    MBIM_PIN_TYPE_DEVICE_FIRST_SIM_PIN = 5,
-    MBIM_PIN_TYPE_NETWORK_PIN          = 6,
-    MBIM_PIN_TYPE_NETWORK_SUBSET_PIN   = 7,
-    MBIM_PIN_TYPE_SERVICE_PROVIDER_PIN = 8,
-    MBIM_PIN_TYPE_CORPORATE_PIN        = 9,
-    MBIM_PIN_TYPE_SUBSIDY_PIN          = 10,
-    MBIM_PIN_TYPE_PUK1                 = 11,
-    MBIM_PIN_TYPE_PUK2                 = 12,
-    MBIM_PIN_TYPE_DEVICE_FIRST_SIM_PUK = 13,
-    MBIM_PIN_TYPE_NETWORK_PUK          = 14,
-    MBIM_PIN_TYPE_NETWORK_SUBSET_PUK   = 15,
-    MBIM_PIN_TYPE_SERVICE_PROVIDER_PUK = 16,
-    MBIM_PIN_TYPE_CORPORATE_PUK        = 17
-} MbimPinType;
-
-

-PIN Types. -

-
+
+

Types and Values

+
--++ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - -

MBIM_PIN_TYPE_UNKNOWN

Unknown or unset. -enumMbimDeviceType

MBIM_PIN_TYPE_CUSTOM

The PIN type is a custom type and is none of the other PIN types listed in this enumeration. -enumMbimCellularClass

MBIM_PIN_TYPE_PIN1

The PIN1 key. -enumMbimVoiceClass

MBIM_PIN_TYPE_PIN2

The PIN2 key. -enumMbimSimClass

MBIM_PIN_TYPE_DEVICE_SIM_PIN

The device to SIM key. -enumMbimDataClass

MBIM_PIN_TYPE_DEVICE_FIRST_SIM_PIN

The device to very first SIM key. -enumMbimSmsCaps

MBIM_PIN_TYPE_NETWORK_PIN

The network personalization key. -enumMbimCtrlCaps

MBIM_PIN_TYPE_NETWORK_SUBSET_PIN

The network subset personalization key. -enumMbimSubscriberReadyState

MBIM_PIN_TYPE_SERVICE_PROVIDER_PIN

The service provider (SP) personalization key. -enumMbimReadyInfoFlag

MBIM_PIN_TYPE_CORPORATE_PIN

The corporate personalization key. -enumMbimRadioSwitchState

MBIM_PIN_TYPE_SUBSIDY_PIN

The subsidy unlock key. -enumMbimPinType

MBIM_PIN_TYPE_PUK1

The Personal Identification Number1 Unlock Key (PUK1). -enumMbimPinState

MBIM_PIN_TYPE_PUK2

The Personal Identification Number2 Unlock Key (PUK2). -enumMbimPinOperation

MBIM_PIN_TYPE_DEVICE_FIRST_SIM_PUK

The device to very first SIM PIN unlock key. -enumMbimPinMode

MBIM_PIN_TYPE_NETWORK_PUK

The network personalization unlock key. -enumMbimPinFormat

MBIM_PIN_TYPE_NETWORK_SUBSET_PUK

The network subset personalization unlock key. -enumMbimProviderState

MBIM_PIN_TYPE_SERVICE_PROVIDER_PUK

The service provider (SP) personalization unlock key. -enumMbimVisibleProvidersAction

MBIM_PIN_TYPE_CORPORATE_PUK

The corporate personalization unlock key. -enumMbimNwError
-
-
-
-

enum MbimPinState

-
typedef enum {
-    MBIM_PIN_STATE_UNLOCKED = 0,
-    MBIM_PIN_STATE_LOCKED   = 1
-} MbimPinState;
-
-

-PIN States. -

-
---- - - - + + - - + + - -

MBIM_PIN_STATE_UNLOCKED

The device does not require a PIN. -enumMbimRegisterAction

MBIM_PIN_STATE_LOCKED

The device requires the user to enter a PIN. -enumMbimRegisterState
-
-
-
-

enum MbimPinOperation

-
typedef enum {
-    MBIM_PIN_OPERATION_ENTER   = 0,
-    MBIM_PIN_OPERATION_ENABLE  = 1,
-    MBIM_PIN_OPERATION_DISABLE = 2,
-    MBIM_PIN_OPERATION_CHANGE  = 3
-} MbimPinOperation;
-
-
---- - - - + + - - + + - - + + - - + + - -

MBIM_PIN_OPERATION_ENTER

Enter the specified PIN into the device. -enumMbimRegisterMode

MBIM_PIN_OPERATION_ENABLE

Enable the specified PIN. -enumMbimRegistrationFlag

MBIM_PIN_OPERATION_DISABLE

Disable the specified PIN. -enumMbimPacketServiceAction

MBIM_PIN_OPERATION_CHANGE

Change the specified PIN. -enumMbimPacketServiceState
-
-
-
-

enum MbimPinMode

-
typedef enum {
-    MBIM_PIN_MODE_NOT_SUPPORTED = 0,
-    MBIM_PIN_MODE_ENABLED       = 1,
-    MBIM_PIN_MODE_DISABLED      = 2
-} MbimPinMode;
-
-

-Whether the lock is enabled or disabled. -

-
---- - - - + + - - + + - - - - -

MBIM_PIN_MODE_NOT_SUPPORTED

Not supported. -enumMbimActivationCommand

MBIM_PIN_MODE_ENABLED

Enabled. -enumMbimCompression

MBIM_PIN_MODE_DISABLED

Disabled. -
-
-
-
-

enum MbimPinFormat

-
typedef enum {
-    MBIM_PIN_FORMAT_UNKNOWN      = 0,
-    MBIM_PIN_FORMAT_NUMERIC      = 1,
-    MBIM_PIN_FORMAT_ALPHANUMERIC = 2
-} MbimPinFormat;
-
-

-Format of the expected PIN code. -

-
---- - - - - - - - - + + - - - - -

MBIM_PIN_FORMAT_UNKNOWN

Unknown format. -

MBIM_PIN_FORMAT_NUMERIC

Numeric-only format. -enumMbimAuthProtocol

MBIM_PIN_FORMAT_ALPHANUMERIC

Alphanumeric format. -
-
-
-
-

enum MbimProviderState

-
typedef enum {
-    MBIM_PROVIDER_STATE_UNKNOWN                = 0,
-    MBIM_PROVIDER_STATE_HOME                   = 1 << 0,
-    MBIM_PROVIDER_STATE_FORBIDDEN              = 1 << 1,
-    MBIM_PROVIDER_STATE_PREFERRED              = 1 << 2,
-    MBIM_PROVIDER_STATE_VISIBLE                = 1 << 3,
-    MBIM_PROVIDER_STATE_REGISTERED             = 1 << 4,
-    MBIM_PROVIDER_STATE_PREFERRED_MULTICARRIER = 1 << 5
-} MbimProviderState;
-
-

-State of the provider. -

-
---- - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - -

MBIM_PROVIDER_STATE_UNKNOWN

Unknown. -enumMbimContextIpType

MBIM_PROVIDER_STATE_HOME

Home operator. -enumMbimActivationState

MBIM_PROVIDER_STATE_FORBIDDEN

Provider blocked. -enumMbimVoiceCallState

MBIM_PROVIDER_STATE_PREFERRED

Provider is in the preferred list. -enumMbimIPConfigurationAvailableFlag

MBIM_PROVIDER_STATE_VISIBLE

Provider is visible. -enumMbimSmsStorageState

MBIM_PROVIDER_STATE_REGISTERED

Currently registered to the provider. -enumMbimSmsFormat

MBIM_PROVIDER_STATE_PREFERRED_MULTICARRIER

Provider is a preferred multicarrier network. -enumMbimSmsFlag
-
-
-
-

enum MbimVisibleProvidersAction

-
typedef enum {
-    MBIM_VISIBLE_PROVIDERS_ACTION_FULL_SCAN       = 0,
-    MBIM_VISIBLE_PROVIDERS_ACTION_RESTRICTED_SCAN = 1
-} MbimVisibleProvidersAction;
-
-

-Type of action to perform when listing visible providers. -

-
---- - - - + + - - + + - -

MBIM_VISIBLE_PROVIDERS_ACTION_FULL_SCAN

Full scan. -enumMbimSmsCdmaLang

MBIM_VISIBLE_PROVIDERS_ACTION_RESTRICTED_SCAN

Locate preferred multicarrier providers. -enumMbimSmsCdmaEncoding
-
-
-
-

enum MbimNwError

-
typedef enum {
-    MBIM_NW_ERROR_UNKNOWN                              = 0,
-    MBIM_NW_ERROR_IMSI_UNKNOWN_IN_HLR                  = 2,
-    MBIM_NW_ERROR_IMSI_UNKNOWN_IN_VLR                  = 4,
-    MBIM_NW_ERROR_ILLEGAL_ME                           = 6,
-    MBIM_NW_ERROR_GPRS_NOT_ALLOWED                     = 7,
-    MBIM_NW_ERROR_GPRS_AND_NON_GPRS_NOT_ALLOWED        = 8,
-    MBIM_NW_ERROR_PLMN_NOT_ALLOWED                     = 11,
-    MBIM_NW_ERROR_LOCATION_AREA_NOT_ALLOWED            = 12,
-    MBIM_NW_ERROR_ROAMING_NOT_ALLOWED_IN_LOCATION_AREA = 13,
-    MBIM_NW_ERROR_GPRS_NOT_ALLOWED_IN_PLMN             = 14,
-    MBIM_NW_ERROR_NO_CELLS_IN_LOCATION_AREA            = 15,
-    MBIM_NW_ERROR_NETWORK_FAILURE                      = 17,
-    MBIM_NW_ERROR_CONGESTION                           = 22
-} MbimNwError;
-
-

-Network errors. -

-
---- - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +

MBIM_NW_ERROR_UNKNOWN

Unknown or unset error. -enumMbimSmsStatus

MBIM_NW_ERROR_IMSI_UNKNOWN_IN_HLR

IMSI unknown in the HLR. -enumMbimSmsStatusFlag

MBIM_NW_ERROR_IMSI_UNKNOWN_IN_VLR

IMSI unknown in the VLR. -enumMbimUssdAction

MBIM_NW_ERROR_ILLEGAL_ME

Illegal ME. -enumMbimUssdResponse

MBIM_NW_ERROR_GPRS_NOT_ALLOWED

GPRS not allowed. -enumMbimUssdSessionState

MBIM_NW_ERROR_GPRS_AND_NON_GPRS_NOT_ALLOWED

GPRS and non-GPRS not allowed. -enumMbimPhonebookFlag

MBIM_NW_ERROR_PLMN_NOT_ALLOWED

PLMN not allowed. -enumMbimPhonebookState

MBIM_NW_ERROR_LOCATION_AREA_NOT_ALLOWED

Location area not allowed. -enumMbimPhonebookWriteFlag

MBIM_NW_ERROR_ROAMING_NOT_ALLOWED_IN_LOCATION_AREA

Roaming not allowed in the location area. -enumMbimStkPacProfile

MBIM_NW_ERROR_GPRS_NOT_ALLOWED_IN_PLMN

GPRS not allowed in PLMN. -enumMbimStkPacType

MBIM_NW_ERROR_NO_CELLS_IN_LOCATION_AREA

No cells in location area. -enumMbimNetworkIdleHintState

MBIM_NW_ERROR_NETWORK_FAILURE

Network failure. -enumMbimEmergencyModeState

MBIM_NW_ERROR_CONGESTION

Congestion. -enumMbimDssLinkState
+
+

Object Hierarchy

+
    GEnum
+    ├── MbimActivationCommand
+    ├── MbimActivationState
+    ├── MbimAuthProtocol
+    ├── MbimCompression
+    ├── MbimContextIpType
+    ├── MbimDeviceType
+    ├── MbimDssLinkState
+    ├── MbimEmergencyModeState
+    ├── MbimNetworkIdleHintState
+    ├── MbimNwError
+    ├── MbimPacketServiceAction
+    ├── MbimPacketServiceState
+    ├── MbimPhonebookFlag
+    ├── MbimPhonebookState
+    ├── MbimPhonebookWriteFlag
+    ├── MbimPinFormat
+    ├── MbimPinMode
+    ├── MbimPinOperation
+    ├── MbimPinState
+    ├── MbimPinType
+    ├── MbimRadioSwitchState
+    ├── MbimRegisterAction
+    ├── MbimRegisterMode
+    ├── MbimRegisterState
+    ├── MbimSmsCdmaEncoding
+    ├── MbimSmsCdmaLang
+    ├── MbimSmsFlag
+    ├── MbimSmsFormat
+    ├── MbimSmsStatus
+    ├── MbimSmsStatusFlag
+    ├── MbimSmsStorageState
+    ├── MbimStkPacProfile
+    ├── MbimStkPacType
+    ├── MbimSubscriberReadyState
+    ├── MbimUssdAction
+    ├── MbimUssdResponse
+    ├── MbimUssdSessionState
+    ├── MbimVisibleProvidersAction
+    ├── MbimVoiceCallState
+    ╰── MbimVoiceClass
+    GFlags
+    ├── MbimCellularClass
+    ├── MbimCtrlCaps
+    ├── MbimDataClass
+    ├── MbimIPConfigurationAvailableFlag
+    ├── MbimProviderState
+    ├── MbimReadyInfoFlag
+    ├── MbimRegistrationFlag
+    ├── MbimSimClass
+    ╰── MbimSmsCaps
+
+
+
+

Description

+

This section defines common enum and flag types used in the interface.

+
+
+

Functions

+
+

mbim_device_type_get_string ()

+
const gchar *
+mbim_device_type_get_string (MbimDeviceType val);
+

Gets the nickname string for the MbimDeviceType specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimDeviceType.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
-

enum MbimRegisterAction

-
typedef enum {
-    MBIM_REGISTER_ACTION_AUTOMATIC = 0,
-    MBIM_REGISTER_ACTION_MANUAL    = 1
-} MbimRegisterAction;
-
-

-Type of registration requested. -

-
---+

mbim_cellular_class_build_string_from_mask ()

+
gchar *
+mbim_cellular_class_build_string_from_mask
+                               (MbimCellularClass mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimCellularClass in mask +.

+
+

Parameters

+
++++ - - - - - - - - - - + + + + +

MBIM_REGISTER_ACTION_AUTOMATIC

Automatic registration. -

MBIM_REGISTER_ACTION_MANUAL

Manual registration. -

mask

bitmask of MbimCellularClass values.

 
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
-

enum MbimRegisterState

-
typedef enum {
-    MBIM_REGISTER_STATE_UNKNOWN      = 0,
-    MBIM_REGISTER_STATE_DEREGISTERED = 1,
-    MBIM_REGISTER_STATE_SEARCHING    = 2,
-    MBIM_REGISTER_STATE_HOME         = 3,
-    MBIM_REGISTER_STATE_ROAMING      = 4,
-    MBIM_REGISTER_STATE_PARTNER      = 5,
-    MBIM_REGISTER_STATE_DENIED       = 6
-} MbimRegisterState;
-
-

-Registration state. -

-
---+

mbim_voice_class_get_string ()

+
const gchar *
+mbim_voice_class_get_string (MbimVoiceClass val);
+

Gets the nickname string for the MbimVoiceClass specified at val +.

+
+

Parameters

+
++++ - - - - - - - - - - - - - + + + + + +

MBIM_REGISTER_STATE_UNKNOWN

Unknown registration state. -

MBIM_REGISTER_STATE_DEREGISTERED

Not registered. -

MBIM_REGISTER_STATE_SEARCHING

Searching. -

val

a MbimVoiceClass.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_sim_class_build_string_from_mask ()

+
gchar *
+mbim_sim_class_build_string_from_mask (MbimSimClass mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimSimClass in mask +.

+
+

Parameters

+
+++++ + + + + + +

mask

bitmask of MbimSimClass values.

 
+
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
+
+
+

mbim_data_class_build_string_from_mask ()

+
gchar *
+mbim_data_class_build_string_from_mask
+                               (MbimDataClass mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimDataClass in mask +.

+
+

Parameters

+
+++++ + + + + + +

mask

bitmask of MbimDataClass values.

 
+
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
+
+
+

mbim_sms_caps_build_string_from_mask ()

+
gchar *
+mbim_sms_caps_build_string_from_mask (MbimSmsCaps mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimSmsCaps in mask +.

+
+

Parameters

+
+++++ + + + + + +

mask

bitmask of MbimSmsCaps values.

 
+
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
+
+
+

mbim_ctrl_caps_build_string_from_mask ()

+
gchar *
+mbim_ctrl_caps_build_string_from_mask (MbimCtrlCaps mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimCtrlCaps in mask +.

+
+

Parameters

+
+++++ + + + + + +

mask

bitmask of MbimCtrlCaps values.

 
+
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
+
+
+

mbim_subscriber_ready_state_get_string ()

+
const gchar *
+mbim_subscriber_ready_state_get_string
+                               (MbimSubscriberReadyState val);
+

Gets the nickname string for the MbimSubscriberReadyState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSubscriberReadyState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_ready_info_flag_build_string_from_mask ()

+
gchar *
+mbim_ready_info_flag_build_string_from_mask
+                               (MbimReadyInfoFlag mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimReadyInfoFlag in mask +.

+
+

Parameters

+
+++++ + + + + + +

mask

bitmask of MbimReadyInfoFlag values.

 
+
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
+
+
+

mbim_radio_switch_state_get_string ()

+
const gchar *
+mbim_radio_switch_state_get_string (MbimRadioSwitchState val);
+

Gets the nickname string for the MbimRadioSwitchState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimRadioSwitchState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_pin_type_get_string ()

+
const gchar *
+mbim_pin_type_get_string (MbimPinType val);
+

Gets the nickname string for the MbimPinType specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPinType.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_pin_state_get_string ()

+
const gchar *
+mbim_pin_state_get_string (MbimPinState val);
+

Gets the nickname string for the MbimPinState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPinState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_pin_operation_get_string ()

+
const gchar *
+mbim_pin_operation_get_string (MbimPinOperation val);
+

Gets the nickname string for the MbimPinOperation specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPinOperation.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_pin_mode_get_string ()

+
const gchar *
+mbim_pin_mode_get_string (MbimPinMode val);
+

Gets the nickname string for the MbimPinMode specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPinMode.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_pin_format_get_string ()

+
const gchar *
+mbim_pin_format_get_string (MbimPinFormat val);
+

Gets the nickname string for the MbimPinFormat specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPinFormat.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_provider_state_build_string_from_mask ()

+
gchar *
+mbim_provider_state_build_string_from_mask
+                               (MbimProviderState mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimProviderState in mask +.

+
+

Parameters

+
+++++ + + + + + +

mask

bitmask of MbimProviderState values.

 
+
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
+
+
+

mbim_visible_providers_action_get_string ()

+
const gchar *
+mbim_visible_providers_action_get_string
+                               (MbimVisibleProvidersAction val);
+

Gets the nickname string for the MbimVisibleProvidersAction specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimVisibleProvidersAction.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_nw_error_get_string ()

+
const gchar *
+mbim_nw_error_get_string (MbimNwError val);
+

Gets the nickname string for the MbimNwError specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimNwError.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_register_action_get_string ()

+
const gchar *
+mbim_register_action_get_string (MbimRegisterAction val);
+

Gets the nickname string for the MbimRegisterAction specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimRegisterAction.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_register_state_get_string ()

+
const gchar *
+mbim_register_state_get_string (MbimRegisterState val);
+

Gets the nickname string for the MbimRegisterState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimRegisterState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_register_mode_get_string ()

+
const gchar *
+mbim_register_mode_get_string (MbimRegisterMode val);
+

Gets the nickname string for the MbimRegisterMode specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimRegisterMode.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_packet_service_action_get_string ()

+
const gchar *
+mbim_packet_service_action_get_string (MbimPacketServiceAction val);
+

Gets the nickname string for the MbimPacketServiceAction specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPacketServiceAction.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_packet_service_state_get_string ()

+
const gchar *
+mbim_packet_service_state_get_string (MbimPacketServiceState val);
+

Gets the nickname string for the MbimPacketServiceState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPacketServiceState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_activation_command_get_string ()

+
const gchar *
+mbim_activation_command_get_string (MbimActivationCommand val);
+

Gets the nickname string for the MbimActivationCommand specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimActivationCommand.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_compression_get_string ()

+
const gchar *
+mbim_compression_get_string (MbimCompression val);
+

Gets the nickname string for the MbimCompression specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCompression.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_auth_protocol_get_string ()

+
const gchar *
+mbim_auth_protocol_get_string (MbimAuthProtocol val);
+

Gets the nickname string for the MbimAuthProtocol specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimAuthProtocol.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_context_ip_type_get_string ()

+
const gchar *
+mbim_context_ip_type_get_string (MbimContextIpType val);
+

Gets the nickname string for the MbimContextIpType specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimContextIpType.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_activation_state_get_string ()

+
const gchar *
+mbim_activation_state_get_string (MbimActivationState val);
+

Gets the nickname string for the MbimActivationState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimActivationState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_voice_call_state_get_string ()

+
const gchar *
+mbim_voice_call_state_get_string (MbimVoiceCallState val);
+

Gets the nickname string for the MbimVoiceCallState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimVoiceCallState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_ip_configuration_available_flag_build_string_from_mask ()

+
gchar *
+mbim_ip_configuration_available_flag_build_string_from_mask
+                               (MbimIPConfigurationAvailableFlag mask);
+

Builds a string containing a comma-separated list of nicknames for +each MbimIPConfigurationAvailableFlag in mask +.

+
+

Parameters

+
+++++ + + + + + +

mask

bitmask of MbimIPConfigurationAvailableFlag values.

 
+
+
+

Returns

+

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free().

+

[transfer full]

+
+
+
+
+

mbim_sms_storage_state_get_string ()

+
const gchar *
+mbim_sms_storage_state_get_string (MbimSmsStorageState val);
+

Gets the nickname string for the MbimSmsStorageState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSmsStorageState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_sms_format_get_string ()

+
const gchar *
+mbim_sms_format_get_string (MbimSmsFormat val);
+

Gets the nickname string for the MbimSmsFormat specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSmsFormat.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_sms_flag_get_string ()

+
const gchar *
+mbim_sms_flag_get_string (MbimSmsFlag val);
+

Gets the nickname string for the MbimSmsFlag specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSmsFlag.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_sms_cdma_lang_get_string ()

+
const gchar *
+mbim_sms_cdma_lang_get_string (MbimSmsCdmaLang val);
+

Gets the nickname string for the MbimSmsCdmaLang specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSmsCdmaLang.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_sms_cdma_encoding_get_string ()

+
const gchar *
+mbim_sms_cdma_encoding_get_string (MbimSmsCdmaEncoding val);
+

Gets the nickname string for the MbimSmsCdmaEncoding specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSmsCdmaEncoding.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_sms_status_get_string ()

+
const gchar *
+mbim_sms_status_get_string (MbimSmsStatus val);
+

Gets the nickname string for the MbimSmsStatus specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSmsStatus.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_sms_status_flag_get_string ()

+
const gchar *
+mbim_sms_status_flag_get_string (MbimSmsStatusFlag val);
+

Gets the nickname string for the MbimSmsStatusFlag specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimSmsStatusFlag.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_ussd_action_get_string ()

+
const gchar *
+mbim_ussd_action_get_string (MbimUssdAction val);
+

Gets the nickname string for the MbimUssdAction specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimUssdAction.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_ussd_response_get_string ()

+
const gchar *
+mbim_ussd_response_get_string (MbimUssdResponse val);
+

Gets the nickname string for the MbimUssdResponse specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimUssdResponse.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_ussd_session_state_get_string ()

+
const gchar *
+mbim_ussd_session_state_get_string (MbimUssdSessionState val);
+

Gets the nickname string for the MbimUssdSessionState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimUssdSessionState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_phonebook_flag_get_string ()

+
const gchar *
+mbim_phonebook_flag_get_string (MbimPhonebookFlag val);
+

Gets the nickname string for the MbimPhonebookFlag specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPhonebookFlag.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_phonebook_state_get_string ()

+
const gchar *
+mbim_phonebook_state_get_string (MbimPhonebookState val);
+

Gets the nickname string for the MbimPhonebookState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPhonebookState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_phonebook_write_flag_get_string ()

+
const gchar *
+mbim_phonebook_write_flag_get_string (MbimPhonebookWriteFlag val);
+

Gets the nickname string for the MbimPhonebookWriteFlag specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimPhonebookWriteFlag.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_stk_pac_profile_get_string ()

+
const gchar *
+mbim_stk_pac_profile_get_string (MbimStkPacProfile val);
+

Gets the nickname string for the MbimStkPacProfile specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimStkPacProfile.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_stk_pac_type_get_string ()

+
const gchar *
+mbim_stk_pac_type_get_string (MbimStkPacType val);
+

Gets the nickname string for the MbimStkPacType specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimStkPacType.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_network_idle_hint_state_get_string ()

+
const gchar *
+mbim_network_idle_hint_state_get_string
+                               (MbimNetworkIdleHintState val);
+

Gets the nickname string for the MbimNetworkIdleHintState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimNetworkIdleHintState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_emergency_mode_state_get_string ()

+
const gchar *
+mbim_emergency_mode_state_get_string (MbimEmergencyModeState val);
+

Gets the nickname string for the MbimEmergencyModeState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimEmergencyModeState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_dss_link_state_get_string ()

+
const gchar *
+mbim_dss_link_state_get_string (MbimDssLinkState val);
+

Gets the nickname string for the MbimDssLinkState specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimDssLinkState.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

Types and Values

+
+

enum MbimDeviceType

+

Type of device.

+
+

Members

+
+++++ + - - + + - - + + - - + + - - + +

MBIM_REGISTER_STATE_HOME

Registered in home network. +

MBIM_DEVICE_TYPE_UNKNOWN

 +

Unknown type.

 

MBIM_REGISTER_STATE_ROAMING

Registered in roaming network. +

MBIM_DEVICE_TYPE_EMBEDDED

 +

Device is embedded in the system.

 

MBIM_REGISTER_STATE_PARTNER

Registered in a preferred roaming network. +

MBIM_DEVICE_TYPE_REMOVABLE

 +

Device is removable.

 

MBIM_REGISTER_STATE_DENIED

Registration denied. +

MBIM_DEVICE_TYPE_REMOTE

 +

Device is remote.

 
+
-

enum MbimRegisterMode

-
typedef enum {
-    MBIM_REGISTER_MODE_UNKNOWN   = 0,
-    MBIM_REGISTER_MODE_AUTOMATIC = 1,
-    MBIM_REGISTER_MODE_MANUAL    = 2
-} MbimRegisterMode;
-
-

-Type of registration requested. -

-
+

enum MbimCellularClass

+

Cellular class.

+
+

Members

+
--+++ - - - - - - + + - - + +

MBIM_REGISTER_MODE_UNKNOWN

Unknown. -

MBIM_REGISTER_MODE_AUTOMATIC

Automatic registration. +

MBIM_CELLULAR_CLASS_GSM

 +

Device is 3GPP.

 

MBIM_REGISTER_MODE_MANUAL

Manual registration. +

MBIM_CELLULAR_CLASS_CDMA

 +

Device is 3GPP2.

 
+
-

enum MbimRegistrationFlag

-
typedef enum {
-    MBIM_REGISTRATION_FLAG_NONE                                   = 0,
-    MBIM_REGISTRATION_FLAG_MANUAL_SELECTION_NOT_AVAILABLE         = 1 << 0,
-    MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH = 1 << 2,
-} MbimRegistrationFlag;
-
-

-Registration flags. -

-
+

enum MbimVoiceClass

+

Voice class.

+
+

Members

+
--+++ - - + + + + + + + - - + + - - + +

MBIM_REGISTRATION_FLAG_NONE

None. +

MBIM_VOICE_CLASS_UNKNOWN

 +

Unknown voice class.

+		 

MBIM_VOICE_CLASS_NO_VOICE

 +

Device doesn't support voice.

 

MBIM_REGISTRATION_FLAG_MANUAL_SELECTION_NOT_AVAILABLE

Network doesn't support manual network selection. +

MBIM_VOICE_CLASS_SEPARATED_VOICE_DATA

 +

Device supports separate voice and data connections.

 

MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH

Modem should auto-attach to the network after registration. +

MBIM_VOICE_CLASS_SIMULTANEOUS_VOICE_DATA

 +

Device supports simultaneous voice and data connections.

 
+
-

enum MbimPacketServiceAction

-
typedef enum {
-    MBIM_PACKET_SERVICE_ACTION_ATTACH = 0,
-    MBIM_PACKET_SERVICE_ACTION_DETACH = 1
-} MbimPacketServiceAction;
-
-

-Packet Service Action. -

-
+

enum MbimSimClass

+

SIM class.

+
+

Members

+
--+++ - - + + - - + +

MBIM_PACKET_SERVICE_ACTION_ATTACH

Attach. +

MBIM_SIM_CLASS_LOGICAL

 +

No physical SIM.

 

MBIM_PACKET_SERVICE_ACTION_DETACH

Detach. +

MBIM_SIM_CLASS_REMOVABLE

 +

Physical removable SIM.

 
+
-

enum MbimPacketServiceState

-
typedef enum {
-    MBIM_PACKET_SERVICE_STATE_UNKNOWN   = 0,
-    MBIM_PACKET_SERVICE_STATE_ATTACHING = 1,
-    MBIM_PACKET_SERVICE_STATE_ATTACHED  = 2,
-    MBIM_PACKET_SERVICE_STATE_DETACHING = 3,
-    MBIM_PACKET_SERVICE_STATE_DETACHED  = 4
-} MbimPacketServiceState;
-
-

-Packet Service State. -

-
+

enum MbimDataClass

+

Data class.

+
+

Members

+
--+++ - - + + - - + + - - + + - - + + - - + + - -

MBIM_PACKET_SERVICE_STATE_UNKNOWN

Unknown. +

MBIM_DATA_CLASS_GPRS

 +

GPRS.

 

MBIM_PACKET_SERVICE_STATE_ATTACHING

Attaching. +

MBIM_DATA_CLASS_EDGE

 +

EDGE.

 

MBIM_PACKET_SERVICE_STATE_ATTACHED

Attached. +

MBIM_DATA_CLASS_UMTS

 +

UMTS.

 

MBIM_PACKET_SERVICE_STATE_DETACHING

Detaching. +

MBIM_DATA_CLASS_HSDPA

 +

HSDPA.

 

MBIM_PACKET_SERVICE_STATE_DETACHED

Detached. +

MBIM_DATA_CLASS_HSUPA

 +

HSUPA.

 
-
-
-
-

enum MbimActivationCommand

-
typedef enum {
-    MBIM_ACTIVATION_COMMAND_DEACTIVATE = 0,
-    MBIM_ACTIVATION_COMMAND_ACTIVATE   = 1
-} MbimActivationCommand;
-
-

-Activation Command. -

-
---- - - - + + - - + + - -

MBIM_ACTIVATION_COMMAND_DEACTIVATE

Deactivate. +

MBIM_DATA_CLASS_LTE

 +

LTE.

 

MBIM_ACTIVATION_COMMAND_ACTIVATE

Activate. +

MBIM_DATA_CLASS_1XRTT

 +

1xRTT.

 
-
-
-
-

enum MbimCompression

-
typedef enum {
-    MBIM_COMPRESSION_NONE   = 0,
-    MBIM_COMPRESSION_ENABLE = 1
-} MbimCompression;
-
-

-Compression. -

-
---- - - - + + - - + + + + + + + - -

MBIM_COMPRESSION_NONE

None. +

MBIM_DATA_CLASS_1XEVDO

 +

1xEV-DO.

 

MBIM_COMPRESSION_ENABLE

Enable. +

MBIM_DATA_CLASS_1XEVDO_REVA

 +

1xEV-DO RevA

 

MBIM_DATA_CLASS_1XEVDV

 +

1xEV-DV.

+		 
-
-
-
-

enum MbimAuthProtocol

-
typedef enum {
-    MBIM_AUTH_PROTOCOL_NONE     = 0,
-    MBIM_AUTH_PROTOCOL_PAP      = 1,
-    MBIM_AUTH_PROTOCOL_CHAP     = 2,
-    MBIM_AUTH_PROTOCOL_MSCHAPV2 = 3
-} MbimAuthProtocol;
-
-

-Auth Protocol. -

-
---- - - - + + - - + + - - + + - - + +

MBIM_AUTH_PROTOCOL_NONE

None. +

MBIM_DATA_CLASS_3XRTT

 +

3xRTT.

 

MBIM_AUTH_PROTOCOL_PAP

Pap. +

MBIM_DATA_CLASS_1XEVDO_REVB

 +

1xEV-DO RevB.

 

MBIM_AUTH_PROTOCOL_CHAP

Chap. +

MBIM_DATA_CLASS_UMB

 +

UMB.

 

MBIM_AUTH_PROTOCOL_MSCHAPV2

V2. +

MBIM_DATA_CLASS_CUSTOM

 +

Custom.

 
+
-

enum MbimContextIpType

-
typedef enum {
-    MBIM_CONTEXT_IP_TYPE_DEFAULT       = 0,
-    MBIM_CONTEXT_IP_TYPE_IPV4          = 1,
-    MBIM_CONTEXT_IP_TYPE_IPV6          = 2,
-    MBIM_CONTEXT_IP_TYPE_IPV4V6        = 3,
-    MBIM_CONTEXT_IP_TYPE_IPV4_AND_IPV6 = 4
-} MbimContextIpType;
-
-

-Context IP Type. -

-
+

enum MbimSmsCaps

+

SMS capabilities.

+
+

Members

+
--+++ - - - - - - + + - - + + - - + + - - + +

MBIM_CONTEXT_IP_TYPE_DEFAULT

It is up to the function to decide, the host does not care. -

MBIM_CONTEXT_IP_TYPE_IPV4

IPv4 context. +

MBIM_SMS_CAPS_PDU_RECEIVE

 +

Can receive in PDU mode.

 

MBIM_CONTEXT_IP_TYPE_IPV6

IPv6 context. +

MBIM_SMS_CAPS_PDU_SEND

 +

Can send in PDU mode.

 

MBIM_CONTEXT_IP_TYPE_IPV4V6

The context is IPv4, IPv6 or dualstack IPv4v6. +

MBIM_SMS_CAPS_TEXT_RECEIVE

 +

Can receive in text mode.

 

MBIM_CONTEXT_IP_TYPE_IPV4_AND_IPV6

Both an IPv4 and an IPv6 context. +

MBIM_SMS_CAPS_TEXT_SEND

 +

Can send in text mode.

 
+
-

enum MbimActivationState

-
typedef enum {
-    MBIM_ACTIVATION_STATE_UNKNOWN      = 0,
-    MBIM_ACTIVATION_STATE_ACTIVATED    = 1,
-    MBIM_ACTIVATION_STATE_ACTIVATING   = 2,
-    MBIM_ACTIVATION_STATE_DEACTIVATED  = 3,
-    MBIM_ACTIVATION_STATE_DEACTIVATING = 4
-} MbimActivationState;
-
-

-Activation State. -

-
+

enum MbimCtrlCaps

+

Control capabilities.

+
+

Members

+
--+++ - - + + - - + + - - + + - - + + - - + +

MBIM_ACTIVATION_STATE_UNKNOWN

Unknown. +

MBIM_CTRL_CAPS_REG_MANUAL

 +

Device allows manual network selection.

 

MBIM_ACTIVATION_STATE_ACTIVATED

Activated. +

MBIM_CTRL_CAPS_HW_RADIO_SWITCH

 +

Device has a hardware radio power switch.

 

MBIM_ACTIVATION_STATE_ACTIVATING

Activating. +

MBIM_CTRL_CAPS_CDMA_MOBILE_IP

 +

The CDMA function supports Mobile IP.

 

MBIM_ACTIVATION_STATE_DEACTIVATED

Deactivated. +

MBIM_CTRL_CAPS_CDMA_SIMPLE_IP

 +

The CDMA function supports Simple IP.

 

MBIM_ACTIVATION_STATE_DEACTIVATING

Deactivating. +

MBIM_CTRL_CAPS_MULTI_CARRIER

 +

Device can work with multiple providers.

 
+
-

enum MbimVoiceCallState

-
typedef enum {
-    MBIM_VOICE_CALL_STATE_NONE        = 0,
-    MBIM_VOICE_CALL_STATE_IN_PROGRESS = 1,
-    MBIM_VOICE_CALL_STATE_HANG_UP     = 2
-} MbimVoiceCallState;
-
-

-Voice Call State. -

-
+

enum MbimSubscriberReadyState

+

Ready state of the subscriber.

+
+

Members

+
--+++ - - - - - - + + - - + + - -

MBIM_VOICE_CALL_STATE_NONE

None. -

MBIM_VOICE_CALL_STATE_IN_PROGRESS

Progress. +

MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED

 +

Not initialized.

 

MBIM_VOICE_CALL_STATE_HANG_UP

Up. +

MBIM_SUBSCRIBER_READY_STATE_INITIALIZED

 +

Initialized.

 
-
-
-
-

enum MbimIPConfigurationAvailableFlag

-
typedef enum {
- /*< underscore_name=mbim_ip_configuration_available_flag >*/
-    MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_NONE     = 0,
-    MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_ADDRESS  = 1 << 0,
-    MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_GATEWAY  = 1 << 1,
-    MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_DNS      = 1 << 2,
-    MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_MTU      = 1 << 3,
-} MbimIPConfigurationAvailableFlag;
-
-

-Mask of available information about an IP address. -

-
---- - - - + + - - + + - - + + - - + + - - + +

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_NONE

No info available. +

MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED

 +

SIM not inserted.

 

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_ADDRESS

Address info available. +

MBIM_SUBSCRIBER_READY_STATE_BAD_SIM

 +

Bad SIM.

 

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_GATEWAY

Gateway info available. +

MBIM_SUBSCRIBER_READY_STATE_FAILURE

 +

Failure.

 

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_DNS

DNS info available. +

MBIM_SUBSCRIBER_READY_STATE_NOT_ACTIVATED

 +

Not activated.

 

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_MTU

MTU info available. +

MBIM_SUBSCRIBER_READY_STATE_DEVICE_LOCKED

 +

Device locked.

 
+
-

enum MbimSmsStorageState

-
typedef enum {
-    MBIM_SMS_STORAGE_STATE_NOT_INITIALIZED = 0,
-    MBIM_SMS_STORAGE_STATE_INITIALIZED     = 1
-} MbimSmsStorageState;
-
-

-State of the SMS storage. -

-
+

enum MbimReadyInfoFlag

+
+

Members

+
--+++ - - - - - - - - + + - - + +

MBIM_SMS_STORAGE_STATE_NOT_INITIALIZED

Storage not initialized. -

MBIM_SMS_STORAGE_STATE_INITIALIZED

Storage initialized. +

MBIM_READY_INFO_FLAG_PROTECT_UNIQUE_ID

 +

Request to avoid displaying subscriber ID.

 
+
-

enum MbimSmsFormat

-
typedef enum {
-    MBIM_SMS_FORMAT_PDU  = 0,
-    MBIM_SMS_FORMAT_CDMA = 1
-} MbimSmsFormat;
-
-

-SMS format. -

-
+

enum MbimRadioSwitchState

+

Radio switch state.

+
+

Members

+
--+++ - - + + - - + +

MBIM_SMS_FORMAT_PDU

PDU format. +

MBIM_RADIO_SWITCH_STATE_OFF

 +

Radio is off.

 

MBIM_SMS_FORMAT_CDMA

CDMA format. +

MBIM_RADIO_SWITCH_STATE_ON

 +

Radio is on.

 
+
-

enum MbimSmsFlag

-
typedef enum {
-    MBIM_SMS_FLAG_ALL   = 0,
-    MBIM_SMS_FLAG_INDEX = 1,
-    MBIM_SMS_FLAG_NEW   = 2,
-    MBIM_SMS_FLAG_OLD   = 3,
-    MBIM_SMS_FLAG_SENT  = 4,
-    MBIM_SMS_FLAG_DRAFT = 5
-} MbimSmsFlag;
-
-

-Flags to use when requesting to read SMS. MBIM_SMS_FLAG_ALL and -MBIM_SMS_FLAG_NEW are mandatory, all the others are optional. -

-
+

enum MbimPinType

+

PIN Types.

+
+

Members

+
--+++ - - + + - - + + - - - - - - - - - - - - - - - - -

MBIM_SMS_FLAG_ALL

All. +

MBIM_PIN_TYPE_UNKNOWN

 +

Unknown or unset.

 

MBIM_SMS_FLAG_INDEX

Index. +

MBIM_PIN_TYPE_CUSTOM

 +

The PIN type is a custom type and is none of the other PIN types listed in this enumeration.

 

MBIM_SMS_FLAG_NEW

New. -

MBIM_SMS_FLAG_OLD

Old. -

MBIM_SMS_FLAG_SENT

Sent. -

MBIM_SMS_FLAG_DRAFT

Draft. -
-
-
-
-

enum MbimSmsCdmaLang

-
typedef enum {
-    MBIM_SMS_CDMA_LANG_UNKNOWN  = 0,
-    MBIM_SMS_CDMA_LANG_ENGLISH  = 1,
-    MBIM_SMS_CDMA_LANG_FRENCH   = 2,
-    MBIM_SMS_CDMA_LANG_SPANISH  = 3,
-    MBIM_SMS_CDMA_LANG_JAPANESE = 4,
-    MBIM_SMS_CDMA_LANG_KOREAN   = 5,
-    MBIM_SMS_CDMA_LANG_CHINESE  = 6,
-    MBIM_SMS_CDMA_LANG_HEBREW   = 7
-} MbimSmsCdmaLang;
-
-

-Language of a CDMA SMS. -

-
---- - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - -

MBIM_SMS_CDMA_LANG_UNKNOWN

Unknown language. +

MBIM_PIN_TYPE_PIN1

 +

The PIN1 key.

 

MBIM_SMS_CDMA_LANG_ENGLISH

English. +

MBIM_PIN_TYPE_PIN2

 +

The PIN2 key.

 

MBIM_SMS_CDMA_LANG_FRENCH

French. +

MBIM_PIN_TYPE_DEVICE_SIM_PIN

 +

The device to SIM key.

 

MBIM_SMS_CDMA_LANG_SPANISH

Spanish. +

MBIM_PIN_TYPE_DEVICE_FIRST_SIM_PIN

 +

The device to very first SIM key.

 

MBIM_SMS_CDMA_LANG_JAPANESE

Japanese. +

MBIM_PIN_TYPE_NETWORK_PIN

 +

The network personalization key.

 

MBIM_SMS_CDMA_LANG_KOREAN

Korean. +

MBIM_PIN_TYPE_NETWORK_SUBSET_PIN

 +

The network subset personalization key.

 

MBIM_SMS_CDMA_LANG_CHINESE

Chinese. +

MBIM_PIN_TYPE_SERVICE_PROVIDER_PIN

 +

The service provider (SP) personalization key.

 

MBIM_SMS_CDMA_LANG_HEBREW

Hebrew. +

MBIM_PIN_TYPE_CORPORATE_PIN

 +

The corporate personalization key.

 
-
-
-
-

enum MbimSmsCdmaEncoding

-
typedef enum {
-    MBIM_SMS_CDMA_ENCODING_OCTET        = 0,
-    MBIM_SMS_CDMA_ENCODING_EPM          = 1,
-    MBIM_SMS_CDMA_ENCODING_7BIT_ASCII   = 2,
-    MBIM_SMS_CDMA_ENCODING_LA5          = 3,
-    MBIM_SMS_CDMA_ENCODING_UNICODE      = 4,
-    MBIM_SMS_CDMA_ENCODING_SHIFT_JIS    = 5,
-    MBIM_SMS_CDMA_ENCODING_KOREAN       = 6,
-    MBIM_SMS_CDMA_ENCODING_LATIN_HEBREW = 7,
-    MBIM_SMS_CDMA_ENCODING_LATIN        = 8,
-    MBIM_SMS_CDMA_ENCODING_GSM_7BIT     = 9
-} MbimSmsCdmaEncoding;
-
-

-Type of encoding of a CDMA SMS. -

-
---- - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + +

MBIM_SMS_CDMA_ENCODING_OCTET

Octet. +

MBIM_PIN_TYPE_SUBSIDY_PIN

 +

The subsidy unlock key.

 

MBIM_SMS_CDMA_ENCODING_EPM

EPM. +

MBIM_PIN_TYPE_PUK1

 +

The Personal Identification Number1 Unlock Key (PUK1).

 

MBIM_SMS_CDMA_ENCODING_7BIT_ASCII

7-bit ASCII. +

MBIM_PIN_TYPE_PUK2

 +

The Personal Identification Number2 Unlock Key (PUK2).

 

MBIM_SMS_CDMA_ENCODING_LA5

LA5. +

MBIM_PIN_TYPE_DEVICE_FIRST_SIM_PUK

 +

The device to very first SIM PIN unlock key.

 

MBIM_SMS_CDMA_ENCODING_UNICODE

Unicode. +

MBIM_PIN_TYPE_NETWORK_PUK

 +

The network personalization unlock key.

 

MBIM_SMS_CDMA_ENCODING_SHIFT_JIS

Shift JIS. +

MBIM_PIN_TYPE_NETWORK_SUBSET_PUK

 +

The network subset personalization unlock key.

 

MBIM_SMS_CDMA_ENCODING_KOREAN

Korean. +

MBIM_PIN_TYPE_SERVICE_PROVIDER_PUK

 +

The service provider (SP) personalization unlock key.

 

MBIM_SMS_CDMA_ENCODING_LATIN_HEBREW

Latin hebrew. +

MBIM_PIN_TYPE_CORPORATE_PUK

 +

The corporate personalization unlock key.

 
+
+ +
+
+

enum MbimPinState

+

PIN States.

+
+

Members

+
+++++ + - - + + - - + +

MBIM_SMS_CDMA_ENCODING_LATIN

Latin. +

MBIM_PIN_STATE_UNLOCKED

 +

The device does not require a PIN.

 

MBIM_SMS_CDMA_ENCODING_GSM_7BIT

7-bit GSM. +

MBIM_PIN_STATE_LOCKED

 +

The device requires the user to enter a PIN.

 
+
-

enum MbimSmsStatus

-
typedef enum {
-    MBIM_SMS_STATUS_NEW   = 0,
-    MBIM_SMS_STATUS_OLD   = 1,
-    MBIM_SMS_STATUS_DRAFT = 2,
-    MBIM_SMS_STATUS_SENT  = 3
-} MbimSmsStatus;
-
-

-Status of a SMS message. -

-
+

enum MbimPinOperation

+
+

Members

+
--+++ - - + + - - + + - - + + - - + +

MBIM_SMS_STATUS_NEW

New. +

MBIM_PIN_OPERATION_ENTER

 +

Enter the specified PIN into the device.

 

MBIM_SMS_STATUS_OLD

Old. +

MBIM_PIN_OPERATION_ENABLE

 +

Enable the specified PIN.

 

MBIM_SMS_STATUS_DRAFT

Draft. +

MBIM_PIN_OPERATION_DISABLE

 +

Disable the specified PIN.

 

MBIM_SMS_STATUS_SENT

Sent. +

MBIM_PIN_OPERATION_CHANGE

 +

Change the specified PIN.

 
+
-

enum MbimSmsStatusFlag

-
typedef enum {
-    MBIM_SMS_STATUS_FLAG_NONE               = 0,
-    MBIM_SMS_STATUS_FLAG_MESSAGE_STORE_FULL = 1,
-    MBIM_SMS_STATUS_FLAG_NEW_MESSAGE        = 2
-} MbimSmsStatusFlag;
-
-

-SMS status flags. -

-
+

enum MbimPinMode

+

Whether the lock is enabled or disabled.

+
+

Members

+
--+++ - - + + - - + + - - + +

MBIM_SMS_STATUS_FLAG_NONE

None. +

MBIM_PIN_MODE_NOT_SUPPORTED

 +

Not supported.

 

MBIM_SMS_STATUS_FLAG_MESSAGE_STORE_FULL

Message store is full. +

MBIM_PIN_MODE_ENABLED

 +

Enabled.

 

MBIM_SMS_STATUS_FLAG_NEW_MESSAGE

New non-Class 0 message arrived. +

MBIM_PIN_MODE_DISABLED

 +

Disabled.

 
+
-

enum MbimUssdAction

-
typedef enum {
-    MBIM_USSD_ACTION_INITIATE = 0,
-    MBIM_USSD_ACTION_CONTINUE = 1,
-    MBIM_USSD_ACTION_CANCEL = 2
-} MbimUssdAction;
-
-

-USSD action. -

-
+

enum MbimPinFormat

+

Format of the expected PIN code.

+
+

Members

+
--+++ - - + + - - + + - - + +

MBIM_USSD_ACTION_INITIATE

Initiate USSD session. +

MBIM_PIN_FORMAT_UNKNOWN

 +

Unknown format.

 

MBIM_USSD_ACTION_CONTINUE

Continue USSD session. +

MBIM_PIN_FORMAT_NUMERIC

 +

Numeric-only format.

 

MBIM_USSD_ACTION_CANCEL

Cancel USSD session. +

MBIM_PIN_FORMAT_ALPHANUMERIC

 +

Alphanumeric format.

 
+
-

enum MbimUssdResponse

-
typedef enum {
-    MBIM_USSD_RESPONSE_NO_ACTION_REQUIRED      = 0,
-    MBIM_USSD_RESPONSE_ACTION_REQUIRED         = 1,
-    MBIM_USSD_RESPONSE_TERMINATED_BY_NETWORK   = 2,
-    MBIM_USSD_RESPONSE_OTHER_LOCAL_CLIENT      = 3,
-    MBIM_USSD_RESPONSE_OPERATION_NOT_SUPPORTED = 4,
-    MBIM_USSD_RESPONSE_NETWORK_TIMEOUT         = 5
-} MbimUssdResponse;
-
-

-USSD response. -

-
+

enum MbimProviderState

+

State of the provider.

+
+

Members

+
--+++ - - + + + + + + + - - + + - - + + - - + + - - + + - - + +

MBIM_USSD_RESPONSE_NO_ACTION_REQUIRED

No action required. +

MBIM_PROVIDER_STATE_UNKNOWN

 +

Unknown.

+		 

MBIM_PROVIDER_STATE_HOME

 +

Home operator.

 

MBIM_USSD_RESPONSE_ACTION_REQUIRED

An action is required. +

MBIM_PROVIDER_STATE_FORBIDDEN

 +

Provider blocked.

 

MBIM_USSD_RESPONSE_TERMINATED_BY_NETWORK

Terminated by network +

MBIM_PROVIDER_STATE_PREFERRED

 +

Provider is in the preferred list.

 

MBIM_USSD_RESPONSE_OTHER_LOCAL_CLIENT

Other local client. +

MBIM_PROVIDER_STATE_VISIBLE

 +

Provider is visible.

 

MBIM_USSD_RESPONSE_OPERATION_NOT_SUPPORTED

Operation not supported. +

MBIM_PROVIDER_STATE_REGISTERED

 +

Currently registered to the provider.

 

MBIM_USSD_RESPONSE_NETWORK_TIMEOUT

Network timeout. +

MBIM_PROVIDER_STATE_PREFERRED_MULTICARRIER

 +

Provider is a preferred multicarrier network.

 
+
-

enum MbimUssdSessionState

-
typedef enum {
-    MBIM_USSD_SESSION_STATE_NEW_SESSION      = 0,
-    MBIM_USSD_SESSION_STATE_EXISTING_SESSION = 1
-} MbimUssdSessionState;
-
-

-Session state. -

-
+

enum MbimVisibleProvidersAction

+

Type of action to perform when listing visible providers.

+
+

Members

+
--+++ - - + + - - + +

MBIM_USSD_SESSION_STATE_NEW_SESSION

New session. +

MBIM_VISIBLE_PROVIDERS_ACTION_FULL_SCAN

 +

Full scan.

 

MBIM_USSD_SESSION_STATE_EXISTING_SESSION

Existing session. +

MBIM_VISIBLE_PROVIDERS_ACTION_RESTRICTED_SCAN

 +

Locate preferred multicarrier providers.

 
+
-

enum MbimPhonebookFlag

-
typedef enum {
-    MBIM_PHONEBOOK_FLAG_ALL   = 0,
-    MBIM_PHONEBOOK_FLAG_INDEX = 1
-} MbimPhonebookFlag;
-
-

-Flags to use when reading the phonebook. -

-
+

enum MbimNwError

+

Network errors.

+
+

Members

+
--+++ - - + + - - + + - -

MBIM_PHONEBOOK_FLAG_ALL

Request all. +

MBIM_NW_ERROR_UNKNOWN

 +

Unknown or unset error.

 

MBIM_PHONEBOOK_FLAG_INDEX

Request single entry by index. +

MBIM_NW_ERROR_IMSI_UNKNOWN_IN_HLR

 +

IMSI unknown in the HLR.

 
-
-
-
-

enum MbimPhonebookState

-
typedef enum {
-    MBIM_PHONEBOOK_STATE_NOT_INITIALIZED = 0,
-    MBIM_PHONEBOOK_STATE_INITIALIZED     = 1
-} MbimPhonebookState;
-
-

-Phonebook state. -

-
---- - - - + + - - + + - -

MBIM_PHONEBOOK_STATE_NOT_INITIALIZED

Not initialized. +

MBIM_NW_ERROR_ILLEGAL_MS

 +

Illegal MS.

 

MBIM_PHONEBOOK_STATE_INITIALIZED

Initialized +

MBIM_NW_ERROR_IMSI_UNKNOWN_IN_VLR

 +

IMSI unknown in the VLR.

 
-
-
-
-

enum MbimPhonebookWriteFlag

-
typedef enum {
-    MBIM_PHONEBOOK_WRITE_FLAG_SAVE_UNUSED = 0,
-    MBIM_PHONEBOOK_WRITE_FLAG_SAVE_INDEX  = 1,
-} MbimPhonebookWriteFlag;
-
-

-Flags to use when writing the phonebook. -

-
---- - - - + + - - + + - -

MBIM_PHONEBOOK_WRITE_FLAG_SAVE_UNUSED

Store the record in an unused slot. +

MBIM_NW_ERROR_IMEI_NOT_ACCEPTED

 +

IMEI not accepted.

 

MBIM_PHONEBOOK_WRITE_FLAG_SAVE_INDEX

Index where to store the record. +

MBIM_NW_ERROR_ILLEGAL_ME

 +

Illegal ME.

 
-
-
-
-

enum MbimStkPacProfile

-
typedef enum {
-    MBIM_STK_PAC_PROFILE_NOT_HANDLED_BY_FUNCTION_HANDLED_BY_HOST           = 0,
-    MBIM_STK_PAC_PROFILE_NOT_HANDLED_BY_FUNCTION_MAY_BE_HANDLED_BY_HOST    = 1,
-    MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_ONLY_TRANSPARENT_TO_HOST      = 2,
-    MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_NOTIFICATION_TO_HOST_POSSIBLE = 3,
-    MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_NOTIFICATIONS_TO_HOST_ENABLED = 4,
-    MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_CAN_BE_OVERRIDEN_BY_HOST      = 5,
-    MBIM_STK_PAC_PROFILE_HANDLED_BY_HOST_FUNCTION_NOT_ABLE_TO_HANDLE       = 6,
-    MBIM_STK_PAC_PROFILE_HANDLED_BY_HOST_FUNCTION_ABLE_TO_HANDLE           = 7
-} MbimStkPacProfile;
-
-

-Proactive command profile. -

-
---- - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - -

MBIM_STK_PAC_PROFILE_NOT_HANDLED_BY_FUNCTION_HANDLED_BY_HOST

Command not handled by function but handled by host. +

MBIM_NW_ERROR_GPRS_NOT_ALLOWED

 +

GPRS not allowed.

 

MBIM_STK_PAC_PROFILE_NOT_HANDLED_BY_FUNCTION_MAY_BE_HANDLED_BY_HOST

Command not handled by function but may be handled by host. +

MBIM_NW_ERROR_GPRS_AND_NON_GPRS_NOT_ALLOWED

 +

GPRS and non-GPRS not allowed.

 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_ONLY_TRANSPARENT_TO_HOST

Command handled by function without informing the host. +

MBIM_NW_ERROR_MS_IDENTITY_NOT_DERIVED_BY_NETWORK

 +

MS identity cannot be derived by the network.

 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_NOTIFICATION_TO_HOST_POSSIBLE

Command handled by function without informing the host, but notifications may be sent to host. +

MBIM_NW_ERROR_IMPLICITLY_DETACHED

 +

Implicitly detached.

 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_NOTIFICATIONS_TO_HOST_ENABLED

Command handled by function, and the function wil also send notification to the host. +

MBIM_NW_ERROR_PLMN_NOT_ALLOWED

 +

PLMN not allowed.

 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_CAN_BE_OVERRIDEN_BY_HOST

Command handled by function, but the host may request full control of the command. +

MBIM_NW_ERROR_LOCATION_AREA_NOT_ALLOWED

 +

Location area not allowed.

 

MBIM_STK_PAC_PROFILE_HANDLED_BY_HOST_FUNCTION_NOT_ABLE_TO_HANDLE

Command will be forwarded to the host. If the host decides not to receive the command, the function will not handle it. +

MBIM_NW_ERROR_ROAMING_NOT_ALLOWED_IN_LOCATION_AREA

 +

Roaming not allowed in the location area.

 

MBIM_STK_PAC_PROFILE_HANDLED_BY_HOST_FUNCTION_ABLE_TO_HANDLE

Command will be forwarded to the host. If the host decides not to receive the command, the function will handle it. +

MBIM_NW_ERROR_GPRS_NOT_ALLOWED_IN_PLMN

 +

GPRS not allowed in PLMN.

 
-
-
-
-

enum MbimStkPacType

-
typedef enum {
-    MBIM_STK_PAC_TYPE_PROACTIVE_COMMAND = 0,
-    MBIM_STK_PAC_TYPE_NOTIFICATION      = 1
-} MbimStkPacType;
-
-

-Type of proactive command. -

-
---- - - - + + - - + + - -

MBIM_STK_PAC_TYPE_PROACTIVE_COMMAND

Host is requested to handle the Proactive command. +

MBIM_NW_ERROR_NO_CELLS_IN_LOCATION_AREA

 +

No cells in location area.

 

MBIM_STK_PAC_TYPE_NOTIFICATION

Proactive command is handled by the function, but the host is notified. +

MBIM_NW_ERROR_MSC_TEMPORARILY_NOT_REACHABLE

 +

MSC temporarily not reachable.

 
-
-
-
-

enum MbimNetworkIdleHintState

-
typedef enum {
-    MBIM_NETWORK_IDLE_HINT_STATE_DISABLED = 0,
-    MBIM_NETWORK_IDLE_HINT_STATE_ENABLED  = 1
-} MbimNetworkIdleHintState;
-
-

-Enable or disable network idle hint. -

-
---- - - - + + - - + + - -

MBIM_NETWORK_IDLE_HINT_STATE_DISABLED

Disabled. +

MBIM_NW_ERROR_NETWORK_FAILURE

 +

Network failure.

 

MBIM_NETWORK_IDLE_HINT_STATE_ENABLED

Enabled. +

MBIM_NW_ERROR_MAC_FAILURE

 +

MAC failure.

 
-
-
-
-

enum MbimEmergencyModeState

-
typedef enum {
-    MBIM_EMERGENCY_MODE_STATE_OFF = 0,
-    MBIM_EMERGENCY_MODE_STATE_ON  = 1
-} MbimEmergencyModeState;
-
-

-Emergency mode state. -

-
---- - - - + + - - + + - -

MBIM_EMERGENCY_MODE_STATE_OFF

Off. +

MBIM_NW_ERROR_SYNCH_FAILURE

 +

Synch failure.

 

MBIM_EMERGENCY_MODE_STATE_ON

On. +

MBIM_NW_ERROR_CONGESTION

 +

Congestion.

 
-
-
-
-

enum MbimDssLinkState

-
typedef enum {
-    MBIM_DSS_LINK_STATE_DEACTIVATE = 0,
-    MBIM_DSS_LINK_STATE_ACTIVATE   = 1
-} MbimDssLinkState;
-
-

-Action performed in the link state. -

-
---- - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -

MBIM_DSS_LINK_STATE_DEACTIVATE

Deactivate. +

MBIM_NW_ERROR_GSM_AUTHENTICATION_UNACCEPTABLE

 +

GSM authentication unacceptable.

 

MBIM_DSS_LINK_STATE_ACTIVATE

Activate. +

MBIM_NW_ERROR_NOT_AUTHORIZED_FOR_CSG

 +

Not authorized for this CSG.

 

MBIM_NW_ERROR_MISSING_OR_UNKNOWN_APN

 +

Missing or unknown access point name.

+		 

MBIM_NW_ERROR_SERVICE_OPTION_NOT_SUPPORTED

 +

Service option not supported.

+		 

MBIM_NW_ERROR_REQUESTED_SERVICE_OPTION_NOT_SUBSCRIBED

 +

Requested service option not subscribed.

+		 

MBIM_NW_ERROR_SERVICE_OPTION_TEMPORARILY_OUT_OF_ORDER

 +

Service option temporarily out of order.

+		 

MBIM_NW_ERROR_NO_PDP_CONTEXT_ACTIVATED

 +

No PDP context activated.

+		 

MBIM_NW_ERROR_SEMANTICALLY_INCORRECT_MESSAGE

 +

Semantically incorrect message.

+		 

MBIM_NW_ERROR_INVALID_MANDATORY_INFORMATION

 +

Invalid mandatory information.

+		 

MBIM_NW_ERROR_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED

 +

Message type non-existent or not implemented.

+		 

MBIM_NW_ERROR_MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE

 +

Message type not compatible with protocol state.

+		 
-
-
-
-

mbim_device_type_get_string ()

-
const gchar *       mbim_device_type_get_string         (MbimDeviceType val);
-

-Gets the nickname string for the MbimDeviceType specified at val. -

-
---- - - - + + + + + + + + - - + + + + + + +

val :

a MbimDeviceType.

MBIM_NW_ERROR_INFORMATION_ELEMENT_NON_EXISTENT_OR_NOT_IMPLEMENTED

 +

Information element non-existent or not implemented.

+		 

MBIM_NW_ERROR_CONDITIONAL_IE_ERROR

 +

Conditional IE error.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_NW_ERROR_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE

 +

Message not compatible with protocol state.

 

MBIM_NW_ERROR_PROTOCOL_ERROR_UNSPECIFIED

 +

Protocol error, unspecified.

+		 
+
-

mbim_cellular_class_build_string_from_mask ()

-
gchar *             mbim_cellular_class_build_string_from_mask
-                                                        (MbimCellularClass mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimCellularClass in mask. -

-
+

enum MbimRegisterAction

+

Type of registration requested.

+
+

Members

+
--+++ - - + + + - - + +

mask :

bitmask of MbimCellularClass values.

MBIM_REGISTER_ACTION_AUTOMATIC

 +

Automatic registration.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_REGISTER_ACTION_MANUAL

 +

Manual registration.

 
+
-

mbim_voice_class_get_string ()

-
const gchar *       mbim_voice_class_get_string         (MbimVoiceClass val);
-

-Gets the nickname string for the MbimVoiceClass specified at val. -

-
+

enum MbimRegisterState

+

Registration state.

+
+

Members

+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + +

val :

a MbimVoiceClass.

MBIM_REGISTER_STATE_UNKNOWN

 +

Unknown registration state.

+		 

MBIM_REGISTER_STATE_DEREGISTERED

 +

Not registered.

+		 

MBIM_REGISTER_STATE_SEARCHING

 +

Searching.

+		 

MBIM_REGISTER_STATE_HOME

 +

Registered in home network.

+		 

MBIM_REGISTER_STATE_ROAMING

 +

Registered in roaming network.

+		 

MBIM_REGISTER_STATE_PARTNER

 +

Registered in a preferred roaming network.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_REGISTER_STATE_DENIED

 +

Registration denied.

 
+
-

mbim_sim_class_build_string_from_mask ()

-
gchar *             mbim_sim_class_build_string_from_mask
-                                                        (MbimSimClass mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimSimClass in mask. -

-
+

enum MbimRegisterMode

+

Type of registration requested.

+
+

Members

+
--+++ - - + + + + + + + + - - + +

mask :

bitmask of MbimSimClass values.

MBIM_REGISTER_MODE_UNKNOWN

 +

Unknown.

+		 

MBIM_REGISTER_MODE_AUTOMATIC

 +

Automatic registration.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_REGISTER_MODE_MANUAL

 +

Manual registration.

 
+
-

mbim_data_class_build_string_from_mask ()

-
gchar *             mbim_data_class_build_string_from_mask
-                                                        (MbimDataClass mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimDataClass in mask. -

-
+

enum MbimRegistrationFlag

+

Registration flags.

+
+

Members

+
--+++ - - + + + + + + + + - - + +

mask :

bitmask of MbimDataClass values.

MBIM_REGISTRATION_FLAG_NONE

 +

None.

+		 

MBIM_REGISTRATION_FLAG_MANUAL_SELECTION_NOT_AVAILABLE

 +

Network doesn't support manual network selection.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH

 +

Modem should auto-attach to the network after registration.

 
+
-

mbim_sms_caps_build_string_from_mask ()

-
gchar *             mbim_sms_caps_build_string_from_mask
-                                                        (MbimSmsCaps mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimSmsCaps in mask. -

-
+

enum MbimPacketServiceAction

+

Packet Service Action.

+
+

Members

+
--+++ - - + + + - - + +

mask :

bitmask of MbimSmsCaps values.

MBIM_PACKET_SERVICE_ACTION_ATTACH

 +

Attach.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_PACKET_SERVICE_ACTION_DETACH

 +

Detach.

 
+
-

mbim_ctrl_caps_build_string_from_mask ()

-
gchar *             mbim_ctrl_caps_build_string_from_mask
-                                                        (MbimCtrlCaps mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimCtrlCaps in mask. -

-
+

enum MbimPacketServiceState

+

Packet Service State.

+
+

Members

+
--+++ - - + + + + + + + + - - + + - -

mask :

bitmask of MbimCtrlCaps values.

MBIM_PACKET_SERVICE_STATE_UNKNOWN

 +

Unknown.

+		 

MBIM_PACKET_SERVICE_STATE_ATTACHING

 +

Attaching.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_PACKET_SERVICE_STATE_ATTACHED

 +

Attached.

 
-
-
-
-

mbim_subscriber_ready_state_get_string ()

-
const gchar *       mbim_subscriber_ready_state_get_string
-                                                        (MbimSubscriberReadyState val);
-

-Gets the nickname string for the MbimSubscriberReadyState specified at val. -

-
---- - - - + + + - - + +

val :

a MbimSubscriberReadyState.

MBIM_PACKET_SERVICE_STATE_DETACHING

 +

Detaching.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_PACKET_SERVICE_STATE_DETACHED

 +

Detached.

 
+
-

mbim_ready_info_flag_build_string_from_mask ()

-
gchar *             mbim_ready_info_flag_build_string_from_mask
-                                                        (MbimReadyInfoFlag mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimReadyInfoFlag in mask. -

-
+

enum MbimActivationCommand

+

Activation Command.

+
+

Members

+
--+++ - - + + + - - + +

mask :

bitmask of MbimReadyInfoFlag values.

MBIM_ACTIVATION_COMMAND_DEACTIVATE

 +

Deactivate.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_ACTIVATION_COMMAND_ACTIVATE

 +

Activate.

 
+
-

mbim_radio_switch_state_get_string ()

-
const gchar *       mbim_radio_switch_state_get_string  (MbimRadioSwitchState val);
-

-Gets the nickname string for the MbimRadioSwitchState specified at val. -

-
+

enum MbimCompression

+

Compression.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimRadioSwitchState.

MBIM_COMPRESSION_NONE

 +

None.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_COMPRESSION_ENABLE

 +

Enable.

 
+
-

mbim_pin_type_get_string ()

-
const gchar *       mbim_pin_type_get_string            (MbimPinType val);
-

-Gets the nickname string for the MbimPinType specified at val. -

-
+

enum MbimAuthProtocol

+

Auth Protocol.

+
+

Members

+
--+++ - - + + + - - + + - -

val :

a MbimPinType.

MBIM_AUTH_PROTOCOL_NONE

 +

None.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_AUTH_PROTOCOL_PAP

 +

Pap.

 
-
-
-
-

mbim_pin_state_get_string ()

-
const gchar *       mbim_pin_state_get_string           (MbimPinState val);
-

-Gets the nickname string for the MbimPinState specified at val. -

-
---- - - - + + + - - + +

val :

a MbimPinState.

MBIM_AUTH_PROTOCOL_CHAP

 +

Chap.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_AUTH_PROTOCOL_MSCHAPV2

 +

V2.

 
+
-

mbim_pin_operation_get_string ()

-
const gchar *       mbim_pin_operation_get_string       (MbimPinOperation val);
-

-Gets the nickname string for the MbimPinOperation specified at val. -

-
+

enum MbimContextIpType

+

Context IP Type.

+
+

Members

+
--+++ - - + + + - - + + + + + + + - -

val :

a MbimPinOperation.

MBIM_CONTEXT_IP_TYPE_DEFAULT

 +

It is up to the function to decide, the host does not care.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CONTEXT_IP_TYPE_IPV4

 +

IPv4 context.

 

MBIM_CONTEXT_IP_TYPE_IPV6

 +

IPv6 context.

+		 
-
-
-
-

mbim_pin_mode_get_string ()

-
const gchar *       mbim_pin_mode_get_string            (MbimPinMode val);
-

-Gets the nickname string for the MbimPinMode specified at val. -

-
---- - - - + + + - - + +

val :

a MbimPinMode.

MBIM_CONTEXT_IP_TYPE_IPV4V6

 +

The context is IPv4, IPv6 or dualstack IPv4v6.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_CONTEXT_IP_TYPE_IPV4_AND_IPV6

 +

Both an IPv4 and an IPv6 context.

 
+
-

mbim_pin_format_get_string ()

-
const gchar *       mbim_pin_format_get_string          (MbimPinFormat val);
-

-Gets the nickname string for the MbimPinFormat specified at val. -

-
+

enum MbimActivationState

+

Activation State.

+
+

Members

+
--+++ - - + + + - - + + + + + + + - -

val :

a MbimPinFormat.

MBIM_ACTIVATION_STATE_UNKNOWN

 +

Unknown.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_ACTIVATION_STATE_ACTIVATED

 +

Activated.

 

MBIM_ACTIVATION_STATE_ACTIVATING

 +

Activating.

+		 
-
-
-
-

mbim_provider_state_build_string_from_mask ()

-
gchar *             mbim_provider_state_build_string_from_mask
-                                                        (MbimProviderState mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimProviderState in mask. -

-
---- - - - + + + - - + +

mask :

bitmask of MbimProviderState values.

MBIM_ACTIVATION_STATE_DEACTIVATED

 +

Deactivated.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_ACTIVATION_STATE_DEACTIVATING

 +

Deactivating.

 
+
-

mbim_visible_providers_action_get_string ()

-
const gchar *       mbim_visible_providers_action_get_string
-                                                        (MbimVisibleProvidersAction val);
-

-Gets the nickname string for the MbimVisibleProvidersAction specified at val. -

-
+

enum MbimVoiceCallState

+

Voice Call State.

+
+

Members

+
--+++ - - + + + + + + + + - - + +

val :

a MbimVisibleProvidersAction.

MBIM_VOICE_CALL_STATE_NONE

 +

None.

+		 

MBIM_VOICE_CALL_STATE_IN_PROGRESS

 +

Progress.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_VOICE_CALL_STATE_HANG_UP

 +

Up.

 
+
-

mbim_nw_error_get_string ()

-
const gchar *       mbim_nw_error_get_string            (MbimNwError val);
-

-Gets the nickname string for the MbimNwError specified at val. -

-
+

enum MbimIPConfigurationAvailableFlag

+

Mask of available information about an IP address.

+
+

Members

+
--+++ - - + + + - - + + + + + + + - -

val :

a MbimNwError.

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_NONE

 +

No info available.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_ADDRESS

 +

Address info available.

 

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_GATEWAY

 +

Gateway info available.

+		 
-
-
-
-

mbim_register_action_get_string ()

-
const gchar *       mbim_register_action_get_string     (MbimRegisterAction val);
-

-Gets the nickname string for the MbimRegisterAction specified at val. -

-
---- - - - + + + - - + +

val :

a MbimRegisterAction.

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_DNS

 +

DNS info available.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_IP_CONFIGURATION_AVAILABLE_FLAG_MTU

 +

MTU info available.

 
+
-

mbim_register_state_get_string ()

-
const gchar *       mbim_register_state_get_string      (MbimRegisterState val);
-

-Gets the nickname string for the MbimRegisterState specified at val. -

-
+

enum MbimSmsStorageState

+

State of the SMS storage.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimRegisterState.

MBIM_SMS_STORAGE_STATE_NOT_INITIALIZED

 +

Storage not initialized.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_STORAGE_STATE_INITIALIZED

 +

Storage initialized.

 
+
-

mbim_register_mode_get_string ()

-
const gchar *       mbim_register_mode_get_string       (MbimRegisterMode val);
-

-Gets the nickname string for the MbimRegisterMode specified at val. -

-
+

enum MbimSmsFormat

+

SMS format.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimRegisterMode.

MBIM_SMS_FORMAT_PDU

 +

PDU format.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_FORMAT_CDMA

 +

CDMA format.

 
+
-

mbim_packet_service_action_get_string ()

-
const gchar *       mbim_packet_service_action_get_string
-                                                        (MbimPacketServiceAction val);
-

-Gets the nickname string for the MbimPacketServiceAction specified at val. -

-
+

enum MbimSmsFlag

+

Flags to use when requesting to read SMS. MBIM_SMS_FLAG_ALL + and +MBIM_SMS_FLAG_NEW + are mandatory, all the others are optional.

+
+

Members

+
--+++ - - + + + - - + + - -

val :

a MbimPacketServiceAction.

MBIM_SMS_FLAG_ALL

 +

All.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_FLAG_INDEX

 +

Index.

 
-
-
-
-

mbim_packet_service_state_get_string ()

-
const gchar *       mbim_packet_service_state_get_string
-                                                        (MbimPacketServiceState val);
-

-Gets the nickname string for the MbimPacketServiceState specified at val. -

-
---- - - - + + + - - + + - -

val :

a MbimPacketServiceState.

MBIM_SMS_FLAG_NEW

 +

New.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_FLAG_OLD

 +

Old.

 
-
-
-
-

mbim_activation_command_get_string ()

-
const gchar *       mbim_activation_command_get_string  (MbimActivationCommand val);
-

-Gets the nickname string for the MbimActivationCommand specified at val. -

-
---- - - - + + + - - + +

val :

a MbimActivationCommand.

MBIM_SMS_FLAG_SENT

 +

Sent.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_FLAG_DRAFT

 +

Draft.

 
+
-

mbim_compression_get_string ()

-
const gchar *       mbim_compression_get_string         (MbimCompression val);
-

-Gets the nickname string for the MbimCompression specified at val. -

-
+

enum MbimSmsCdmaLang

+

Language of a CDMA SMS.

+
+

Members

+
--+++ - - + + + - - + + - -

val :

a MbimCompression.

MBIM_SMS_CDMA_LANG_UNKNOWN

 +

Unknown language.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_LANG_ENGLISH

 +

English.

 
-
-
-
-

mbim_auth_protocol_get_string ()

-
const gchar *       mbim_auth_protocol_get_string       (MbimAuthProtocol val);
-

-Gets the nickname string for the MbimAuthProtocol specified at val. -

-
---- - - - + + + - - + + - -

val :

a MbimAuthProtocol.

MBIM_SMS_CDMA_LANG_FRENCH

 +

French.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_LANG_SPANISH

 +

Spanish.

 
-
-
-
-

mbim_context_ip_type_get_string ()

-
const gchar *       mbim_context_ip_type_get_string     (MbimContextIpType val);
-

-Gets the nickname string for the MbimContextIpType specified at val. -

-
---- - - - + + + - - + + - -

val :

a MbimContextIpType.

MBIM_SMS_CDMA_LANG_JAPANESE

 +

Japanese.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_LANG_KOREAN

 +

Korean.

 
-
-
-
-

mbim_activation_state_get_string ()

-
const gchar *       mbim_activation_state_get_string    (MbimActivationState val);
-

-Gets the nickname string for the MbimActivationState specified at val. -

-
---- - - - + + + - - + +

val :

a MbimActivationState.

MBIM_SMS_CDMA_LANG_CHINESE

 +

Chinese.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_LANG_HEBREW

 +

Hebrew.

 
+
-

mbim_voice_call_state_get_string ()

-
const gchar *       mbim_voice_call_state_get_string    (MbimVoiceCallState val);
-

-Gets the nickname string for the MbimVoiceCallState specified at val. -

-
+

enum MbimSmsCdmaEncoding

+

Type of encoding of a CDMA SMS.

+
+

Members

+
--+++ - - + + + - - + + - -

val :

a MbimVoiceCallState.

MBIM_SMS_CDMA_ENCODING_OCTET

 +

Octet.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_ENCODING_EPM

 +

EPM.

 
-
-
-
-

mbim_ip_configuration_available_flag_build_string_from_mask ()

-
gchar *             mbim_ip_configuration_available_flag_build_string_from_mask
-                                                        (MbimIPConfigurationAvailableFlag mask);
-

-Builds a string containing a comma-separated list of nicknames for -each MbimIPConfigurationAvailableFlag in mask. -

-
---- - - - + + + - - + + - -

mask :

bitmask of MbimIPConfigurationAvailableFlag values.

MBIM_SMS_CDMA_ENCODING_7BIT_ASCII

 +

7-bit ASCII.

+		 

Returns :

a string with the list of nicknames, or NULL if none given. The returned value should be freed with g_free(). [transfer full] +

MBIM_SMS_CDMA_ENCODING_LA5

 +

LA5.

 
-
-
-
-

mbim_sms_storage_state_get_string ()

-
const gchar *       mbim_sms_storage_state_get_string   (MbimSmsStorageState val);
-

-Gets the nickname string for the MbimSmsStorageState specified at val. -

-
---- - - - + + + - - + + - -

val :

a MbimSmsStorageState.

MBIM_SMS_CDMA_ENCODING_UNICODE

 +

Unicode.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_ENCODING_SHIFT_JIS

 +

Shift JIS.

 
-
-
-
-

mbim_sms_format_get_string ()

-
const gchar *       mbim_sms_format_get_string          (MbimSmsFormat val);
-

-Gets the nickname string for the MbimSmsFormat specified at val. -

-
---- - - - + + + - - + + - -

val :

a MbimSmsFormat.

MBIM_SMS_CDMA_ENCODING_KOREAN

 +

Korean.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_ENCODING_LATIN_HEBREW

 +

Latin hebrew.

 
-
-
-
-

mbim_sms_flag_get_string ()

-
const gchar *       mbim_sms_flag_get_string            (MbimSmsFlag val);
-

-Gets the nickname string for the MbimSmsFlag specified at val. -

-
---- - - - + + + - - + +

val :

a MbimSmsFlag.

MBIM_SMS_CDMA_ENCODING_LATIN

 +

Latin.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_CDMA_ENCODING_GSM_7BIT

 +

7-bit GSM.

 
+
-

mbim_sms_cdma_lang_get_string ()

-
const gchar *       mbim_sms_cdma_lang_get_string       (MbimSmsCdmaLang val);
-

-Gets the nickname string for the MbimSmsCdmaLang specified at val. -

-
+

enum MbimSmsStatus

+

Status of a SMS message.

+
+

Members

+
--+++ - - + + + - - + + - -

val :

a MbimSmsCdmaLang.

MBIM_SMS_STATUS_NEW

 +

New.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_STATUS_OLD

 +

Old.

 
-
-
-
-

mbim_sms_cdma_encoding_get_string ()

-
const gchar *       mbim_sms_cdma_encoding_get_string   (MbimSmsCdmaEncoding val);
-

-Gets the nickname string for the MbimSmsCdmaEncoding specified at val. -

-
---- - - - + + + - - + +

val :

a MbimSmsCdmaEncoding.

MBIM_SMS_STATUS_DRAFT

 +

Draft.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_STATUS_SENT

 +

Sent.

 
+
-

mbim_sms_status_get_string ()

-
const gchar *       mbim_sms_status_get_string          (MbimSmsStatus val);
-

-Gets the nickname string for the MbimSmsStatus specified at val. -

-
+

enum MbimSmsStatusFlag

+

SMS status flags.

+
+

Members

+
--+++ - - + + + + + + + + - - + +

val :

a MbimSmsStatus.

MBIM_SMS_STATUS_FLAG_NONE

 +

None.

+		 

MBIM_SMS_STATUS_FLAG_MESSAGE_STORE_FULL

 +

Message store is full.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SMS_STATUS_FLAG_NEW_MESSAGE

 +

New non-Class 0 message arrived.

 
+
-

mbim_sms_status_flag_get_string ()

-
const gchar *       mbim_sms_status_flag_get_string     (MbimSmsStatusFlag val);
-

-Gets the nickname string for the MbimSmsStatusFlag specified at val. -

-
+

enum MbimUssdAction

+

USSD action.

+
+

Members

+
--+++ - - + + + + + + + + - - + +

val :

a MbimSmsStatusFlag.

MBIM_USSD_ACTION_INITIATE

 +

Initiate USSD session.

+		 

MBIM_USSD_ACTION_CONTINUE

 +

Continue USSD session.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_USSD_ACTION_CANCEL

 +

Cancel USSD session.

 
+
-

mbim_ussd_action_get_string ()

-
const gchar *       mbim_ussd_action_get_string         (MbimUssdAction val);
-

-Gets the nickname string for the MbimUssdAction specified at val. -

-
+

enum MbimUssdResponse

+

USSD response.

+
+

Members

+
--+++ - - + + + - - + + + + + + + + + + + + - -

val :

a MbimUssdAction.

MBIM_USSD_RESPONSE_NO_ACTION_REQUIRED

 +

No action required.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_USSD_RESPONSE_ACTION_REQUIRED

 +

An action is required.

 

MBIM_USSD_RESPONSE_TERMINATED_BY_NETWORK

 +

Terminated by network

+		 

MBIM_USSD_RESPONSE_OTHER_LOCAL_CLIENT

 +

Other local client.

+		 
-
-
-
-

mbim_ussd_response_get_string ()

-
const gchar *       mbim_ussd_response_get_string       (MbimUssdResponse val);
-

-Gets the nickname string for the MbimUssdResponse specified at val. -

-
---- - - - + + + - - + +

val :

a MbimUssdResponse.

MBIM_USSD_RESPONSE_OPERATION_NOT_SUPPORTED

 +

Operation not supported.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_USSD_RESPONSE_NETWORK_TIMEOUT

 +

Network timeout.

 
+
-

mbim_ussd_session_state_get_string ()

-
const gchar *       mbim_ussd_session_state_get_string  (MbimUssdSessionState val);
-

-Gets the nickname string for the MbimUssdSessionState specified at val. -

-
+

enum MbimUssdSessionState

+

Session state.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimUssdSessionState.

MBIM_USSD_SESSION_STATE_NEW_SESSION

 +

New session.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_USSD_SESSION_STATE_EXISTING_SESSION

 +

Existing session.

 
+
-

mbim_phonebook_flag_get_string ()

-
const gchar *       mbim_phonebook_flag_get_string      (MbimPhonebookFlag val);
-

-Gets the nickname string for the MbimPhonebookFlag specified at val. -

-
+

enum MbimPhonebookFlag

+

Flags to use when reading the phonebook.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimPhonebookFlag.

MBIM_PHONEBOOK_FLAG_ALL

 +

Request all.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_PHONEBOOK_FLAG_INDEX

 +

Request single entry by index.

 
+
-

mbim_phonebook_state_get_string ()

-
const gchar *       mbim_phonebook_state_get_string     (MbimPhonebookState val);
-

-Gets the nickname string for the MbimPhonebookState specified at val. -

-
+

enum MbimPhonebookState

+

Phonebook state.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimPhonebookState.

MBIM_PHONEBOOK_STATE_NOT_INITIALIZED

 +

Not initialized.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_PHONEBOOK_STATE_INITIALIZED

 +

Initialized

 
+
-

mbim_phonebook_write_flag_get_string ()

-
const gchar *       mbim_phonebook_write_flag_get_string
-                                                        (MbimPhonebookWriteFlag val);
-

-Gets the nickname string for the MbimPhonebookWriteFlag specified at val. -

-
+

enum MbimPhonebookWriteFlag

+

Flags to use when writing the phonebook.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimPhonebookWriteFlag.

MBIM_PHONEBOOK_WRITE_FLAG_SAVE_UNUSED

 +

Store the record in an unused slot.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_PHONEBOOK_WRITE_FLAG_SAVE_INDEX

 +

Index where to store the record.

 
+
-

mbim_stk_pac_profile_get_string ()

-
const gchar *       mbim_stk_pac_profile_get_string     (MbimStkPacProfile val);
-

-Gets the nickname string for the MbimStkPacProfile specified at val. -

-
+

enum MbimStkPacProfile

+

Proactive command profile.

+
+

Members

+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + +

val :

a MbimStkPacProfile.

MBIM_STK_PAC_PROFILE_NOT_HANDLED_BY_FUNCTION_HANDLED_BY_HOST

 +

Command not handled by function but handled by host.

+		 

MBIM_STK_PAC_PROFILE_NOT_HANDLED_BY_FUNCTION_MAY_BE_HANDLED_BY_HOST

 +

Command not handled by function but may be handled by host.

+		 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_ONLY_TRANSPARENT_TO_HOST

 +

Command handled by function without informing the host.

+		 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_NOTIFICATION_TO_HOST_POSSIBLE

 +

Command handled by function without informing the host, but notifications may be sent to host.

+		 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_NOTIFICATIONS_TO_HOST_ENABLED

 +

Command handled by function, and the function wil also send notification to the host.

+		 

MBIM_STK_PAC_PROFILE_HANDLED_BY_FUNCTION_CAN_BE_OVERRIDEN_BY_HOST

 +

Command handled by function, but the host may request full control of the command.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_STK_PAC_PROFILE_HANDLED_BY_HOST_FUNCTION_NOT_ABLE_TO_HANDLE

 +

Command will be forwarded to the host. If the host decides not to receive the command, the function will not handle it.

 

MBIM_STK_PAC_PROFILE_HANDLED_BY_HOST_FUNCTION_ABLE_TO_HANDLE

 +

Command will be forwarded to the host. If the host decides not to receive the command, the function will handle it.

+		 
+
-

mbim_stk_pac_type_get_string ()

-
const gchar *       mbim_stk_pac_type_get_string        (MbimStkPacType val);
-

-Gets the nickname string for the MbimStkPacType specified at val. -

-
+

enum MbimStkPacType

+

Type of proactive command.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimStkPacType.

MBIM_STK_PAC_TYPE_PROACTIVE_COMMAND

 +

Host is requested to handle the Proactive command.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_STK_PAC_TYPE_NOTIFICATION

 +

Proactive command is handled by the function, but the host is notified.

 
+
-

mbim_network_idle_hint_state_get_string ()

-
const gchar *       mbim_network_idle_hint_state_get_string
-                                                        (MbimNetworkIdleHintState val);
-

-Gets the nickname string for the MbimNetworkIdleHintState specified at val. -

-
+

enum MbimNetworkIdleHintState

+

Enable or disable network idle hint.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimNetworkIdleHintState.

MBIM_NETWORK_IDLE_HINT_STATE_DISABLED

 +

Disabled.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_NETWORK_IDLE_HINT_STATE_ENABLED

 +

Enabled.

 
+
-

mbim_emergency_mode_state_get_string ()

-
const gchar *       mbim_emergency_mode_state_get_string
-                                                        (MbimEmergencyModeState val);
-

-Gets the nickname string for the MbimEmergencyModeState specified at val. -

-
+

enum MbimEmergencyModeState

+

Emergency mode state.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimEmergencyModeState.

MBIM_EMERGENCY_MODE_STATE_OFF

 +

Off.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_EMERGENCY_MODE_STATE_ON

 +

On.

 
+
-

mbim_dss_link_state_get_string ()

-
const gchar *       mbim_dss_link_state_get_string      (MbimDssLinkState val);
-

-Gets the nickname string for the MbimDssLinkState specified at val. -

-
+

enum MbimDssLinkState

+

Action performed in the link state.

+
+

Members

+
--+++ - - + + + - - + +

val :

a MbimDssLinkState.

MBIM_DSS_LINK_STATE_DEACTIVATE

 +

Deactivate.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_DSS_LINK_STATE_ACTIVATE

 +

Activate.

 
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Errors.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Errors.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Errors.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Errors.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,557 +2,651 @@ -Errors +libmbim-glib Reference Manual: Errors - + - - - - - - - - - - + + + + + + +
- +

Errors

-

Errors

+

Errors — Common error types.
-
-

Synopsis

-
enum                MbimCoreError;
-enum                MbimProtocolError;
-enum                MbimStatusError;
-
-const gchar *       mbim_core_error_get_string          (MbimCoreError val);
-const gchar *       mbim_protocol_error_get_string      (MbimProtocolError val);
-const gchar *       mbim_status_error_get_string        (MbimStatusError val);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
const gchar * + +mbim_core_error_get_string () +
const gchar * + +mbim_protocol_error_get_string () +
const gchar * + +mbim_status_error_get_string () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + +
enumMbimCoreError
enumMbimProtocolError
enumMbimStatusError

Object Hierarchy

-
-  GEnum
-   +----MbimCoreError
-
-
-  GEnum
-   +----MbimProtocolError
-
-
-  GEnum
-   +----MbimStatusError
+
    GEnum
+    ├── MbimCoreError
+    ├── MbimProtocolError
+    ╰── MbimStatusError

Description

-

-This section defines common error types used in the interface. -

+

This section defines common error types used in the interface.

-

Details

+

Functions

-

enum MbimCoreError

-
typedef enum {
- /*< underscore_name=mbim_core_error >*/
-    MBIM_CORE_ERROR_FAILED           = 0, /*< nick=Failed >*/
-    MBIM_CORE_ERROR_WRONG_STATE      = 1, /*< nick=WrongState >*/
-    MBIM_CORE_ERROR_TIMEOUT          = 2, /*< nick=Timeout >*/
-    MBIM_CORE_ERROR_INVALID_ARGS     = 3, /*< nick=InvalidArgs >*/
-    MBIM_CORE_ERROR_INVALID_MESSAGE  = 4, /*< nick=InvalidMessage >*/
-    MBIM_CORE_ERROR_UNSUPPORTED      = 5, /*< nick=Unsupported >*/
-    MBIM_CORE_ERROR_ABORTED          = 6  /*< nick=Aborted >*/
-} MbimCoreError;
-
-

-Common errors that may be reported by libmbim-glib. -

-
+

mbim_core_error_get_string ()

+
const gchar *
+mbim_core_error_get_string (MbimCoreError val);
+

Gets the nickname string for the MbimCoreError specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimCoreError.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_protocol_error_get_string ()

+
const gchar *
+mbim_protocol_error_get_string (MbimProtocolError val);
+

Gets the nickname string for the MbimProtocolError specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimProtocolError.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_status_error_get_string ()

+
const gchar *
+mbim_status_error_get_string (MbimStatusError val);
+

Gets the nickname string for the MbimStatusError specified at val +.

+
+

Parameters

+
--++++ + + + + + +

val

a MbimStatusError.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

Types and Values

+
+

enum MbimCoreError

+

Common errors that may be reported by libmbim-glib.

+
+

Members

+
++++ - - + + - - + + - - + + - - + + - - + + - - + + - - + +

MBIM_CORE_ERROR_FAILED

Operation failed. +

MBIM_CORE_ERROR_FAILED

 +

Operation failed.

 

MBIM_CORE_ERROR_WRONG_STATE

Operation cannot be executed in the current state. +

MBIM_CORE_ERROR_WRONG_STATE

 +

Operation cannot be executed in the current state.

 

MBIM_CORE_ERROR_TIMEOUT

Operation timed out. +

MBIM_CORE_ERROR_TIMEOUT

 +

Operation timed out.

 

MBIM_CORE_ERROR_INVALID_ARGS

Invalid arguments given. +

MBIM_CORE_ERROR_INVALID_ARGS

 +

Invalid arguments given.

 

MBIM_CORE_ERROR_INVALID_MESSAGE

MBIM message is invalid. +

MBIM_CORE_ERROR_INVALID_MESSAGE

 +

MBIM message is invalid.

 

MBIM_CORE_ERROR_UNSUPPORTED

Not supported. +

MBIM_CORE_ERROR_UNSUPPORTED

 +

Not supported.

 

MBIM_CORE_ERROR_ABORTED

Operation aborted.. +

MBIM_CORE_ERROR_ABORTED

 +

Operation aborted..

 
+
-

enum MbimProtocolError

-
typedef enum {
-    MBIM_PROTOCOL_ERROR_INVALID                  = 0, /*< nick=Invalid >*/
-    MBIM_PROTOCOL_ERROR_TIMEOUT_FRAGMENT         = 1, /*< nick=TimeoutFragment >*/
-    MBIM_PROTOCOL_ERROR_FRAGMENT_OUT_OF_SEQUENCE = 2, /*< nick=FragmentOutOfSequence >*/
-    MBIM_PROTOCOL_ERROR_LENGTH_MISMATCH          = 3, /*< nick=LengthMismatch >*/
-    MBIM_PROTOCOL_ERROR_DUPLICATED_TID           = 4, /*< nick=DuplicatedTid >*/
-    MBIM_PROTOCOL_ERROR_NOT_OPENED               = 5, /*< nick=NotOpened >*/
-    MBIM_PROTOCOL_ERROR_UNKNOWN                  = 6, /*< nick=Unknown >*/
-    MBIM_PROTOCOL_ERROR_CANCEL                   = 7, /*< nick=Cancel >*/
-    MBIM_PROTOCOL_ERROR_MAX_TRANSFER             = 8  /*< nick=MaxTransfer >*/
-} MbimProtocolError;
-
-

-MBIM protocol errors. -

-
+

enum MbimProtocolError

+

MBIM protocol errors.

+
+

Members

+
--+++ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +

MBIM_PROTOCOL_ERROR_INVALID

Invalid MBIM error. +

MBIM_PROTOCOL_ERROR_INVALID

 +

Invalid MBIM error.

 

MBIM_PROTOCOL_ERROR_TIMEOUT_FRAGMENT

Timeout waiting for fragment. +

MBIM_PROTOCOL_ERROR_TIMEOUT_FRAGMENT

 +

Timeout waiting for fragment.

 

MBIM_PROTOCOL_ERROR_FRAGMENT_OUT_OF_SEQUENCE

Fragment received out of sequence. +

MBIM_PROTOCOL_ERROR_FRAGMENT_OUT_OF_SEQUENCE

 +

Fragment received out of sequence.

 

MBIM_PROTOCOL_ERROR_LENGTH_MISMATCH

Length mismatch. +

MBIM_PROTOCOL_ERROR_LENGTH_MISMATCH

 +

Length mismatch.

 

MBIM_PROTOCOL_ERROR_DUPLICATED_TID

Duplicated transaction ID. +

MBIM_PROTOCOL_ERROR_DUPLICATED_TID

 +

Duplicated transaction ID.

 

MBIM_PROTOCOL_ERROR_NOT_OPENED

Not opened. +

MBIM_PROTOCOL_ERROR_NOT_OPENED

 +

Not opened.

 

MBIM_PROTOCOL_ERROR_UNKNOWN

Unknown error. +

MBIM_PROTOCOL_ERROR_UNKNOWN

 +

Unknown error.

 

MBIM_PROTOCOL_ERROR_CANCEL

Cancel the operation. +

MBIM_PROTOCOL_ERROR_CANCEL

 +

Cancel the operation.

 

MBIM_PROTOCOL_ERROR_MAX_TRANSFER

Maximum control transfer not supported. +

MBIM_PROTOCOL_ERROR_MAX_TRANSFER

 +

Maximum control transfer not supported.

 
+
-

enum MbimStatusError

-
typedef enum {
-    MBIM_STATUS_ERROR_NONE                             = 0,  /*< nick=None >*/
-    MBIM_STATUS_ERROR_BUSY                             = 1,  /*< nick=Busy >*/
-    MBIM_STATUS_ERROR_FAILURE                          = 2,  /*< nick=Failure >*/
-    MBIM_STATUS_ERROR_SIM_NOT_INSERTED                 = 3,  /*< nick=SimNotInserted >*/
-    MBIM_STATUS_ERROR_BAD_SIM                          = 4,  /*< nick=BadSim >*/
-    MBIM_STATUS_ERROR_PIN_REQUIRED                     = 5,  /*< nick=PinRequired >*/
-    MBIM_STATUS_ERROR_PIN_DISABLED                     = 6,  /*< nick=PinDisabled >*/
-    MBIM_STATUS_ERROR_NOT_REGISTERED                   = 7,  /*< nick=NotRegistered >*/
-    MBIM_STATUS_ERROR_PROVIDERS_NOT_FOUND              = 8,  /*< nick=ProvidersNotFound >*/
-    MBIM_STATUS_ERROR_NO_DEVICE_SUPPORT                = 9,  /*< nick=NoDeviceSupport >*/
-    MBIM_STATUS_ERROR_PROVIDER_NOT_VISIBLE             = 10, /*< nick=ProviderNotVisible >*/
-    MBIM_STATUS_ERROR_DATA_CLASS_NOT_AVAILABLE         = 11, /*< nick=DataClassNotAvailable >*/
-    MBIM_STATUS_ERROR_PACKET_SERVICE_DETACHED          = 12, /*< nick=PacketServiceDetached >*/
-    MBIM_STATUS_ERROR_MAX_ACTIVATED_CONTEXTS           = 13, /*< nick=MaxActivatedContexts >*/
-    MBIM_STATUS_ERROR_NOT_INITIALIZED                  = 14, /*< nick=NotInitialized >*/
-    MBIM_STATUS_ERROR_VOICE_CALL_IN_PROGRESS           = 15, /*< nick=VoiceCallInProgress >*/
-    MBIM_STATUS_ERROR_CONTEXT_NOT_ACTIVATED            = 16, /*< nick=ContextNotActivated >*/
-    MBIM_STATUS_ERROR_SERVICE_NOT_ACTIVATED            = 17, /*< nick=ServiceNotActivated >*/
-    MBIM_STATUS_ERROR_INVALID_ACCESS_STRING            = 18, /*< nick=InvalidAccessString >*/
-    MBIM_STATUS_ERROR_INVALID_USER_NAME_PWD            = 19, /*< nick=InvalidUserNamePwd >*/
-    MBIM_STATUS_ERROR_RADIO_POWER_OFF                  = 20, /*< nick=RadioPowerOff >*/
-    MBIM_STATUS_ERROR_INVALID_PARAMETERS               = 21, /*< nick=InvalidParameters >*/
-    MBIM_STATUS_ERROR_READ_FAILURE                     = 22, /*< nick=ReadFailure >*/
-    MBIM_STATUS_ERROR_WRITE_FAILURE                    = 23, /*< nick=WriteFailure >*/
-    /* 24 = reserved */
-    MBIM_STATUS_ERROR_NO_PHONEBOOK                     = 25, /*< nick=NoPhonebook >*/
-    MBIM_STATUS_ERROR_PARAMETER_TOO_LONG               = 26, /*< nick=ParameterTooLong >*/
-    MBIM_STATUS_ERROR_STK_BUSY                         = 27, /*< nick=StkBusy >*/
-    MBIM_STATUS_ERROR_OPERATION_NOT_ALLOWED            = 28, /*< nick=OperationNotAllowed >*/
-    MBIM_STATUS_ERROR_MEMORY_FAILURE                   = 29, /*< nick=MemoryFailure >*/
-    MBIM_STATUS_ERROR_INVALID_MEMORY_INDEX             = 30, /*< nick=InvalidMemoryIndex >*/
-    MBIM_STATUS_ERROR_MEMORY_FULL                      = 31, /*< nick=MemoryFull >*/
-    MBIM_STATUS_ERROR_FILTER_NOT_SUPPORTED             = 32, /*< nick=FilterNotSupported >*/
-    MBIM_STATUS_ERROR_DSS_INSTANCE_LIMIT               = 33, /*< nick=DssInstanceLimit >*/
-    MBIM_STATUS_ERROR_INVALID_DEVICE_SERVICE_OPERATION = 34, /*< nick=InvalidDeviceServiceOperation >*/
-    MBIM_STATUS_ERROR_AUTH_INCORRECT_AUTN              = 35, /*< nick=AuthIncorrectAuth >*/
-    MBIM_STATUS_ERROR_AUTH_SYNC_FAILURE                = 36, /*< nick=AuthSyncFailure >*/
-    MBIM_STATUS_ERROR_AUTH_AMF_NOT_SET                 = 37, /*< nick=AuthAmfNotSet >*/
-    MBIM_STATUS_ERROR_SMS_UNKNOWN_SMSC_ADDRESS         = 100, /*< nick=SmsUnknownSmscAddress >*/
-    MBIM_STATUS_ERROR_SMS_NETWORK_TIMEOUT              = 101, /*< nick=SmsNetworkTimeout >*/
-    MBIM_STATUS_ERROR_SMS_LANG_NOT_SUPPORTED           = 102, /*< nick=SmsLangNotSupported >*/
-    MBIM_STATUS_ERROR_SMS_ENCODING_NOT_SUPPORTED       = 103, /*< nick=SmsEncodingNotSupported >*/
-    MBIM_STATUS_ERROR_SMS_FORMAT_NOT_SUPPORTED         = 104  /*< nick=SmsFormatNotSupported >*/
-} MbimStatusError;
-
-

-Status of the MBIM request. -

-
+

enum MbimStatusError

+

Status of the MBIM request.

+
+

Members

+
--+++ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - -

MBIM_STATUS_ERROR_NONE

Success, no error. +

MBIM_STATUS_ERROR_NONE

 +

Success, no error.

 

MBIM_STATUS_ERROR_BUSY

Busy. +

MBIM_STATUS_ERROR_BUSY

 +

Busy.

 

MBIM_STATUS_ERROR_FAILURE

Failure. +

MBIM_STATUS_ERROR_FAILURE

 +

Failure.

 

MBIM_STATUS_ERROR_SIM_NOT_INSERTED

SIM not inserted. +

MBIM_STATUS_ERROR_SIM_NOT_INSERTED

 +

SIM not inserted.

 

MBIM_STATUS_ERROR_BAD_SIM

Bad SIM. +

MBIM_STATUS_ERROR_BAD_SIM

 +

Bad SIM.

 

MBIM_STATUS_ERROR_PIN_REQUIRED

PIN required. +

MBIM_STATUS_ERROR_PIN_REQUIRED

 +

PIN required.

 

MBIM_STATUS_ERROR_PIN_DISABLED

PIN disabled. +

MBIM_STATUS_ERROR_PIN_DISABLED

 +

PIN disabled.

 

MBIM_STATUS_ERROR_NOT_REGISTERED

Not registered. +

MBIM_STATUS_ERROR_NOT_REGISTERED

 +

Not registered.

 

MBIM_STATUS_ERROR_PROVIDERS_NOT_FOUND

Providers not found. +

MBIM_STATUS_ERROR_PROVIDERS_NOT_FOUND

 +

Providers not found.

 

MBIM_STATUS_ERROR_NO_DEVICE_SUPPORT

No device support. +

MBIM_STATUS_ERROR_NO_DEVICE_SUPPORT

 +

No device support.

 

MBIM_STATUS_ERROR_PROVIDER_NOT_VISIBLE

Provider not visible. +

MBIM_STATUS_ERROR_PROVIDER_NOT_VISIBLE

 +

Provider not visible.

 

MBIM_STATUS_ERROR_DATA_CLASS_NOT_AVAILABLE

Data class not available. +

MBIM_STATUS_ERROR_DATA_CLASS_NOT_AVAILABLE

 +

Data class not available.

 

MBIM_STATUS_ERROR_PACKET_SERVICE_DETACHED

Packet service detached. +

MBIM_STATUS_ERROR_PACKET_SERVICE_DETACHED

 +

Packet service detached.

 

MBIM_STATUS_ERROR_MAX_ACTIVATED_CONTEXTS

Max activated contexts. +

MBIM_STATUS_ERROR_MAX_ACTIVATED_CONTEXTS

 +

Max activated contexts.

 

MBIM_STATUS_ERROR_NOT_INITIALIZED

Not initialized. +

MBIM_STATUS_ERROR_NOT_INITIALIZED

 +

Not initialized.

 

MBIM_STATUS_ERROR_VOICE_CALL_IN_PROGRESS

Voice call in progress. +

MBIM_STATUS_ERROR_VOICE_CALL_IN_PROGRESS

 +

Voice call in progress.

 

MBIM_STATUS_ERROR_CONTEXT_NOT_ACTIVATED

Context not activated. +

MBIM_STATUS_ERROR_CONTEXT_NOT_ACTIVATED

 +

Context not activated.

 

MBIM_STATUS_ERROR_SERVICE_NOT_ACTIVATED

Service not activated. +

MBIM_STATUS_ERROR_SERVICE_NOT_ACTIVATED

 +

Service not activated.

 

MBIM_STATUS_ERROR_INVALID_ACCESS_STRING

Invalid access string. +

MBIM_STATUS_ERROR_INVALID_ACCESS_STRING

 +

Invalid access string.

 

MBIM_STATUS_ERROR_INVALID_USER_NAME_PWD

Invalid user name or password. +

MBIM_STATUS_ERROR_INVALID_USER_NAME_PWD

 +

Invalid user name or password.

 

MBIM_STATUS_ERROR_RADIO_POWER_OFF

Radio power off. +

MBIM_STATUS_ERROR_RADIO_POWER_OFF

 +

Radio power off.

 

MBIM_STATUS_ERROR_INVALID_PARAMETERS

Invalid parameters. +

MBIM_STATUS_ERROR_INVALID_PARAMETERS

 +

Invalid parameters.

 

MBIM_STATUS_ERROR_READ_FAILURE

Read failure. +

MBIM_STATUS_ERROR_READ_FAILURE

 +

Read failure.

 

MBIM_STATUS_ERROR_WRITE_FAILURE

Write failure. +

MBIM_STATUS_ERROR_WRITE_FAILURE

 +

Write failure.

 

MBIM_STATUS_ERROR_NO_PHONEBOOK

No phonebook. +

MBIM_STATUS_ERROR_NO_PHONEBOOK

 +

No phonebook.

 

MBIM_STATUS_ERROR_PARAMETER_TOO_LONG

Parameter too long. +

MBIM_STATUS_ERROR_PARAMETER_TOO_LONG

 +

Parameter too long.

 

MBIM_STATUS_ERROR_STK_BUSY

SIM toolkit busy. +

MBIM_STATUS_ERROR_STK_BUSY

 +

SIM toolkit busy.

 

MBIM_STATUS_ERROR_OPERATION_NOT_ALLOWED

Operation not allowed. +

MBIM_STATUS_ERROR_OPERATION_NOT_ALLOWED

 +

Operation not allowed.

 

MBIM_STATUS_ERROR_MEMORY_FAILURE

Memory failure. +

MBIM_STATUS_ERROR_MEMORY_FAILURE

 +

Memory failure.

 

MBIM_STATUS_ERROR_INVALID_MEMORY_INDEX

Invalid memory index. +

MBIM_STATUS_ERROR_INVALID_MEMORY_INDEX

 +

Invalid memory index.

 

MBIM_STATUS_ERROR_MEMORY_FULL

Memory full. +

MBIM_STATUS_ERROR_MEMORY_FULL

 +

Memory full.

 

MBIM_STATUS_ERROR_FILTER_NOT_SUPPORTED

Filter not supported. +

MBIM_STATUS_ERROR_FILTER_NOT_SUPPORTED

 +

Filter not supported.

 

MBIM_STATUS_ERROR_DSS_INSTANCE_LIMIT

DSS instance limit. +

MBIM_STATUS_ERROR_DSS_INSTANCE_LIMIT

 +

DSS instance limit.

 

MBIM_STATUS_ERROR_INVALID_DEVICE_SERVICE_OPERATION

Invalid device service operation. +

MBIM_STATUS_ERROR_INVALID_DEVICE_SERVICE_OPERATION

 +

Invalid device service operation.

 

MBIM_STATUS_ERROR_AUTH_INCORRECT_AUTN

Incorrect AUTN when sending authentication. +

MBIM_STATUS_ERROR_AUTH_INCORRECT_AUTN

 +

Incorrect AUTN when sending authentication.

 

MBIM_STATUS_ERROR_AUTH_SYNC_FAILURE

Synchronization failure during the authentication. +

MBIM_STATUS_ERROR_AUTH_SYNC_FAILURE

 +

Synchronization failure during the authentication.

 

MBIM_STATUS_ERROR_AUTH_AMF_NOT_SET

AMF bit not set in the authentication. +

MBIM_STATUS_ERROR_AUTH_AMF_NOT_SET

 +

AMF bit not set in the authentication.

 

MBIM_STATUS_ERROR_SMS_UNKNOWN_SMSC_ADDRESS

Unknown SMSC address. +

MBIM_STATUS_ERROR_SMS_UNKNOWN_SMSC_ADDRESS

 +

Unknown SMSC address.

 

MBIM_STATUS_ERROR_SMS_NETWORK_TIMEOUT

Network timeout when sending SMS. +

MBIM_STATUS_ERROR_SMS_NETWORK_TIMEOUT

 +

Network timeout when sending SMS.

 

MBIM_STATUS_ERROR_SMS_LANG_NOT_SUPPORTED

Language not supported in SMS. +

MBIM_STATUS_ERROR_SMS_LANG_NOT_SUPPORTED

 +

Language not supported in SMS.

 

MBIM_STATUS_ERROR_SMS_ENCODING_NOT_SUPPORTED

Encoding not supported in SMS. +

MBIM_STATUS_ERROR_SMS_ENCODING_NOT_SUPPORTED

 +

Encoding not supported in SMS.

 

MBIM_STATUS_ERROR_SMS_FORMAT_NOT_SUPPORTED

Format not supported in SMS. -
-
-
-
-

mbim_core_error_get_string ()

-
const gchar *       mbim_core_error_get_string          (MbimCoreError val);
-

-Gets the nickname string for the MbimCoreError specified at val. -

-
---- - - - - - - - - + +

val :

a MbimCoreError.

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_STATUS_ERROR_SMS_FORMAT_NOT_SUPPORTED

 +

Format not supported in SMS.

 
-
-
-

mbim_protocol_error_get_string ()

-
const gchar *       mbim_protocol_error_get_string      (MbimProtocolError val);
-

-Gets the nickname string for the MbimProtocolError specified at val. -

-
---- - - - - - - - - - - -

val :

a MbimProtocolError.

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] -
-
-
-
-

mbim_status_error_get_string ()

-
const gchar *       mbim_status_error_get_string        (MbimStatusError val);
-

-Gets the nickname string for the MbimStatusError specified at val. -

-
---- - - - - - - - - - - -

val :

a MbimStatusError.

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] -
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Firmware-ID.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Firmware-ID.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Firmware-ID.html 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Firmware-ID.html 2014-08-04 13:06:13.000000000 +0000 @@ -0,0 +1,154 @@ + + + + +libmbim-glib Reference Manual: MS Firmware ID + + + + + + + + + + + + + + + + +
+
+
+ + +
+

MS Firmware ID

+

MS Firmware ID

+
+
+

Functions

+
++++ + + + + + + + + + + +
+MbimMessage * + +mbim_message_ms_firmware_id_get_query_new () +
+gboolean + +mbim_message_ms_firmware_id_get_response_parse () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+

+

+
+
+

Functions

+
+

mbim_message_ms_firmware_id_get_query_new ()

+
MbimMessage *
+mbim_message_ms_firmware_id_get_query_new
+                               (GError **error);
+

Create a new request for the 'Get' query command in the 'MS Firmware ID' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
+
+
+

mbim_message_ms_firmware_id_get_response_parse ()

+
gboolean
+mbim_message_ms_firmware_id_get_response_parse
+                               (const MbimMessage *message,
+                                const MbimUuid **firmware_id,
+                                GError **error);
+

Create a new request for the 'FirmwareId' response command in the 'MS Firmware ID' service.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

message

the MbimMessage.

 

firmware_id

return location for a MbimUuid, or NULL if the 'FirmwareId' field is not needed. Do not free the returned value, it is owned by message +.

 

error

return location for error or NULL.

 
+
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
+
+
+

Types and Values

+
+
+
+
+ Generated by GTK-Doc V1.20
+ + \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Host-Shutdown.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Host-Shutdown.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Host-Shutdown.html 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-MS-Host-Shutdown.html 2014-08-04 13:06:13.000000000 +0000 @@ -0,0 +1,100 @@ + + + + +libmbim-glib Reference Manual: MS Host Shutdown + + + + + + + + + + + + + + + + +
+
+
+ + +
+

MS Host Shutdown

+

MS Host Shutdown

+
+
+

Functions

+
++++ + + + + +
+MbimMessage * + +mbim_message_ms_host_shutdown_notify_set_new () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+

+

+
+
+

Functions

+
+

mbim_message_ms_host_shutdown_notify_set_new ()

+
MbimMessage *
+mbim_message_ms_host_shutdown_notify_set_new
+                               (GError **error);
+

Create a new request for the 'Notify' set command in the 'MS Host Shutdown' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
+
+
+

Types and Values

+
+
+
+
+ Generated by GTK-Doc V1.20
+ + \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Phonebook.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Phonebook.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Phonebook.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Phonebook.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -Phonebook +libmbim-glib Reference Manual: Phonebook - + - + - - - - - - - - - - + + + + + + +
@@ -33,474 +30,608 @@

Phonebook

Phonebook

- +
-
-

Synopsis

-
                    MbimPhonebookEntry;
-void                mbim_phonebook_entry_array_free     (MbimPhonebookEntry **array);
-
-MbimMessage *       mbim_message_phonebook_configuration_query_new
-                                                        (GError **error);
-gboolean            mbim_message_phonebook_configuration_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimPhonebookState *state,
-                                                         guint32 *number_of_entries,
-                                                         guint32 *used_entries,
-                                                         guint32 *max_number_length,
-                                                         guint32 *max_name,
-                                                         GError **error);
-gboolean            mbim_message_phonebook_configuration_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimPhonebookState *state,
-                                                         guint32 *number_of_entries,
-                                                         guint32 *used_entries,
-                                                         guint32 *max_number_length,
-                                                         guint32 *max_name,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_phonebook_read_query_new
-                                                        (MbimPhonebookFlag filter_flag,
-                                                         guint32 filter_message_index,
-                                                         GError **error);
-gboolean            mbim_message_phonebook_read_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *entry_count,
-                                                         MbimPhonebookEntry ***entries,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_phonebook_delete_set_new
-                                                        (MbimPhonebookFlag filter_flag,
-                                                         guint32 filter_message_index,
-                                                         GError **error);
-gboolean            mbim_message_phonebook_delete_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_phonebook_write_set_new
-                                                        (MbimPhonebookWriteFlag save_flag,
-                                                         guint32 save_index,
-                                                         const gchar *number,
-                                                         const gchar *name,
-                                                         GError **error);
-gboolean            mbim_message_phonebook_write_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);
-
-
-
-

Description

-

-

-
-

Details

-
-

MbimPhonebookEntry

-
typedef struct {
-    guint32 entry_index;
-    gchar *number;
-    gchar *name;
-} MbimPhonebookEntry;
-
-
+

Functions

+
--++ - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

guint32 entry_index;

a guint32. +void + +mbim_phonebook_entry_array_free () +

gchar *number;

a string. +MbimMessage * + +mbim_message_phonebook_configuration_query_new () +

gchar *name;

a string. +gboolean + +mbim_message_phonebook_configuration_response_parse () +
+gboolean + +mbim_message_phonebook_configuration_notification_parse () +
+MbimMessage * + +mbim_message_phonebook_read_query_new () +
+gboolean + +mbim_message_phonebook_read_response_parse () +
+MbimMessage * + +mbim_message_phonebook_delete_set_new () +
+gboolean + +mbim_message_phonebook_delete_response_parse () +
+MbimMessage * + +mbim_message_phonebook_write_set_new () +
+gboolean + +mbim_message_phonebook_write_response_parse () +
-
-
-

mbim_phonebook_entry_array_free ()

-
void                mbim_phonebook_entry_array_free     (MbimPhonebookEntry **array);
+
+

Types and Values

+
++++ + + + + +
 MbimPhonebookEntry
+
+
+

Object Hierarchy

+
+
+
+
+

Description

-Frees the memory allocated for the array of MbimPhonebookEntrys.

-
---+ +
+

Functions

+
+

mbim_phonebook_entry_array_free ()

+
void
+mbim_phonebook_entry_array_free (MbimPhonebookEntry **array);
+

Frees the memory allocated for the array of MbimPhonebookEntrys.

+
+

Parameters

+
++++ - - + + +

array :

a NULL terminated array of MbimPhonebookEntry structs.

array

a NULL terminated array of MbimPhonebookEntry structs.

 
+
-

mbim_message_phonebook_configuration_query_new ()

-
MbimMessage *       mbim_message_phonebook_configuration_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Configuration' query command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_configuration_query_new ()

+
MbimMessage *
+mbim_message_phonebook_configuration_query_new
+                               (GError **error);
+

Create a new request for the 'Configuration' query command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_phonebook_configuration_response_parse ()

-
gboolean            mbim_message_phonebook_configuration_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimPhonebookState *state,
-                                                         guint32 *number_of_entries,
-                                                         guint32 *used_entries,
-                                                         guint32 *max_number_length,
-                                                         guint32 *max_name,
-                                                         GError **error);
-

-Create a new request for the 'MaxName' response command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_configuration_response_parse ()

+
gboolean
+mbim_message_phonebook_configuration_response_parse
+                               (const MbimMessage *message,
+                                MbimPhonebookState *state,
+                                guint32 *number_of_entries,
+                                guint32 *used_entries,
+                                guint32 *max_number_length,
+                                guint32 *max_name,
+                                GError **error);
+

Create a new request for the 'MaxName' response command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

state :

return location for a MbimPhonebookState, or NULL if the 'State' field is not needed.

message

the MbimMessage.

 

number_of_entries :

return location for a guint32, or NULL if the 'NumberOfEntries' field is not needed.

state

return location for a MbimPhonebookState, or NULL if the 'State' field is not needed.

 

used_entries :

return location for a guint32, or NULL if the 'UsedEntries' field is not needed.

number_of_entries

return location for a guint32, or NULL if the 'NumberOfEntries' field is not needed.

 

max_number_length :

return location for a guint32, or NULL if the 'MaxNumberLength' field is not needed.

used_entries

return location for a guint32, or NULL if the 'UsedEntries' field is not needed.

 

max_name :

return location for a guint32, or NULL if the 'MaxName' field is not needed.

max_number_length

return location for a guint32, or NULL if the 'MaxNumberLength' field is not needed.

 

error :

return location for error or NULL.

max_name

return location for a guint32, or NULL if the 'MaxName' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_phonebook_configuration_notification_parse ()

-
gboolean            mbim_message_phonebook_configuration_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimPhonebookState *state,
-                                                         guint32 *number_of_entries,
-                                                         guint32 *used_entries,
-                                                         guint32 *max_number_length,
-                                                         guint32 *max_name,
-                                                         GError **error);
-

-Create a new request for the 'MaxName' notification command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_configuration_notification_parse ()

+
gboolean
+mbim_message_phonebook_configuration_notification_parse
+                               (const MbimMessage *message,
+                                MbimPhonebookState *state,
+                                guint32 *number_of_entries,
+                                guint32 *used_entries,
+                                guint32 *max_number_length,
+                                guint32 *max_name,
+                                GError **error);
+

Create a new request for the 'MaxName' notification command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - - - - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

state :

return location for a MbimPhonebookState, or NULL if the 'State' field is not needed.

state

return location for a MbimPhonebookState, or NULL if the 'State' field is not needed.

 

number_of_entries :

return location for a guint32, or NULL if the 'NumberOfEntries' field is not needed.

number_of_entries

return location for a guint32, or NULL if the 'NumberOfEntries' field is not needed.

 

used_entries :

return location for a guint32, or NULL if the 'UsedEntries' field is not needed.

used_entries

return location for a guint32, or NULL if the 'UsedEntries' field is not needed.

 

max_number_length :

return location for a guint32, or NULL if the 'MaxNumberLength' field is not needed.

max_number_length

return location for a guint32, or NULL if the 'MaxNumberLength' field is not needed.

 

max_name :

return location for a guint32, or NULL if the 'MaxName' field is not needed.

max_name

return location for a guint32, or NULL if the 'MaxName' field is not needed.

 

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_phonebook_read_query_new ()

-
MbimMessage *       mbim_message_phonebook_read_query_new
-                                                        (MbimPhonebookFlag filter_flag,
-                                                         guint32 filter_message_index,
-                                                         GError **error);
-

-Create a new request for the 'Read' query command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_read_query_new ()

+
MbimMessage *
+mbim_message_phonebook_read_query_new (MbimPhonebookFlag filter_flag,
+                                       guint32 filter_message_index,
+                                       GError **error);
+

Create a new request for the 'Read' query command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - - - - - + + +

filter_flag :

the 'FilterFlag' field, given as a MbimPhonebookFlag.

filter_flag

the 'FilterFlag' field, given as a MbimPhonebookFlag.

 

filter_message_index :

the 'FilterMessageIndex' field, given as a guint32.

filter_message_index

the 'FilterMessageIndex' field, given as a guint32.

 

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_phonebook_read_response_parse ()

-
gboolean            mbim_message_phonebook_read_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *entry_count,
-                                                         MbimPhonebookEntry ***entries,
-                                                         GError **error);
-

-Create a new request for the 'Entries' response command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_read_response_parse ()

+
gboolean
+mbim_message_phonebook_read_response_parse
+                               (const MbimMessage *message,
+                                guint32 *entry_count,
+                                MbimPhonebookEntry ***entries,
+                                GError **error);
+

Create a new request for the 'Entries' response command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - - - - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

entry_count :

return location for a guint32, or NULL if the 'EntryCount' field is not needed.

entry_count

return location for a guint32, or NULL if the 'EntryCount' field is not needed.

 

entries :

return location for a newly allocated array of MbimPhonebookEntrys, or NULL if the 'Entries' field is not needed. Free the returned value with mbim_phonebook_entry_array_free().

entries

return location for a newly allocated array of MbimPhonebookEntrys, or NULL if the 'Entries' field is not needed. Free the returned value with mbim_phonebook_entry_array_free().

 

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_phonebook_delete_set_new ()

-
MbimMessage *       mbim_message_phonebook_delete_set_new
-                                                        (MbimPhonebookFlag filter_flag,
-                                                         guint32 filter_message_index,
-                                                         GError **error);
-

-Create a new request for the 'Delete' set command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_delete_set_new ()

+
MbimMessage *
+mbim_message_phonebook_delete_set_new (MbimPhonebookFlag filter_flag,
+                                       guint32 filter_message_index,
+                                       GError **error);
+

Create a new request for the 'Delete' set command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - - - - - + + + - - + + + - - + + +

filter_flag :

the 'FilterFlag' field, given as a MbimPhonebookFlag.

filter_message_index :

the 'FilterMessageIndex' field, given as a guint32.

filter_flag

the 'FilterFlag' field, given as a MbimPhonebookFlag.

 

error :

return location for error or NULL.

filter_message_index

the 'FilterMessageIndex' field, given as a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_phonebook_delete_response_parse ()

-
gboolean            mbim_message_phonebook_delete_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);
-

-Create a new request for the 'Delete' response command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_delete_response_parse ()

+
gboolean
+mbim_message_phonebook_delete_response_parse
+                               (const MbimMessage *message,
+                                GError **error);
+

Create a new request for the 'Delete' response command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - - - - - + + + - - + + +

message :

the MbimMessage.

error :

return location for error or NULL.

message

the MbimMessage.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_phonebook_write_set_new ()

-
MbimMessage *       mbim_message_phonebook_write_set_new
-                                                        (MbimPhonebookWriteFlag save_flag,
-                                                         guint32 save_index,
-                                                         const gchar *number,
-                                                         const gchar *name,
-                                                         GError **error);
-

-Create a new request for the 'Write' set command in the 'Phonebook' service. -

-
---+

mbim_message_phonebook_write_set_new ()

+
MbimMessage *
+mbim_message_phonebook_write_set_new (MbimPhonebookWriteFlag save_flag,
+                                      guint32 save_index,
+                                      const gchar *number,
+                                      const gchar *name,
+                                      GError **error);
+

Create a new request for the 'Write' set command in the 'Phonebook' service.

+
+

Parameters

+
++++ - - + + + + + + + + - - + + + - - + + + - - + + + + +

save_flag :

the 'SaveFlag' field, given as a MbimPhonebookWriteFlag.

save_flag

the 'SaveFlag' field, given as a MbimPhonebookWriteFlag.

 

save_index

the 'SaveIndex' field, given as a guint32.

 

save_index :

the 'SaveIndex' field, given as a guint32.

number

the 'Number' field, given as a string.

 

number :

the 'Number' field, given as a string.

name

the 'Name' field, given as a string.

 

name :

the 'Name' field, given as a string.

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_phonebook_write_response_parse ()

+
gboolean
+mbim_message_phonebook_write_response_parse
+                               (const MbimMessage *message,
+                                GError **error);
+

Create a new request for the 'Write' response command in the 'Phonebook' service.

+
+

Parameters

+
+++++ + - - + + + - - + + +

error :

return location for error or NULL.

message

the MbimMessage.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
-
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
+ +
+

Types and Values

-

mbim_message_phonebook_write_response_parse ()

-
gboolean            mbim_message_phonebook_write_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);
-

-Create a new request for the 'Write' response command in the 'Phonebook' service. -

-
---+

MbimPhonebookEntry

+
typedef struct {
+    guint32 entry_index;
+    gchar *number;
+    gchar *name;
+} MbimPhonebookEntry;
+
+
+

Members

+
++++ - - + + + - - + + + - - + + +

message :

the MbimMessage.

guint32 entry_index;

a guint32.

 

error :

return location for error or NULL.

gchar *number;

a string.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

gchar *name;

a string.

 
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-SMS.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-SMS.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-SMS.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-SMS.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -SMS +libmbim-glib Reference Manual: SMS - + - + - - - - - - - - - - + + + + + + +
@@ -33,839 +30,1087 @@

SMS

SMS

- +
-
-

Synopsis

-
                    MbimSmsPduReadRecord;
-void                mbim_sms_pdu_read_record_array_free (MbimSmsPduReadRecord **array);
-
-                    MbimSmsCdmaReadRecord;
-void                mbim_sms_cdma_read_record_array_free
-                                                        (MbimSmsCdmaReadRecord **array);
-
-                    MbimSmsPduSendRecord;
-void                mbim_sms_pdu_send_record_free       (MbimSmsPduSendRecord *var);
-
-                    MbimSmsCdmaSendRecord;
-void                mbim_sms_cdma_send_record_free      (MbimSmsCdmaSendRecord *var);
-
-MbimMessage *       mbim_message_sms_configuration_query_new
-                                                        (GError **error);
-MbimMessage *       mbim_message_sms_configuration_set_new
-                                                        (MbimSmsFormat format,
-                                                         const gchar *sc_address,
-                                                         GError **error);
-gboolean            mbim_message_sms_configuration_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsStorageState *sms_storage_state,
-                                                         MbimSmsFormat *format,
-                                                         guint32 *max_messages,
-                                                         guint32 *cdma_short_message_size,
-                                                         gchar **sc_address,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_sms_read_query_new     (MbimSmsFormat format,
-                                                         MbimSmsFlag flag,
-                                                         guint32 message_index,
-                                                         GError **error);
-gboolean            mbim_message_sms_read_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsFormat *format,
-                                                         guint32 *messages_count,
-                                                         MbimSmsPduReadRecord ***pdu_messages,
-                                                         MbimSmsCdmaReadRecord ***cdma_messages,
-                                                         GError **error);
-gboolean            mbim_message_sms_read_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsFormat *format,
-                                                         guint32 *messages_count,
-                                                         MbimSmsPduReadRecord ***pdu_messages,
-                                                         MbimSmsCdmaReadRecord ***cdma_messages,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_sms_send_set_new       (MbimSmsFormat format,
-                                                         const MbimSmsPduSendRecord *pdu_message,
-                                                         const MbimSmsCdmaSendRecord *cdma_message,
-                                                         GError **error);
-gboolean            mbim_message_sms_send_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *message_reference,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_sms_delete_set_new     (MbimSmsFlag flag,
-                                                         guint32 message_index,
-                                                         GError **error);
-gboolean            mbim_message_sms_delete_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_sms_message_store_status_query_new
-                                                        (GError **error);
-gboolean            mbim_message_sms_message_store_status_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsStatusFlag *flag,
-                                                         guint32 *message_index,
-                                                         GError **error);
-gboolean            mbim_message_sms_message_store_status_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsStatusFlag *flag,
-                                                         guint32 *message_index,
-                                                         GError **error);
-
-
-

Description

-

-

-
-
-

Details

-
-

MbimSmsPduReadRecord

-
typedef struct {
-    guint32 message_index;
-    guint32 message_status;
-    guint32 pdu_data_size;
-    guint8 *pdu_data;
-} MbimSmsPduReadRecord;
-
-
+

Functions

+
--++ - - + + - - + + - - + + - - + + - -

guint32 message_index;

a guint32. +void + +mbim_sms_pdu_read_record_array_free () +

guint32 message_status;

a guint32. +void + +mbim_sms_cdma_read_record_array_free () +

guint32 pdu_data_size;

size of the pdu_data array. +void + +mbim_sms_pdu_send_record_free () +

guint8 *pdu_data;

an array of guint8 values. +void + +mbim_sms_cdma_send_record_free () +
-
-
-
-

mbim_sms_pdu_read_record_array_free ()

-
void                mbim_sms_pdu_read_record_array_free (MbimSmsPduReadRecord **array);
-

-Frees the memory allocated for the array of MbimSmsPduReadRecords. -

-
---- - - - - -

array :

a NULL terminated array of MbimSmsPduReadRecord structs.
-
-
-
-

MbimSmsCdmaReadRecord

-
typedef struct {
-    guint32 message_index;
-    guint32 message_status;
-    gchar *address;
-    gchar *timestamp;
-    guint32 encoding;
-    guint32 language;
-    guint32 encoded_message_size;
-    guint8 *encoded_message;
-    guint32 encoded_message_size_in_characters;
-} MbimSmsCdmaReadRecord;
-
-
---- - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - - + + + + + + + + + + + + + +

guint32 message_index;

a guint32. +MbimMessage * + +mbim_message_sms_configuration_query_new () +

guint32 message_status;

a guint32. +MbimMessage * + +mbim_message_sms_configuration_set_new () +

gchar *address;

a string. +gboolean + +mbim_message_sms_configuration_response_parse () +

gchar *timestamp;

a string. +MbimMessage * + +mbim_message_sms_read_query_new () +

guint32 encoding;

a guint32. +gboolean + +mbim_message_sms_read_response_parse () +

guint32 language;

a guint32. +gboolean + +mbim_message_sms_read_notification_parse () +

guint32 encoded_message_size;

size of the encoded_message array. +MbimMessage * + +mbim_message_sms_send_set_new () +

guint8 *encoded_message;

an array of guint8 values. +gboolean + +mbim_message_sms_send_response_parse () +
+MbimMessage * + +mbim_message_sms_delete_set_new () +

guint32 encoded_message_size_in_characters;

a guint32. +gboolean + +mbim_message_sms_delete_response_parse () +
+MbimMessage * + +mbim_message_sms_message_store_status_query_new () +
+gboolean + +mbim_message_sms_message_store_status_response_parse () +
+gboolean + +mbim_message_sms_message_store_status_notification_parse () +
-
-
-

mbim_sms_cdma_read_record_array_free ()

-
void                mbim_sms_cdma_read_record_array_free
-                                                        (MbimSmsCdmaReadRecord **array);
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + +
 MbimSmsPduReadRecord
 MbimSmsCdmaReadRecord
 MbimSmsPduSendRecord
 MbimSmsCdmaSendRecord
+
+
+

Object Hierarchy

+
+
+
+
+

Description

-Frees the memory allocated for the array of MbimSmsCdmaReadRecords.

-
---+ +
+

Functions

+
+

mbim_sms_pdu_read_record_array_free ()

+
void
+mbim_sms_pdu_read_record_array_free (MbimSmsPduReadRecord **array);
+

Frees the memory allocated for the array of MbimSmsPduReadRecords.

+
+

Parameters

+
++++ - - + + +

array :

a NULL terminated array of MbimSmsCdmaReadRecord structs.

array

a NULL terminated array of MbimSmsPduReadRecord structs.

 
+
-

MbimSmsPduSendRecord

-
typedef struct {
-    guint32 pdu_data_size;
-    guint8 *pdu_data;
-} MbimSmsPduSendRecord;
-
-
---+

mbim_sms_cdma_read_record_array_free ()

+
void
+mbim_sms_cdma_read_record_array_free (MbimSmsCdmaReadRecord **array);
+

Frees the memory allocated for the array of MbimSmsCdmaReadRecords.

+
+

Parameters

+
++++ - - - - - - - - - - + + + + +

guint32 pdu_data_size;

size of the pdu_data array.

guint8 *pdu_data;

an array of guint8 values.

array

a NULL terminated array of MbimSmsCdmaReadRecord structs.

 
+
-

mbim_sms_pdu_send_record_free ()

-
void                mbim_sms_pdu_send_record_free       (MbimSmsPduSendRecord *var);
-

-Frees the memory allocated for the MbimSmsPduSendRecord. -

-
---+

mbim_sms_pdu_send_record_free ()

+
void
+mbim_sms_pdu_send_record_free (MbimSmsPduSendRecord *var);
+

Frees the memory allocated for the MbimSmsPduSendRecord.

+
+

Parameters

+
++++ - - + + +

var :

a MbimSmsPduSendRecord.

var

a MbimSmsPduSendRecord.

 
+
-

MbimSmsCdmaSendRecord

-
typedef struct {
-    guint32 encoding;
-    guint32 language;
-    gchar *address;
-    guint32 encoded_message_size;
-    guint8 *encoded_message;
-    guint32 encoded_message_size_in_characters;
-} MbimSmsCdmaSendRecord;
-
-
---+

mbim_sms_cdma_send_record_free ()

+
void
+mbim_sms_cdma_send_record_free (MbimSmsCdmaSendRecord *var);
+

Frees the memory allocated for the MbimSmsCdmaSendRecord.

+
+

Parameters

+
++++ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +

guint32 encoding;

a guint32.

guint32 language;

a guint32.

gchar *address;

a string.

guint32 encoded_message_size;

size of the encoded_message array.

guint8 *encoded_message;

an array of guint8 values.

guint32 encoded_message_size_in_characters;

a guint32.

var

a MbimSmsCdmaSendRecord.

 
+
-

mbim_sms_cdma_send_record_free ()

-
void                mbim_sms_cdma_send_record_free      (MbimSmsCdmaSendRecord *var);
-

-Frees the memory allocated for the MbimSmsCdmaSendRecord. -

-
---+

mbim_message_sms_configuration_query_new ()

+
MbimMessage *
+mbim_message_sms_configuration_query_new
+                               (GError **error);
+

Create a new request for the 'Configuration' query command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + +

var :

a MbimSmsCdmaSendRecord.

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_sms_configuration_query_new ()

-
MbimMessage *       mbim_message_sms_configuration_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Configuration' query command in the 'SMS' service. -

-
---+

mbim_message_sms_configuration_set_new ()

+
MbimMessage *
+mbim_message_sms_configuration_set_new
+                               (MbimSmsFormat format,
+                                const gchar *sc_address,
+                                GError **error);
+

Create a new request for the 'Configuration' set command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + + + + + + - - + + +

error :

return location for error or NULL.

format

the 'Format' field, given as a MbimSmsFormat.

 

sc_address

the 'ScAddress' field, given as a string.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_sms_configuration_set_new ()

-
MbimMessage *       mbim_message_sms_configuration_set_new
-                                                        (MbimSmsFormat format,
-                                                         const gchar *sc_address,
-                                                         GError **error);
-

-Create a new request for the 'Configuration' set command in the 'SMS' service. -

-
---+

mbim_message_sms_configuration_response_parse ()

+
gboolean
+mbim_message_sms_configuration_response_parse
+                               (const MbimMessage *message,
+                                MbimSmsStorageState *sms_storage_state,
+                                MbimSmsFormat *format,
+                                guint32 *max_messages,
+                                guint32 *cdma_short_message_size,
+                                gchar **sc_address,
+                                GError **error);
+

Create a new request for the 'ScAddress' response command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + + + + + + - - + + + - - + + + - - + + + + + + + + + + + + +

format :

the 'Format' field, given as a MbimSmsFormat.

message

the MbimMessage.

 

sms_storage_state

return location for a MbimSmsStorageState, or NULL if the 'SmsStorageState' field is not needed.

 

sc_address :

the 'ScAddress' field, given as a string.

format

return location for a MbimSmsFormat, or NULL if the 'Format' field is not needed.

 

error :

return location for error or NULL.

max_messages

return location for a guint32, or NULL if the 'MaxMessages' field is not needed.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

cdma_short_message_size

return location for a guint32, or NULL if the 'CdmaShortMessageSize' field is not needed.

 

sc_address

return location for a newly allocated string, or NULL if the 'ScAddress' field is not needed. Free the returned value with g_free().

 

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_sms_configuration_response_parse ()

-
gboolean            mbim_message_sms_configuration_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsStorageState *sms_storage_state,
-                                                         MbimSmsFormat *format,
-                                                         guint32 *max_messages,
-                                                         guint32 *cdma_short_message_size,
-                                                         gchar **sc_address,
-                                                         GError **error);
-

-Create a new request for the 'ScAddress' response command in the 'SMS' service. -

-
---+

mbim_message_sms_read_query_new ()

+
MbimMessage *
+mbim_message_sms_read_query_new (MbimSmsFormat format,
+                                 MbimSmsFlag flag,
+                                 guint32 message_index,
+                                 GError **error);
+

Create a new request for the 'Read' query command in the 'SMS' service.

+
+

Parameters

+
++++ - - - - - - + + + - - + + + - - + + + - - - - - - - - - - - - - - + + +

message :

the MbimMessage.

sms_storage_state :

return location for a MbimSmsStorageState, or NULL if the 'SmsStorageState' field is not needed.

format

the 'Format' field, given as a MbimSmsFormat.

 

format :

return location for a MbimSmsFormat, or NULL if the 'Format' field is not needed.

flag

the 'Flag' field, given as a MbimSmsFlag.

 

max_messages :

return location for a guint32, or NULL if the 'MaxMessages' field is not needed.

message_index

the 'MessageIndex' field, given as a guint32.

 

cdma_short_message_size :

return location for a guint32, or NULL if the 'CdmaShortMessageSize' field is not needed.

sc_address :

return location for a newly allocated string, or NULL if the 'ScAddress' field is not needed. Free the returned value with g_free().

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_sms_read_query_new ()

-
MbimMessage *       mbim_message_sms_read_query_new     (MbimSmsFormat format,
-                                                         MbimSmsFlag flag,
-                                                         guint32 message_index,
-                                                         GError **error);
-

-Create a new request for the 'Read' query command in the 'SMS' service. -

-
---+

mbim_message_sms_read_response_parse ()

+
gboolean
+mbim_message_sms_read_response_parse (const MbimMessage *message,
+                                      MbimSmsFormat *format,
+                                      guint32 *messages_count,
+                                      MbimSmsPduReadRecord ***pdu_messages,
+                                      MbimSmsCdmaReadRecord ***cdma_messages,
+                                      GError **error);
+

Create a new request for the 'CdmaMessages' response command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + + - - + + + + + + + +

format :

the 'Format' field, given as a MbimSmsFormat.

message

the MbimMessage.

 

flag :

the 'Flag' field, given as a MbimSmsFlag.

format

return location for a MbimSmsFormat, or NULL if the 'Format' field is not needed.

 

message_index :

the 'MessageIndex' field, given as a guint32.

messages_count

return location for a guint32, or NULL if the 'MessagesCount' field is not needed.

 

error :

return location for error or NULL.

pdu_messages

return location for a newly allocated array of MbimSmsPduReadRecords, or NULL if the 'PduMessages' field is not needed. Free the returned value with mbim_sms_pdu_read_record_array_free().

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

cdma_messages

return location for a newly allocated array of MbimSmsCdmaReadRecords, or NULL if the 'CdmaMessages' field is not needed. Free the returned value with mbim_sms_cdma_read_record_array_free().

 

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_sms_read_response_parse ()

-
gboolean            mbim_message_sms_read_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsFormat *format,
-                                                         guint32 *messages_count,
-                                                         MbimSmsPduReadRecord ***pdu_messages,
-                                                         MbimSmsCdmaReadRecord ***cdma_messages,
-                                                         GError **error);
-

-Create a new request for the 'CdmaMessages' response command in the 'SMS' service. -

-
---+

mbim_message_sms_read_notification_parse ()

+
gboolean
+mbim_message_sms_read_notification_parse
+                               (const MbimMessage *message,
+                                MbimSmsFormat *format,
+                                guint32 *messages_count,
+                                MbimSmsPduReadRecord ***pdu_messages,
+                                MbimSmsCdmaReadRecord ***cdma_messages,
+                                GError **error);
+

Create a new request for the 'CdmaMessages' notification command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + + - - + + + - - - - - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

format :

return location for a MbimSmsFormat, or NULL if the 'Format' field is not needed.

format

return location for a MbimSmsFormat, or NULL if the 'Format' field is not needed.

 

messages_count :

return location for a guint32, or NULL if the 'MessagesCount' field is not needed.

messages_count

return location for a guint32, or NULL if the 'MessagesCount' field is not needed.

 

pdu_messages :

return location for a newly allocated array of MbimSmsPduReadRecords, or NULL if the 'PduMessages' field is not needed. Free the returned value with mbim_sms_pdu_read_record_array_free().

pdu_messages

return location for a newly allocated array of MbimSmsPduReadRecords, or NULL if the 'PduMessages' field is not needed. Free the returned value with mbim_sms_pdu_read_record_array_free().

 

cdma_messages :

return location for a newly allocated array of MbimSmsCdmaReadRecords, or NULL if the 'CdmaMessages' field is not needed. Free the returned value with mbim_sms_cdma_read_record_array_free().

cdma_messages

return location for a newly allocated array of MbimSmsCdmaReadRecords, or NULL if the 'CdmaMessages' field is not needed. Free the returned value with mbim_sms_cdma_read_record_array_free().

 

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_sms_read_notification_parse ()

-
gboolean            mbim_message_sms_read_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsFormat *format,
-                                                         guint32 *messages_count,
-                                                         MbimSmsPduReadRecord ***pdu_messages,
-                                                         MbimSmsCdmaReadRecord ***cdma_messages,
-                                                         GError **error);
-

-Create a new request for the 'CdmaMessages' notification command in the 'SMS' service. -

-
---+

mbim_message_sms_send_set_new ()

+
MbimMessage *
+mbim_message_sms_send_set_new (MbimSmsFormat format,
+                               const MbimSmsPduSendRecord *pdu_message,
+                               const MbimSmsCdmaSendRecord *cdma_message,
+                               GError **error);
+

Create a new request for the 'Send' set command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + + + +

message :

the MbimMessage.

format

the 'Format' field, given as a MbimSmsFormat.

 

format :

return location for a MbimSmsFormat, or NULL if the 'Format' field is not needed.

pdu_message

the 'PduMessage' field, given as a MbimSmsPduSendRecord.

 

messages_count :

return location for a guint32, or NULL if the 'MessagesCount' field is not needed.

cdma_message

the 'CdmaMessage' field, given as a MbimSmsCdmaSendRecord.

 

pdu_messages :

return location for a newly allocated array of MbimSmsPduReadRecords, or NULL if the 'PduMessages' field is not needed. Free the returned value with mbim_sms_pdu_read_record_array_free().

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_sms_send_response_parse ()

+
gboolean
+mbim_message_sms_send_response_parse (const MbimMessage *message,
+                                      guint32 *message_reference,
+                                      GError **error);
+

Create a new request for the 'MessageReference' response command in the 'SMS' service.

+
+

Parameters

+
+++++ + - - + + + - - + + + - - + + +

cdma_messages :

return location for a newly allocated array of MbimSmsCdmaReadRecords, or NULL if the 'CdmaMessages' field is not needed. Free the returned value with mbim_sms_cdma_read_record_array_free().

message

the MbimMessage.

 

error :

return location for error or NULL.

message_reference

return location for a guint32, or NULL if the 'MessageReference' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_sms_send_set_new ()

-
MbimMessage *       mbim_message_sms_send_set_new       (MbimSmsFormat format,
-                                                         const MbimSmsPduSendRecord *pdu_message,
-                                                         const MbimSmsCdmaSendRecord *cdma_message,
-                                                         GError **error);
-

-Create a new request for the 'Send' set command in the 'SMS' service. -

-
---+

mbim_message_sms_delete_set_new ()

+
MbimMessage *
+mbim_message_sms_delete_set_new (MbimSmsFlag flag,
+                                 guint32 message_index,
+                                 GError **error);
+

Create a new request for the 'Delete' set command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + + +

format :

the 'Format' field, given as a MbimSmsFormat.

flag

the 'Flag' field, given as a MbimSmsFlag.

 

pdu_message :

the 'PduMessage' field, given as a MbimSmsPduSendRecord.

message_index

the 'MessageIndex' field, given as a guint32.

 

cdma_message :

the 'CdmaMessage' field, given as a MbimSmsCdmaSendRecord.

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_sms_delete_response_parse ()

+
gboolean
+mbim_message_sms_delete_response_parse
+                               (const MbimMessage *message,
+                                GError **error);
+

Create a new request for the 'Delete' response command in the 'SMS' service.

+
+

Parameters

+
+++++ + - - + + + - - + + +

error :

return location for error or NULL.

message

the MbimMessage.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_sms_send_response_parse ()

-
gboolean            mbim_message_sms_send_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *message_reference,
-                                                         GError **error);
-

-Create a new request for the 'MessageReference' response command in the 'SMS' service. -

-
---+

mbim_message_sms_message_store_status_query_new ()

+
MbimMessage *
+mbim_message_sms_message_store_status_query_new
+                               (GError **error);
+

Create a new request for the 'Message Store Status' query command in the 'SMS' service.

+
+

Parameters

+
+++++ + + + + + +

error

return location for error or NULL.

 
+
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+ +
+
+

mbim_message_sms_message_store_status_response_parse ()

+
gboolean
+mbim_message_sms_message_store_status_response_parse
+                               (const MbimMessage *message,
+                                MbimSmsStatusFlag *flag,
+                                guint32 *message_index,
+                                GError **error);
+

Create a new request for the 'MessageIndex' response command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

message_reference :

return location for a guint32, or NULL if the 'MessageReference' field is not needed.

flag

return location for a MbimSmsStatusFlag, or NULL if the 'Flag' field is not needed.

 

error :

return location for error or NULL.

message_index

return location for a guint32, or NULL if the 'MessageIndex' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_sms_delete_set_new ()

-
MbimMessage *       mbim_message_sms_delete_set_new     (MbimSmsFlag flag,
-                                                         guint32 message_index,
-                                                         GError **error);
-

-Create a new request for the 'Delete' set command in the 'SMS' service. -

-
---+

mbim_message_sms_message_store_status_notification_parse ()

+
gboolean
+mbim_message_sms_message_store_status_notification_parse
+                               (const MbimMessage *message,
+                                MbimSmsStatusFlag *flag,
+                                guint32 *message_index,
+                                GError **error);
+

Create a new request for the 'MessageIndex' notification command in the 'SMS' service.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + +

flag :

the 'Flag' field, given as a MbimSmsFlag.

message

the MbimMessage.

 

message_index :

the 'MessageIndex' field, given as a guint32.

flag

return location for a MbimSmsStatusFlag, or NULL if the 'Flag' field is not needed.

 

error :

return location for error or NULL.

message_index

return location for a guint32, or NULL if the 'MessageIndex' field is not needed.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
-
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+ + +
+

Types and Values

-

mbim_message_sms_delete_response_parse ()

-
gboolean            mbim_message_sms_delete_response_parse
-                                                        (const MbimMessage *message,
-                                                         GError **error);
-

-Create a new request for the 'Delete' response command in the 'SMS' service. -

-
---+

MbimSmsPduReadRecord

+
typedef struct {
+    guint32 message_index;
+    guint32 message_status;
+    guint32 pdu_data_size;
+    guint8 *pdu_data;
+} MbimSmsPduReadRecord;
+
+
+

Members

+
++++ - - + + + - - + + + - - + + + + + + + +

message :

the MbimMessage.

guint32 message_index;

a guint32.

 

error :

return location for error or NULL.

guint32 message_status;

a guint32.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

guint32 pdu_data_size;

size of the pdu_data array.

 

guint8 *pdu_data;

an array of guint8 values.

 
+
-

mbim_message_sms_message_store_status_query_new ()

-
MbimMessage *       mbim_message_sms_message_store_status_query_new
-                                                        (GError **error);
-

-Create a new request for the 'Message Store Status' query command in the 'SMS' service. -

-
---+

MbimSmsCdmaReadRecord

+
typedef struct {
+    guint32 message_index;
+    guint32 message_status;
+    gchar *address;
+    gchar *timestamp;
+    guint32 encoding;
+    guint32 language;
+    guint32 encoded_message_size;
+    guint8 *encoded_message;
+    guint32 encoded_message_size_in_characters;
+} MbimSmsCdmaReadRecord;
+
+
+

Members

+
++++ - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

error :

return location for error or NULL.

guint32 message_index;

a guint32.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

guint32 message_status;

a guint32.

 

gchar *address;

a string.

 

gchar *timestamp;

a string.

 

guint32 encoding;

a guint32.

 

guint32 language;

a guint32.

 

guint32 encoded_message_size;

size of the encoded_message array.

 

guint8 *encoded_message;

an array of guint8 values.

 

guint32 encoded_message_size_in_characters;

a guint32.

 
+
-

mbim_message_sms_message_store_status_response_parse ()

-
gboolean            mbim_message_sms_message_store_status_response_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsStatusFlag *flag,
-                                                         guint32 *message_index,
-                                                         GError **error);
-

-Create a new request for the 'MessageIndex' response command in the 'SMS' service. -

-
---+

MbimSmsPduSendRecord

+
typedef struct {
+    guint32 pdu_data_size;
+    guint8 *pdu_data;
+} MbimSmsPduSendRecord;
+
+
+

Members

+
++++ - - - - - - + + + - - - - - - - - - - + + +

message :

the MbimMessage.

flag :

return location for a MbimSmsStatusFlag, or NULL if the 'Flag' field is not needed.

guint32 pdu_data_size;

size of the pdu_data array.

 

message_index :

return location for a guint32, or NULL if the 'MessageIndex' field is not needed.

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

guint8 *pdu_data;

an array of guint8 values.

 
+
-

mbim_message_sms_message_store_status_notification_parse ()

-
gboolean            mbim_message_sms_message_store_status_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimSmsStatusFlag *flag,
-                                                         guint32 *message_index,
-                                                         GError **error);
-

-Create a new request for the 'MessageIndex' notification command in the 'SMS' service. -

-
---+

MbimSmsCdmaSendRecord

+
typedef struct {
+    guint32 encoding;
+    guint32 language;
+    gchar *address;
+    guint32 encoded_message_size;
+    guint8 *encoded_message;
+    guint32 encoded_message_size_in_characters;
+} MbimSmsCdmaSendRecord;
+
+
+

Members

+
++++ - - + + + - - + + + - - + + + - - + + + - - + + + + + + + +

message :

the MbimMessage.

guint32 encoding;

a guint32.

 

flag :

return location for a MbimSmsStatusFlag, or NULL if the 'Flag' field is not needed.

guint32 language;

a guint32.

 

message_index :

return location for a guint32, or NULL if the 'MessageIndex' field is not needed.

gchar *address;

a string.

 

error :

return location for error or NULL.

guint32 encoded_message_size;

size of the encoded_message array.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

guint8 *encoded_message;

an array of guint8 values.

 

guint32 encoded_message_size_in_characters;

a guint32.

 
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-STK.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-STK.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-STK.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-STK.html 2014-08-04 13:06:12.000000000 +0000 @@ -2,30 +2,27 @@ -STK +libmbim-glib Reference Manual: STK - + - + - - - - - - - - - - + + + + + + +
@@ -33,42 +30,94 @@

STK

STK

- +
-
-

Synopsis

-
MbimMessage *       mbim_message_stk_pac_query_new      (GError **error);
-MbimMessage *       mbim_message_stk_pac_set_new        (const guint8 *pac_hostcontrol,
-                                                         GError **error);
-gboolean            mbim_message_stk_pac_response_parse (const MbimMessage *message,
-                                                         const guint8 **pac_support,
-                                                         GError **error);
-gboolean            mbim_message_stk_pac_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimStkPacType *pac_type,
-                                                         guint32 *data_buffer_size,
-                                                         const guint8 **data_buffer,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_stk_terminal_response_set_new
-                                                        (const guint32 response_size,
-                                                         const guint8 *response,
-                                                         GError **error);
-gboolean            mbim_message_stk_terminal_response_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *result_data_size,
-                                                         const guint8 **result_data,
-                                                         guint32 *status_words,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_stk_envelope_query_new (GError **error);
-MbimMessage *       mbim_message_stk_envelope_set_new   (const guint32 data_size,
-                                                         const guint8 *data,
-                                                         GError **error);
-gboolean            mbim_message_stk_envelope_response_parse
-                                                        (const MbimMessage *message,
-                                                         const guint8 **envelope_support,
-                                                         GError **error);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+MbimMessage *
+
+mbim_message_stk_pac_query_new ()
+

+MbimMessage *
+
+mbim_message_stk_pac_set_new ()
+

+gboolean
+
+mbim_message_stk_pac_response_parse ()
+

+gboolean
+
+mbim_message_stk_pac_notification_parse ()
+

+MbimMessage *
+
+mbim_message_stk_terminal_response_set_new ()
+

+gboolean
+
+mbim_message_stk_terminal_response_response_parse ()
+

+MbimMessage *
+
+mbim_message_stk_envelope_query_new ()
+

+MbimMessage *
+
+mbim_message_stk_envelope_set_new ()
+

+gboolean
+
+mbim_message_stk_envelope_response_parse ()
+

+

+

+
Object Hierarchy

+
 

 

 

@@ -77,319 +126,384 @@
 

 

 

-
Details

+
Functions

 

-
mbim_message_stk_pac_query_new ()

-
MbimMessage *       mbim_message_stk_pac_query_new      (GError **error);

-

-Create a new request for the 'Pac' query command in the 'STK' service.
-

-

+
mbim_message_stk_pac_query_new ()

+
MbimMessage *
+mbim_message_stk_pac_query_new (GError **error);

+
Create a new request for the 'Pac' query command in the 'STK' service.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
error :
return location for error or NULL.
Returns :
a newly allocated MbimMessage, which should be freed with mbim_message_unref().
error
return location for error or NULL.
 

 

 

+

+
Returns

+
 a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+

+

 

 

-
mbim_message_stk_pac_set_new ()

-
MbimMessage *       mbim_message_stk_pac_set_new        (const guint8 *pac_hostcontrol,
-                                                         GError **error);

-

-Create a new request for the 'Pac' set command in the 'STK' service.
-

-

+
mbim_message_stk_pac_set_new ()

+
MbimMessage *
+mbim_message_stk_pac_set_new (const guint8 *pac_host_control,
+                              GError **error);

+
Create a new request for the 'Pac' set command in the 'STK' service.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
pac_hostcontrol :
the 'PacHostcontrol' field, given as an array of 32 guint8 values.
error :
return location for error or NULL.
pac_host_control
the 'PacHostControl' field, given as an array of 32 guint8 values.
 
 

 
Returns :
a newly allocated MbimMessage, which should be freed with mbim_message_unref().
error
return location for error or NULL.
 
 

 
 

 

+

+
Returns

+
 a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+

+
-

mbim_message_stk_pac_response_parse ()

-
gboolean            mbim_message_stk_pac_response_parse (const MbimMessage *message,
-                                                         const guint8 **pac_support,
-                                                         GError **error);
-

-Create a new request for the 'PacSupport' response command in the 'STK' service. -

-
+

mbim_message_stk_pac_response_parse ()

+
gboolean
+mbim_message_stk_pac_response_parse (const MbimMessage *message,
+                                     const guint8 **pac_support,
+                                     GError **error);
+

Create a new request for the 'PacSupport' response command in the 'STK' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + +

message :

the MbimMessage.

pac_support :

return location for an array of 256 guint8 values. Do not free the returned value, it is owned by message.

message

the MbimMessage.

 

error :

return location for error or NULL.

pac_support

return location for an array of 256 guint8 values. Do not free the returned value, it is owned by message +.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_stk_pac_notification_parse ()

-
gboolean            mbim_message_stk_pac_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimStkPacType *pac_type,
-                                                         guint32 *data_buffer_size,
-                                                         const guint8 **data_buffer,
-                                                         GError **error);
-

-Create a new request for the 'DataBuffer' notification command in the 'STK' service. -

-
+

mbim_message_stk_pac_notification_parse ()

+
gboolean
+mbim_message_stk_pac_notification_parse
+                               (const MbimMessage *message,
+                                MbimStkPacType *pac_type,
+                                guint32 *data_buffer_size,
+                                const guint8 **data_buffer,
+                                GError **error);
+

Create a new request for the 'DataBuffer' notification command in the 'STK' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + + - - - - - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

pac_type :

return location for a MbimStkPacType, or NULL if the 'PacType' field is not needed.

pac_type

return location for a MbimStkPacType, or NULL if the 'PacType' field is not needed.

 

data_buffer_size :

return location for the size of the data_buffer array.

data_buffer_size

return location for the size of the data_buffer array.

 

data_buffer :

return location for an array of guint8 values. Do not free the returned value, it is owned by message.

data_buffer

return location for an array of guint8 values. Do not free the returned value, it is owned by message +.

 

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_stk_terminal_response_set_new ()

-
MbimMessage *       mbim_message_stk_terminal_response_set_new
-                                                        (const guint32 response_size,
-                                                         const guint8 *response,
-                                                         GError **error);
-

-Create a new request for the 'Terminal Response' set command in the 'STK' service. -

-
+

mbim_message_stk_terminal_response_set_new ()

+
MbimMessage *
+mbim_message_stk_terminal_response_set_new
+                               (const guint32 response_size,
+                                const guint8 *response,
+                                GError **error);
+

Create a new request for the 'Terminal Response' set command in the 'STK' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - - - - - + + +

response_size :

size of the response array.

response_size

size of the response array.

 

response :

the 'Response' field, given as an array of guint8 values.

response

the 'Response' field, given as an array of guint8 values.

 

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_stk_terminal_response_response_parse ()

-
gboolean            mbim_message_stk_terminal_response_response_parse
-                                                        (const MbimMessage *message,
-                                                         guint32 *result_data_size,
-                                                         const guint8 **result_data,
-                                                         guint32 *status_words,
-                                                         GError **error);
-

-Create a new request for the 'StatusWords' response command in the 'STK' service. -

-
+

mbim_message_stk_terminal_response_response_parse ()

+
gboolean
+mbim_message_stk_terminal_response_response_parse
+                               (const MbimMessage *message,
+                                guint32 *result_data_size,
+                                const guint8 **result_data,
+                                guint32 *status_words,
+                                GError **error);
+

Create a new request for the 'StatusWords' response command in the 'STK' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

result_data_size :

return location for the size of the result_data array.

message

the MbimMessage.

 

result_data :

return location for an array of guint8 values. Do not free the returned value, it is owned by message.

result_data_size

return location for the size of the result_data array.

 

status_words :

return location for a guint32, or NULL if the 'StatusWords' field is not needed.

result_data

return location for an array of guint8 values. Do not free the returned value, it is owned by message +.

 

error :

return location for error or NULL.

status_words

return location for a guint32, or NULL if the 'StatusWords' field is not needed.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
-

mbim_message_stk_envelope_query_new ()

-
MbimMessage *       mbim_message_stk_envelope_query_new (GError **error);
-

-Create a new request for the 'Envelope' query command in the 'STK' service. -

-
+

mbim_message_stk_envelope_query_new ()

+
MbimMessage *
+mbim_message_stk_envelope_query_new (GError **error);
+

Create a new request for the 'Envelope' query command in the 'STK' service.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

error :

return location for error or NULL.

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_stk_envelope_set_new ()

-
MbimMessage *       mbim_message_stk_envelope_set_new   (const guint32 data_size,
-                                                         const guint8 *data,
-                                                         GError **error);
-

-Create a new request for the 'Envelope' set command in the 'STK' service. -

-
+

mbim_message_stk_envelope_set_new ()

+
MbimMessage *
+mbim_message_stk_envelope_set_new (const guint32 data_size,
+                                   const guint8 *data,
+                                   GError **error);
+

Create a new request for the 'Envelope' set command in the 'STK' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + +

data_size :

size of the data array.

data :

the 'Data' field, given as an array of guint8 values.

data_size

size of the data array.

 

error :

return location for error or NULL.

data

the 'Data' field, given as an array of guint8 values.

 

Returns :

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

error

return location for error or NULL.

 
+
+

Returns

+

a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+
+
-

mbim_message_stk_envelope_response_parse ()

-
gboolean            mbim_message_stk_envelope_response_parse
-                                                        (const MbimMessage *message,
-                                                         const guint8 **envelope_support,
-                                                         GError **error);
-

-Create a new request for the 'EnvelopeSupport' response command in the 'STK' service. -

-
+

mbim_message_stk_envelope_response_parse ()

+
gboolean
+mbim_message_stk_envelope_response_parse
+                               (const MbimMessage *message,
+                                const guint8 **envelope_support,
+                                GError **error);
+

Create a new request for the 'EnvelopeSupport' response command in the 'STK' service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - - - - - + + +

message :

the MbimMessage.

message

the MbimMessage.

 

envelope_support :

return location for an array of 32 guint8 values. Do not free the returned value, it is owned by message.

envelope_support

return location for an array of 32 guint8 values. Do not free the returned value, it is owned by message +.

 

error :

return location for error or NULL.

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+ + +
+

Types and Values

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-USSD.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-USSD.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-USSD.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-USSD.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -USSD +libmbim-glib Reference Manual: USSD - + - + - - - - - - - - - - + + + + + + +
@@ -33,30 +30,46 @@

USSD

USSD

- +
-
-

Synopsis

-
MbimMessage *       mbim_message_ussd_set_new           (MbimUssdAction action,
-                                                         guint32 data_coding_scheme,
-                                                         const guint32 payload_size,
-                                                         const guint8 *payload,
-                                                         GError **error);
-gboolean            mbim_message_ussd_response_parse    (const MbimMessage *message,
-                                                         MbimUssdResponse *response,
-                                                         MbimUssdSessionState *session_state,
-                                                         guint32 *data_coding_scheme,
-                                                         guint32 *payload_size,
-                                                         const guint8 **payload,
-                                                         GError **error);
-gboolean            mbim_message_ussd_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimUssdResponse *response,
-                                                         MbimUssdSessionState *session_state,
-                                                         guint32 *data_coding_scheme,
-                                                         guint32 *payload_size,
-                                                         const guint8 **payload,
-                                                         GError **error);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+MbimMessage *
+
+mbim_message_ussd_set_new ()
+

+gboolean
+
+mbim_message_ussd_response_parse ()
+

+gboolean
+
+mbim_message_ussd_notification_parse ()
+

+

+

+
Object Hierarchy

+
 

 

 

@@ -65,165 +78,200 @@
 

 

 

-
Details

+
Functions

 

-
mbim_message_ussd_set_new ()

-
MbimMessage *       mbim_message_ussd_set_new           (MbimUssdAction action,
-                                                         guint32 data_coding_scheme,
-                                                         const guint32 payload_size,
-                                                         const guint8 *payload,
-                                                         GError **error);

-

-Create a new request for the '' set command in the 'USSD' service.
-

-

+
mbim_message_ussd_set_new ()

+
MbimMessage *
+mbim_message_ussd_set_new (MbimUssdAction action,
+                           guint32 data_coding_scheme,
+                           const guint32 payload_size,
+                           const guint8 *payload,
+                           GError **error);

+
Create a new request for the '' set command in the 'USSD' service.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
action :
the 'Action' field, given as a MbimUssdAction.
action
the 'Action' field, given as a MbimUssdAction.
 
 

 
data_coding_scheme :
the 'DataCodingScheme' field, given as a guint32.
data_coding_scheme
the 'DataCodingScheme' field, given as a guint32.
 
 

 
payload_size :
size of the payload array.
payload_size
size of the payload array.
 
 

 
payload :
the 'Payload' field, given as an array of guint8 values.
payload
the 'Payload' field, given as an array of guint8 values.
 
 

 
error :
return location for error or NULL.
Returns :
a newly allocated MbimMessage, which should be freed with mbim_message_unref().
error
return location for error or NULL.
 
 

 
 

 

+

+
Returns

+
 a newly allocated MbimMessage, which should be freed with mbim_message_unref().

+

+

+

 

 

-
mbim_message_ussd_response_parse ()

-
gboolean            mbim_message_ussd_response_parse    (const MbimMessage *message,
-                                                         MbimUssdResponse *response,
-                                                         MbimUssdSessionState *session_state,
-                                                         guint32 *data_coding_scheme,
-                                                         guint32 *payload_size,
-                                                         const guint8 **payload,
-                                                         GError **error);

-

-Create a new request for the 'Payload' response command in the 'USSD' service.
-

-

+
mbim_message_ussd_response_parse ()

+
gboolean
+mbim_message_ussd_response_parse (const MbimMessage *message,
+                                  MbimUssdResponse *response,
+                                  MbimUssdSessionState *session_state,
+                                  guint32 *data_coding_scheme,
+                                  guint32 *payload_size,
+                                  const guint8 **payload,
+                                  GError **error);

+
Create a new request for the 'Payload' response command in the 'USSD' service.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
message :
the MbimMessage.
response :
return location for a MbimUssdResponse, or NULL if the 'Response' field is not needed.
message
the MbimMessage.
 
 

 
session_state :
return location for a MbimUssdSessionState, or NULL if the 'SessionState' field is not needed.
response
return location for a MbimUssdResponse, or NULL if the 'Response' field is not needed.
 
 

 
data_coding_scheme :
return location for a guint32, or NULL if the 'DataCodingScheme' field is not needed.
session_state
return location for a MbimUssdSessionState, or NULL if the 'SessionState' field is not needed.
 
 

 
payload_size :
return location for the size of the payload array.
data_coding_scheme
return location for a guint32, or NULL if the 'DataCodingScheme' field is not needed.
 
 

 
payload :
return location for an array of guint8 values. Do not free the returned value, it is owned by message.
payload_size
return location for the size of the payload array.
 
 

 
error :
return location for error or NULL.
payload
return location for an array of guint8 values. Do not free the returned value, it is owned by message
+.
 
 

 
Returns :

-TRUE if the message was correctly parsed, FALSE if error is set.
error
return location for error or NULL.
 
 

 
 

 

+

+
Returns

+
 TRUE if the message was correctly parsed, FALSE if error
+is set.

+

+

+
-

mbim_message_ussd_notification_parse ()

-
gboolean            mbim_message_ussd_notification_parse
-                                                        (const MbimMessage *message,
-                                                         MbimUssdResponse *response,
-                                                         MbimUssdSessionState *session_state,
-                                                         guint32 *data_coding_scheme,
-                                                         guint32 *payload_size,
-                                                         const guint8 **payload,
-                                                         GError **error);
-

-Create a new request for the 'Payload' notification command in the 'USSD' service. -

-
+

mbim_message_ussd_notification_parse ()

+
gboolean
+mbim_message_ussd_notification_parse (const MbimMessage *message,
+                                      MbimUssdResponse *response,
+                                      MbimUssdSessionState *session_state,
+                                      guint32 *data_coding_scheme,
+                                      guint32 *payload_size,
+                                      const guint8 **payload,
+                                      GError **error);
+

Create a new request for the 'Payload' notification command in the 'USSD' service.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

message :

the MbimMessage.

response :

return location for a MbimUssdResponse, or NULL if the 'Response' field is not needed.

message

the MbimMessage.

 

session_state :

return location for a MbimUssdSessionState, or NULL if the 'SessionState' field is not needed.

response

return location for a MbimUssdResponse, or NULL if the 'Response' field is not needed.

 

data_coding_scheme :

return location for a guint32, or NULL if the 'DataCodingScheme' field is not needed.

session_state

return location for a MbimUssdSessionState, or NULL if the 'SessionState' field is not needed.

 

payload_size :

return location for the size of the payload array.

data_coding_scheme

return location for a guint32, or NULL if the 'DataCodingScheme' field is not needed.

 

payload :

return location for an array of guint8 values. Do not free the returned value, it is owned by message.

payload_size

return location for the size of the payload array.

 

error :

return location for error or NULL.

payload

return location for an array of guint8 values. Do not free the returned value, it is owned by message +.

 

Returns :

 -TRUE if the message was correctly parsed, FALSE if error is set.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the message was correctly parsed, FALSE if error +is set.

+

+
+
+ +
+

Types and Values

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-UUIDs.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-UUIDs.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-UUIDs.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-UUIDs.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,603 +2,943 @@ -UUIDs +libmbim-glib Reference Manual: UUIDs - + - - - - - - - - - - + + + + + + +
- +

UUIDs

-

UUIDs

+

UUIDs — Generic UUID handling routines.
-
-

Synopsis

-
enum                MbimService;
-enum                MbimContextType;
-                    MbimUuid;
-#define             MBIM_UUID_INVALID
-#define             MBIM_UUID_BASIC_CONNECT
-#define             MBIM_UUID_SMS
-#define             MBIM_UUID_USSD
-#define             MBIM_UUID_PHONEBOOK
-#define             MBIM_UUID_STK
-#define             MBIM_UUID_AUTH
-#define             MBIM_UUID_DSS
-
-const gchar *       mbim_service_get_string             (MbimService val);
-const gchar *       mbim_context_type_get_string        (MbimContextType val);
-gboolean            mbim_uuid_cmp                       (const MbimUuid *a,
-                                                         const MbimUuid *b);
-gchar *             mbim_uuid_get_printable             (const MbimUuid *uuid);
-const MbimUuid *    mbim_uuid_from_service              (MbimService service);
-MbimService         mbim_uuid_to_service                (const MbimUuid *uuid);
-const MbimUuid *    mbim_uuid_from_context_type         (MbimContextType context_type);
-MbimContextType     mbim_uuid_to_context_type           (const MbimUuid *uuid);
-
-
-
-

Object Hierarchy

-
-  GEnum
-   +----MbimService
-
-
-  GEnum
-   +----MbimContextType
-
-
-

Description

-

-This section defines the data type for unique identifiers. -

-
-
-

Details

-
-

enum MbimService

-
typedef enum {
-    MBIM_SERVICE_INVALID       = 0,
-    MBIM_SERVICE_BASIC_CONNECT = 1,
-    MBIM_SERVICE_SMS           = 2,
-    MBIM_SERVICE_USSD          = 3,
-    MBIM_SERVICE_PHONEBOOK     = 4,
-    MBIM_SERVICE_STK           = 5,
-    MBIM_SERVICE_AUTH          = 6,
-    MBIM_SERVICE_DSS           = 7,
-} MbimService;
-
-

-Enumeration of the generic MBIM services. -

-
+

Functions

+
--++ - - + + + + + + + + + + + + + - - + - - + - - + - - + - - + - - + - - + + + + + + + + +

MBIM_SERVICE_INVALID

Invalid service. +const gchar * + +mbim_service_get_string () +
const gchar * + +mbim_service_lookup_name () +
+guint + +mbim_register_custom_service () +
+gboolean + +mbim_unregister_custom_service ()

MBIM_SERVICE_BASIC_CONNECT

Basic connectivity service. + +gboolean + +mbim_service_id_is_custom ()

MBIM_SERVICE_SMS

SMS messaging service. +const gchar * + +mbim_context_type_get_string ()

MBIM_SERVICE_USSD

USSD service. + +gboolean + +mbim_uuid_cmp ()

MBIM_SERVICE_PHONEBOOK

Phonebook service. + +gboolean + +mbim_uuid_from_printable ()

MBIM_SERVICE_STK

SIM toolkit service. + +gchar * + +mbim_uuid_get_printable ()

MBIM_SERVICE_AUTH

Authentication service. +const MbimUuid * + +mbim_uuid_from_service ()

MBIM_SERVICE_DSS

Device Service Stream service. + +MbimService + +mbim_uuid_to_service () +
const MbimUuid * + +mbim_uuid_from_context_type () +
+MbimContextType + +mbim_uuid_to_context_type ()
-
-
-

enum MbimContextType

-
typedef enum {
-    MBIM_CONTEXT_TYPE_INVALID     = 0,
-    MBIM_CONTEXT_TYPE_NONE        = 1,
-    MBIM_CONTEXT_TYPE_INTERNET    = 2,
-    MBIM_CONTEXT_TYPE_VPN         = 3,
-    MBIM_CONTEXT_TYPE_VOICE       = 4,
-    MBIM_CONTEXT_TYPE_VIDEO_SHARE = 5,
-    MBIM_CONTEXT_TYPE_PURCHASE    = 6,
-    MBIM_CONTEXT_TYPE_IMS         = 7,
-    MBIM_CONTEXT_TYPE_MMS         = 8,
-    MBIM_CONTEXT_TYPE_LOCAL       = 9,
-} MbimContextType;
-
-

-Enumeration of the generic MBIM context types. -

-
+
+

Types and Values

+
--++ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + +

MBIM_CONTEXT_TYPE_INVALID

Invalid context type. -enumMbimService

MBIM_CONTEXT_TYPE_NONE

Context not yet provisioned. -enumMbimContextType

MBIM_CONTEXT_TYPE_INTERNET

Connection to the Internet. - MbimUuid

MBIM_CONTEXT_TYPE_VPN

Connection to a VPN. -#defineMBIM_UUID_INVALID

MBIM_CONTEXT_TYPE_VOICE

Connection to a VoIP service. -#defineMBIM_UUID_BASIC_CONNECT

MBIM_CONTEXT_TYPE_VIDEO_SHARE

Connection to a video sharing service. -#defineMBIM_UUID_SMS

MBIM_CONTEXT_TYPE_PURCHASE

Connection to an over-the-air activation site. -#defineMBIM_UUID_USSD

MBIM_CONTEXT_TYPE_IMS

Connection to IMS. -#defineMBIM_UUID_PHONEBOOK

MBIM_CONTEXT_TYPE_MMS

Connection to MMS. -#defineMBIM_UUID_STK

MBIM_CONTEXT_TYPE_LOCAL

A local. -#defineMBIM_UUID_AUTH
#defineMBIM_UUID_DSS
#defineMBIM_UUID_MS_FIRMWARE_ID
#defineMBIM_UUID_MS_HOST_SHUTDOWN
#defineMBIM_UUID_PROXY_CONTROL
-
+
+

Object Hierarchy

+
    GEnum
+    ├── MbimContextType
+    ╰── MbimService
+
+
+
+

Description

+

This section defines the data type for unique identifiers.

+
+
+

Functions

-

MbimUuid

-
typedef struct _MbimUuid MbimUuid;
-

-A UUID as defined in MBIM. -

+

mbim_service_get_string ()

+
const gchar *
+mbim_service_get_string (MbimService val);
+

Gets the nickname string for the MbimService specified at val +.

+
+

Parameters

+
+++++ + + + + + +

val

a MbimService.

 
+
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
-

MBIM_UUID_INVALID

-
#define MBIM_UUID_INVALID mbim_uuid_from_service (MBIM_SERVICE_INVALID)
-
-

-Get the UUID of the MBIM_SERVICE_INVALID service. -

-
---+

mbim_service_lookup_name ()

+
const gchar *
+mbim_service_lookup_name (guint service);
+

Gets the nickname string for the service +.

+

As opposed to mbim_service_get_string(), this methods takes into account +custom services that may have been registered by the user.

+
+

Parameters

+
++++ - - + + +

Returns :

a MbimUuid. [transfer none] -

service

a MbimService or custom service.

 
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
+
+
+

mbim_register_custom_service ()

+
guint
+mbim_register_custom_service (const MbimUuid *uuid,
+                              const gchar *nickname);
+

Register a custom service

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

uuid

MbimUuid structure corresponding to service

 

nickname

a printable name for service

 
+
+
+

Returns

+

TRUE if service has been registered, FALSE otherwise.

+

+
+
-

MBIM_UUID_BASIC_CONNECT

-
#define MBIM_UUID_BASIC_CONNECT mbim_uuid_from_service (MBIM_SERVICE_BASIC_CONNECT)
-
-

-Get the UUID of the MBIM_SERVICE_BASIC_CONNECT service. -

-
+

mbim_unregister_custom_service ()

+
gboolean
+mbim_unregister_custom_service (const guint id);
+

Unregister a custom service.

+
+

Parameters

+
--+++ - - + + +

Returns :

a MbimUuid. [transfer none] -

id

ID of the service to unregister.MbimUuid structure corresponding to service

 
+
+

Returns

+

TRUE if service has been unregistered, FALSE otherwise.

+

+
+
-

MBIM_UUID_SMS

-
#define MBIM_UUID_SMS mbim_uuid_from_service (MBIM_SERVICE_SMS)
-
-

-Get the UUID of the MBIM_SERVICE_SMS service. -

-
---+

mbim_service_id_is_custom ()

+
gboolean
+mbim_service_id_is_custom (const guint id);
+

Checks whether id + is a custom or standard service.

+
+

Parameters

+
++++ - - + + +

Returns :

a MbimUuid. [transfer none] -

id

ID of the service

 
+
+

Returns

+

TRUE if service is custom, FALSE otherwise.

+

+
+
-

MBIM_UUID_USSD

-
#define MBIM_UUID_USSD mbim_uuid_from_service (MBIM_SERVICE_USSD)
-
-

-Get the UUID of the MBIM_SERVICE_USSD service. -

-
---+

mbim_context_type_get_string ()

+
const gchar *
+mbim_context_type_get_string (MbimContextType val);
+

Gets the nickname string for the MbimContextType specified at val +.

+
+

Parameters

+
++++ - - + + +

Returns :

a MbimUuid. [transfer none] -

val

a MbimContextType.

 
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
-

MBIM_UUID_PHONEBOOK

-
#define MBIM_UUID_PHONEBOOK mbim_uuid_from_service (MBIM_SERVICE_PHONEBOOK)
-
-

-Get the UUID of the MBIM_SERVICE_PHONEBOOK service. -

-
---+

mbim_uuid_cmp ()

+
gboolean
+mbim_uuid_cmp (const MbimUuid *a,
+               const MbimUuid *b);
+

Compare two MbimUuid values.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

a

a MbimUuid.

 

b

a MbimUuid.

 
+
+
+

Returns

+

TRUE if a +and b +are equal, FALSE otherwise.

+

+
+ +
+
+

mbim_uuid_from_printable ()

+
gboolean
+mbim_uuid_from_printable (const gchar *str,
+                          MbimUuid *uuid);
+

Fills in uuid + from the printable representation give in str +.

+

Only ccepts str + written with dashes separating items, e.g.: + a289cc33-bcbb-8b4f-b6b0-133ec2aae6df

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

str

a MBIM UUID.

 

uuid

pointer to the target MbimUuid.

 
+
+
+

Returns

+

TRUE if uuid +was correctly set, FALSE otherwise.

+

+
+
+
+
+

mbim_uuid_get_printable ()

+
gchar *
+mbim_uuid_get_printable (const MbimUuid *uuid);
+

Get a string with the UUID.

+
+

Parameters

+
++++ - - + + +

Returns :

a MbimUuid. [transfer none] -

uuid

a MbimUuid.

 
+
+

Returns

+

a newly allocated string, which should be freed with g_free().

+

[transfer full]

+
+
-

MBIM_UUID_STK

-
#define MBIM_UUID_STK mbim_uuid_from_service (MBIM_SERVICE_STK)
-
-

-Get the UUID of the MBIM_SERVICE_STK service. -

-
---+

mbim_uuid_from_service ()

+
const MbimUuid *
+mbim_uuid_from_service (MbimService service);
+

Get the UUID corresponding to service +.

+
+

Parameters

+
++++ - - + + +

Returns :

a MbimUuid. [transfer none] -

service

a MbimService.

 
+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
-

MBIM_UUID_AUTH

-
#define MBIM_UUID_AUTH mbim_uuid_from_service (MBIM_SERVICE_AUTH)
-
-

-Get the UUID of the MBIM_SERVICE_AUTH service. -

-
---+

mbim_uuid_to_service ()

+
MbimService
+mbim_uuid_to_service (const MbimUuid *uuid);
+

Get the service corresponding to uuid +.

+
+

Parameters

+
++++ - - + + +

Returns :

a MbimUuid. [transfer none] -

uuid

a MbimUuid.

 
+
+

Returns

+

a MbimService.

+

+
+
-

MBIM_UUID_DSS

-
#define MBIM_UUID_DSS mbim_uuid_from_service (MBIM_SERVICE_DSS)
-
-

-Get the UUID of the MBIM_SERVICE_DSS service. -

-
---+

mbim_uuid_from_context_type ()

+
const MbimUuid *
+mbim_uuid_from_context_type (MbimContextType context_type);
+

Get the UUID corresponding to context_type +.

+
+

Parameters

+
++++ - - + + +

Returns :

a MbimUuid. [transfer none] -

context_type

a MbimContextType.

 
+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
-

mbim_service_get_string ()

-
const gchar *       mbim_service_get_string             (MbimService val);
-

-Gets the nickname string for the MbimService specified at val. -

-
---+

mbim_uuid_to_context_type ()

+
MbimContextType
+mbim_uuid_to_context_type (const MbimUuid *uuid);
+

Get the context type corresponding to uuid +.

+
+

Parameters

+
+++++ + + + + + +

uuid

a MbimUuid.

 
+
+
+

Returns

+

a MbimContextType.

+

+
+ + +
+

Types and Values

+
+

enum MbimService

+

Enumeration of the generic MBIM services.

+
+

Members

+
++++ - - + + + - - + + - -

val :

a MbimService.

MBIM_SERVICE_INVALID

 +

Invalid service.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SERVICE_BASIC_CONNECT

 +

Basic connectivity service.

 
-
-
-
-

mbim_context_type_get_string ()

-
const gchar *       mbim_context_type_get_string        (MbimContextType val);
-

-Gets the nickname string for the MbimContextType specified at val. -

-
---- - - - + + + - - + + - -

val :

a MbimContextType.

MBIM_SERVICE_SMS

 +

SMS messaging service.

+		 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] +

MBIM_SERVICE_USSD

 +

USSD service.

 
-
-
-
-

mbim_uuid_cmp ()

-
gboolean            mbim_uuid_cmp                       (const MbimUuid *a,
-                                                         const MbimUuid *b);
-

-Compare two MbimUuid values. -

-
---- - - - + + + - - + + + - - + + + - -

a :

a MbimUuid.

MBIM_SERVICE_PHONEBOOK

 +

Phonebook service.

+		 

b :

a MbimUuid.

MBIM_SERVICE_STK

 +

SIM toolkit service.

+		 

Returns :

 -TRUE if a and b are equal, FALSE otherwise.

MBIM_SERVICE_AUTH

 +

Authentication service.

+		 
-
-
-
-

mbim_uuid_get_printable ()

-
gchar *             mbim_uuid_get_printable             (const MbimUuid *uuid);
-

-Get a string with the UUID. -

-
---- - - - + + + - - + + - -

uuid :

a MbimUuid.

MBIM_SERVICE_DSS

 +

Device Service Stream service.

+		 

Returns :

a newly allocated string, which should be freed with g_free(). [transfer full] +

MBIM_SERVICE_MS_FIRMWARE_ID

 +

Microsoft Firmware ID service.

 
-
-
-
-

mbim_uuid_from_service ()

-
const MbimUuid *    mbim_uuid_from_service              (MbimService service);
-

-Get the UUID corresponding to service. -

-
---- - - - + + + - - + +

service :

a MbimService.

MBIM_SERVICE_MS_HOST_SHUTDOWN

 +

Microsoft Host Shutdown service.

+		 

Returns :

a MbimUuid. [transfer none] +

MBIM_SERVICE_PROXY_CONTROL

 +

Proxy Control service.

 
+
-

mbim_uuid_to_service ()

-
MbimService         mbim_uuid_to_service                (const MbimUuid *uuid);
-

-Get the service corresponding to uuid. -

-
---+

enum MbimContextType

+

Enumeration of the generic MBIM context types.

+
+

Members

+
++++ - - + + + - - + + + - -

uuid :

a MbimUuid.

MBIM_CONTEXT_TYPE_INVALID

 +

Invalid context type.

+		 

Returns :

a MbimService.

MBIM_CONTEXT_TYPE_NONE

 +

Context not yet provisioned.

+		 
-
-
-
-

mbim_uuid_from_context_type ()

-
const MbimUuid *    mbim_uuid_from_context_type         (MbimContextType context_type);
-

-Get the UUID corresponding to context_type. -

-
---- - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + - -

context_type :

a MbimContextType.

MBIM_CONTEXT_TYPE_INTERNET

 +

Connection to the Internet.

+		 

Returns :

a MbimUuid. [transfer none] +

MBIM_CONTEXT_TYPE_VPN

 +

Connection to a VPN.

 

MBIM_CONTEXT_TYPE_VOICE

 +

Connection to a VoIP service.

+		 

MBIM_CONTEXT_TYPE_VIDEO_SHARE

 +

Connection to a video sharing service.

+		 

MBIM_CONTEXT_TYPE_PURCHASE

 +

Connection to an over-the-air activation site.

+		 

MBIM_CONTEXT_TYPE_IMS

 +

Connection to IMS.

+		 
-
-
-
-

mbim_uuid_to_context_type ()

-
MbimContextType     mbim_uuid_to_context_type           (const MbimUuid *uuid);
-

-Get the context type corresponding to uuid. -

-
---- - - - + + + - - + + +

uuid :

a MbimUuid.

MBIM_CONTEXT_TYPE_MMS

 +

Connection to MMS.

+		 

Returns :

a MbimContextType.

MBIM_CONTEXT_TYPE_LOCAL

 +

A local.

+		 
+
+
+

MbimUuid

+
typedef struct _MbimUuid MbimUuid;
+

A UUID as defined in MBIM.

+
+
+
+

MBIM_UUID_INVALID

+
#define MBIM_UUID_INVALID mbim_uuid_from_service (MBIM_SERVICE_INVALID)
+
+

Get the UUID of the MBIM_SERVICE_INVALID service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_BASIC_CONNECT

+
#define MBIM_UUID_BASIC_CONNECT mbim_uuid_from_service (MBIM_SERVICE_BASIC_CONNECT)
+
+

Get the UUID of the MBIM_SERVICE_BASIC_CONNECT service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_SMS

+
#define MBIM_UUID_SMS mbim_uuid_from_service (MBIM_SERVICE_SMS)
+
+

Get the UUID of the MBIM_SERVICE_SMS service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_USSD

+
#define MBIM_UUID_USSD mbim_uuid_from_service (MBIM_SERVICE_USSD)
+
+

Get the UUID of the MBIM_SERVICE_USSD service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_PHONEBOOK

+
#define MBIM_UUID_PHONEBOOK mbim_uuid_from_service (MBIM_SERVICE_PHONEBOOK)
+
+

Get the UUID of the MBIM_SERVICE_PHONEBOOK service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_STK

+
#define MBIM_UUID_STK mbim_uuid_from_service (MBIM_SERVICE_STK)
+
+

Get the UUID of the MBIM_SERVICE_STK service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_AUTH

+
#define MBIM_UUID_AUTH mbim_uuid_from_service (MBIM_SERVICE_AUTH)
+
+

Get the UUID of the MBIM_SERVICE_AUTH service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_DSS

+
#define MBIM_UUID_DSS mbim_uuid_from_service (MBIM_SERVICE_DSS)
+
+

Get the UUID of the MBIM_SERVICE_DSS service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_MS_FIRMWARE_ID

+
#define MBIM_UUID_MS_FIRMWARE_ID mbim_uuid_from_service (MBIM_SERVICE_MS_FIRMWARE_ID)
+
+

Get the UUID of the MBIM_SERVICE_MS_FIRMWARE_ID service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_MS_HOST_SHUTDOWN

+
#define MBIM_UUID_MS_HOST_SHUTDOWN mbim_uuid_from_service (MBIM_SERVICE_MS_HOST_SHUTDOWN)
+
+

Get the UUID of the MBIM_SERVICE_MS_HOST_SHUTDOWN service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
+
+

MBIM_UUID_PROXY_CONTROL

+
#define MBIM_UUID_PROXY_CONTROL mbim_uuid_from_service (MBIM_SERVICE_PROXY_CONTROL)
+
+

Get the UUID of the MBIM_SERVICE_PROXY_CONTROL service.

+
+

Returns

+

a MbimUuid.

+

[transfer none]

+
+
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Version-checks.html libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Version-checks.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/libmbim-glib-Version-checks.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/libmbim-glib-Version-checks.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,30 +2,27 @@ -Version checks +libmbim-glib Reference Manual: Version checks - + - - - - - - - - - - + + + + + + +
@@ -33,90 +30,116 @@

Version checks

Version checks — Version information in the API.

- +
-
-

Synopsis

-
#define             MBIM_MAJOR_VERSION
-#define             MBIM_MINOR_VERSION
-#define             MBIM_MICRO_VERSION
-#define             MBIM_CHECK_VERSION                  (major,
-                                                         minor,
-                                                         micro)
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineMBIM_MAJOR_VERSION
#defineMBIM_MINOR_VERSION
#defineMBIM_MICRO_VERSION
#define
+MBIM_CHECK_VERSION()
+

+

+

+
Object Hierarchy

+
 

 

 

 
Description

-

-This section defines types that are used to identify the libmbim-glib version.
-

+
This section defines types that are used to identify the libmbim-glib version.

 

 

-
Details

+
Functions

 

 
MBIM_MAJOR_VERSION

 
#define MBIM_MAJOR_VERSION (1)
 

-

-Evaluates to the major version number of libmbim-glib which this source
-is compiled against.
-

+
Evaluates to the major version number of libmbim-glib which this source
+is compiled against.

 

 

 

 
MBIM_MINOR_VERSION

-
#define MBIM_MINOR_VERSION (6)
+
#define MBIM_MINOR_VERSION (10)
 

-

-Evaluates to the minor version number of libmbim-glib which this source
-is compiled against.
-

+
Evaluates to the minor version number of libmbim-glib which this source
+is compiled against.

 

 

 

 
MBIM_MICRO_VERSION

 
#define MBIM_MICRO_VERSION (0)
 

-

-Evaluates to the micro version number of libmbim-glib which this source
-compiled against.
-

+
Evaluates to the micro version number of libmbim-glib which this source
+compiled against.

 

 

 

 
MBIM_CHECK_VERSION()

 
#define             MBIM_CHECK_VERSION(major,minor,micro)

-

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
major :
major version (e.g. 1 for version 1.2.5)
major
major version (e.g. 1 for version 1.2.5)
 
 

 
minor :
minor version (e.g. 2 for version 1.2.5)
minor
minor version (e.g. 2 for version 1.2.5)
 
 

 
micro :
micro version (e.g. 5 for version 1.2.5)
Returns :

-TRUE if the version of the libmbim-glib header files
-is the same as or newer than the passed-in version.
micro
micro version (e.g. 5 for version 1.2.5)
 
 

 
 

 

+

+
Returns

+
 TRUE if the version of the libmbim-glib header files
+is the same as or newer than the passed-in version.

+

+

+

+
+
+

Types and Values

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/MbimDevice.html libmbim-1.10.0/docs/reference/libmbim-glib/html/MbimDevice.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/MbimDevice.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/MbimDevice.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,38 +2,30 @@ -MbimDevice +libmbim-glib Reference Manual: MbimDevice - - + + - - - - - - - - - - + + + + + + +
@@ -41,604 +33,1052 @@

MbimDevice

MbimDevice — Generic MBIM device handling routines

- +
-
-

Synopsis

-
struct              MbimDevice;
-void                mbim_device_new                     (GFile *file,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-MbimDevice *        mbim_device_new_finish              (GAsyncResult *res,
-                                                         GError **error);
-GFile *             mbim_device_get_file                (MbimDevice *self);
-GFile *             mbim_device_peek_file               (MbimDevice *self);
-const gchar *       mbim_device_get_path                (MbimDevice *self);
-const gchar *       mbim_device_get_path_display        (MbimDevice *self);
-gboolean            mbim_device_is_open                 (MbimDevice *self);
-void                mbim_device_open                    (MbimDevice *self,
-                                                         guint timeout,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            mbim_device_open_finish             (MbimDevice *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-void                mbim_device_close                   (MbimDevice *self,
-                                                         guint timeout,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            mbim_device_close_finish            (MbimDevice *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-gboolean            mbim_device_close_force             (MbimDevice *self,
-                                                         GError **error);
-guint32             mbim_device_get_next_transaction_id (MbimDevice *self);
-void                mbim_device_command                 (MbimDevice *self,
-                                                         MbimMessage *message,
-                                                         guint timeout,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-MbimMessage *       mbim_device_command_finish          (MbimDevice *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----MbimDevice
-
-
-
-

Implemented Interfaces

-

-MbimDevice implements - GAsyncInitable.

-
-
-

Properties

-
-  "device-file"              GFile*                : Read / Write / Construct Only
-  "device-in-session"        gboolean              : Read / Write
-  "device-transaction-id"    guint                 : Read / Write
-
-
-

Signals

-
-  "device-error"                                   : Run Last
-  "device-indicate-status"                         : Run Last
-
-
-
-

Description

-

-MbimDevice is a generic type in charge of controlling the access to the -managed MBIM port. -

-

-A MbimDevice can only handle one single MBIM port. -

-
-
-

Details

-
-

struct MbimDevice

-
struct MbimDevice;
-

-The MbimDevice structure contains private data and should only be accessed -using the provided API. -

-
-
-
-

mbim_device_new ()

-
void                mbim_device_new                     (GFile *file,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-

-Asynchronously creates a MbimDevice object to manage file. -When the operation is finished, callback will be invoked. You can then call -mbim_device_new_finish() to get the result of the operation. -

-
+

Functions

+
--++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + - - + +

file :

a GFile. +void + +mbim_device_new () +
+MbimDevice * + +mbim_device_new_finish () +
+GFile * + +mbim_device_get_file () +
+GFile * + +mbim_device_peek_file () +
const gchar * + +mbim_device_get_path () +
const gchar * + +mbim_device_get_path_display () +
+gboolean + +mbim_device_is_open () +
+void + +mbim_device_open () +
+gboolean + +mbim_device_open_finish () +
+void + +mbim_device_open_full () +
+gboolean + +mbim_device_open_full_finish () +
+void + +mbim_device_close () +
+gboolean + +mbim_device_close_finish () +

cancellable :

optional GCancellable object, NULL to ignore. +gboolean + +mbim_device_close_force () +

callback :

a GAsyncReadyCallback to call when the initialization is finished. +guint32 + +mbim_device_get_next_transaction_id () +
+void + +mbim_device_command () +

user_data :

the data to pass to callback function. +MbimMessage * + +mbim_device_command_finish () +
-
-
-

mbim_device_new_finish ()

-
MbimDevice *        mbim_device_new_finish              (GAsyncResult *res,
-                                                         GError **error);
-

-Finishes an operation started with mbim_device_new(). -

-
+
+

Properties

+
--+++ - - + + + - - + + + - - + + +

res :

a GAsyncResult. +GFile *device-fileRead / Write / Construct Only

error :

Return location for error or NULL.gbooleandevice-in-sessionRead / Write

Returns :

A newly created MbimDevice, or NULL if error is set.guintdevice-transaction-idRead / Write
-
-
-

mbim_device_get_file ()

-
GFile *             mbim_device_get_file                (MbimDevice *self);
-

-Get the GFile associated with this MbimDevice. -

-
+
+

Signals

+
--+++ - - + + + - - + + + + + + + +

self :

a MbimDevice.voiddevice-errorRun Last

Returns :

a GFile that must be freed with g_object_unref().voiddevice-indicate-statusRun Last
voiddevice-removedRun Last
-
-
-

mbim_device_peek_file ()

-
GFile *             mbim_device_peek_file               (MbimDevice *self);
-

-Get the GFile associated with this MbimDevice, without increasing the reference count -on the returned object. -

-
+
+

Types and Values

+
--++ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + +

self :

a MbimDevice.#defineMBIM_DEVICE_FILE

Returns :

a GFile. Do not free the returned object, it is owned by self.#defineMBIM_DEVICE_IN_SESSION
#defineMBIM_DEVICE_TRANSACTION_ID
#defineMBIM_DEVICE_SIGNAL_REMOVED
#defineMBIM_DEVICE_SIGNAL_INDICATE_STATUS
#defineMBIM_DEVICE_SIGNAL_ERROR
structMbimDevice
enumMbimDeviceOpenFlags
-
-
-

mbim_device_get_path ()

-
const gchar *       mbim_device_get_path                (MbimDevice *self);
+
+

Object Hierarchy

+
    GObject
+    ╰── MbimDevice
+
+
+
+

Implemented Interfaces

-Get the system path of the underlying MBIM device. -

-
+MbimDevice implements + GAsyncInitable.

+ +
+

Description

+

MbimDevice is a generic type in charge of controlling the access to the +managed MBIM port.

+

A MbimDevice can only handle one single MBIM port.

+
+
+

Functions

+
+

mbim_device_new ()

+
void
+mbim_device_new (GFile *file,
+                 GCancellable *cancellable,
+                 GAsyncReadyCallback callback,
+                 gpointer user_data);
+

Asynchronously creates a MbimDevice object to manage file +. +When the operation is finished, callback + will be invoked. You can then call +mbim_device_new_finish() to get the result of the operation.

+
+

Parameters

+
--+++ - - + + + + + + + + + + + + + - - + + +

self :

a MbimDevice.

file

a GFile.

 

cancellable

optional GCancellable object, NULL to ignore.

 

callback

a GAsyncReadyCallback to call when the initialization is finished.

 

Returns :

the system path of the device.

user_data

the data to pass to callback function.

 
+
-

mbim_device_get_path_display ()

-
const gchar *       mbim_device_get_path_display        (MbimDevice *self);
-

-Get the system path of the underlying MBIM device in UTF-8. -

-
+

mbim_device_new_finish ()

+
MbimDevice *
+mbim_device_new_finish (GAsyncResult *res,
+                        GError **error);
+

Finishes an operation started with mbim_device_new().

+
+

Parameters

+
--+++ - - + + + - - + + +

self :

a MbimDevice.

res

a GAsyncResult.

 

Returns :

UTF-8 encoded system path of the device.

error

Return location for error or NULL.

 
+
+

Returns

+

A newly created MbimDevice, or NULL if error +is set.

+

+
+
-

mbim_device_is_open ()

-
gboolean            mbim_device_is_open                 (MbimDevice *self);
-

-Checks whether the MbimDevice is open for I/O. -

-
+

mbim_device_get_file ()

+
GFile *
+mbim_device_get_file (MbimDevice *self);
+

Get the GFile associated with this MbimDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimDevice.

Returns :

 -TRUE if self is open, FALSE otherwise.

self

a MbimDevice.

 
+
+

Returns

+

a GFile that must be freed with g_object_unref().

+

+
+
-

mbim_device_open ()

-
void                mbim_device_open                    (MbimDevice *self,
-                                                         guint timeout,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-

-Asynchronously opens a MbimDevice for I/O. -

-

-When the operation is finished callback will be called. You can then call -mbim_device_open_finish() to get the result of the operation. -

-
+

mbim_device_peek_file ()

+
GFile *
+mbim_device_peek_file (MbimDevice *self);
+

Get the GFile associated with this MbimDevice, without increasing the reference count +on the returned object.

+
+

Parameters

+
--++++ + + + + + +

self

a MbimDevice.

 
+
+
+

Returns

+

a GFile. Do not free the returned object, it is owned by self +.

+

+
+ +
+
+

mbim_device_get_path ()

+
const gchar *
+mbim_device_get_path (MbimDevice *self);
+

Get the system path of the underlying MBIM device.

+
+

Parameters

+
+++++ + + + + + +

self

a MbimDevice.

 
+
+
+

Returns

+

the system path of the device.

+

+
+
+
+
+

mbim_device_get_path_display ()

+
const gchar *
+mbim_device_get_path_display (MbimDevice *self);
+

Get the system path of the underlying MBIM device in UTF-8.

+
+

Parameters

+
+++++ + + + + + +

self

a MbimDevice.

 
+
+
+

Returns

+

UTF-8 encoded system path of the device.

+

+
+
+
+
+

mbim_device_is_open ()

+
gboolean
+mbim_device_is_open (MbimDevice *self);
+

Checks whether the MbimDevice is open for I/O.

+
+

Parameters

+
+++++ + + + + + +

self

a MbimDevice.

 
+
+
+

Returns

+

TRUE if self +is open, FALSE otherwise.

+

+
+
+
+
+

mbim_device_open ()

+
void
+mbim_device_open (MbimDevice *self,
+                  guint timeout,
+                  GCancellable *cancellable,
+                  GAsyncReadyCallback callback,
+                  gpointer user_data);
+

Asynchronously opens a MbimDevice for I/O.

+

When the operation is finished callback + will be called. You can then call +mbim_device_open_finish() to get the result of the operation.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + + - - + + +

self :

a MbimDevice.

self

a MbimDevice.

 

timeout :

maximum time, in seconds, to wait for the device to be opened.

timeout

maximum time, in seconds, to wait for the device to be opened.

 

cancellable :

optional GCancellable object, NULL to ignore.

cancellable

optional GCancellable object, NULL to ignore.

 

callback :

a GAsyncReadyCallback to call when the operation is finished.

callback

a GAsyncReadyCallback to call when the operation is finished.

 

user_data :

the data to pass to callback function.

user_data

the data to pass to callback function.

 
+
-

mbim_device_open_finish ()

-
gboolean            mbim_device_open_finish             (MbimDevice *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-

-Finishes an asynchronous open operation started with mbim_device_open(). -

-
+

mbim_device_open_finish ()

+
gboolean
+mbim_device_open_finish (MbimDevice *self,
+                         GAsyncResult *res,
+                         GError **error);
+

Finishes an asynchronous open operation started with mbim_device_open().

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + +

self :

a MbimDevice.

res :

a GAsyncResult.

self

a MbimDevice.

 

error :

Return location for error or NULL.

res

a GAsyncResult.

 

Returns :

 -TRUE if successful, FALSE if error is set.

error

Return location for error or NULL.

 
+
+

Returns

+

TRUE if successful, FALSE if error +is set.

+

+
+
-

mbim_device_close ()

-
void                mbim_device_close                   (MbimDevice *self,
-                                                         guint timeout,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-

-Asynchronously closes a MbimDevice for I/O. -

-

-When the operation is finished callback will be called. You can then call -mbim_device_close_finish() to get the result of the operation. -

-
+

mbim_device_open_full ()

+
void
+mbim_device_open_full (MbimDevice *self,
+                       MbimDeviceOpenFlags flags,
+                       guint timeout,
+                       GCancellable *cancellable,
+                       GAsyncReadyCallback callback,
+                       gpointer user_data);
+

Asynchronously opens a MbimDevice for I/O.

+

This method is an extension of the generic mbim_device_open(), which allows +launching the MbimDevice with proxy support.

+

When the operation is finished callback + will be called. You can then call +mbim_device_open_full_finish() to get the result of the operation.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + + - - + + + + + + + +

self :

a MbimDevice.

self

a MbimDevice.

 

timeout :

maximum time, in seconds, to wait for the device to be closed.

flags

a set of MbimDeviceOpenFlags.

 

cancellable :

optional GCancellable object, NULL to ignore.

timeout

maximum time, in seconds, to wait for the device to be opened.

 

callback :

a GAsyncReadyCallback to call when the operation is finished.

cancellable

optional GCancellable object, NULL to ignore.

 

user_data :

the data to pass to callback function.

callback

a GAsyncReadyCallback to call when the operation is finished.

 

user_data

the data to pass to callback function.

 
+
-

mbim_device_close_finish ()

-
gboolean            mbim_device_close_finish            (MbimDevice *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-

-Finishes an asynchronous close operation started with mbim_device_close(). -

-
+

mbim_device_open_full_finish ()

+
gboolean
+mbim_device_open_full_finish (MbimDevice *self,
+                              GAsyncResult *res,
+                              GError **error);
+

Finishes an asynchronous open operation started with mbim_device_open_full().

+
+

Parameters

+
--+++ - - + + + + + + + + + + + + + + + +

self :

a MbimDevice.

self

a MbimDevice.

 

res

a GAsyncResult.

 

error

Return location for error or NULL.

 
+
+
+

Returns

+

TRUE if successful, FALSE if error +is set.

+

+
+ +
+
+

mbim_device_close ()

+
void
+mbim_device_close (MbimDevice *self,
+                   guint timeout,
+                   GCancellable *cancellable,
+                   GAsyncReadyCallback callback,
+                   gpointer user_data);
+

Asynchronously closes a MbimDevice for I/O.

+

When the operation is finished callback + will be called. You can then call +mbim_device_close_finish() to get the result of the operation.

+
+

Parameters

+
+++++ + + + + + + + + + + - - + + + - - + + + - - + + +

self

a MbimDevice.

 

timeout

maximum time, in seconds, to wait for the device to be closed.

 

res :

a GAsyncResult.

cancellable

optional GCancellable object, NULL to ignore.

 

error :

Return location for error or NULL.

callback

a GAsyncReadyCallback to call when the operation is finished.

 

Returns :

 -TRUE if successful, FALSE if error is set.

user_data

the data to pass to callback function.

 
+
-

mbim_device_close_force ()

-
gboolean            mbim_device_close_force             (MbimDevice *self,
-                                                         GError **error);
-

-Forces the MbimDevice to be closed. -

-
+

mbim_device_close_finish ()

+
gboolean
+mbim_device_close_finish (MbimDevice *self,
+                          GAsyncResult *res,
+                          GError **error);
+

Finishes an asynchronous close operation started with mbim_device_close().

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

self :

a MbimDevice.

self

a MbimDevice.

 

error :

Return location for error or NULL.

res

a GAsyncResult.

 

Returns :

 -TRUE if self if no error happens, otherwise FALSE and error is set.

error

Return location for error or NULL.

 
+
+

Returns

+

TRUE if successful, FALSE if error +is set.

+

+
+
-

mbim_device_get_next_transaction_id ()

-
guint32             mbim_device_get_next_transaction_id (MbimDevice *self);
-

-Acquire the next transaction ID of this MbimDevice. -The internal transaction ID gets incremented. -

-
+

mbim_device_close_force ()

+
gboolean
+mbim_device_close_force (MbimDevice *self,
+                         GError **error);
+

Forces the MbimDevice to be closed.

+
+

Parameters

+
--+++ - - + + + - - + + +

self :

A MbimDevice.

self

a MbimDevice.

 

Returns :

the next transaction ID.

error

Return location for error or NULL.

 
+
+

Returns

+

TRUE if self +if no error happens, otherwise FALSE and error +is set.

+

+
+
-

mbim_device_command ()

-
void                mbim_device_command                 (MbimDevice *self,
-                                                         MbimMessage *message,
-                                                         guint timeout,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-

-Asynchronously sends a MbimMessage to the device. -

-

-When the operation is finished callback will be called. You can then call -mbim_device_command_finish() to get the result of the operation. -

-
+

mbim_device_get_next_transaction_id ()

+
guint32
+mbim_device_get_next_transaction_id (MbimDevice *self);
+

Acquire the next transaction ID of this MbimDevice. +The internal transaction ID gets incremented.

+
+

Parameters

+
--++++ + + + + + +

self

A MbimDevice.

 
+
+
+

Returns

+

the next transaction ID.

+

+
+ +
+
+

mbim_device_command ()

+
void
+mbim_device_command (MbimDevice *self,
+                     MbimMessage *message,
+                     guint timeout,
+                     GCancellable *cancellable,
+                     GAsyncReadyCallback callback,
+                     gpointer user_data);
+

Asynchronously sends a MbimMessage to the device.

+

When the operation is finished callback + will be called. You can then call +mbim_device_command_finish() to get the result of the operation.

+
+

Parameters

+
++++ - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

self :

a MbimDevice.

self

a MbimDevice.

 

message :

the message to send.

message

the message to send.

 

timeout :

maximum time, in seconds, to wait for the response.

timeout

maximum time, in seconds, to wait for the response.

 

cancellable :

a GCancellable, or NULL.

cancellable

a GCancellable, or NULL.

 

callback :

a GAsyncReadyCallback to call when the operation is finished.

callback

a GAsyncReadyCallback to call when the operation is finished.

 

user_data :

the data to pass to callback function.

user_data

the data to pass to callback function.

 
+
-

mbim_device_command_finish ()

-
MbimMessage *       mbim_device_command_finish          (MbimDevice *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-

-Finishes an operation started with mbim_device_command(). -

-
+

mbim_device_command_finish ()

+
MbimMessage *
+mbim_device_command_finish (MbimDevice *self,
+                            GAsyncResult *res,
+                            GError **error);
+

Finishes an operation started with mbim_device_command().

+
+

Parameters

+
--+++ - - + + + + + + + + - - + + + + +

self :

a MbimDevice.

self

a MbimDevice.

 

res

a GAsyncResult.

 

res :

a GAsyncResult.

error

Return location for error or NULL.

 
+
+
+

Returns

+

a MbimMessage response, or NULL if error +is set. The returned value should be freed with mbim_message_unref().

+

+
+ + +
+

Types and Values

+
+

MBIM_DEVICE_FILE

+
#define MBIM_DEVICE_FILE           "device-file"
+
+

+

+
+
+
+

MBIM_DEVICE_IN_SESSION

+
#define MBIM_DEVICE_IN_SESSION     "device-in-session"
+
+

+

+
+
+
+

MBIM_DEVICE_TRANSACTION_ID

+
#define MBIM_DEVICE_TRANSACTION_ID "device-transaction-id"
+
+

+

+
+
+
+

MBIM_DEVICE_SIGNAL_REMOVED

+
#define MBIM_DEVICE_SIGNAL_REMOVED         "device-removed"
+
+

+

+
+
+
+

MBIM_DEVICE_SIGNAL_INDICATE_STATUS

+
#define MBIM_DEVICE_SIGNAL_INDICATE_STATUS "device-indicate-status"
+
+

+

+
+
+
+

MBIM_DEVICE_SIGNAL_ERROR

+
#define MBIM_DEVICE_SIGNAL_ERROR           "device-error"
+
+

+

+
+
+
+

struct MbimDevice

+
struct MbimDevice;
+

The MbimDevice structure contains private data and should only be accessed +using the provided API.

+
+
+
+

enum MbimDeviceOpenFlags

+

Flags to specify which actions to be performed when the device is open.

+
+

Members

+
+++++ + - - + + + - - + + +

error :

Return location for error or NULL.

MBIM_DEVICE_OPEN_FLAGS_NONE

 +

None.

+		 

Returns :

a MbimMessage response, or NULL if error is set. The returned value should be freed with mbim_message_unref().

MBIM_DEVICE_OPEN_FLAGS_PROXY

 +

Try to open the port through the 'mbim-proxy'.

+		 
+

Property Details

-

The "device-file" property

-
  "device-file"              GFile*                : Read / Write / Construct Only
+

The “device-file” property

+
  “device-file”              GFile *

File to the underlying MBIM device.

+

Flags: Read / Write / Construct Only

-

The "device-in-session" property

-
  "device-in-session"        gboolean              : Read / Write
+

The “device-in-session” property

+
  “device-in-session”        gboolean

Flag to specify if the device is within a session.

+

Flags: Read / Write

Default value: FALSE

-

The "device-transaction-id" property

-
  "device-transaction-id"    guint                 : Read / Write
+

The “device-transaction-id” property

+
  “device-transaction-id”    guint

Current transaction ID.

+

Flags: Read / Write

Allowed values: >= 1

Default value: 1

@@ -646,70 +1086,118 @@

Signal Details

-

The "device-error" signal

-
void                user_function                      (MbimDevice *self,
-                                                        GError     *message,
-                                                        gpointer    user_data)      : Run Last
-

-The ::device-error signal is emitted when a MBIM error is received. -

-
+

The “device-error” signal

+
void
+user_function (MbimDevice *self,
+               GError     *message,
+               gpointer    user_data)
+

The ::device-error signal is emitted when a MBIM error is received.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

self :

the MbimDevice -

self

the MbimDevice

 

message :

the MbimMessage error

message

the MbimMessage error

 

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
-

The "device-indicate-status" signal

-
void                user_function                      (MbimDevice  *self,
-                                                        MbimMessage *message,
-                                                        gpointer     user_data)      : Run Last
-

-The ::device-indication-status signal is emitted when a MBIM indication is received. -

-
+

The “device-indicate-status” signal

+
void
+user_function (MbimDevice  *self,
+               MbimMessage *message,
+               gpointer     user_data)
+

The ::device-indication-status signal is emitted when a MBIM indication is received.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

self :

the MbimDevice -

self

the MbimDevice

 

message :

the MbimMessage indication

message

the MbimMessage indication

 

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
+
+
+

The “device-removed” signal

+
void
+user_function (MbimDevice *self,
+               gpointer    user_data)
+

The ::device-removed signal is emitted when an unexpected port hang-up is received.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

self

the MbimDevice

 

message

None

 

user_data

user data set when the signal handler was connected.

 
+
+

Flags: Run Last

+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/MbimMessage.html libmbim-1.10.0/docs/reference/libmbim-glib/html/MbimMessage.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/MbimMessage.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/MbimMessage.html 2014-08-04 13:06:12.000000000 +0000 @@ -2,32 +2,27 @@ -MbimMessage +libmbim-glib Reference Manual: MbimMessage - + - - - - - - - - - - + + + + + + +
@@ -35,1359 +30,1770 @@

MbimMessage

MbimMessage — Generic MBIM message handling routines

- +
-
-

Synopsis

-
                    MbimMessage;
-enum                MbimMessageType;
-struct              MbimIPv4;
-struct              MbimIPv6;
-enum                MbimMessageCommandType;
-
-MbimMessage *       mbim_message_new                    (const guint8 *data,
-                                                         guint32 data_length);
-MbimMessage *       mbim_message_dup                    (const MbimMessage *self);
-MbimMessage *       mbim_message_ref                    (MbimMessage *self);
-void                mbim_message_unref                  (MbimMessage *self);
-gchar *             mbim_message_get_printable          (const MbimMessage *self,
-                                                         const gchar *line_prefix,
-                                                         gboolean headers_only);
-const guint8 *      mbim_message_get_raw                (const MbimMessage *self,
-                                                         guint32 *length,
-                                                         GError **error);
-MbimMessageType     mbim_message_get_message_type       (const MbimMessage *self);
-guint32             mbim_message_get_message_length     (const MbimMessage *self);
-guint32             mbim_message_get_transaction_id     (const MbimMessage *self);
-void                mbim_message_set_transaction_id     (MbimMessage *self,
-                                                         guint32 transaction_id);
-const gchar *       mbim_message_type_get_string        (MbimMessageType val);
-
-MbimMessage *       mbim_message_open_new               (guint32 transaction_id,
-                                                         guint32 max_control_transfer);
-guint32             mbim_message_open_get_max_control_transfer
-                                                        (const MbimMessage *self);
-
-MbimStatusError     mbim_message_open_done_get_status_code
-                                                        (const MbimMessage *self);
-gboolean            mbim_message_open_done_get_result   (const MbimMessage *self,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_close_new              (guint32 transaction_id);
-
-MbimStatusError     mbim_message_close_done_get_status_code
-                                                        (const MbimMessage *self);
-gboolean            mbim_message_close_done_get_result  (const MbimMessage *self,
-                                                         GError **error);
-
-MbimMessage *       mbim_message_error_new              (guint32 transaction_id,
-                                                         MbimProtocolError error_status_code);
-MbimProtocolError   mbim_message_error_get_error_status_code
-                                                        (const MbimMessage *self);
-GError *            mbim_message_error_get_error        (const MbimMessage *self);
-
-MbimMessage *       mbim_message_command_new            (guint32 transaction_id,
-                                                         MbimService service,
-                                                         guint32 cid,
-                                                         MbimMessageCommandType command_type);
-void                mbim_message_command_append         (MbimMessage *self,
-                                                         const guint8 *buffer,
-                                                         guint32 buffer_size);
-MbimService         mbim_message_command_get_service    (const MbimMessage *self);
-const MbimUuid *    mbim_message_command_get_service_id (const MbimMessage *self);
-guint32             mbim_message_command_get_cid        (const MbimMessage *self);
-MbimMessageCommandType mbim_message_command_get_command_type
-                                                        (const MbimMessage *self);
-const guint8 *      mbim_message_command_get_raw_information_buffer
-                                                        (const MbimMessage *self,
-                                                         guint32 *length);
-const gchar *       mbim_message_command_type_get_string
-                                                        (MbimMessageCommandType val);
-
-MbimService         mbim_message_command_done_get_service
-                                                        (const MbimMessage *self);
-const MbimUuid *    mbim_message_command_done_get_service_id
-                                                        (const MbimMessage *self);
-guint32             mbim_message_command_done_get_cid   (const MbimMessage *self);
-MbimStatusError     mbim_message_command_done_get_status_code
-                                                        (const MbimMessage *self);
-gboolean            mbim_message_command_done_get_result
-                                                        (const MbimMessage *self,
-                                                         GError **error);
-const guint8 *      mbim_message_command_done_get_raw_information_buffer
-                                                        (const MbimMessage *self,
-                                                         guint32 *length);
-
-MbimService         mbim_message_indicate_status_get_service
-                                                        (const MbimMessage *self);
-const MbimUuid *    mbim_message_indicate_status_get_service_id
-                                                        (const MbimMessage *self);
-guint32             mbim_message_indicate_status_get_cid
-                                                        (const MbimMessage *self);
-const guint8 *      mbim_message_indicate_status_get_raw_information_buffer
-                                                        (const MbimMessage *self,
-                                                         guint32 *length);
-
-
-
-

Object Hierarchy

-
-  GBoxed
-   +----MbimMessage
-
-
-  GEnum
-   +----MbimMessageType
-
-
-  GEnum
-   +----MbimMessageCommandType
-
-
-

Description

-

-MbimMessage is a generic type representing a MBIM message of any kind -(request, response, indication). -

-
-
-

Details

-
-

MbimMessage

-
typedef struct _MbimMessage MbimMessage;
-

-An opaque type representing a MBIM message. -

-
-
-
-

enum MbimMessageType

-
typedef enum {
-    MBIM_MESSAGE_TYPE_INVALID         = 0x00000000,
-    /* From Host to Function */
-    MBIM_MESSAGE_TYPE_OPEN            = 0x00000001,
-    MBIM_MESSAGE_TYPE_CLOSE           = 0x00000002,
-    MBIM_MESSAGE_TYPE_COMMAND         = 0x00000003,
-    MBIM_MESSAGE_TYPE_HOST_ERROR      = 0x00000004,
-    /* From Function to Host */
-    MBIM_MESSAGE_TYPE_OPEN_DONE       = 0x80000001,
-    MBIM_MESSAGE_TYPE_CLOSE_DONE      = 0x80000002,
-    MBIM_MESSAGE_TYPE_COMMAND_DONE    = 0x80000003,
-    MBIM_MESSAGE_TYPE_FUNCTION_ERROR  = 0x80000004,
-    MBIM_MESSAGE_TYPE_INDICATE_STATUS = 0x80000007
-} MbimMessageType;
-
-

-Type of MBIM messages. -

-
+

Functions

+
--++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - +

MBIM_MESSAGE_TYPE_INVALID

Invalid MBIM message. + +MbimMessage * + +mbim_message_new () +
+MbimMessage * + +mbim_message_dup () +
+MbimMessage * + +mbim_message_ref () +
+void + +mbim_message_unref () +
+gchar * + +mbim_message_get_printable () +
const guint8 * + +mbim_message_get_raw () +
+MbimMessageType + +mbim_message_get_message_type () +
+guint32 + +mbim_message_get_message_length () +
+guint32 + +mbim_message_get_transaction_id () +
+void + +mbim_message_set_transaction_id () +
const gchar * + +mbim_message_type_get_string () +
+MbimMessage * + +mbim_message_open_new () +
+guint32 + +mbim_message_open_get_max_control_transfer () +
+MbimStatusError + +mbim_message_open_done_get_status_code () +
+gboolean + +mbim_message_open_done_get_result () +
+MbimMessage * + +mbim_message_close_new () +
+MbimStatusError + +mbim_message_close_done_get_status_code () +
+gboolean + +mbim_message_close_done_get_result () +
+MbimMessage * + +mbim_message_error_new () +
+MbimProtocolError + +mbim_message_error_get_error_status_code () +
+GError * + +mbim_message_error_get_error () +
+MbimMessage * + +mbim_message_command_new () +
+void + +mbim_message_command_append () +
+MbimService + +mbim_message_command_get_service () +
const MbimUuid * + +mbim_message_command_get_service_id () +
+guint32 + +mbim_message_command_get_cid () +
+MbimMessageCommandType + +mbim_message_command_get_command_type () +
const guint8 * + +mbim_message_command_get_raw_information_buffer () +
const gchar * + +mbim_message_command_type_get_string () +
+MbimService + +mbim_message_command_done_get_service ()

MBIM_MESSAGE_TYPE_OPEN

Initialization request. +const MbimUuid * + +mbim_message_command_done_get_service_id ()

MBIM_MESSAGE_TYPE_CLOSE

Close request. + +guint32 + +mbim_message_command_done_get_cid ()

MBIM_MESSAGE_TYPE_COMMAND

Command request. + +MbimStatusError + +mbim_message_command_done_get_status_code ()

MBIM_MESSAGE_TYPE_HOST_ERROR

Host-reported error in the communication. + +gboolean + +mbim_message_command_done_get_result ()

MBIM_MESSAGE_TYPE_OPEN_DONE

Response to initialization request. +const guint8 * + +mbim_message_command_done_get_raw_information_buffer ()

MBIM_MESSAGE_TYPE_CLOSE_DONE

Response to close request. + +MbimService + +mbim_message_indicate_status_get_service ()

MBIM_MESSAGE_TYPE_COMMAND_DONE

Response to command request. +const MbimUuid * + +mbim_message_indicate_status_get_service_id ()

MBIM_MESSAGE_TYPE_FUNCTION_ERROR

Function-reported error in the communication. + +guint32 + +mbim_message_indicate_status_get_cid ()

MBIM_MESSAGE_TYPE_INDICATE_STATUS

Unsolicited message from the function. +const guint8 * + +mbim_message_indicate_status_get_raw_information_buffer ()
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
 MbimMessage
enumMbimMessageType
structMbimIPv4
structMbimIPv6
enumMbimMessageCommandType
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── MbimMessage
+    GEnum
+    ├── MbimMessageCommandType
+    ╰── MbimMessageType
+
+
+
+

Description

+

MbimMessage is a generic type representing a MBIM message of any kind +(request, response, indication).

+
+
+

Functions

+
+

mbim_message_new ()

+
MbimMessage *
+mbim_message_new (const guint8 *data,
+                  guint32 data_length);
+

Create a MbimMessage with the given contents.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

data

contents of the message.

 

data_length

length of the message.

 
+
+
+

Returns

+

a newly created MbimMessage, which should be freed with mbim_message_unref().

+

[transfer full]

+
+
-

struct MbimIPv4

-
struct MbimIPv4 {
-    guint8 addr[4];
-};
-
-

-An IPv4 address. -

-
+

mbim_message_dup ()

+
MbimMessage *
+mbim_message_dup (const MbimMessage *self);
+

Create a MbimMessage with the same contents as self +.

+
+

Parameters

+
--+++ - - + + +

guint8 addr[4];

4 bytes specifying the IPv4 address.

self

a MbimMessage to duplicate.

 
+
+

Returns

+

a newly created MbimMessage, which should be freed with mbim_message_unref().

+

[transfer full]

+
+
-

struct MbimIPv6

-
struct MbimIPv6 {
-    guint8 addr[16];
-};
-
-

-An IPv6 address. -

-
---+

mbim_message_ref ()

+
MbimMessage *
+mbim_message_ref (MbimMessage *self);
+

Atomically increments the reference count of self + by one.

+
+

Parameters

+
++++ - - + + +

guint8 addr[16];

16 bytes specifying the IPv6 address.

self

a MbimMessage.

 
+
+

Returns

+

(transfer full) the new reference to self +.

+

+
+
-

enum MbimMessageCommandType

-
typedef enum {
-    MBIM_MESSAGE_COMMAND_TYPE_UNKNOWN = -1,
-    MBIM_MESSAGE_COMMAND_TYPE_QUERY   = 0,
-    MBIM_MESSAGE_COMMAND_TYPE_SET     = 1
-} MbimMessageCommandType;
-
-

-Type of command message. -

-
+

mbim_message_unref ()

+
void
+mbim_message_unref (MbimMessage *self);
+

Atomically decrements the reference count of self + by one. +If the reference count drops to 0, self + is completely disposed.

+
+

Parameters

+
+++++ + + + + + +

self

a MbimMessage.

 
+
+
+
+
+

mbim_message_get_printable ()

+
gchar *
+mbim_message_get_printable (const MbimMessage *self,
+                            const gchar *line_prefix,
+                            gboolean headers_only);
+

Gets a printable string with the contents of the whole MBIM message.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

MBIM_MESSAGE_COMMAND_TYPE_UNKNOWN

Unknown type. -

self

a MbimMessage.

 

MBIM_MESSAGE_COMMAND_TYPE_QUERY

Query command. -

line_prefix

prefix string to use in each new generated line.

 

MBIM_MESSAGE_COMMAND_TYPE_SET

Set command. -

headers_only

TRUE if only basic headers should be printed.

 
+
+

Returns

+

a newly allocated string, which should be freed with g_free().

+

[transfer full]

+
+
-

mbim_message_new ()

-
MbimMessage *       mbim_message_new                    (const guint8 *data,
-                                                         guint32 data_length);
-

-Create a MbimMessage with the given contents. -

-
+

mbim_message_get_raw ()

+
const guint8 *
+mbim_message_get_raw (const MbimMessage *self,
+                      guint32 *length,
+                      GError **error);
+

Gets the whole raw data buffer of the MbimMessage.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

data :

contents of the message.

self

a MbimMessage.

 

data_length :

length of the message.

length

return location for the size of the output buffer.

[out]

Returns :

a newly created MbimMessage, which should be freed with mbim_message_unref(). [transfer full] -

error

return location for error or NULL.

 
+
+

Returns

+

The raw data buffer, or NULL if error +is set.

+

[transfer none]

+
+
-

mbim_message_dup ()

-
MbimMessage *       mbim_message_dup                    (const MbimMessage *self);
-

-Create a MbimMessage with the same contents as self. -

-
+

mbim_message_get_message_type ()

+
MbimMessageType
+mbim_message_get_message_type (const MbimMessage *self);
+

Gets the message type.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage to duplicate.

Returns :

a newly created MbimMessage, which should be freed with mbim_message_unref(). [transfer full] -

self

a MbimMessage.

 
+
+

Returns

+

a MbimMessageType.

+

+
+
-

mbim_message_ref ()

-
MbimMessage *       mbim_message_ref                    (MbimMessage *self);
-

-Atomically increments the reference count of self by one. -

-
+

mbim_message_get_message_length ()

+
guint32
+mbim_message_get_message_length (const MbimMessage *self);
+

Gets the whole message length.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

(transfer full) the new reference to self.

self

a MbimMessage.

 
+
+

Returns

+

the length of the message.

+

+
+
-

mbim_message_unref ()

-
void                mbim_message_unref                  (MbimMessage *self);
-

-Atomically decrements the reference count of self by one. -If the reference count drops to 0, self is completely disposed. -

-
+

mbim_message_get_transaction_id ()

+
guint32
+mbim_message_get_transaction_id (const MbimMessage *self);
+

Gets the transaction ID of the message.

+
+

Parameters

+
--+++ - - + + +

self :

a MbimMessage.

self

a MbimMessage.

 
+
+

Returns

+

the transaction ID.

+

+
+
-

mbim_message_get_printable ()

-
gchar *             mbim_message_get_printable          (const MbimMessage *self,
-                                                         const gchar *line_prefix,
-                                                         gboolean headers_only);
-

-Gets a printable string with the contents of the whole MBIM message. -

-
+

mbim_message_set_transaction_id ()

+
void
+mbim_message_set_transaction_id (MbimMessage *self,
+                                 guint32 transaction_id);
+

Sets the transaction ID of the message.

+
+

Parameters

+
--+++ - - + + + - - - - - - - - - - + + +

self :

a MbimMessage.

self

a MbimMessage.

 

line_prefix :

prefix string to use in each new generated line.

headers_only :

 -TRUE if only basic headers should be printed.

Returns :

a newly allocated string, which should be freed with g_free(). [transfer full] -

transaction_id

the transaction id.

 
+
-

mbim_message_get_raw ()

-
const guint8 *      mbim_message_get_raw                (const MbimMessage *self,
-                                                         guint32 *length,
-                                                         GError **error);
-

-Gets the whole raw data buffer of the MbimMessage. -

-
+

mbim_message_type_get_string ()

+
const gchar *
+mbim_message_type_get_string (MbimMessageType val);
+

Gets the nickname string for the MbimMessageType specified at val +.

+
+

Parameters

+
--+++ - - - - - - - - - - - - - - - - - - + + + + +

self :

a MbimMessage.

length :

return location for the size of the output buffer. [out] -

error :

return location for error or NULL.

Returns :

The raw data buffer, or NULL if error is set. [transfer none] -

val

a MbimMessageType.

 
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
-

mbim_message_get_message_type ()

-
MbimMessageType     mbim_message_get_message_type       (const MbimMessage *self);
-

-Gets the message type. -

-
+

mbim_message_open_new ()

+
MbimMessage *
+mbim_message_open_new (guint32 transaction_id,
+                       guint32 max_control_transfer);
+

Create a new MbimMessage of type MBIM_MESSAGE_TYPE_OPEN with the specified +parameters.

+
+

Parameters

+
--+++ - - + + + - - + + +

self :

a MbimMessage.

transaction_id

transaction ID.

 

Returns :

a MbimMessageType.

max_control_transfer

maximum control transfer.

 
+
+

Returns

+

a newly created MbimMessage. The returned value +should be freed with mbim_message_unref().

+

[transfer full]

+
+
-

mbim_message_get_message_length ()

-
guint32             mbim_message_get_message_length     (const MbimMessage *self);
-

-Gets the whole message length. -

-
+

mbim_message_open_get_max_control_transfer ()

+
guint32
+mbim_message_open_get_max_control_transfer
+                               (const MbimMessage *self);
+

Get the maximum control transfer set to be used in the MbimMessage of type +MBIM_MESSAGE_TYPE_OPEN.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

the length of the message.

self

a MbimMessage.

 
+
+

Returns

+

the maximum control transfer.

+

+
+
-

mbim_message_get_transaction_id ()

-
guint32             mbim_message_get_transaction_id     (const MbimMessage *self);
-

-Gets the transaction ID of the message. -

-
---+

mbim_message_open_done_get_status_code ()

+
MbimStatusError
+mbim_message_open_done_get_status_code
+                               (const MbimMessage *self);
+

Get status code from the MBIM_MESSAGE_TYPE_OPEN_DONE message.

+
+

Parameters

+
++++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

the transaction ID.

self

a MbimMessage.

 
+
+

Returns

+

a MbimStatusError.

+

+
+
-

mbim_message_set_transaction_id ()

-
void                mbim_message_set_transaction_id     (MbimMessage *self,
-                                                         guint32 transaction_id);
-

-Sets the transaction ID of the message. -

-
+

mbim_message_open_done_get_result ()

+
gboolean
+mbim_message_open_done_get_result (const MbimMessage *self,
+                                   GError **error);
+

Gets the result of the 'Open' operation in the MBIM_MESSAGE_TYPE_OPEN_DONE message.

+
+

Parameters

+
--+++ - - + + + - - + + +

self :

a MbimMessage.

self

a MbimMessage.

 

transaction_id :

the transaction id.

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the operation succeeded, FALSE if error +is set.

+

+
+
-

mbim_message_type_get_string ()

-
const gchar *       mbim_message_type_get_string        (MbimMessageType val);
-

-Gets the nickname string for the MbimMessageType specified at val. -

-
+

mbim_message_close_new ()

+
MbimMessage *
+mbim_message_close_new (guint32 transaction_id);
+

Create a new MbimMessage of type MBIM_MESSAGE_TYPE_CLOSE with the specified +parameters.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + + +

val :

a MbimMessageType.

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] -

transaction_id

transaction ID.

 
+
+
+

Returns

+

a newly created MbimMessage. The returned value +should be freed with mbim_message_unref().

+

[transfer full]

+
+ +
+
+

mbim_message_close_done_get_status_code ()

+
MbimStatusError
+mbim_message_close_done_get_status_code
+                               (const MbimMessage *self);
+

Get status code from the MBIM_MESSAGE_TYPE_CLOSE_DONE message.

+
+

Parameters

+
+++++ + + + + +

self

a MbimMessage.

 
+
+

Returns

+

a MbimStatusError.

+

+
+
-

mbim_message_open_new ()

-
MbimMessage *       mbim_message_open_new               (guint32 transaction_id,
-                                                         guint32 max_control_transfer);
-

-Create a new MbimMessage of type MBIM_MESSAGE_TYPE_OPEN with the specified -parameters. -

-
+

mbim_message_close_done_get_result ()

+
gboolean
+mbim_message_close_done_get_result (const MbimMessage *self,
+                                    GError **error);
+

Gets the result of the 'Close' operation in the MBIM_MESSAGE_TYPE_CLOSE_DONE message.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

transaction_id :

transaction ID.

max_control_transfer :

maximum control transfer.

self

a MbimMessage.

 

Returns :

a newly created MbimMessage. The returned value -should be freed with mbim_message_unref(). [transfer full] -

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the operation succeeded, FALSE if error +is set.

+

+
+
-

mbim_message_open_get_max_control_transfer ()

-
guint32             mbim_message_open_get_max_control_transfer
-                                                        (const MbimMessage *self);
-

-Get the maximum control transfer set to be used in the MbimMessage of type -MBIM_MESSAGE_TYPE_OPEN. -

-
+

mbim_message_error_new ()

+
MbimMessage *
+mbim_message_error_new (guint32 transaction_id,
+                        MbimProtocolError error_status_code);
+

Create a new MbimMessage of type MBIM_MESSAGE_TYPE_HOST_ERROR with the specified +parameters.

+
+

Parameters

+
--+++ - - + + + - - + + +

self :

a MbimMessage.

transaction_id

transaction ID.

 

Returns :

the maximum control transfer.

error_status_code

a MbimProtocolError.

 
+
+

Returns

+

a newly created MbimMessage. The returned value +should be freed with mbim_message_unref().

+

[transfer full]

+
+
-

mbim_message_open_done_get_status_code ()

-
MbimStatusError     mbim_message_open_done_get_status_code
-                                                        (const MbimMessage *self);
-

-Get status code from the MBIM_MESSAGE_TYPE_OPEN_DONE message. -

-
+

mbim_message_error_get_error_status_code ()

+
MbimProtocolError
+mbim_message_error_get_error_status_code
+                               (const MbimMessage *self);
+

Get the error code in a MBIM_MESSAGE_TYPE_HOST_ERROR or +MBIM_MESSAGE_TYPE_FUNCTION_ERROR message.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a MbimStatusError.

self

a MbimMessage.

 
+
+

Returns

+

a MbimProtocolError.

+

+
+
-

mbim_message_open_done_get_result ()

-
gboolean            mbim_message_open_done_get_result   (const MbimMessage *self,
-                                                         GError **error);
-

-Gets the result of the 'Open' operation in the MBIM_MESSAGE_TYPE_OPEN_DONE message. -

-
---+

mbim_message_error_get_error ()

+
GError *
+mbim_message_error_get_error (const MbimMessage *self);
+

Get the error in a MBIM_MESSAGE_TYPE_HOST_ERROR or +MBIM_MESSAGE_TYPE_FUNCTION_ERROR message.

+
+

Parameters

+
++++ - - - - - - - - - - - - - - + + + + +

self :

a MbimMessage.

error :

return location for error or NULL.

Returns :

 -TRUE if the operation succeeded, FALSE if error is set.

self

a MbimMessage.

 
+
+

Returns

+

a newly allocated GError, which should be freed with g_error_free().

+

+
+
-

mbim_message_close_new ()

-
MbimMessage *       mbim_message_close_new              (guint32 transaction_id);
-

-Create a new MbimMessage of type MBIM_MESSAGE_TYPE_CLOSE with the specified -parameters. -

-
+

mbim_message_command_new ()

+
MbimMessage *
+mbim_message_command_new (guint32 transaction_id,
+                          MbimService service,
+                          guint32 cid,
+                          MbimMessageCommandType command_type);
+

Create a new MbimMessage of type MBIM_MESSAGE_TYPE_COMMAND with the +specified parameters and an empty information buffer.

+
+

Parameters

+
--+++ - - + + + - - + + + - -

transaction_id :

transaction ID.

transaction_id

transaction ID.

 

Returns :

a newly created MbimMessage. The returned value -should be freed with mbim_message_unref(). [transfer full] -

service

a MbimService.

 
-
-
-
-

mbim_message_close_done_get_status_code ()

-
MbimStatusError     mbim_message_close_done_get_status_code
-                                                        (const MbimMessage *self);
-

-Get status code from the MBIM_MESSAGE_TYPE_CLOSE_DONE message. -

-
---- - - - + + + - - + + +

self :

a MbimMessage.

cid

the command ID.

 

Returns :

a MbimStatusError.

command_type

the command type.

 
+
+

Returns

+

a newly created MbimMessage. The returned value +should be freed with mbim_message_unref().

+

[transfer full]

+
+
-

mbim_message_close_done_get_result ()

-
gboolean            mbim_message_close_done_get_result  (const MbimMessage *self,
-                                                         GError **error);
-

-Gets the result of the 'Close' operation in the MBIM_MESSAGE_TYPE_CLOSE_DONE message. -

-
+

mbim_message_command_append ()

+
void
+mbim_message_command_append (MbimMessage *self,
+                             const guint8 *buffer,
+                             guint32 buffer_size);
+

Appends the contents of buffer + to self +.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

self :

a MbimMessage.

self

a MbimMessage.

 

error :

return location for error or NULL.

buffer

raw buffer to append to the message.

 

Returns :

 -TRUE if the operation succeeded, FALSE if error is set.

buffer_size

length of the data in buffer +.

 
+
-

mbim_message_error_new ()

-
MbimMessage *       mbim_message_error_new              (guint32 transaction_id,
-                                                         MbimProtocolError error_status_code);
-

-Create a new MbimMessage of type MBIM_MESSAGE_TYPE_HOST_ERROR with the specified -parameters. -

-
+

mbim_message_command_get_service ()

+
MbimService
+mbim_message_command_get_service (const MbimMessage *self);
+

Get the service of a MBIM_MESSAGE_TYPE_COMMAND message.

+
+

Parameters

+
--+++ - - - - - - - - - - - - - - + + + + +

transaction_id :

transaction ID.

error_status_code :

a MbimProtocolError.

Returns :

a newly created MbimMessage. The returned value -should be freed with mbim_message_unref(). [transfer full] -

self

a MbimMessage.

 
+
+

Returns

+

a MbimService.

+

+
+
-

mbim_message_error_get_error_status_code ()

-
MbimProtocolError   mbim_message_error_get_error_status_code
-                                                        (const MbimMessage *self);
-

-Get the error code in a MBIM_MESSAGE_TYPE_HOST_ERROR or -MBIM_MESSAGE_TYPE_FUNCTION_ERROR message. -

-
+

mbim_message_command_get_service_id ()

+
const MbimUuid *
+mbim_message_command_get_service_id (const MbimMessage *self);
+

Get the service UUID of a MBIM_MESSAGE_TYPE_COMMAND message.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a MbimProtocolError.

self

a MbimMessage.

 
+
+

Returns

+

a MbimUuid.

+

+
+
-

mbim_message_error_get_error ()

-
GError *            mbim_message_error_get_error        (const MbimMessage *self);
-

-Get the error in a MBIM_MESSAGE_TYPE_HOST_ERROR or -MBIM_MESSAGE_TYPE_FUNCTION_ERROR message. -

-
+

mbim_message_command_get_cid ()

+
guint32
+mbim_message_command_get_cid (const MbimMessage *self);
+

Get the command id of a MBIM_MESSAGE_TYPE_COMMAND message.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a newly allocated GError, which should be freed with g_error_free().

self

a MbimMessage.

 
+
+

Returns

+

a CID.

+

+
+
-

mbim_message_command_new ()

-
MbimMessage *       mbim_message_command_new            (guint32 transaction_id,
-                                                         MbimService service,
-                                                         guint32 cid,
-                                                         MbimMessageCommandType command_type);
-

-Create a new MbimMessage of type MBIM_MESSAGE_TYPE_COMMAND with the -specified parameters and an empty information buffer. -

-
+

mbim_message_command_get_command_type ()

+
MbimMessageCommandType
+mbim_message_command_get_command_type (const MbimMessage *self);
+

Get the command type of a MBIM_MESSAGE_TYPE_COMMAND message.

+
+

Parameters

+
--+++ - - - - - - - - - - - - - - - - - - - - - - + + + + +

transaction_id :

transaction ID.

service :

a MbimService.

cid :

the command ID.

command_type :

the command type.

Returns :

a newly created MbimMessage. The returned value -should be freed with mbim_message_unref(). [transfer full] -

self

a MbimMessage.

 
+
+

Returns

+

a MbimMessageCommandType.

+

+
+
-

mbim_message_command_append ()

-
void                mbim_message_command_append         (MbimMessage *self,
-                                                         const guint8 *buffer,
-                                                         guint32 buffer_size);
-

-Appends the contents of buffer to self. -

-
+

mbim_message_command_get_raw_information_buffer ()

+
const guint8 *
+mbim_message_command_get_raw_information_buffer
+                               (const MbimMessage *self,
+                                guint32 *length);
+

Gets the information buffer of the MBIM_MESSAGE_TYPE_COMMAND message.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

self :

a MbimMessage.

buffer :

raw buffer to append to the message.

self

a MbimMessage.

 

buffer_size :

length of the data in buffer.

length

return location for the size of the output buffer.

[out]
+
+

Returns

+

The raw data buffer, or NULL if empty.

+

[transfer none]

+
+
-

mbim_message_command_get_service ()

-
MbimService         mbim_message_command_get_service    (const MbimMessage *self);
-

-Get the service of a MBIM_MESSAGE_TYPE_COMMAND message. -

-
+

mbim_message_command_type_get_string ()

+
const gchar *
+mbim_message_command_type_get_string (MbimMessageCommandType val);
+

Gets the nickname string for the MbimMessageCommandType specified at val +.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a MbimService.

val

a MbimMessageCommandType.

 
+
+

Returns

+

a string with the nickname, or NULL if not found. Do not free the returned value.

+

[transfer none]

+
+
-

mbim_message_command_get_service_id ()

-
const MbimUuid *    mbim_message_command_get_service_id (const MbimMessage *self);
-

-Get the service UUID of a MBIM_MESSAGE_TYPE_COMMAND message. -

-
+

mbim_message_command_done_get_service ()

+
MbimService
+mbim_message_command_done_get_service (const MbimMessage *self);
+

Get the service of a MBIM_MESSAGE_TYPE_COMMAND_DONE message.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a MbimUuid.

self

a MbimMessage.

 
+
+

Returns

+

a MbimService.

+

+
+
-

mbim_message_command_get_cid ()

-
guint32             mbim_message_command_get_cid        (const MbimMessage *self);
-

-Get the command id of a MBIM_MESSAGE_TYPE_COMMAND message. -

-
---+

mbim_message_command_done_get_service_id ()

+
const MbimUuid *
+mbim_message_command_done_get_service_id
+                               (const MbimMessage *self);
+

Get the service UUID of a MBIM_MESSAGE_TYPE_COMMAND_DONE message.

+
+

Parameters

+
++++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a CID.

self

a MbimMessage.

 
+
+

Returns

+

a MbimUuid.

+

+
+
-

mbim_message_command_get_command_type ()

-
MbimMessageCommandType mbim_message_command_get_command_type
-                                                        (const MbimMessage *self);
-

-Get the command type of a MBIM_MESSAGE_TYPE_COMMAND message. -

-
+

mbim_message_command_done_get_cid ()

+
guint32
+mbim_message_command_done_get_cid (const MbimMessage *self);
+

Get the command id of a MBIM_MESSAGE_TYPE_COMMAND_DONE message.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a MbimMessageCommandType.

self

a MbimMessage.

 
+
+

Returns

+

a CID.

+

+
+
-

mbim_message_command_get_raw_information_buffer ()

-
const guint8 *      mbim_message_command_get_raw_information_buffer
-                                                        (const MbimMessage *self,
-                                                         guint32 *length);
-

-Gets the information buffer of the MBIM_MESSAGE_TYPE_COMMAND message. -

-
---+

mbim_message_command_done_get_status_code ()

+
MbimStatusError
+mbim_message_command_done_get_status_code
+                               (const MbimMessage *self);
+

Get status code from the MBIM_MESSAGE_TYPE_COMMAND_DONE message.

+
+

Parameters

+
++++ - - - - - - - - - - - - - - + + + + +

self :

a MbimMessage.

length :

return location for the size of the output buffer. [out] -

Returns :

The raw data buffer, or NULL if empty. [transfer none] -

self

a MbimMessage.

 
+
+

Returns

+

a MbimStatusError.

+

+
+
-

mbim_message_command_type_get_string ()

-
const gchar *       mbim_message_command_type_get_string
-                                                        (MbimMessageCommandType val);
-

-Gets the nickname string for the MbimMessageCommandType specified at val. -

-
+

mbim_message_command_done_get_result ()

+
gboolean
+mbim_message_command_done_get_result (const MbimMessage *self,
+                                      GError **error);
+

Gets the result of the 'Command' operation in the MBIM_MESSAGE_TYPE_COMMAND_DONE message.

+
+

Parameters

+
--+++ - - + + + - - + + +

val :

a MbimMessageCommandType.

self

a MbimMessage.

 

Returns :

a string with the nickname, or NULL if not found. Do not free the returned value. [transfer none] -

error

return location for error or NULL.

 
+
+

Returns

+

TRUE if the operation succeeded, FALSE if error +is set.

+

+
+
-

mbim_message_command_done_get_service ()

-
MbimService         mbim_message_command_done_get_service
-                                                        (const MbimMessage *self);
-

-Get the service of a MBIM_MESSAGE_TYPE_COMMAND_DONE message. -

-
+

mbim_message_command_done_get_raw_information_buffer ()

+
const guint8 *
+mbim_message_command_done_get_raw_information_buffer
+                               (const MbimMessage *self,
+                                guint32 *length);
+

Gets the information buffer of the MBIM_MESSAGE_TYPE_COMMAND_DONE message.

+
+

Parameters

+
--+++ - - + + + - - + + +

self :

a MbimMessage.

self

a MbimMessage.

 

Returns :

a MbimService.

length

return location for the size of the output buffer.

[out]
+
+

Returns

+

The raw data buffer, or NULL if empty.

+

[transfer none]

+
+
-

mbim_message_command_done_get_service_id ()

-
const MbimUuid *    mbim_message_command_done_get_service_id
-                                                        (const MbimMessage *self);
-

-Get the service UUID of a MBIM_MESSAGE_TYPE_COMMAND_DONE message. -

-
+

mbim_message_indicate_status_get_service ()

+
MbimService
+mbim_message_indicate_status_get_service
+                               (const MbimMessage *self);
+

Get the service of a MBIM_MESSAGE_TYPE_INDICATE_STATUS message.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + + +

self :

a MbimMessage.

Returns :

a MbimUuid.

self

a MbimMessage.

 
+
+
+

Returns

+

a MbimService.

+

+
+ +
+
+

mbim_message_indicate_status_get_service_id ()

+
const MbimUuid *
+mbim_message_indicate_status_get_service_id
+                               (const MbimMessage *self);
+

Get the service UUID of a MBIM_MESSAGE_TYPE_INDICATE_STATUS message.

+
+

Parameters

+
+++++ + + + + +

self

a MbimMessage.

 
+
+

Returns

+

a MbimUuid.

+

+
+
-

mbim_message_command_done_get_cid ()

-
guint32             mbim_message_command_done_get_cid   (const MbimMessage *self);
-

-Get the command id of a MBIM_MESSAGE_TYPE_COMMAND_DONE message. -

-
+

mbim_message_indicate_status_get_cid ()

+
guint32
+mbim_message_indicate_status_get_cid (const MbimMessage *self);
+

Get the command id of a MBIM_MESSAGE_TYPE_INDICATE_STATUS message.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a CID.

self

a MbimMessage.

 
+
+

Returns

+

a CID.

+

+
+
-

mbim_message_command_done_get_status_code ()

-
MbimStatusError     mbim_message_command_done_get_status_code
-                                                        (const MbimMessage *self);
-

-Get status code from the MBIM_MESSAGE_TYPE_COMMAND_DONE message. -

-
+

mbim_message_indicate_status_get_raw_information_buffer ()

+
const guint8 *
+mbim_message_indicate_status_get_raw_information_buffer
+                               (const MbimMessage *self,
+                                guint32 *length);
+

Gets the information buffer of the MBIM_MESSAGE_TYPE_INDICATE_STATUS message.

+
+

Parameters

+
--+++ - - + + + - - + + +

self :

a MbimMessage.

self

a MbimMessage.

 

Returns :

a MbimStatusError.

length

return location for the size of the output buffer.

[out]
+
+

Returns

+

The raw data buffer, or NULL if empty.

+

[transfer none]

+
+ + +
+

Types and Values

+
+

MbimMessage

+
typedef struct _MbimMessage MbimMessage;
+

An opaque type representing a MBIM message.

+
-

mbim_message_command_done_get_result ()

-
gboolean            mbim_message_command_done_get_result
-                                                        (const MbimMessage *self,
-                                                         GError **error);
-

-Gets the result of the 'Command' operation in the MBIM_MESSAGE_TYPE_COMMAND_DONE message. -

-
+

enum MbimMessageType

+

Type of MBIM messages.

+
+

Members

+
--+++ - - + + + - - + + + - - + + + - -

self :

a MbimMessage.

MBIM_MESSAGE_TYPE_INVALID

 +

Invalid MBIM message.

+		 

error :

return location for error or NULL.

MBIM_MESSAGE_TYPE_OPEN

 +

Initialization request.

+		 

Returns :

 -TRUE if the operation succeeded, FALSE if error is set.

MBIM_MESSAGE_TYPE_CLOSE

 +

Close request.

+		 
-
-
-
-

mbim_message_command_done_get_raw_information_buffer ()

-
const guint8 *      mbim_message_command_done_get_raw_information_buffer
-                                                        (const MbimMessage *self,
-                                                         guint32 *length);
-

-Gets the information buffer of the MBIM_MESSAGE_TYPE_COMMAND_DONE message. -

-
---- - - - + + + - - + + - - + + + + + + + + + + + + - -

self :

a MbimMessage.

MBIM_MESSAGE_TYPE_COMMAND

 +

Command request.

+		 

length :

return location for the size of the output buffer. [out] +

MBIM_MESSAGE_TYPE_HOST_ERROR

 +

Host-reported error in the communication.

 

Returns :

The raw data buffer, or NULL if empty. [transfer none] +

MBIM_MESSAGE_TYPE_OPEN_DONE

 +

Response to initialization request.

 

MBIM_MESSAGE_TYPE_CLOSE_DONE

 +

Response to close request.

+		 

MBIM_MESSAGE_TYPE_COMMAND_DONE

 +

Response to command request.

+		 
-
-
-
-

mbim_message_indicate_status_get_service ()

-
MbimService         mbim_message_indicate_status_get_service
-                                                        (const MbimMessage *self);
-

-Get the service of a MBIM_MESSAGE_TYPE_INDICATE_STATUS message. -

-
---- - - - + + + - - + + +

self :

a MbimMessage.

MBIM_MESSAGE_TYPE_FUNCTION_ERROR

 +

Function-reported error in the communication.

+		 

Returns :

a MbimService.

MBIM_MESSAGE_TYPE_INDICATE_STATUS

 +

Unsolicited message from the function.

+		 
+
-

mbim_message_indicate_status_get_service_id ()

-
const MbimUuid *    mbim_message_indicate_status_get_service_id
-                                                        (const MbimMessage *self);
-

-Get the service UUID of a MBIM_MESSAGE_TYPE_INDICATE_STATUS message. -

-
---+

struct MbimIPv4

+
struct MbimIPv4 {
+    guint8 addr[4];
+};
+
+

An IPv4 address.

+
+

Members

+
++++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a MbimUuid.

guint8 addr[4];

4 bytes specifying the IPv4 address.

 
+
-

mbim_message_indicate_status_get_cid ()

-
guint32             mbim_message_indicate_status_get_cid
-                                                        (const MbimMessage *self);
-

-Get the command id of a MBIM_MESSAGE_TYPE_INDICATE_STATUS message. -

-
---+

struct MbimIPv6

+
struct MbimIPv6 {
+    guint8 addr[16];
+};
+
+

An IPv6 address.

+
+

Members

+
++++ - - - - - - - - - - + + + + +

self :

a MbimMessage.

Returns :

a CID.

guint8 addr[16];

16 bytes specifying the IPv6 address.

 
+
-

mbim_message_indicate_status_get_raw_information_buffer ()

-
const guint8 *      mbim_message_indicate_status_get_raw_information_buffer
-                                                        (const MbimMessage *self,
-                                                         guint32 *length);
-

-Gets the information buffer of the MBIM_MESSAGE_TYPE_INDICATE_STATUS message. -

-
+

enum MbimMessageCommandType

+

Type of command message.

+
+

Members

+
--+++ - - + + + - - + + - - + +

self :

a MbimMessage.

MBIM_MESSAGE_COMMAND_TYPE_UNKNOWN

 +

Unknown type.

+		 

length :

return location for the size of the output buffer. [out] +

MBIM_MESSAGE_COMMAND_TYPE_QUERY

 +

Query command.

 

Returns :

The raw data buffer, or NULL if empty. [transfer none] +

MBIM_MESSAGE_COMMAND_TYPE_SET

 +

Set command.

 
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/MbimProxy.html libmbim-1.10.0/docs/reference/libmbim-glib/html/MbimProxy.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/MbimProxy.html 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/MbimProxy.html 2014-08-04 13:06:13.000000000 +0000 @@ -0,0 +1,255 @@ + + + + +libmbim-glib Reference Manual: MbimProxy + + + + + + + + + + + + + + + + +
+
+
+ + +
+

MbimProxy

+

MbimProxy

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+MbimProxy * + +mbim_proxy_new () +
+guint + +mbim_proxy_get_n_clients () +
+guint + +mbim_proxy_get_n_devices () +
+
+
+

Properties

+
+++++ + + + + + + + + + + + + +
guintmbim-proxy-n-clientsRead
guintmbim-proxy-n-devicesRead
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + +
#defineMBIM_PROXY_SOCKET_PATH
#defineMBIM_PROXY_N_CLIENTS
#defineMBIM_PROXY_N_DEVICES
structMbimProxy
+
+
+

Object Hierarchy

+
    GObject
+    ╰── MbimProxy
+
+
+
+

Description

+

+

+
+
+

Functions

+
+

mbim_proxy_new ()

+
MbimProxy *
+mbim_proxy_new (GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

mbim_proxy_get_n_clients ()

+
guint
+mbim_proxy_get_n_clients (MbimProxy *self);
+

Get the number of clients currently connected to the proxy.

+
+

Parameters

+
+++++ + + + + + +

self

a MbimProxy.

 
+
+
+

Returns

+

a guint.

+

+
+
+
+
+

mbim_proxy_get_n_devices ()

+
guint
+mbim_proxy_get_n_devices (MbimProxy *self);
+

Get the number of devices currently connected to the proxy.

+
+

Parameters

+
+++++ + + + + + +

self

a MbimProxy.

 
+
+
+

Returns

+

a guint.

+

+
+
+
+
+

Types and Values

+
+

MBIM_PROXY_SOCKET_PATH

+
#define MBIM_PROXY_SOCKET_PATH "mbim-proxy"
+
+

+

+
+
+
+

MBIM_PROXY_N_CLIENTS

+
#define MBIM_PROXY_N_CLIENTS   "mbim-proxy-n-clients"
+
+

+

+
+
+
+

MBIM_PROXY_N_DEVICES

+
#define MBIM_PROXY_N_DEVICES   "mbim-proxy-n-devices"
+
+

+

+
+
+
+

struct MbimProxy

+
struct MbimProxy;
+

+

+
+
+
+

Property Details

+
+

The “mbim-proxy-n-clients” property

+
  “mbim-proxy-n-clients”     guint
+

Number of clients currently connected to the proxy.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “mbim-proxy-n-devices” property

+
  “mbim-proxy-n-devices”     guint
+

Number of devices currently managed by the proxy.

+

Flags: Read

+

Default value: 0

+
+
+
+
+
+ Generated by GTK-Doc V1.20
+ + \ No newline at end of file diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/object-tree.html libmbim-1.10.0/docs/reference/libmbim-glib/html/object-tree.html --- libmbim-1.6.0/docs/reference/libmbim-glib/html/object-tree.html 2013-12-10 20:33:48.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/object-tree.html 2014-08-04 13:06:13.000000000 +0000 @@ -2,100 +2,104 @@ -Object Hierarchy +libmbim-glib Reference Manual: Object Hierarchy - + - + - - - - - - + + + + + +

Object Hierarchy

     GObject
-        MbimDevice
+    ├── MbimDevice
+    ╰── MbimProxy
     GEnum
-        MbimActivationCommand
-        MbimActivationState
-        MbimAuthProtocol
-        MbimCidAuth
-        MbimCidBasicConnect
-        MbimCidDss
-        MbimCidPhonebook
-        MbimCidSms
-        MbimCidStk
-        MbimCidUssd
-        MbimCompression
-        MbimContextIpType
-        MbimContextType
-        MbimCoreError
-        MbimDeviceType
-        MbimDssLinkState
-        MbimEmergencyModeState
-        MbimMessageCommandType
-        MbimMessageType
-        MbimNetworkIdleHintState
-        MbimNwError
-        MbimPacketServiceAction
-        MbimPacketServiceState
-        MbimPhonebookFlag
-        MbimPhonebookState
-        MbimPhonebookWriteFlag
-        MbimPinFormat
-        MbimPinMode
-        MbimPinOperation
-        MbimPinState
-        MbimPinType
-        MbimProtocolError
-        MbimRadioSwitchState
-        MbimRegisterAction
-        MbimRegisterMode
-        MbimRegisterState
-        MbimService
-        MbimSmsCdmaEncoding
-        MbimSmsCdmaLang
-        MbimSmsFlag
-        MbimSmsFormat
-        MbimSmsStatusFlag
-        MbimSmsStatus
-        MbimSmsStorageState
-        MbimStatusError
-        MbimStkPacProfile
-        MbimStkPacType
-        MbimSubscriberReadyState
-        MbimUssdAction
-        MbimUssdResponse
-        MbimUssdSessionState
-        MbimVisibleProvidersAction
-        MbimVoiceCallState
-        MbimVoiceClass
+    ├── MbimActivationCommand
+    ├── MbimActivationState
+    ├── MbimAuthProtocol
+    ├── MbimCidAuth
+    ├── MbimCidBasicConnect
+    ├── MbimCidDss
+    ├── MbimCidMsFirmwareId
+    ├── MbimCidMsHostShutdown
+    ├── MbimCidPhonebook
+    ├── MbimCidProxyControl
+    ├── MbimCidSms
+    ├── MbimCidStk
+    ├── MbimCidUssd
+    ├── MbimCompression
+    ├── MbimContextIpType
+    ├── MbimContextType
+    ├── MbimCoreError
+    ├── MbimDeviceType
+    ├── MbimDssLinkState
+    ├── MbimEmergencyModeState
+    ├── MbimMessageCommandType
+    ├── MbimMessageType
+    ├── MbimNetworkIdleHintState
+    ├── MbimNwError
+    ├── MbimPacketServiceAction
+    ├── MbimPacketServiceState
+    ├── MbimPhonebookFlag
+    ├── MbimPhonebookState
+    ├── MbimPhonebookWriteFlag
+    ├── MbimPinFormat
+    ├── MbimPinMode
+    ├── MbimPinOperation
+    ├── MbimPinState
+    ├── MbimPinType
+    ├── MbimProtocolError
+    ├── MbimRadioSwitchState
+    ├── MbimRegisterAction
+    ├── MbimRegisterMode
+    ├── MbimRegisterState
+    ├── MbimService
+    ├── MbimSmsCdmaEncoding
+    ├── MbimSmsCdmaLang
+    ├── MbimSmsFlag
+    ├── MbimSmsFormat
+    ├── MbimSmsStatusFlag
+    ├── MbimSmsStatus
+    ├── MbimSmsStorageState
+    ├── MbimStatusError
+    ├── MbimStkPacProfile
+    ├── MbimStkPacType
+    ├── MbimSubscriberReadyState
+    ├── MbimUssdAction
+    ├── MbimUssdResponse
+    ├── MbimUssdSessionState
+    ├── MbimVisibleProvidersAction
+    ├── MbimVoiceCallState
+    ╰── MbimVoiceClass
     GFlags
-        MbimCellularClass
-        MbimCtrlCaps
-        MbimDataClass
-        MbimIPConfigurationAvailableFlag
-        MbimProviderState
-        MbimReadyInfoFlag
-        MbimRegistrationFlag
-        MbimSimClass
-        MbimSmsCaps
+    ├── MbimCellularClass
+    ├── MbimCtrlCaps
+    ├── MbimDataClass
+    ├── MbimIPConfigurationAvailableFlag
+    ├── MbimProviderState
+    ├── MbimReadyInfoFlag
+    ├── MbimRegistrationFlag
+    ├── MbimSimClass
+    ╰── MbimSmsCaps
     GBoxed
-        MbimMessage
+    ╰── MbimMessage
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file Binary files /tmp/kEtYJx4gkH/libmbim-1.6.0/docs/reference/libmbim-glib/html/right-insensitive.png and /tmp/HmEfIG1rvy/libmbim-1.10.0/docs/reference/libmbim-glib/html/right-insensitive.png differ Binary files /tmp/kEtYJx4gkH/libmbim-1.6.0/docs/reference/libmbim-glib/html/right.png and /tmp/HmEfIG1rvy/libmbim-1.10.0/docs/reference/libmbim-glib/html/right.png differ diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/html/style.css libmbim-1.10.0/docs/reference/libmbim-glib/html/style.css --- libmbim-1.6.0/docs/reference/libmbim-glib/html/style.css 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/html/style.css 2014-08-04 13:06:12.000000000 +0000 @@ -1,15 +1,23 @@ +body +{ + font-family: cantarell, sans-serif; +} .synopsis, .classsynopsis { /* tango:aluminium 1/2 */ background: #eeeeec; - border: solid 1px #d3d7cf; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); padding: 0.5em; } .programlisting { /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ background: #e6f3ff; border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0.5em; } .variablelist @@ -27,7 +35,6 @@ { position: relative; top: 0em ! important; - } /* this is needed so that the local anchors are displayed below the naviagtion */ div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] @@ -46,16 +53,20 @@ */ body { - padding-top: 3.2em; - padding-bottom: 20em; + padding-top: 5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; } /* style and size the navigation bar */ table.navigation#top { position: fixed; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; margin-top: 0; margin-bottom: 0; top: 0; @@ -65,21 +76,57 @@ } .navigation a, .navigation a:visited { - /* tango:scarlet red 3 */ - color: #a40000; + /* tango:sky blue 3 */ + color: #204a87; } .navigation a:hover { - /* tango:scarlet red 1 */ - color: #ef2929; + /* tango:sky blue 2 */ + color: #3465a4; } td.shortcuts { - /* tango:scarlet red 1 */ - color: #ef2929; + /* tango:sky blue 2 */ + color: #3465a4; font-size: 80%; white-space: nowrap; } + td.shortcuts .dim + { + color: #babdb6; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } } @media print { table.navigation { @@ -89,9 +136,8 @@ div.titlepage table.navigation { visibility: visible; display: table; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; + background: #e2e2e2; + border: solid 1px #babdb6; margin-top: 0; margin-bottom: 0; top: 0; @@ -102,7 +148,7 @@ .navigation .title { - font-size: 200%; + font-size: 120%; } div.gallery-float @@ -132,6 +178,67 @@ color: #729fcf; } +div.informaltable table +{ + border-collapse: separate; + border-spacing: 20px 3px; + border: none; +} + +div.informaltable table td, div.informaltable table th +{ + vertical-align: top; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + div.table table { border-collapse: collapse; @@ -154,14 +261,43 @@ background-color: #d3d7cf; } +h4 +{ + color: #555753; +} + hr { - /* tango:aluminium 3 */ - color: #babdb6; - background: #babdb6; + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; border: none 0px; height: 1px; clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dd > dl > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 1em; + padding-bottom: 0.5em; + font-weight: bold; +} + +.parameter +{ + font-style: normal; } .footer @@ -173,31 +309,70 @@ font-size: 80%; } +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + .warning { /* tango:orange 0/1 */ background: #ffeed9; + background: rgba(252, 175, 62, 0.1); border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); } .note { /* tango:chameleon 0/0.5 */ background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); +} +div.blockquote +{ + border-color: #eeeeec; } -.note, .warning +.note, .warning, div.blockquote { padding: 0.5em; border-width: 1px; border-style: solid; + margin: 2em; } -.note h3, .warning h3 +.note p, .warning p { - margin-top: 0.0em + margin: 0; } -.note p, .warning p + +div.warning h3.title, +div.note h3.title { - margin-bottom: 0.0em + display: none; +} + +p + div.section +{ + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; } /* blob links */ @@ -210,11 +385,22 @@ font-weight: normal; } +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + .annotation { /* tango:aluminium 5 */ color: #555753; - font-size: 80%; + font-weight: normal; +} + +.structfield +{ + font-style: normal; font-weight: normal; } @@ -237,6 +423,7 @@ .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0px; } @@ -246,19 +433,27 @@ padding: 0.5em; } .listing_lines { + /* this just adds visual clutter and + takes precious room from small screens */ + display: none; +} +.listing_lines { /* tango:sky blue 0.5 */ background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); /* tango:aluminium 6 */ color: #2e3436; } .listing_code { /* tango:sky blue 0 */ background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); } .listing_code .programlisting { /* override from previous */ border: none 0px; padding: 0px; + background: none; } .listing_lines pre, .listing_code pre { margin: 0px; Binary files /tmp/kEtYJx4gkH/libmbim-1.6.0/docs/reference/libmbim-glib/html/up-insensitive.png and /tmp/HmEfIG1rvy/libmbim-1.10.0/docs/reference/libmbim-glib/html/up-insensitive.png differ Binary files /tmp/kEtYJx4gkH/libmbim-1.6.0/docs/reference/libmbim-glib/html/up.png and /tmp/HmEfIG1rvy/libmbim-1.10.0/docs/reference/libmbim-glib/html/up.png differ diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib-common.sections libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib-common.sections --- libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib-common.sections 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib-common.sections 2014-07-31 16:44:12.000000000 +0000 @@ -20,10 +20,18 @@ MBIM_UUID_STK MBIM_UUID_AUTH MBIM_UUID_DSS +MBIM_UUID_MS_FIRMWARE_ID +MBIM_UUID_MS_HOST_SHUTDOWN +MBIM_UUID_PROXY_CONTROL mbim_service_get_string +mbim_service_lookup_name +mbim_register_custom_service +mbim_unregister_custom_service +mbim_service_id_is_custom mbim_context_type_get_string mbim_uuid_cmp +mbim_uuid_from_printable mbim_uuid_get_printable mbim_uuid_from_service mbim_uuid_to_service @@ -44,6 +52,9 @@ MbimCidStk MbimCidAuth MbimCidDss +MbimCidMsFirmwareId +MbimCidMsHostShutdown +MbimCidProxyControl mbim_cid_can_set mbim_cid_can_query @@ -56,6 +67,9 @@ mbim_cid_stk_get_string mbim_cid_auth_get_string mbim_cid_dss_get_string +mbim_cid_ms_firmware_id_get_string +mbim_cid_ms_host_shutdown_get_string +mbim_cid_proxy_control_get_string mbim_cid_basic_connect_build_string_from_mask mbim_cid_sms_build_string_from_mask @@ -64,6 +78,9 @@ mbim_cid_stk_build_string_from_mask mbim_cid_auth_build_string_from_mask mbim_cid_dss_build_string_from_mask +mbim_cid_ms_firmware_id_build_string_from_mask +mbim_cid_ms_host_shutdown_build_string_from_mask +mbim_cid_proxy_control_build_string_from_mask MBIM_TYPE_CID_AUTH MBIM_TYPE_CID_BASIC_CONNECT @@ -72,6 +89,9 @@ MBIM_TYPE_CID_SMS MBIM_TYPE_CID_STK MBIM_TYPE_CID_USSD +MBIM_TYPE_CID_MS_FIRMWARE_ID +MBIM_TYPE_CID_MS_HOST_SHUTDOWN +MBIM_TYPE_CID_PROXY_CONTROL mbim_cid_auth_get_type mbim_cid_basic_connect_get_type mbim_cid_dss_get_type @@ -79,6 +99,9 @@ mbim_cid_sms_get_type mbim_cid_stk_get_type mbim_cid_ussd_get_type +mbim_cid_ms_firmware_id_get_type +mbim_cid_ms_host_shutdown_get_type +mbim_cid_proxy_control_get_type
@@ -137,6 +160,10 @@ mbim_message_indicate_status_get_cid mbim_message_indicate_status_get_raw_information_buffer +mbim_message_open_done_new +mbim_message_close_done_new +mbim_message_proxy_control_configuration_response_parse +mbim_message_proxy_control_configuration_set_new mbim_message_type_build_string_from_mask mbim_message_command_type_build_string_from_mask @@ -147,6 +174,12 @@
mbim-device MbimDevice +MBIM_DEVICE_FILE +MBIM_DEVICE_IN_SESSION +MBIM_DEVICE_TRANSACTION_ID +MBIM_DEVICE_SIGNAL_REMOVED +MBIM_DEVICE_SIGNAL_INDICATE_STATUS +MBIM_DEVICE_SIGNAL_ERROR MbimDevice mbim_device_new mbim_device_new_finish @@ -157,6 +190,9 @@ mbim_device_is_open mbim_device_open mbim_device_open_finish +MbimDeviceOpenFlags +mbim_device_open_full +mbim_device_open_full_finish mbim_device_close mbim_device_close_finish mbim_device_close_force @@ -165,11 +201,6 @@ mbim_device_command_finish MbimDeviceClass -MBIM_DEVICE_FILE -MBIM_DEVICE_IN_SESSION -MBIM_DEVICE_TRANSACTION_ID -MBIM_DEVICE_SIGNAL_INDICATE_STATUS -MBIM_DEVICE_SIGNAL_ERROR MBIM_DEVICE MBIM_DEVICE_CLASS @@ -182,6 +213,28 @@
+mbim-proxy +MbimProxy +MBIM_PROXY_SOCKET_PATH +MBIM_PROXY_N_CLIENTS +MBIM_PROXY_N_DEVICES +MbimProxy +mbim_proxy_new +mbim_proxy_get_n_clients +mbim_proxy_get_n_devices + +MbimProxyClass +MBIM_PROXY +MBIM_PROXY_CLASS +MBIM_PROXY_GET_CLASS +MBIM_IS_PROXY +MBIM_IS_PROXY_CLASS +MBIM_TYPE_PROXY +MbimProxyPrivate +mbim_proxy_get_type +
+ +
mbim-enums MbimDeviceType MbimCellularClass @@ -475,3 +528,11 @@ mbim_utils_get_traces_enabled mbim_utils_set_traces_enabled
+ +
+mbim-compat +MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST +MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH +mbim_message_device_service_subscriber_list_response_parse +mbim_message_device_service_subscriber_list_set_new +
diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib-docs.xml libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib-docs.xml --- libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib-docs.xml 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib-docs.xml 2014-07-31 16:44:12.000000000 +0000 @@ -11,7 +11,7 @@ for libmbim-glib &version; - 2013 + 2013-2014 The libmbim-glib authors @@ -44,13 +44,14 @@ + - Services + Generic Services @@ -60,6 +61,17 @@ + + Other Services + + + + + + Compatibility + + + Object Hierarchy @@ -68,10 +80,6 @@ API Index - - Index of deprecated API - - diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib-sections.txt libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib-sections.txt --- libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib-sections.txt 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib-sections.txt 2014-08-04 13:06:12.000000000 +0000 @@ -20,10 +20,18 @@ MBIM_UUID_STK MBIM_UUID_AUTH MBIM_UUID_DSS +MBIM_UUID_MS_FIRMWARE_ID +MBIM_UUID_MS_HOST_SHUTDOWN +MBIM_UUID_PROXY_CONTROL mbim_service_get_string +mbim_service_lookup_name +mbim_register_custom_service +mbim_unregister_custom_service +mbim_service_id_is_custom mbim_context_type_get_string mbim_uuid_cmp +mbim_uuid_from_printable mbim_uuid_get_printable mbim_uuid_from_service mbim_uuid_to_service @@ -44,6 +52,9 @@ MbimCidStk MbimCidAuth MbimCidDss +MbimCidMsFirmwareId +MbimCidMsHostShutdown +MbimCidProxyControl mbim_cid_can_set mbim_cid_can_query @@ -56,6 +67,9 @@ mbim_cid_stk_get_string mbim_cid_auth_get_string mbim_cid_dss_get_string +mbim_cid_ms_firmware_id_get_string +mbim_cid_ms_host_shutdown_get_string +mbim_cid_proxy_control_get_string mbim_cid_basic_connect_build_string_from_mask mbim_cid_sms_build_string_from_mask @@ -64,6 +78,9 @@ mbim_cid_stk_build_string_from_mask mbim_cid_auth_build_string_from_mask mbim_cid_dss_build_string_from_mask +mbim_cid_ms_firmware_id_build_string_from_mask +mbim_cid_ms_host_shutdown_build_string_from_mask +mbim_cid_proxy_control_build_string_from_mask MBIM_TYPE_CID_AUTH MBIM_TYPE_CID_BASIC_CONNECT @@ -72,6 +89,9 @@ MBIM_TYPE_CID_SMS MBIM_TYPE_CID_STK MBIM_TYPE_CID_USSD +MBIM_TYPE_CID_MS_FIRMWARE_ID +MBIM_TYPE_CID_MS_HOST_SHUTDOWN +MBIM_TYPE_CID_PROXY_CONTROL mbim_cid_auth_get_type mbim_cid_basic_connect_get_type mbim_cid_dss_get_type @@ -79,6 +99,9 @@ mbim_cid_sms_get_type mbim_cid_stk_get_type mbim_cid_ussd_get_type +mbim_cid_ms_firmware_id_get_type +mbim_cid_ms_host_shutdown_get_type +mbim_cid_proxy_control_get_type
@@ -137,6 +160,10 @@ mbim_message_indicate_status_get_cid mbim_message_indicate_status_get_raw_information_buffer +mbim_message_open_done_new +mbim_message_close_done_new +mbim_message_proxy_control_configuration_response_parse +mbim_message_proxy_control_configuration_set_new mbim_message_type_build_string_from_mask mbim_message_command_type_build_string_from_mask @@ -147,6 +174,12 @@
mbim-device MbimDevice +MBIM_DEVICE_FILE +MBIM_DEVICE_IN_SESSION +MBIM_DEVICE_TRANSACTION_ID +MBIM_DEVICE_SIGNAL_REMOVED +MBIM_DEVICE_SIGNAL_INDICATE_STATUS +MBIM_DEVICE_SIGNAL_ERROR MbimDevice mbim_device_new mbim_device_new_finish @@ -157,6 +190,9 @@ mbim_device_is_open mbim_device_open mbim_device_open_finish +MbimDeviceOpenFlags +mbim_device_open_full +mbim_device_open_full_finish mbim_device_close mbim_device_close_finish mbim_device_close_force @@ -165,11 +201,6 @@ mbim_device_command_finish MbimDeviceClass -MBIM_DEVICE_FILE -MBIM_DEVICE_IN_SESSION -MBIM_DEVICE_TRANSACTION_ID -MBIM_DEVICE_SIGNAL_INDICATE_STATUS -MBIM_DEVICE_SIGNAL_ERROR MBIM_DEVICE MBIM_DEVICE_CLASS @@ -182,6 +213,28 @@
+mbim-proxy +MbimProxy +MBIM_PROXY_SOCKET_PATH +MBIM_PROXY_N_CLIENTS +MBIM_PROXY_N_DEVICES +MbimProxy +mbim_proxy_new +mbim_proxy_get_n_clients +mbim_proxy_get_n_devices + +MbimProxyClass +MBIM_PROXY +MBIM_PROXY_CLASS +MBIM_PROXY_GET_CLASS +MBIM_IS_PROXY +MBIM_IS_PROXY_CLASS +MBIM_TYPE_PROXY +MbimProxyPrivate +mbim_proxy_get_type +
+ +
mbim-enums MbimDeviceType MbimCellularClass @@ -477,6 +530,14 @@
+mbim-compat +MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST +MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH +mbim_message_device_service_subscriber_list_response_parse +mbim_message_device_service_subscriber_list_set_new +
+ +
mbim-basic-connect Basic Connect @@ -512,6 +573,7 @@ mbim_message_subscriber_ready_status_query_new mbim_message_subscriber_ready_status_response_parse +mbim_message_subscriber_ready_status_notification_parse mbim_message_radio_state_query_new @@ -537,6 +599,7 @@ mbim_message_preferred_providers_query_new mbim_message_preferred_providers_set_new mbim_message_preferred_providers_response_parse +mbim_message_preferred_providers_notification_parse mbim_message_visible_providers_query_new @@ -585,9 +648,9 @@ mbim_message_device_services_query_new mbim_message_device_services_response_parse - -mbim_message_device_service_subscriber_list_set_new -mbim_message_device_service_subscriber_list_response_parse + +mbim_message_device_service_subscribe_list_set_new +mbim_message_device_service_subscribe_list_response_parse mbim_message_packet_statistics_query_new @@ -602,6 +665,7 @@ mbim_message_emergency_mode_query_new mbim_message_emergency_mode_set_new mbim_message_emergency_mode_response_parse +mbim_message_emergency_mode_notification_parse mbim_message_ip_packet_filters_query_new @@ -612,6 +676,7 @@ mbim_message_multicarrier_providers_query_new mbim_message_multicarrier_providers_set_new mbim_message_multicarrier_providers_response_parse +mbim_message_multicarrier_providers_notification_parse
@@ -734,3 +799,20 @@ mbim_message_dss_connect_set_new mbim_message_dss_connect_response_parse
+ +
+mbim-ms-firmware-id +MS Firmware ID + + +mbim_message_ms_firmware_id_get_query_new +mbim_message_ms_firmware_id_get_response_parse +
+ +
+mbim-ms-host-shutdown +MS Host Shutdown + + +mbim_message_ms_host_shutdown_notify_set_new +
diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib.types libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib.types --- libmbim-1.6.0/docs/reference/libmbim-glib/libmbim-glib.types 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/libmbim-glib.types 2014-08-04 13:06:12.000000000 +0000 @@ -5,7 +5,10 @@ mbim_cid_auth_get_type mbim_cid_basic_connect_get_type mbim_cid_dss_get_type +mbim_cid_ms_firmware_id_get_type +mbim_cid_ms_host_shutdown_get_type mbim_cid_phonebook_get_type +mbim_cid_proxy_control_get_type mbim_cid_sms_get_type mbim_cid_stk_get_type mbim_cid_ussd_get_type @@ -37,6 +40,7 @@ mbim_pin_type_get_type mbim_protocol_error_get_type mbim_provider_state_get_type +mbim_proxy_get_type mbim_radio_switch_state_get_type mbim_ready_info_flag_get_type mbim_register_action_get_type diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/Makefile.am libmbim-1.10.0/docs/reference/libmbim-glib/Makefile.am --- libmbim-1.6.0/docs/reference/libmbim-glib/Makefile.am 2013-12-10 19:13:44.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/Makefile.am 2014-03-05 09:55:33.000000000 +0000 @@ -14,7 +14,9 @@ $(top_builddir)/src/libmbim-glib/generated/mbim-auth.sections \ $(top_builddir)/src/libmbim-glib/generated/mbim-phonebook.sections \ $(top_builddir)/src/libmbim-glib/generated/mbim-stk.sections \ - $(top_builddir)/src/libmbim-glib/generated/mbim-dss.sections + $(top_builddir)/src/libmbim-glib/generated/mbim-dss.sections \ + $(top_builddir)/src/libmbim-glib/generated/mbim-ms-firmware-id.sections \ + $(top_builddir)/src/libmbim-glib/generated/mbim-ms-host-shutdown.sections $(DOC_MODULE)-sections.mstamp: $(ALL_SECTIONS) $(AM_V_GEN) \ diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/Makefile.in libmbim-1.10.0/docs/reference/libmbim-glib/Makefile.in --- libmbim-1.6.0/docs/reference/libmbim-glib/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -147,6 +147,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -173,6 +174,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -272,7 +275,9 @@ $(top_builddir)/src/libmbim-glib/generated/mbim-auth.sections \ $(top_builddir)/src/libmbim-glib/generated/mbim-phonebook.sections \ $(top_builddir)/src/libmbim-glib/generated/mbim-stk.sections \ - $(top_builddir)/src/libmbim-glib/generated/mbim-dss.sections + $(top_builddir)/src/libmbim-glib/generated/mbim-dss.sections \ + $(top_builddir)/src/libmbim-glib/generated/mbim-ms-firmware-id.sections \ + $(top_builddir)/src/libmbim-glib/generated/mbim-ms-host-shutdown.sections BUILT_SOURCES = $(DOC_MODULE)-sections.mstamp @@ -363,19 +368,19 @@ $(DOC_MODULE)-unused.txt CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt \ - $(DOC_MODULE)-overrides.txt $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-undocumented.txt $(DOC_MODULE)-overrides.txt \ - $(DOC_MODULE)-unused.txt $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites $(DOC_MODULE).signals \ - $(DOC_MODULE).types $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-sections.mstamp *.stamp -rf xml html tmpl \ - $(NULL) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + gtkdoc-check.test $(DOC_MODULE)-decl-list.txt \ + $(DOC_MODULE)-decl.txt $(DOC_MODULE)-overrides.txt \ + $(DOC_MODULE)-undeclared.txt $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-overrides.txt $(DOC_MODULE)-unused.txt \ + $(DOC_MODULE).args $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt $(DOC_MODULE)-sections.mstamp \ + *.stamp -rf xml html tmpl $(NULL) +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp #### setup #### GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) @@ -498,6 +503,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: $(BUILT_SOURCES) @@ -623,8 +629,15 @@ cat $(ALL_SECTIONS) > $(DOC_MODULE)-sections.txt && \ touch $(DOC_MODULE)-sections.mstamp -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -635,17 +648,19 @@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file` ;\ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ - { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -675,7 +690,7 @@ $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi $(AM_V_at)touch tmpl-build.stamp @@ -687,7 +702,7 @@ @true sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -749,6 +764,9 @@ clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -794,12 +812,14 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/tmpl @mkdir $(distdir)/html @-cp ./tmpl/*.sgml $(distdir)/tmpl diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-basic-connect.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-basic-connect.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-basic-connect.sgml 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-basic-connect.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -230,6 +230,22 @@ @Returns: + + + + + +@message: +@ready_state: +@subscriber_id: +@sim_icc_id: +@ready_info: +@telephone_numbers_count: +@telephone_numbers: +@error: +@Returns: + + @@ -399,6 +415,18 @@ @Returns: + + + + + +@message: +@providers_count: +@providers: +@error: +@Returns: + + @@ -815,7 +843,7 @@ @Returns: - + @@ -826,7 +854,7 @@ @Returns: - + @@ -925,6 +953,17 @@ @Returns: + + + + + +@message: +@state: +@error: +@Returns: + + @@ -986,6 +1025,18 @@ + +@message: +@providers_count: +@providers: +@error: +@Returns: + + + + + + @message: @providers_count: diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-cid.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-cid.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-cid.sgml 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-cid.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -44,7 +44,7 @@ @MBIM_CID_BASIC_CONNECT_SERVICE_ACTIVATION: @MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION: @MBIM_CID_BASIC_CONNECT_DEVICE_SERVICES: -@MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST: +@MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST: @MBIM_CID_BASIC_CONNECT_PACKET_STATISTICS: @MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT: @MBIM_CID_BASIC_CONNECT_EMERGENCY_MODE: @@ -110,6 +110,30 @@ @MBIM_CID_DSS_UNKNOWN: @MBIM_CID_DSS_CONNECT: + + + + + +@MBIM_CID_MS_FIRMWARE_ID_UNKNOWN: +@MBIM_CID_MS_FIRMWARE_ID_GET: + + + + + + +@MBIM_CID_MS_HOST_SHUTDOWN_UNKNOWN: +@MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY: + + + + + + +@MBIM_CID_PROXY_CONTROL_UNKNOWN: +@MBIM_CID_PROXY_CONTROL_CONFIGURATION: + @@ -208,6 +232,33 @@ + +@val: +@Returns: + + + + + + + +@val: +@Returns: + + + + + + + +@val: +@Returns: + + + + + + @val: @Returns: diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-compat.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-compat.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-compat.sgml 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-compat.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -0,0 +1,61 @@ + +mbim-compat + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@message: +@events_count: +@events: +@error: +@Returns: + + + + + + + +@events_count: +@events: +@error: +@Returns: + + diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-device.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-device.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-device.sgml 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-device.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -22,6 +22,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,6 +86,13 @@ @mbimdevice: the object which received the signal. @arg1: + + + + + +@mbimdevice: the object which received the signal. + @@ -141,6 +190,38 @@ + +@self: +@res: +@error: +@Returns: + + + + + + + +@MBIM_DEVICE_OPEN_FLAGS_NONE: +@MBIM_DEVICE_OPEN_FLAGS_PROXY: + + + + + + +@self: +@flags: +@timeout: +@cancellable: +@callback: +@user_data: + + + + + + @self: @res: diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-enums.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-enums.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-enums.sgml 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-enums.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -215,17 +215,39 @@ @MBIM_NW_ERROR_UNKNOWN: @MBIM_NW_ERROR_IMSI_UNKNOWN_IN_HLR: +@MBIM_NW_ERROR_ILLEGAL_MS: @MBIM_NW_ERROR_IMSI_UNKNOWN_IN_VLR: +@MBIM_NW_ERROR_IMEI_NOT_ACCEPTED: @MBIM_NW_ERROR_ILLEGAL_ME: @MBIM_NW_ERROR_GPRS_NOT_ALLOWED: @MBIM_NW_ERROR_GPRS_AND_NON_GPRS_NOT_ALLOWED: +@MBIM_NW_ERROR_MS_IDENTITY_NOT_DERIVED_BY_NETWORK: +@MBIM_NW_ERROR_IMPLICITLY_DETACHED: @MBIM_NW_ERROR_PLMN_NOT_ALLOWED: @MBIM_NW_ERROR_LOCATION_AREA_NOT_ALLOWED: @MBIM_NW_ERROR_ROAMING_NOT_ALLOWED_IN_LOCATION_AREA: @MBIM_NW_ERROR_GPRS_NOT_ALLOWED_IN_PLMN: @MBIM_NW_ERROR_NO_CELLS_IN_LOCATION_AREA: +@MBIM_NW_ERROR_MSC_TEMPORARILY_NOT_REACHABLE: @MBIM_NW_ERROR_NETWORK_FAILURE: +@MBIM_NW_ERROR_MAC_FAILURE: +@MBIM_NW_ERROR_SYNCH_FAILURE: @MBIM_NW_ERROR_CONGESTION: +@MBIM_NW_ERROR_GSM_AUTHENTICATION_UNACCEPTABLE: +@MBIM_NW_ERROR_NOT_AUTHORIZED_FOR_CSG: +@MBIM_NW_ERROR_MISSING_OR_UNKNOWN_APN: +@MBIM_NW_ERROR_SERVICE_OPTION_NOT_SUPPORTED: +@MBIM_NW_ERROR_REQUESTED_SERVICE_OPTION_NOT_SUBSCRIBED: +@MBIM_NW_ERROR_SERVICE_OPTION_TEMPORARILY_OUT_OF_ORDER: +@MBIM_NW_ERROR_NO_PDP_CONTEXT_ACTIVATED: +@MBIM_NW_ERROR_SEMANTICALLY_INCORRECT_MESSAGE: +@MBIM_NW_ERROR_INVALID_MANDATORY_INFORMATION: +@MBIM_NW_ERROR_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED: +@MBIM_NW_ERROR_MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE: +@MBIM_NW_ERROR_INFORMATION_ELEMENT_NON_EXISTENT_OR_NOT_IMPLEMENTED: +@MBIM_NW_ERROR_CONDITIONAL_IE_ERROR: +@MBIM_NW_ERROR_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE: +@MBIM_NW_ERROR_PROTOCOL_ERROR_UNSPECIFIED: @@ -264,7 +286,7 @@ @MBIM_REGISTRATION_FLAG_NONE: @MBIM_REGISTRATION_FLAG_MANUAL_SELECTION_NOT_AVAILABLE: -@MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH: +@MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH: diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-ms-firmware-id.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-ms-firmware-id.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-ms-firmware-id.sgml 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-ms-firmware-id.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -0,0 +1,44 @@ + +MS Firmware ID + + + + + + + + + + + + + + + + + + + + + + + + + + + +@error: +@Returns: + + + + + + + +@message: +@firmware_id: +@error: +@Returns: + + diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-ms-host-shutdown.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-ms-host-shutdown.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-ms-host-shutdown.sgml 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-ms-host-shutdown.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -0,0 +1,33 @@ + +MS Host Shutdown + + + + + + + + + + + + + + + + + + + + + + + + + + + +@error: +@Returns: + + diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-proxy.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-proxy.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-proxy.sgml 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-proxy.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -0,0 +1,88 @@ + +MbimProxy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@error: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-stk.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-stk.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-stk.sgml 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-stk.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -36,7 +36,7 @@ -@pac_hostcontrol: +@pac_host_control: @error: @Returns: diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-uuid.sgml libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-uuid.sgml --- libmbim-1.6.0/docs/reference/libmbim-glib/tmpl/mbim-uuid.sgml 2013-12-10 20:33:47.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/tmpl/mbim-uuid.sgml 2014-08-04 13:06:12.000000000 +0000 @@ -35,6 +35,9 @@ @MBIM_SERVICE_STK: @MBIM_SERVICE_AUTH: @MBIM_SERVICE_DSS: +@MBIM_SERVICE_MS_FIRMWARE_ID: +@MBIM_SERVICE_MS_HOST_SHUTDOWN: +@MBIM_SERVICE_PROXY_CONTROL: @@ -114,6 +117,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -123,6 +147,43 @@ @Returns: + + + + + +@service: +@Returns: + + + + + + + +@uuid: +@nickname: +@Returns: + + + + + + + +@id: +@Returns: + + + + + + + +@id: +@Returns: + + @@ -142,6 +203,16 @@ @Returns: + + + + + +@str: +@uuid: +@Returns: + + diff -Nru libmbim-1.6.0/docs/reference/libmbim-glib/version.xml libmbim-1.10.0/docs/reference/libmbim-glib/version.xml --- libmbim-1.6.0/docs/reference/libmbim-glib/version.xml 2013-12-10 20:25:16.000000000 +0000 +++ libmbim-1.10.0/docs/reference/libmbim-glib/version.xml 2014-08-04 13:00:38.000000000 +0000 @@ -1 +1 @@ -1.6.0 +1.10.0 diff -Nru libmbim-1.6.0/docs/reference/Makefile.in libmbim-1.10.0/docs/reference/Makefile.in --- libmbim-1.6.0/docs/reference/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/docs/reference/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -200,6 +200,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -226,6 +227,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ diff -Nru libmbim-1.6.0/gtk-doc.make libmbim-1.10.0/gtk-doc.make --- libmbim-1.6.0/gtk-doc.make 2013-05-26 12:37:34.000000000 +0000 +++ libmbim-1.10.0/gtk-doc.make 2014-02-16 15:19:33.000000000 +0000 @@ -49,9 +49,13 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test -if ENABLE_GTK_DOC if GTK_DOC_BUILD_HTML HTML_BUILD_STAMP=html-build.stamp else @@ -63,9 +67,11 @@ PDF_BUILD_STAMP= endif -all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -else -all-local: +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +if ENABLE_GTK_DOC +all-local: all-gtk-doc endif docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -83,12 +89,14 @@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file` ;\ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ - { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp @@ -103,7 +111,7 @@ GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -139,7 +147,7 @@ $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi $(AM_V_at)touch tmpl-build.stamp @@ -157,7 +165,7 @@ GTK_DOC_V_XML_0=@echo " DOC Building XML"; sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -235,6 +243,9 @@ clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -280,15 +291,17 @@ # # Require gtk-doc when making dist # -if ENABLE_GTK_DOC +if HAVE_GTK_DOC dist-check-gtkdoc: docs else dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" + @echo "*** gtk-doc is needed to run 'make dist'. ***" + @echo "*** gtk-doc was not found when 'configure' ran. ***" + @echo "*** please install gtk-doc and rerun 'configure'. ***" @false endif -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/tmpl @mkdir $(distdir)/html @-cp ./tmpl/*.sgml $(distdir)/tmpl diff -Nru libmbim-1.6.0/INSTALL libmbim-1.10.0/INSTALL --- libmbim-1.6.0/INSTALL 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/INSTALL 2014-08-04 13:00:32.000000000 +0000 @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff -Nru libmbim-1.6.0/m4/gtk-doc.m4 libmbim-1.10.0/m4/gtk-doc.m4 --- libmbim-1.6.0/m4/gtk-doc.m4 2012-12-14 16:23:01.000000000 +0000 +++ libmbim-1.10.0/m4/gtk-doc.m4 2014-02-16 15:19:32.000000000 +0000 @@ -1,6 +1,6 @@ dnl -*- mode: autoconf -*- -# serial 1 +# serial 2 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) @@ -10,8 +10,24 @@ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) @@ -28,22 +44,22 @@ [use gtk-doc to build documentation [[default=no]]]),, [enable_gtk_doc=no]) - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - fi - AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + dnl enable/disable output formats AC_ARG_ENABLE([gtk-doc-html], AS_HELP_STRING([--enable-gtk-doc-html], @@ -63,6 +79,7 @@ fi AC_SUBST([AM_DEFAULT_VERBOSITY]) + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) diff -Nru libmbim-1.6.0/m4/libtool.m4 libmbim-1.10.0/m4/libtool.m4 --- libmbim-1.6.0/m4/libtool.m4 2013-12-10 20:25:06.000000000 +0000 +++ libmbim-1.10.0/m4/libtool.m4 2014-08-04 13:00:28.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,10 +1326,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1348,10 +1345,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -2675,14 +2669,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on diff -Nru libmbim-1.6.0/Makefile.am libmbim-1.10.0/Makefile.am --- libmbim-1.6.0/Makefile.am 2013-12-10 18:39:02.000000000 +0000 +++ libmbim-1.10.0/Makefile.am 2014-03-05 10:23:39.000000000 +0000 @@ -5,4 +5,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -EXTRA_DIST = gtester.make +EXTRA_DIST = \ + gtester.make \ + COPYING.LIB diff -Nru libmbim-1.6.0/Makefile.in libmbim-1.10.0/Makefile.in --- libmbim-1.6.0/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/Makefile.in 2014-08-04 13:00:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -81,8 +81,8 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in COPYING compile config.guess config.sub \ - install-sh missing ltmain.sh + $(srcdir)/config.h.in COPYING COPYING.LIB compile config.guess \ + config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -224,6 +224,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -250,6 +251,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -336,7 +339,10 @@ SUBDIRS = . build-aux data src utils docs ACLOCAL_AMFLAGS = -I m4 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -EXTRA_DIST = gtester.make +EXTRA_DIST = \ + gtester.make \ + COPYING.LIB + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -377,8 +383,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -586,10 +592,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -631,9 +643,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -Nru libmbim-1.6.0/missing libmbim-1.10.0/missing --- libmbim-1.6.0/missing 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/missing 2014-08-04 13:00:32.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -Nru libmbim-1.6.0/NEWS libmbim-1.10.0/NEWS --- libmbim-1.6.0/NEWS 2013-12-10 20:24:56.000000000 +0000 +++ libmbim-1.10.0/NEWS 2014-08-04 12:58:47.000000000 +0000 @@ -1,4 +1,50 @@ +Overview of changes in libmbim 1.10 +---------------------------------------- + + * API break: Flag values in 'MbimRegistrationFlag' were updated to match the + ones in the MBIM documentation. + + * Implemented a new 'mbim-proxy', which allows sharing a single MBIM control + port among different processes. The usage of the proxy is optional, and can + be requested by specifying the MBIM_DEVICE_OPEN_FLAGS_PROXY flag in the new + mbim_device_open_full() method. The 'mbimcli' command line tool was also + extended with a new '--device-open-proxy,-p' option, to allow requesting the + use of the proxy process. + + * New 'removed' signal added to the MbimDevice, to notify when the underlying + connection to the device is lost (e.g. lost connection to the mbim-proxy, or + lost access to the MBIM control port). + + * Added support for registering and using custom services. + + * Added additional GMM cause codes to MbimNwError. + + * Transactions are now matched not only by ID but also by type. + + * Several other minor improvements and fixes. + + +Overview of changes in libmbim 1.8 +---------------------------------------- + + * Added support for additional MBIM messages: + MBIM_CID_MS_FIRMWARE_ID_GET + MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY + + * Updated mbimcli with new commands: + --set-radio-state + --ms-query-firmware-id + --ms-notify-host-shutdown + --dss-connect + --dss-disconnect + + * Several enums and functions were renamed, and marked as deprecated. A small + layer is given to provide backwards compatibility. + + * Several other minor improvements and fixes. + + Overview of changes in libmbim 1.6 ---------------------------------------- diff -Nru libmbim-1.6.0/README libmbim-1.10.0/README --- libmbim-1.6.0/README 2013-09-13 14:27:28.000000000 +0000 +++ libmbim-1.10.0/README 2014-03-05 10:17:20.000000000 +0000 @@ -1,2 +1,6 @@ libmbim is a glib-based library for talking to WWAN modems and devices which -speak the Mobile Broadband Interface Model (MBIM) protocol. \ No newline at end of file +speak the Mobile Broadband Interface Model (MBIM) protocol. + +License: + The libmbim-glib library is released under the LGPLv2+ license. + The mbimcli tool is released under the GPLv2+ license. diff -Nru libmbim-1.6.0/src/libmbim-glib/generated/Makefile.am libmbim-1.10.0/src/libmbim-glib/generated/Makefile.am --- libmbim-1.6.0/src/libmbim-glib/generated/Makefile.am 2013-12-10 19:13:44.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/generated/Makefile.am 2014-07-31 16:44:12.000000000 +0000 @@ -9,7 +9,10 @@ mbim-auth.h \ mbim-phonebook.h \ mbim-stk.h \ - mbim-dss.h + mbim-dss.h \ + mbim-ms-firmware-id.h \ + mbim-ms-host-shutdown.h \ + mbim-proxy-control.h GENERATED_C = \ mbim-error-types.c \ @@ -21,7 +24,10 @@ mbim-auth.c \ mbim-phonebook.c \ mbim-stk.c \ - mbim-dss.c + mbim-dss.c \ + mbim-ms-firmware-id.c \ + mbim-ms-host-shutdown.c \ + mbim-proxy-control.c GENERATED_SECTIONS = \ mbim-basic-connect.sections \ @@ -30,7 +36,10 @@ mbim-auth.sections \ mbim-phonebook.sections \ mbim-stk.sections \ - mbim-dss.sections + mbim-dss.sections \ + mbim-ms-firmware-id.sections \ + mbim-ms-host-shutdown.sections \ + mbim-proxy-control.sections # Error types mbim-error-types.h: $(top_srcdir)/src/libmbim-glib/mbim-errors.h $(top_srcdir)/build-aux/templates/mbim-error-types-template.h @@ -134,6 +143,33 @@ --input $(top_srcdir)/data/mbim-service-dss.json \ --output mbim-dss +# Microsoft Firmware ID service +mbim-ms-firmware-id.h mbim-ms-firmware-id.c mbim-ms-firmware-id.sections: $(top_srcdir)/data/mbim-service-ms-firmware-id.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen + $(AM_V_GEN) \ + rm -f mbim-ms-firmware-id.h && \ + rm -f mbim-ms-firmware-id.c && \ + $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \ + --input $(top_srcdir)/data/mbim-service-ms-firmware-id.json \ + --output mbim-ms-firmware-id + +# Microsoft Host Shutdown service +mbim-ms-host-shutdown.h mbim-ms-host-shutdown.c mbim-ms-host-shutdown.sections: $(top_srcdir)/data/mbim-service-ms-host-shutdown.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen + $(AM_V_GEN) \ + rm -f mbim-ms-host-shutdown.h && \ + rm -f mbim-ms-host-shutdown.c && \ + $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \ + --input $(top_srcdir)/data/mbim-service-ms-host-shutdown.json \ + --output mbim-ms-host-shutdown + +# Proxy Control service +mbim-proxy-control.h mbim-proxy-control.c mbim-proxy-control.sections: $(top_srcdir)/data/mbim-service-proxy-control.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen + $(AM_V_GEN) \ + rm -f mbim-proxy-control.h && \ + rm -f mbim-proxy-control.c && \ + $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \ + --input $(top_srcdir)/data/mbim-service-proxy-control.json \ + --output mbim-proxy-control + BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) nodist_libmbim_glib_generated_la_SOURCES = \ diff -Nru libmbim-1.6.0/src/libmbim-glib/generated/Makefile.in libmbim-1.10.0/src/libmbim-glib/generated/Makefile.in --- libmbim-1.6.0/src/libmbim-glib/generated/Makefile.in 2013-12-10 20:25:13.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/generated/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -107,7 +107,10 @@ libmbim_glib_generated_la-mbim-auth.lo \ libmbim_glib_generated_la-mbim-phonebook.lo \ libmbim_glib_generated_la-mbim-stk.lo \ - libmbim_glib_generated_la-mbim-dss.lo + libmbim_glib_generated_la-mbim-dss.lo \ + libmbim_glib_generated_la-mbim-ms-firmware-id.lo \ + libmbim_glib_generated_la-mbim-ms-host-shutdown.lo \ + libmbim_glib_generated_la-mbim-proxy-control.lo nodist_libmbim_glib_generated_la_OBJECTS = $(am__objects_1) \ $(am__objects_2) libmbim_glib_generated_la_OBJECTS = \ @@ -234,6 +237,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -260,6 +264,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -353,7 +359,10 @@ mbim-auth.h \ mbim-phonebook.h \ mbim-stk.h \ - mbim-dss.h + mbim-dss.h \ + mbim-ms-firmware-id.h \ + mbim-ms-host-shutdown.h \ + mbim-proxy-control.h GENERATED_C = \ mbim-error-types.c \ @@ -365,7 +374,10 @@ mbim-auth.c \ mbim-phonebook.c \ mbim-stk.c \ - mbim-dss.c + mbim-dss.c \ + mbim-ms-firmware-id.c \ + mbim-ms-host-shutdown.c \ + mbim-proxy-control.c GENERATED_SECTIONS = \ mbim-basic-connect.sections \ @@ -374,7 +386,10 @@ mbim-auth.sections \ mbim-phonebook.sections \ mbim-stk.sections \ - mbim-dss.sections + mbim-dss.sections \ + mbim-ms-firmware-id.sections \ + mbim-ms-host-shutdown.sections \ + mbim-proxy-control.sections # Enum/Flag types @@ -465,7 +480,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-enum-types.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-error-quarks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-error-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-ms-firmware-id.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-ms-host-shutdown.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-phonebook.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-proxy-control.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-sms.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-stk.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_generated_la-mbim-ussd.Plo@am__quote@ @@ -475,14 +493,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -561,6 +579,27 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_generated_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_generated_la-mbim-dss.lo `test -f 'mbim-dss.c' || echo '$(srcdir)/'`mbim-dss.c +libmbim_glib_generated_la-mbim-ms-firmware-id.lo: mbim-ms-firmware-id.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_generated_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmbim_glib_generated_la-mbim-ms-firmware-id.lo -MD -MP -MF $(DEPDIR)/libmbim_glib_generated_la-mbim-ms-firmware-id.Tpo -c -o libmbim_glib_generated_la-mbim-ms-firmware-id.lo `test -f 'mbim-ms-firmware-id.c' || echo '$(srcdir)/'`mbim-ms-firmware-id.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmbim_glib_generated_la-mbim-ms-firmware-id.Tpo $(DEPDIR)/libmbim_glib_generated_la-mbim-ms-firmware-id.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-ms-firmware-id.c' object='libmbim_glib_generated_la-mbim-ms-firmware-id.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_generated_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_generated_la-mbim-ms-firmware-id.lo `test -f 'mbim-ms-firmware-id.c' || echo '$(srcdir)/'`mbim-ms-firmware-id.c + +libmbim_glib_generated_la-mbim-ms-host-shutdown.lo: mbim-ms-host-shutdown.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_generated_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmbim_glib_generated_la-mbim-ms-host-shutdown.lo -MD -MP -MF $(DEPDIR)/libmbim_glib_generated_la-mbim-ms-host-shutdown.Tpo -c -o libmbim_glib_generated_la-mbim-ms-host-shutdown.lo `test -f 'mbim-ms-host-shutdown.c' || echo '$(srcdir)/'`mbim-ms-host-shutdown.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmbim_glib_generated_la-mbim-ms-host-shutdown.Tpo $(DEPDIR)/libmbim_glib_generated_la-mbim-ms-host-shutdown.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-ms-host-shutdown.c' object='libmbim_glib_generated_la-mbim-ms-host-shutdown.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_generated_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_generated_la-mbim-ms-host-shutdown.lo `test -f 'mbim-ms-host-shutdown.c' || echo '$(srcdir)/'`mbim-ms-host-shutdown.c + +libmbim_glib_generated_la-mbim-proxy-control.lo: mbim-proxy-control.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_generated_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmbim_glib_generated_la-mbim-proxy-control.lo -MD -MP -MF $(DEPDIR)/libmbim_glib_generated_la-mbim-proxy-control.Tpo -c -o libmbim_glib_generated_la-mbim-proxy-control.lo `test -f 'mbim-proxy-control.c' || echo '$(srcdir)/'`mbim-proxy-control.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmbim_glib_generated_la-mbim-proxy-control.Tpo $(DEPDIR)/libmbim_glib_generated_la-mbim-proxy-control.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-proxy-control.c' object='libmbim_glib_generated_la-mbim-proxy-control.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_generated_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_generated_la-mbim-proxy-control.lo `test -f 'mbim-proxy-control.c' || echo '$(srcdir)/'`mbim-proxy-control.c + mostlyclean-libtool: -rm -f *.lo @@ -895,6 +934,33 @@ --input $(top_srcdir)/data/mbim-service-dss.json \ --output mbim-dss +# Microsoft Firmware ID service +mbim-ms-firmware-id.h mbim-ms-firmware-id.c mbim-ms-firmware-id.sections: $(top_srcdir)/data/mbim-service-ms-firmware-id.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen + $(AM_V_GEN) \ + rm -f mbim-ms-firmware-id.h && \ + rm -f mbim-ms-firmware-id.c && \ + $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \ + --input $(top_srcdir)/data/mbim-service-ms-firmware-id.json \ + --output mbim-ms-firmware-id + +# Microsoft Host Shutdown service +mbim-ms-host-shutdown.h mbim-ms-host-shutdown.c mbim-ms-host-shutdown.sections: $(top_srcdir)/data/mbim-service-ms-host-shutdown.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen + $(AM_V_GEN) \ + rm -f mbim-ms-host-shutdown.h && \ + rm -f mbim-ms-host-shutdown.c && \ + $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \ + --input $(top_srcdir)/data/mbim-service-ms-host-shutdown.json \ + --output mbim-ms-host-shutdown + +# Proxy Control service +mbim-proxy-control.h mbim-proxy-control.c mbim-proxy-control.sections: $(top_srcdir)/data/mbim-service-proxy-control.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen + $(AM_V_GEN) \ + rm -f mbim-proxy-control.h && \ + rm -f mbim-proxy-control.c && \ + $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \ + --input $(top_srcdir)/data/mbim-service-proxy-control.json \ + --output mbim-proxy-control + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru libmbim-1.6.0/src/libmbim-glib/libmbim-glib.h libmbim-1.10.0/src/libmbim-glib/libmbim-glib.h --- libmbim-1.6.0/src/libmbim-glib/libmbim-glib.h 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/libmbim-glib.h 2014-07-31 16:44:12.000000000 +0000 @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_H_ @@ -34,6 +34,7 @@ #include "mbim-message.h" #include "mbim-device.h" #include "mbim-enums.h" +#include "mbim-proxy.h" /* generated */ #include "mbim-enum-types.h" @@ -45,5 +46,10 @@ #include "mbim-phonebook.h" #include "mbim-stk.h" #include "mbim-dss.h" +#include "mbim-ms-firmware-id.h" +#include "mbim-ms-host-shutdown.h" + +/* backwards compatibility */ +#include "mbim-compat.h" #endif /* _LIBMBIM_GLIB_H_ */ diff -Nru libmbim-1.6.0/src/libmbim-glib/Makefile.am libmbim-1.10.0/src/libmbim-glib/Makefile.am --- libmbim-1.6.0/src/libmbim-glib/Makefile.am 2013-12-10 18:39:49.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/Makefile.am 2014-07-31 16:44:12.000000000 +0000 @@ -12,6 +12,7 @@ -I$(top_builddir)/src/libmbim-glib \ -I$(top_builddir)/src/libmbim-glib/generated \ -DLIBMBIM_GLIB_COMPILATION \ + -DLIBEXEC_PATH=\""$(libexecdir)"\" \ -DG_LOG_DOMAIN=\"Mbim\" libmbim_glib_core_la_SOURCES = \ mbim-version.h \ @@ -21,7 +22,10 @@ mbim-uuid.h mbim-uuid.c \ mbim-cid.h mbim-cid.c \ mbim-message-private.h mbim-message.h mbim-message.c \ - mbim-device.h mbim-device.c + mbim-device.h mbim-device.c \ + mbim-compat.h mbim-compat.c \ + mbim-proxy.h mbim-proxy.c \ + mbim-proxy-helpers.h mbim-proxy-helpers.c # Final installable library lib_LTLIBRARIES = libmbim-glib.la @@ -48,7 +52,9 @@ mbim-uuid.h \ mbim-cid.h \ mbim-message.h \ - mbim-device.h + mbim-device.h \ + mbim-compat.h \ + mbim-proxy.h EXTRA_DIST = \ mbim-version.h.in diff -Nru libmbim-1.6.0/src/libmbim-glib/Makefile.in libmbim-1.10.0/src/libmbim-glib/Makefile.in --- libmbim-1.6.0/src/libmbim-glib/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -129,7 +129,10 @@ libmbim_glib_core_la-mbim-uuid.lo \ libmbim_glib_core_la-mbim-cid.lo \ libmbim_glib_core_la-mbim-message.lo \ - libmbim_glib_core_la-mbim-device.lo + libmbim_glib_core_la-mbim-device.lo \ + libmbim_glib_core_la-mbim-compat.lo \ + libmbim_glib_core_la-mbim-proxy.lo \ + libmbim_glib_core_la-mbim-proxy-helpers.lo libmbim_glib_core_la_OBJECTS = $(am_libmbim_glib_core_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -278,6 +281,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -304,6 +308,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -400,6 +406,7 @@ -I$(top_builddir)/src/libmbim-glib \ -I$(top_builddir)/src/libmbim-glib/generated \ -DLIBMBIM_GLIB_COMPILATION \ + -DLIBEXEC_PATH=\""$(libexecdir)"\" \ -DG_LOG_DOMAIN=\"Mbim\" libmbim_glib_core_la_SOURCES = \ @@ -410,7 +417,10 @@ mbim-uuid.h mbim-uuid.c \ mbim-cid.h mbim-cid.c \ mbim-message-private.h mbim-message.h mbim-message.c \ - mbim-device.h mbim-device.c + mbim-device.h mbim-device.c \ + mbim-compat.h mbim-compat.c \ + mbim-proxy.h mbim-proxy.c \ + mbim-proxy-helpers.h mbim-proxy-helpers.c # Final installable library @@ -436,7 +446,9 @@ mbim-uuid.h \ mbim-cid.h \ mbim-message.h \ - mbim-device.h + mbim-device.h \ + mbim-compat.h \ + mbim-proxy.h EXTRA_DIST = \ mbim-version.h.in @@ -537,8 +549,11 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-cid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-compat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-device.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-message.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-proxy-helpers.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-proxy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmbim_glib_core_la-mbim-uuid.Plo@am__quote@ @@ -547,14 +562,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -598,6 +613,27 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_core_la-mbim-device.lo `test -f 'mbim-device.c' || echo '$(srcdir)/'`mbim-device.c +libmbim_glib_core_la-mbim-compat.lo: mbim-compat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmbim_glib_core_la-mbim-compat.lo -MD -MP -MF $(DEPDIR)/libmbim_glib_core_la-mbim-compat.Tpo -c -o libmbim_glib_core_la-mbim-compat.lo `test -f 'mbim-compat.c' || echo '$(srcdir)/'`mbim-compat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmbim_glib_core_la-mbim-compat.Tpo $(DEPDIR)/libmbim_glib_core_la-mbim-compat.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-compat.c' object='libmbim_glib_core_la-mbim-compat.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_core_la-mbim-compat.lo `test -f 'mbim-compat.c' || echo '$(srcdir)/'`mbim-compat.c + +libmbim_glib_core_la-mbim-proxy.lo: mbim-proxy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmbim_glib_core_la-mbim-proxy.lo -MD -MP -MF $(DEPDIR)/libmbim_glib_core_la-mbim-proxy.Tpo -c -o libmbim_glib_core_la-mbim-proxy.lo `test -f 'mbim-proxy.c' || echo '$(srcdir)/'`mbim-proxy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmbim_glib_core_la-mbim-proxy.Tpo $(DEPDIR)/libmbim_glib_core_la-mbim-proxy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-proxy.c' object='libmbim_glib_core_la-mbim-proxy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_core_la-mbim-proxy.lo `test -f 'mbim-proxy.c' || echo '$(srcdir)/'`mbim-proxy.c + +libmbim_glib_core_la-mbim-proxy-helpers.lo: mbim-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmbim_glib_core_la-mbim-proxy-helpers.lo -MD -MP -MF $(DEPDIR)/libmbim_glib_core_la-mbim-proxy-helpers.Tpo -c -o libmbim_glib_core_la-mbim-proxy-helpers.lo `test -f 'mbim-proxy-helpers.c' || echo '$(srcdir)/'`mbim-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmbim_glib_core_la-mbim-proxy-helpers.Tpo $(DEPDIR)/libmbim_glib_core_la-mbim-proxy-helpers.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-proxy-helpers.c' object='libmbim_glib_core_la-mbim-proxy-helpers.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmbim_glib_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmbim_glib_core_la-mbim-proxy-helpers.lo `test -f 'mbim-proxy-helpers.c' || echo '$(srcdir)/'`mbim-proxy-helpers.c + mostlyclean-libtool: -rm -f *.lo diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-cid.c libmbim-1.10.0/src/libmbim-glib/mbim-cid.c --- libmbim-1.6.0/src/libmbim-glib/mbim-cid.c 2013-05-21 15:34:26.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-cid.c 2014-07-31 16:44:12.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include "mbim-cid.h" @@ -27,6 +27,7 @@ /** * SECTION: mbim-cid * @title: Command IDs + * @short_description: Generic command handling routines. * * This section defines the interface of the known command IDs. */ @@ -58,7 +59,7 @@ { FALSE, TRUE, FALSE }, /* MBIM_CID_BASIC_CONNECT_DEVICE_SERVICES */ { FALSE, FALSE, FALSE }, /* 17 reserved */ { FALSE, FALSE, FALSE }, /* 18 reserved */ - { TRUE, FALSE, FALSE }, /* MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST */ + { TRUE, FALSE, FALSE }, /* MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST */ { FALSE, TRUE, FALSE }, /* MBIM_CID_BASIC_CONNECT_PACKET_STATISTICS */ { TRUE, TRUE, FALSE }, /* MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT */ { FALSE, TRUE, TRUE }, /* MBIM_CID_BASIC_CONNECT_EMERGENCY_MODE */ @@ -113,6 +114,24 @@ { TRUE, FALSE, FALSE }, /* MBIM_CID_DSS_CONNECT */ }; +/* Note: index of the array is CID-1 */ +#define MBIM_CID_MS_FIRMWARE_ID_LAST MBIM_CID_MS_FIRMWARE_ID_GET +static const CidConfig cid_ms_firmware_id_config [MBIM_CID_MS_FIRMWARE_ID_LAST] = { + { FALSE, TRUE, FALSE }, /* MBIM_CID_MS_FIRMWARE_ID_GET */ +}; + +/* Note: index of the array is CID-1 */ +#define MBIM_CID_MS_HOST_SHUTDOWN_LAST MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY +static const CidConfig cid_ms_host_shutdown_config [MBIM_CID_MS_HOST_SHUTDOWN_LAST] = { + { TRUE, FALSE, FALSE }, /* MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY */ +}; + +/* Note: index of the array is CID-1 */ +#define MBIM_CID_PROXY_CONTROL_LAST MBIM_CID_PROXY_CONTROL_CONFIGURATION +static const CidConfig cid_proxy_control_config [MBIM_CID_PROXY_CONTROL_LAST] = { + { TRUE, FALSE, FALSE }, /* MBIM_CID_PROXY_CONTROL_CONFIGURATION */ +}; + /** * mbim_cid_can_set: * @service: a #MbimService. @@ -130,7 +149,7 @@ g_return_val_if_fail (cid > 0, FALSE); /* Known service required */ g_return_val_if_fail (service > MBIM_SERVICE_INVALID, FALSE); - g_return_val_if_fail (service <= MBIM_SERVICE_DSS, FALSE); + g_return_val_if_fail (service <= MBIM_SERVICE_PROXY_CONTROL, FALSE); switch (service) { case MBIM_SERVICE_BASIC_CONNECT: @@ -147,6 +166,12 @@ return cid_auth_config[cid - 1].set; case MBIM_SERVICE_DSS: return cid_dss_config[cid - 1].set; + case MBIM_SERVICE_MS_FIRMWARE_ID: + return cid_ms_firmware_id_config[cid - 1].set; + case MBIM_SERVICE_MS_HOST_SHUTDOWN: + return cid_ms_host_shutdown_config[cid - 1].set; + case MBIM_SERVICE_PROXY_CONTROL: + return cid_proxy_control_config[cid - 1].set; default: g_assert_not_reached (); return FALSE; @@ -170,7 +195,7 @@ g_return_val_if_fail (cid > 0, FALSE); /* Known service required */ g_return_val_if_fail (service > MBIM_SERVICE_INVALID, FALSE); - g_return_val_if_fail (service <= MBIM_SERVICE_DSS, FALSE); + g_return_val_if_fail (service <= MBIM_SERVICE_PROXY_CONTROL, FALSE); switch (service) { case MBIM_SERVICE_BASIC_CONNECT: @@ -187,6 +212,12 @@ return cid_auth_config[cid - 1].query; case MBIM_SERVICE_DSS: return cid_dss_config[cid - 1].query; + case MBIM_SERVICE_MS_FIRMWARE_ID: + return cid_ms_firmware_id_config[cid - 1].query; + case MBIM_SERVICE_MS_HOST_SHUTDOWN: + return cid_ms_host_shutdown_config[cid - 1].query; + case MBIM_SERVICE_PROXY_CONTROL: + return cid_proxy_control_config[cid - 1].query; default: g_assert_not_reached (); return FALSE; @@ -210,7 +241,7 @@ g_return_val_if_fail (cid > 0, FALSE); /* Known service required */ g_return_val_if_fail (service > MBIM_SERVICE_INVALID, FALSE); - g_return_val_if_fail (service <= MBIM_SERVICE_DSS, FALSE); + g_return_val_if_fail (service <= MBIM_SERVICE_PROXY_CONTROL, FALSE); switch (service) { case MBIM_SERVICE_BASIC_CONNECT: @@ -227,6 +258,12 @@ return cid_auth_config[cid - 1].notify; case MBIM_SERVICE_DSS: return cid_dss_config[cid - 1].notify; + case MBIM_SERVICE_MS_FIRMWARE_ID: + return cid_ms_firmware_id_config[cid - 1].notify; + case MBIM_SERVICE_MS_HOST_SHUTDOWN: + return cid_ms_host_shutdown_config[cid - 1].notify; + case MBIM_SERVICE_PROXY_CONTROL: + return cid_proxy_control_config[cid - 1].notify; default: g_assert_not_reached (); return FALSE; @@ -251,7 +288,7 @@ g_return_val_if_fail (cid > 0, NULL); /* Known service required */ g_return_val_if_fail (service > MBIM_SERVICE_INVALID, NULL); - g_return_val_if_fail (service <= MBIM_SERVICE_DSS, NULL); + g_return_val_if_fail (service <= MBIM_SERVICE_PROXY_CONTROL, NULL); switch (service) { case MBIM_SERVICE_BASIC_CONNECT: @@ -268,6 +305,12 @@ return mbim_cid_auth_get_string (cid); case MBIM_SERVICE_DSS: return mbim_cid_dss_get_string (cid); + case MBIM_SERVICE_MS_FIRMWARE_ID: + return mbim_cid_ms_firmware_id_get_string (cid); + case MBIM_SERVICE_MS_HOST_SHUTDOWN: + return mbim_cid_ms_host_shutdown_get_string (cid); + case MBIM_SERVICE_PROXY_CONTROL: + return mbim_cid_proxy_control_get_string (cid); default: g_assert_not_reached (); return FALSE; diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-cid.h libmbim-1.10.0/src/libmbim-glib/mbim-cid.h --- libmbim-1.6.0/src/libmbim-glib/mbim-cid.h 2013-06-23 15:18:20.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-cid.h 2014-07-31 16:44:12.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_MBIM_CID_H_ @@ -53,7 +53,7 @@ * @MBIM_CID_BASIC_CONNECT_SERVICE_ACTIVATION: Service activation. * @MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION: IP configuration. * @MBIM_CID_BASIC_CONNECT_DEVICE_SERVICES: Device services. - * @MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST: Device service subscriber list. + * @MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST: Device service subscribe list. * @MBIM_CID_BASIC_CONNECT_PACKET_STATISTICS: Packet statistics. * @MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT: Network idle hint. * @MBIM_CID_BASIC_CONNECT_EMERGENCY_MODE: Emergency mode. @@ -81,7 +81,7 @@ MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION = 15, MBIM_CID_BASIC_CONNECT_DEVICE_SERVICES = 16, /* 17, 18 reserved */ - MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST = 19, + MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST = 19, MBIM_CID_BASIC_CONNECT_PACKET_STATISTICS = 20, MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT = 21, MBIM_CID_BASIC_CONNECT_EMERGENCY_MODE = 22, @@ -183,6 +183,42 @@ MBIM_CID_DSS_CONNECT = 1 } MbimCidDss; +/** + * MbimCidMsFirmwareId: + * @MBIM_CID_MS_FIRMWARE_ID_UNKNOWN: Unknown command. + * @MBIM_CID_MS_FIRMWARE_ID_GET: Get Firmware ID. + * + * MBIM commands in the %MBIM_SERVICE_MS_FIRMWARE_ID service. + */ +typedef enum { + MBIM_CID_MS_FIRMWARE_ID_UNKNOWN = 0, + MBIM_CID_MS_FIRMWARE_ID_GET = 1 +} MbimCidMsFirmwareId; + +/** + * MbimCidMsHostShutdown: + * @MBIM_CID_MS_HOST_SHUTDOWN_UNKNOWN: Unknown command. + * @MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY: Notify that the host is shutting down. + * + * MBIM commands in the %MBIM_SERVICE_MS_HOST_SHUTDOWN service. + */ +typedef enum { + MBIM_CID_MS_HOST_SHUTDOWN_UNKNOWN = 0, + MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY = 1 +} MbimCidMsHostShutdown; + +/** + * MbimCidProxyControl: + * @MBIM_CID_PROXY_CONTROL_UNKNOWN: Unknown command. + * @MBIM_CID_PROXY_CONTROL_CONFIGURATION: Configuration. + * + * MBIM commands in the %MBIM_SERVICE_PROXY_CONTROL service. + */ +typedef enum { + MBIM_CID_PROXY_CONTROL_UNKNOWN = 0, + MBIM_CID_PROXY_CONTROL_CONFIGURATION = 1 +} MbimCidProxyControl; + /* Command helpers */ gboolean mbim_cid_can_set (MbimService service, diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-compat.c libmbim-1.10.0/src/libmbim-glib/mbim-compat.c --- libmbim-1.6.0/src/libmbim-glib/mbim-compat.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-compat.c 2014-06-10 15:36:24.000000000 +0000 @@ -0,0 +1,83 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2014 Aleksander Morgado + */ + +#include "mbim-compat.h" + +/** + * SECTION: mbim-compat + * @title: Deprecated API + * @short_description: Types and functions flagged as deprecated. + * + * This section defines types and functions that have been deprecated. + */ + +/*****************************************************************************/ +/* 'Service Subscriber List' rename to 'Service Subscribe List' */ + +/** + * mbim_message_device_service_subscriber_list_set_new: + * @events_count: the 'EventsCount' field, given as a #guint32. + * @events: the 'Events' field, given as an array of #MbimEventEntrys. + * @error: return location for error or %NULL. + * + * Create a new request for the 'Device Service Subscribe List' set command in the 'Basic Connect' service. + * + * Returns: a newly allocated #MbimMessage, which should be freed with mbim_message_unref(). + * + * Deprecated:1.8.0: Use mbim_message_device_service_subscribe_list_set_new() instead. + */ +MbimMessage * +mbim_message_device_service_subscriber_list_set_new ( + guint32 events_count, + const MbimEventEntry *const *events, + GError **error) +{ + return (mbim_message_device_service_subscribe_list_set_new ( + events_count, + events, + error)); +} + +/** + * mbim_message_device_service_subscriber_list_response_parse: + * @message: the #MbimMessage. + * @events_count: return location for a #guint32, or %NULL if the 'EventsCount' field is not needed. + * @events: return location for a newly allocated array of #MbimEventEntrys, or %NULL if the 'Events' field is not needed. Free the returned value with mbim_event_entry_array_free(). + * @error: return location for error or %NULL. + * + * Create a new request for the 'Events' response command in the 'Basic Connect' service. + * + * Returns: %TRUE if the message was correctly parsed, %FALSE if @error is set. + * + * Deprecated:1.8.0: Use mbim_message_device_service_subscribe_list_response_parse() instead. + */ +gboolean +mbim_message_device_service_subscriber_list_response_parse ( + const MbimMessage *message, + guint32 *events_count, + MbimEventEntry ***events, + GError **error) +{ + return (mbim_message_device_service_subscribe_list_response_parse ( + message, + events_count, + events, + error)); +} diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-compat.h libmbim-1.10.0/src/libmbim-glib/mbim-compat.h --- libmbim-1.6.0/src/libmbim-glib/mbim-compat.h 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-compat.h 2014-06-10 15:36:24.000000000 +0000 @@ -0,0 +1,75 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2014 Aleksander Morgado + */ + +#ifndef _LIBMBIM_GLIB_MBIM_COMPAT_H_ +#define _LIBMBIM_GLIB_MBIM_COMPAT_H_ + +#if !defined (__LIBMBIM_GLIB_H_INSIDE__) && !defined (LIBMBIM_GLIB_COMPILATION) +#error "Only can be included directly." +#endif + +#include + +#include "mbim-basic-connect.h" + +G_BEGIN_DECLS + +/*****************************************************************************/ +/* Registration flags name fixup */ + +/** + * MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH: + * + * Modem should auto-attach to the network after registration. + * + * Deprecated:1.8.0: Use MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH instead. + */ +G_DEPRECATED_FOR (MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH) +#define MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH + +/*****************************************************************************/ +/* 'Service Subscriber List' rename to 'Service Subscribe List' */ + +/** + * MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST: + * + * Device service subscribe list. + * + * Deprecated:1.8.0: Use MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST instead. + */ +G_DEPRECATED_FOR (MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST) +#define MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST + +G_DEPRECATED_FOR (mbim_message_device_service_subscribe_list_set_new) +MbimMessage *mbim_message_device_service_subscriber_list_set_new ( + guint32 events_count, + const MbimEventEntry *const *events, + GError **error); + +G_DEPRECATED_FOR (mbim_message_device_service_subscribe_list_response_parse) +gboolean mbim_message_device_service_subscriber_list_response_parse ( + const MbimMessage *message, + guint32 *events_count, + MbimEventEntry ***events, + GError **error); + +G_END_DECLS + +#endif /* _LIBMBIM_GLIB_MBIM_COMPAT_H_ */ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-device.c libmbim-1.10.0/src/libmbim-glib/mbim-device.c --- libmbim-1.6.0/src/libmbim-glib/mbim-device.c 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-device.c 2014-08-04 09:02:15.000000000 +0000 @@ -17,7 +17,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013-2014 Aleksander Morgado + * Copyright (C) 2014 Smith Micro Software, Inc. * * Implementation based on the 'QmiDevice' GObject from libqmi-glib. */ @@ -28,6 +29,7 @@ #include #include #include +#include #include #include #define IOCTL_WDM_MAX_COMMAND _IOR('H', 0xA0, guint16) @@ -37,6 +39,8 @@ #include "mbim-message.h" #include "mbim-message-private.h" #include "mbim-error-types.h" +#include "mbim-proxy.h" +#include "mbim-proxy-control.h" /** * SECTION:mbim-device @@ -67,6 +71,7 @@ enum { SIGNAL_INDICATE_STATUS, SIGNAL_ERROR, + SIGNAL_REMOVED, SIGNAL_LAST }; @@ -78,6 +83,12 @@ TRANSACTION_TYPE_LAST = 2 } TransactionType; +typedef enum { + OPEN_STATUS_CLOSED = 0, + OPEN_STATUS_OPENING = 1, + OPEN_STATUS_OPEN = 2 +} OpenStatus; + struct _MbimDevicePrivate { /* File */ GFile *file; @@ -88,6 +99,11 @@ GIOChannel *iochannel; guint watch_id; GByteArray *response; + OpenStatus open_status; + + /* Support for mbim-proxy */ + GSocketClient *socket_client; + GSocketConnection *socket_connection; /* HT to keep track of ongoing host/function transactions * Host transactions: created by us @@ -105,6 +121,7 @@ guint16 max_control_transfer; }; +#define MAX_SPAWN_RETRIES 10 #define MAX_CONTROL_TRANSFER 4096 #define MAX_TIME_BETWEEN_FRAGMENTS_MS 1250 @@ -123,6 +140,7 @@ typedef struct { MbimMessage *fragments; + MbimMessageType type; guint32 transaction_id; GSimpleAsyncResult *result; guint timeout_id; @@ -133,6 +151,7 @@ static Transaction * transaction_new (MbimDevice *self, + MbimMessageType type, guint32 transaction_id, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -141,6 +160,7 @@ Transaction *tr; tr = g_slice_new0 (Transaction); + tr->type = type; tr->transaction_id = transaction_id; tr->result = g_simple_async_result_new (G_OBJECT (self), callback, @@ -187,13 +207,14 @@ static Transaction * device_release_transaction (MbimDevice *self, TransactionType type, + MbimMessageType expected_type, guint32 transaction_id) { Transaction *tr = NULL; if (self->priv->transactions[type]) { tr = g_hash_table_lookup (self->priv->transactions[type], GUINT_TO_POINTER (transaction_id)); - if (tr) + if (tr && ((tr->type == expected_type) || (expected_type == MBIM_MESSAGE_TYPE_INVALID))) /* If found, remove it from the HT */ g_hash_table_remove (self->priv->transactions[type], GUINT_TO_POINTER (transaction_id)); } @@ -207,7 +228,14 @@ Transaction *tr; GError *error = NULL; - tr = device_release_transaction (ctx->self, ctx->type, ctx->transaction_id); + tr = device_release_transaction (ctx->self, + ctx->type, + MBIM_MESSAGE_TYPE_INVALID, + ctx->transaction_id); + if (!tr) + /* transaction already completed */ + return FALSE; + tr->timeout_id = 0; /* If no fragment was received, complete transaction with a timeout error */ @@ -240,7 +268,10 @@ Transaction *tr; GError *error = NULL; - tr = device_release_transaction (ctx->self, ctx->type, ctx->transaction_id); + tr = device_release_transaction (ctx->self, + ctx->type, + MBIM_MESSAGE_TYPE_INVALID, + ctx->transaction_id); tr->cancellable_id = 0; /* Complete transaction with an abort error */ @@ -267,11 +298,14 @@ tr->wait_ctx->transaction_id = tr->transaction_id; tr->wait_ctx->type = type; - tr->timeout_id = g_timeout_add (timeout_ms, - (GSourceFunc)transaction_timed_out, - tr->wait_ctx); + /* don't add timeout if one already exists */ + if (!tr->timeout_id) { + tr->timeout_id = g_timeout_add (timeout_ms, + (GSourceFunc)transaction_timed_out, + tr->wait_ctx); + } - if (tr->cancellable) { + if (tr->cancellable && !tr->cancellable_id) { tr->cancellable_id = g_cancellable_connect (tr->cancellable, (GCallback)transaction_cancelled, tr->wait_ctx, @@ -291,15 +325,6 @@ return TRUE; } -static Transaction * -device_match_transaction (MbimDevice *self, - TransactionType type, - const MbimMessage *message) -{ - /* msg can be either the original message or the response */ - return device_release_transaction (self, type, mbim_message_get_transaction_id (message)); -} - /*****************************************************************************/ /** @@ -385,7 +410,7 @@ { g_return_val_if_fail (MBIM_IS_DEVICE (self), FALSE); - return !!self->priv->iochannel; + return (self->priv->open_status == OPEN_STATUS_OPEN); } /*****************************************************************************/ @@ -414,12 +439,13 @@ process_message (MbimDevice *self, const MbimMessage *message) { + gboolean is_partial_fragment; + + is_partial_fragment = (_mbim_message_is_fragment (message) && + _mbim_message_fragment_get_total (message) > 1); + if (mbim_utils_get_traces_enabled ()) { gchar *printable; - gboolean is_partial_fragment; - - is_partial_fragment = (_mbim_message_is_fragment (message) && - _mbim_message_fragment_get_total (message) > 1); printable = __mbim_utils_str_hex (((GByteArray *)message)->data, ((GByteArray *)message)->len, @@ -453,20 +479,39 @@ if (MBIM_MESSAGE_GET_MESSAGE_TYPE (message) == MBIM_MESSAGE_TYPE_INDICATE_STATUS) { /* Grab transaction */ - tr = device_match_transaction (self, TRANSACTION_TYPE_MODEM, message); + tr = device_release_transaction (self, + TRANSACTION_TYPE_MODEM, + MBIM_MESSAGE_TYPE_INDICATE_STATUS, + mbim_message_get_transaction_id (message)); + if (!tr) /* Create new transaction for the indication */ tr = transaction_new (self, + MBIM_MESSAGE_TYPE_INDICATE_STATUS, mbim_message_get_transaction_id (message), NULL, /* no cancellable */ (GAsyncReadyCallback)indication_ready, NULL); } else { - /* Grab transaction */ - tr = device_match_transaction (self, TRANSACTION_TYPE_HOST, message); + /* Grab transaction. This is a _DONE message, so look for the request + * that generated the _DONE */ + tr = device_release_transaction (self, + TRANSACTION_TYPE_HOST, + (MBIM_MESSAGE_GET_MESSAGE_TYPE (message) - 0x80000000), + mbim_message_get_transaction_id (message)); if (!tr) { + gchar *printable; + g_debug ("[%s] No transaction matched in received message", self->priv->path_display); + /* Attempt to print a user friendly dump of the packet anyway */ + printable = mbim_message_get_printable (message, ">>>>>> ", is_partial_fragment); + if (printable) { + g_debug ("[%s] Received unexpected message (translated)...\n%s", + self->priv->path_display, + printable); + g_free (printable); + } return; } @@ -545,7 +590,7 @@ case MBIM_MESSAGE_TYPE_COMMAND: case MBIM_MESSAGE_TYPE_HOST_ERROR: /* Shouldn't expect host-generated messages as replies */ - g_warning ("[%s] Host-generated message received: ignoring", + g_message ("[%s] Host-generated message received: ignoring", self->priv->path_display); return; } @@ -596,6 +641,7 @@ g_byte_array_remove_range (self->priv->response, 0, self->priv->response->len); mbim_device_close_force (self, NULL); + g_signal_emit (self, signals[SIGNAL_REMOVED], 0 ); return FALSE; } @@ -771,94 +817,256 @@ return max; } +typedef struct { + MbimDevice *self; + GSimpleAsyncResult *result; + guint spawn_retries; +} CreateIoChannelContext; + +static void +create_iochannel_context_complete_and_free (CreateIoChannelContext *ctx) +{ + g_simple_async_result_complete_in_idle (ctx->result); + g_object_unref (ctx->result); + g_object_unref (ctx->self); + g_slice_free (CreateIoChannelContext, ctx); +} + static gboolean -create_iochannel (MbimDevice *self, - GError **error) +create_iochannel_finish (MbimDevice *self, + GAsyncResult *res, + GError **error) +{ + return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); +} + +static void +setup_iochannel (CreateIoChannelContext *ctx) { GError *inner_error = NULL; - gint fd; - guint16 max; - if (self->priv->iochannel) { - g_set_error_literal (error, - MBIM_CORE_ERROR, - MBIM_CORE_ERROR_WRONG_STATE, - "Already open"); - return FALSE; + /* We don't want UTF-8 encoding, we're playing with raw binary data */ + g_io_channel_set_encoding (ctx->self->priv->iochannel, NULL, NULL); + + /* We don't want to get the channel buffered */ + g_io_channel_set_buffered (ctx->self->priv->iochannel, FALSE); + + /* Let the GIOChannel own the FD */ + g_io_channel_set_close_on_unref (ctx->self->priv->iochannel, TRUE); + + /* We don't want to get blocked while writing stuff */ + if (!g_io_channel_set_flags (ctx->self->priv->iochannel, + G_IO_FLAG_NONBLOCK, + &inner_error)) { + g_simple_async_result_take_error (ctx->result, inner_error); + g_io_channel_shutdown (ctx->self->priv->iochannel, FALSE, NULL); + g_io_channel_unref (ctx->self->priv->iochannel); + ctx->self->priv->iochannel = NULL; + g_clear_object (&ctx->self->priv->socket_connection); + g_clear_object (&ctx->self->priv->socket_client); + create_iochannel_context_complete_and_free (ctx); + return; } - g_assert (self->priv->file); - g_assert (self->priv->path); + ctx->self->priv->watch_id = g_io_add_watch (ctx->self->priv->iochannel, + G_IO_IN | G_IO_ERR | G_IO_HUP, + (GIOFunc)data_available, + ctx->self); + + g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); + create_iochannel_context_complete_and_free (ctx); +} + +static void +create_iochannel_with_fd (CreateIoChannelContext *ctx) +{ + gint fd; + guint16 max; errno = 0; - fd = open (self->priv->path, O_RDWR | O_EXCL | O_NONBLOCK | O_NOCTTY); + fd = open (ctx->self->priv->path, O_RDWR | O_EXCL | O_NONBLOCK | O_NOCTTY); if (fd < 0) { - g_set_error (error, - MBIM_CORE_ERROR, - MBIM_CORE_ERROR_FAILED, - "Cannot open device file '%s': %s", - self->priv->path_display, - strerror (errno)); - return FALSE; + g_simple_async_result_set_error ( + ctx->result, + MBIM_CORE_ERROR, + MBIM_CORE_ERROR_FAILED, + "Cannot open device file '%s': %s", + ctx->self->priv->path_display, + strerror (errno)); + create_iochannel_context_complete_and_free (ctx); + return; } /* Query message size */ if (ioctl (fd, IOCTL_WDM_MAX_COMMAND, &max) < 0) { g_debug ("[%s] Couldn't query maximum message size: " "IOCTL_WDM_MAX_COMMAND failed: %s", - self->priv->path_display, + ctx->self->priv->path_display, strerror (errno)); /* Fallback, try to read the descriptor file */ - max = read_max_control_transfer (self); + max = read_max_control_transfer (ctx->self); } else { g_debug ("[%s] Queried max control message size: %" G_GUINT16_FORMAT, - self->priv->path_display, + ctx->self->priv->path_display, max); } - self->priv->max_control_transfer = max; + ctx->self->priv->max_control_transfer = max; /* Create new GIOChannel */ - self->priv->iochannel = g_io_channel_unix_new (fd); + ctx->self->priv->iochannel = g_io_channel_unix_new (fd); - /* We don't want UTF-8 encoding, we're playing with raw binary data */ - g_io_channel_set_encoding (self->priv->iochannel, NULL, NULL); + setup_iochannel (ctx); +} - /* We don't want to get the channel buffered */ - g_io_channel_set_buffered (self->priv->iochannel, FALSE); +static void create_iochannel_with_socket (CreateIoChannelContext *ctx); - /* Let the GIOChannel own the FD */ - g_io_channel_set_close_on_unref (self->priv->iochannel, TRUE); +static gboolean +wait_for_proxy_cb (CreateIoChannelContext *ctx) +{ + create_iochannel_with_socket (ctx); + return FALSE; +} - /* We don't want to get blocked while writing stuff */ - if (!g_io_channel_set_flags (self->priv->iochannel, - G_IO_FLAG_NONBLOCK, - &inner_error)) { - g_prefix_error (&inner_error, "Cannot set non-blocking channel: "); - g_propagate_error (error, inner_error); - g_io_channel_shutdown (self->priv->iochannel, FALSE, NULL); - g_io_channel_unref (self->priv->iochannel); - self->priv->iochannel = NULL; - return FALSE; +static void +create_iochannel_with_socket (CreateIoChannelContext *ctx) +{ + GSocketAddress *socket_address; + GError *error = NULL; + + /* Create socket client */ + if (ctx->self->priv->socket_client) + g_object_unref (ctx->self->priv->socket_client); + ctx->self->priv->socket_client = g_socket_client_new (); + g_socket_client_set_family (ctx->self->priv->socket_client, G_SOCKET_FAMILY_UNIX); + g_socket_client_set_socket_type (ctx->self->priv->socket_client, G_SOCKET_TYPE_STREAM); + g_socket_client_set_protocol (ctx->self->priv->socket_client, G_SOCKET_PROTOCOL_DEFAULT); + + /* Setup socket address */ + socket_address = (g_unix_socket_address_new_with_type ( + MBIM_PROXY_SOCKET_PATH, + -1, + G_UNIX_SOCKET_ADDRESS_ABSTRACT)); + + /* Connect to address */ + if (ctx->self->priv->socket_connection) + g_object_unref (ctx->self->priv->socket_connection); + ctx->self->priv->socket_connection = (g_socket_client_connect ( + ctx->self->priv->socket_client, + G_SOCKET_CONNECTABLE (socket_address), + NULL, + &error)); + g_object_unref (socket_address); + + if (!ctx->self->priv->socket_connection) { + gchar **argc; + + g_debug ("cannot connect to proxy: %s", error->message); + g_clear_error (&error); + g_clear_object (&ctx->self->priv->socket_client); + + /* Don't retry forever */ + ctx->spawn_retries++; + if (ctx->spawn_retries > MAX_SPAWN_RETRIES) { + g_simple_async_result_set_error (ctx->result, + MBIM_CORE_ERROR, + MBIM_CORE_ERROR_FAILED, + "Couldn't spawn the mbim-proxy"); + create_iochannel_context_complete_and_free (ctx); + return; + } + + g_debug ("spawning new mbim-proxy (try %u)...", ctx->spawn_retries); + + argc = g_new0 (gchar *, 2); + argc[0] = g_strdup (LIBEXEC_PATH "/mbim-proxy"); + if (!g_spawn_async (NULL, /* working directory */ + argc, + NULL, /* envp */ + G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, + NULL, /* child_setup */ + NULL, /* child_setup_user_data */ + NULL, + &error)) { + g_debug ("error spawning mbim-proxy: %s", error->message); + g_clear_error (&error); + } + g_strfreev (argc); + + /* Wait some ms and retry */ + g_timeout_add (100, (GSourceFunc)wait_for_proxy_cb, ctx); + return; + } + + ctx->self->priv->iochannel = g_io_channel_unix_new ( + g_socket_get_fd ( + g_socket_connection_get_socket (ctx->self->priv->socket_connection))); + + /* try to read the descriptor file */ + ctx->self->priv->max_control_transfer = read_max_control_transfer (ctx->self); + + setup_iochannel (ctx); +} + +static void +create_iochannel (MbimDevice *self, + gboolean proxy, + GAsyncReadyCallback callback, + gpointer user_data) +{ + CreateIoChannelContext *ctx; + + ctx = g_slice_new (CreateIoChannelContext); + ctx->self = g_object_ref (self); + ctx->result = g_simple_async_result_new (G_OBJECT (self), + callback, + user_data, + create_iochannel); + ctx->spawn_retries = 0; + + if (self->priv->iochannel) { + g_simple_async_result_set_error (ctx->result, + MBIM_CORE_ERROR, + MBIM_CORE_ERROR_WRONG_STATE, + "Already open"); + create_iochannel_context_complete_and_free (ctx); + return; } - self->priv->watch_id = g_io_add_watch (self->priv->iochannel, - G_IO_IN | G_IO_ERR | G_IO_HUP, - (GIOFunc)data_available, - self); + g_assert (self->priv->file); + g_assert (self->priv->path); - return !!self->priv->iochannel; + if (proxy) + create_iochannel_with_socket (ctx); + else + create_iochannel_with_fd (ctx); } +typedef enum { + DEVICE_OPEN_CONTEXT_STEP_FIRST = 0, + DEVICE_OPEN_CONTEXT_STEP_CREATE_IOCHANNEL, + DEVICE_OPEN_CONTEXT_STEP_FLAGS_PROXY, + DEVICE_OPEN_CONTEXT_STEP_OPEN_MESSAGE, + DEVICE_OPEN_CONTEXT_STEP_LAST +} DeviceOpenContextStep; + typedef struct { MbimDevice *self; GSimpleAsyncResult *result; GCancellable *cancellable; + DeviceOpenContextStep step; + MbimDeviceOpenFlags flags; guint timeout; } DeviceOpenContext; static void -device_open_context_complete_and_free (DeviceOpenContext *ctx) +device_open_context_complete_and_free (DeviceOpenContext *ctx, + GError *error) { + if (error) + g_simple_async_result_take_error (ctx->result, error); + else + g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); + g_simple_async_result_complete_in_idle (ctx->result); g_object_unref (ctx->result); if (ctx->cancellable) @@ -867,6 +1075,26 @@ g_slice_free (DeviceOpenContext, ctx); } +static void device_open_context_step (DeviceOpenContext *ctx); + +/** + * mbim_device_open_full_finish: + * @self: a #MbimDevice. + * @res: a #GAsyncResult. + * @error: Return location for error or %NULL. + * + * Finishes an asynchronous open operation started with mbim_device_open_full(). + * + * Returns: %TRUE if successful, %FALSE if @error is set. + */ +gboolean +mbim_device_open_full_finish (MbimDevice *self, + GAsyncResult *res, + GError **error) +{ + return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); +} + /** * mbim_device_open_finish: * @self: a #MbimDevice. @@ -879,10 +1107,10 @@ */ gboolean mbim_device_open_finish (MbimDevice *self, - GAsyncResult *res, - GError **error) + GAsyncResult *res, + GError **error) { - return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); + return mbim_device_open_full_finish (self, res, error); } static void open_message (DeviceOpenContext *ctx); @@ -910,15 +1138,25 @@ /* No more seconds left in the timeout... return error */ } - g_simple_async_result_take_error (ctx->result, error); - } else if (!mbim_message_open_done_get_result (response, &error)) - g_simple_async_result_take_error (ctx->result, error); - else - g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); + g_debug ("open operation timed out: closed"); + self->priv->open_status = OPEN_STATUS_CLOSED; + device_open_context_complete_and_free (ctx, error); + return; + } - if (response) + if (!mbim_message_open_done_get_result (response, &error)) { + g_debug ("getting open done result failed: closed"); + self->priv->open_status = OPEN_STATUS_CLOSED; + device_open_context_complete_and_free (ctx, error); mbim_message_unref (response); - device_open_context_complete_and_free (ctx); + return; + } + + mbim_message_unref (response); + + /* go on */ + ctx->step++; + device_open_context_step (ctx); } static void @@ -938,9 +1176,140 @@ mbim_message_unref (request); } +static void +proxy_cfg_message_ready (MbimDevice *self, + GAsyncResult *res, + DeviceOpenContext *ctx) +{ + MbimMessage *response; + GError *error = NULL; + + response = mbim_device_command_finish (self, res, &error); + if (!response) { + /* Hard error if proxy cfg command fails */ + g_debug ("proxy configuration failed: closed"); + self->priv->open_status = OPEN_STATUS_CLOSED; + device_open_context_complete_and_free (ctx, error); + return; + } + + mbim_message_unref (response); + + ctx->step++; + device_open_context_step (ctx); +} + +static void +proxy_cfg_message (DeviceOpenContext *ctx) +{ + GError *error = NULL; + MbimMessage *request; + + request = mbim_message_proxy_control_configuration_set_new (ctx->self->priv->path, ctx->timeout, &error); + + /* This message is no longer a direct reply; as the proxy will also try to open the device + * directly. If it cannot open the device, it will return an error. */ + mbim_device_command (ctx->self, + request, + ctx->timeout, + ctx->cancellable, + (GAsyncReadyCallback)proxy_cfg_message_ready, + ctx); + mbim_message_unref (request); +} + +static void +create_iochannel_ready (MbimDevice *self, + GAsyncResult *res, + DeviceOpenContext *ctx) +{ + GError *error = NULL; + + if (!create_iochannel_finish (self, res, &error)) { + g_debug ("creating iochannel failed: closed"); + self->priv->open_status = OPEN_STATUS_CLOSED; + device_open_context_complete_and_free (ctx, error); + return; + } + + /* Go on */ + ctx->step++; + device_open_context_step (ctx); +} + +static void +device_open_context_step (DeviceOpenContext *ctx) +{ + switch (ctx->step) { + case DEVICE_OPEN_CONTEXT_STEP_FIRST: + if (ctx->self->priv->open_status == OPEN_STATUS_OPEN) { + GError *error; + + error = g_error_new (MBIM_CORE_ERROR, + MBIM_CORE_ERROR_WRONG_STATE, + "Already open"); + device_open_context_complete_and_free (ctx, error); + return; + } + + if (ctx->self->priv->open_status == OPEN_STATUS_OPENING) { + GError *error; + + error = g_error_new (MBIM_CORE_ERROR, + MBIM_CORE_ERROR_WRONG_STATE, + "Already opening"); + device_open_context_complete_and_free (ctx, error); + return; + } + + g_debug ("opening device..."); + g_assert (ctx->self->priv->open_status == OPEN_STATUS_CLOSED); + ctx->self->priv->open_status = OPEN_STATUS_OPENING; + + ctx->step++; + /* Fall down */ + + case DEVICE_OPEN_CONTEXT_STEP_CREATE_IOCHANNEL: + create_iochannel (ctx->self, + !!(ctx->flags & MBIM_DEVICE_OPEN_FLAGS_PROXY), + (GAsyncReadyCallback)create_iochannel_ready, + ctx); + return; + + case DEVICE_OPEN_CONTEXT_STEP_FLAGS_PROXY: + if (ctx->flags & MBIM_DEVICE_OPEN_FLAGS_PROXY) { + proxy_cfg_message (ctx); + return; + } + ctx->step++; + /* Fall down */ + + case DEVICE_OPEN_CONTEXT_STEP_OPEN_MESSAGE: + /* If the device is already in-session, avoid the open message */ + if (!ctx->self->priv->in_session) { + open_message (ctx); + return; + } + ctx->step++; + /* Fall down */ + + case DEVICE_OPEN_CONTEXT_STEP_LAST: + /* Nothing else to process, complete without error */ + ctx->self->priv->open_status = OPEN_STATUS_OPEN; + device_open_context_complete_and_free (ctx, NULL); + return; + + default: + break; + } + + g_assert_not_reached (); +} + /** - * mbim_device_open: + * mbim_device_open_full: * @self: a #MbimDevice. + * @flags: a set of #MbimDeviceOpenFlags. * @timeout: maximum time, in seconds, to wait for the device to be opened. * @cancellable: optional #GCancellable object, #NULL to ignore. * @callback: a #GAsyncReadyCallback to call when the operation is finished. @@ -948,18 +1317,21 @@ * * Asynchronously opens a #MbimDevice for I/O. * + * This method is an extension of the generic mbim_device_open(), which allows + * launching the #MbimDevice with proxy support. + * * When the operation is finished @callback will be called. You can then call - * mbim_device_open_finish() to get the result of the operation. + * mbim_device_open_full_finish() to get the result of the operation. */ void -mbim_device_open (MbimDevice *self, - guint timeout, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +mbim_device_open_full (MbimDevice *self, + MbimDeviceOpenFlags flags, + guint timeout, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { DeviceOpenContext *ctx; - GError *error = NULL; g_return_if_fail (MBIM_IS_DEVICE (self)); g_return_if_fail (timeout > 0); @@ -969,26 +1341,42 @@ ctx->result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - mbim_device_open); + mbim_device_open_full); + ctx->step = DEVICE_OPEN_CONTEXT_STEP_FIRST; + ctx->flags = flags; ctx->timeout = timeout; ctx->cancellable = (cancellable ? g_object_ref (cancellable) : NULL); - if (!create_iochannel (self, &error)) { - g_prefix_error (&error, - "Cannot open MBIM device: "); - g_simple_async_result_take_error (ctx->result, error); - device_open_context_complete_and_free (ctx); - return; - } - - /* If the device is already in-session, avoid the open message */ - if (self->priv->in_session) { - g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); - device_open_context_complete_and_free (ctx); - return; - } + /* Start processing */ + device_open_context_step (ctx); +} - open_message (ctx); +/** + * mbim_device_open: + * @self: a #MbimDevice. + * @timeout: maximum time, in seconds, to wait for the device to be opened. + * @cancellable: optional #GCancellable object, #NULL to ignore. + * @callback: a #GAsyncReadyCallback to call when the operation is finished. + * @user_data: the data to pass to callback function. + * + * Asynchronously opens a #MbimDevice for I/O. + * + * When the operation is finished @callback will be called. You can then call + * mbim_device_open_finish() to get the result of the operation. + */ +void +mbim_device_open (MbimDevice *self, + guint timeout, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + mbim_device_open_full (self, + MBIM_DEVICE_OPEN_FLAGS_NONE, + timeout, + cancellable, + callback, + user_data); } /*****************************************************************************/ @@ -1000,11 +1388,21 @@ { GError *inner_error = NULL; - g_io_channel_shutdown (self->priv->iochannel, TRUE, &inner_error); + self->priv->open_status = OPEN_STATUS_CLOSED; + + /* Already closed? */ + if (!self->priv->iochannel && !self->priv->socket_connection && !self->priv->socket_client) + return TRUE; + + if (self->priv->iochannel) { + g_io_channel_shutdown (self->priv->iochannel, TRUE, &inner_error); + g_io_channel_unref (self->priv->iochannel); + self->priv->iochannel = NULL; + } /* Failures when closing still make the device to get closed */ - g_io_channel_unref (self->priv->iochannel); - self->priv->iochannel = NULL; + g_clear_object (&self->priv->socket_connection); + g_clear_object (&self->priv->socket_client); if (self->priv->watch_id) { g_source_remove (self->priv->watch_id); @@ -1039,10 +1437,6 @@ { g_return_val_if_fail (MBIM_IS_DEVICE (self), FALSE); - /* Already closed? */ - if (!self->priv->iochannel) - return TRUE; - return destroy_iochannel (self, error); } @@ -1463,6 +1857,7 @@ } tr = transaction_new (self, + MBIM_MESSAGE_GET_MESSAGE_TYPE (message), transaction_id, cancellable, callback, @@ -1488,7 +1883,10 @@ if (!device_send (self, message, &error)) { /* Match transaction so that we remove it from our tracking table */ - tr = device_match_transaction (self, TRANSACTION_TYPE_HOST, message); + tr = device_release_transaction (self, + TRANSACTION_TYPE_HOST, + MBIM_MESSAGE_GET_MESSAGE_TYPE (message), + mbim_message_get_transaction_id (message)); transaction_complete_and_free (tr, error); g_error_free (error); return; @@ -1712,6 +2110,7 @@ /* Initialize transaction ID */ self->priv->transaction_id = 0x01; + self->priv->open_status = OPEN_STATUS_CLOSED; } static void @@ -1721,6 +2120,8 @@ g_clear_object (&self->priv->file); + destroy_iochannel (self, NULL); + G_OBJECT_CLASS (mbim_device_parent_class)->dispose (object); } @@ -1736,17 +2137,12 @@ if (self->priv->transactions[i]) { g_assert (g_hash_table_size (self->priv->transactions[i]) == 0); g_hash_table_unref (self->priv->transactions[i]); + self->priv->transactions[i] = NULL; } } g_free (self->priv->path); g_free (self->priv->path_display); - if (self->priv->watch_id) - g_source_remove (self->priv->watch_id); - if (self->priv->response) - g_byte_array_unref (self->priv->response); - if (self->priv->iochannel) - g_io_channel_unref (self->priv->iochannel); G_OBJECT_CLASS (mbim_device_parent_class)->finalize (object); } @@ -1833,4 +2229,22 @@ G_TYPE_NONE, 1, G_TYPE_ERROR); + + /** + * MbimDevice::device-removed: + * @self: the #MbimDevice + * @message: None + * + * The ::device-removed signal is emitted when an unexpected port hang-up is received. + */ + signals[SIGNAL_REMOVED] = + g_signal_new (MBIM_DEVICE_SIGNAL_REMOVED, + G_OBJECT_CLASS_TYPE (G_OBJECT_CLASS (klass)), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + NULL, + G_TYPE_NONE, + 0); } diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-device.h libmbim-1.10.0/src/libmbim-glib/mbim-device.h --- libmbim-1.6.0/src/libmbim-glib/mbim-device.h 2013-06-03 07:46:17.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-device.h 2014-07-31 16:44:12.000000000 +0000 @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_MBIM_DEVICE_H_ @@ -51,6 +51,7 @@ #define MBIM_DEVICE_SIGNAL_INDICATE_STATUS "device-indicate-status" #define MBIM_DEVICE_SIGNAL_ERROR "device-error" +#define MBIM_DEVICE_SIGNAL_REMOVED "device-removed" /** * MbimDevice: @@ -84,6 +85,28 @@ const gchar *mbim_device_get_path_display (MbimDevice *self); gboolean mbim_device_is_open (MbimDevice *self); +/** + * MbimDeviceOpenFlags: + * @MBIM_DEVICE_OPEN_FLAGS_NONE: None. + * @MBIM_DEVICE_OPEN_FLAGS_PROXY: Try to open the port through the 'mbim-proxy'. + * + * Flags to specify which actions to be performed when the device is open. + */ +typedef enum { + MBIM_DEVICE_OPEN_FLAGS_NONE = 0, + MBIM_DEVICE_OPEN_FLAGS_PROXY = 1 << 0 +} MbimDeviceOpenFlags; + +void mbim_device_open_full (MbimDevice *self, + MbimDeviceOpenFlags flags, + guint timeout, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean mbim_device_open_full_finish (MbimDevice *self, + GAsyncResult *res, + GError **error); + void mbim_device_open (MbimDevice *self, guint timeout, GCancellable *cancellable, diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-enums.h libmbim-1.10.0/src/libmbim-glib/mbim-enums.h --- libmbim-1.6.0/src/libmbim-glib/mbim-enums.h 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-enums.h 2014-07-31 16:41:35.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_MBIM_ENUMS_H_ @@ -33,6 +33,7 @@ /** * SECTION: mbim-enums * @title: Enumerations and Flags + * @short_description: Common enumeration and flag types. * * This section defines common enum and flag types used in the interface. */ @@ -367,34 +368,78 @@ * MbimNwError: * @MBIM_NW_ERROR_UNKNOWN: Unknown or unset error. * @MBIM_NW_ERROR_IMSI_UNKNOWN_IN_HLR: IMSI unknown in the HLR. + * @MBIM_NW_ERROR_ILLEGAL_MS: Illegal MS. * @MBIM_NW_ERROR_IMSI_UNKNOWN_IN_VLR: IMSI unknown in the VLR. + * @MBIM_NW_ERROR_IMEI_NOT_ACCEPTED: IMEI not accepted. * @MBIM_NW_ERROR_ILLEGAL_ME: Illegal ME. * @MBIM_NW_ERROR_GPRS_NOT_ALLOWED: GPRS not allowed. * @MBIM_NW_ERROR_GPRS_AND_NON_GPRS_NOT_ALLOWED: GPRS and non-GPRS not allowed. + * @MBIM_NW_ERROR_MS_IDENTITY_NOT_DERIVED_BY_NETWORK: MS identity cannot be derived by the network. + * @MBIM_NW_ERROR_IMPLICITLY_DETACHED: Implicitly detached. * @MBIM_NW_ERROR_PLMN_NOT_ALLOWED: PLMN not allowed. * @MBIM_NW_ERROR_LOCATION_AREA_NOT_ALLOWED: Location area not allowed. * @MBIM_NW_ERROR_ROAMING_NOT_ALLOWED_IN_LOCATION_AREA: Roaming not allowed in the location area. * @MBIM_NW_ERROR_GPRS_NOT_ALLOWED_IN_PLMN: GPRS not allowed in PLMN. * @MBIM_NW_ERROR_NO_CELLS_IN_LOCATION_AREA: No cells in location area. + * @MBIM_NW_ERROR_MSC_TEMPORARILY_NOT_REACHABLE: MSC temporarily not reachable. * @MBIM_NW_ERROR_NETWORK_FAILURE: Network failure. + * @MBIM_NW_ERROR_MAC_FAILURE: MAC failure. + * @MBIM_NW_ERROR_SYNCH_FAILURE: Synch failure. * @MBIM_NW_ERROR_CONGESTION: Congestion. + * @MBIM_NW_ERROR_GSM_AUTHENTICATION_UNACCEPTABLE: GSM authentication unacceptable. + * @MBIM_NW_ERROR_NOT_AUTHORIZED_FOR_CSG: Not authorized for this CSG. + * @MBIM_NW_ERROR_MISSING_OR_UNKNOWN_APN: Missing or unknown access point name. + * @MBIM_NW_ERROR_SERVICE_OPTION_NOT_SUPPORTED: Service option not supported. + * @MBIM_NW_ERROR_REQUESTED_SERVICE_OPTION_NOT_SUBSCRIBED: Requested service option not subscribed. + * @MBIM_NW_ERROR_SERVICE_OPTION_TEMPORARILY_OUT_OF_ORDER: Service option temporarily out of order. + * @MBIM_NW_ERROR_NO_PDP_CONTEXT_ACTIVATED: No PDP context activated. + * @MBIM_NW_ERROR_SEMANTICALLY_INCORRECT_MESSAGE: Semantically incorrect message. + * @MBIM_NW_ERROR_INVALID_MANDATORY_INFORMATION: Invalid mandatory information. + * @MBIM_NW_ERROR_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED: Message type non-existent or not implemented. + * @MBIM_NW_ERROR_MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE: Message type not compatible with protocol state. + * @MBIM_NW_ERROR_INFORMATION_ELEMENT_NON_EXISTENT_OR_NOT_IMPLEMENTED: Information element non-existent or not implemented. + * @MBIM_NW_ERROR_CONDITIONAL_IE_ERROR: Conditional IE error. + * @MBIM_NW_ERROR_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE: Message not compatible with protocol state. + * @MBIM_NW_ERROR_PROTOCOL_ERROR_UNSPECIFIED: Protocol error, unspecified. * * Network errors. */ typedef enum { - MBIM_NW_ERROR_UNKNOWN = 0, - MBIM_NW_ERROR_IMSI_UNKNOWN_IN_HLR = 2, - MBIM_NW_ERROR_IMSI_UNKNOWN_IN_VLR = 4, - MBIM_NW_ERROR_ILLEGAL_ME = 6, - MBIM_NW_ERROR_GPRS_NOT_ALLOWED = 7, - MBIM_NW_ERROR_GPRS_AND_NON_GPRS_NOT_ALLOWED = 8, - MBIM_NW_ERROR_PLMN_NOT_ALLOWED = 11, - MBIM_NW_ERROR_LOCATION_AREA_NOT_ALLOWED = 12, - MBIM_NW_ERROR_ROAMING_NOT_ALLOWED_IN_LOCATION_AREA = 13, - MBIM_NW_ERROR_GPRS_NOT_ALLOWED_IN_PLMN = 14, - MBIM_NW_ERROR_NO_CELLS_IN_LOCATION_AREA = 15, - MBIM_NW_ERROR_NETWORK_FAILURE = 17, - MBIM_NW_ERROR_CONGESTION = 22 + MBIM_NW_ERROR_UNKNOWN = 0, + MBIM_NW_ERROR_IMSI_UNKNOWN_IN_HLR = 2, + MBIM_NW_ERROR_ILLEGAL_MS = 3, + MBIM_NW_ERROR_IMSI_UNKNOWN_IN_VLR = 4, + MBIM_NW_ERROR_IMEI_NOT_ACCEPTED = 5, + MBIM_NW_ERROR_ILLEGAL_ME = 6, + MBIM_NW_ERROR_GPRS_NOT_ALLOWED = 7, + MBIM_NW_ERROR_GPRS_AND_NON_GPRS_NOT_ALLOWED = 8, + MBIM_NW_ERROR_MS_IDENTITY_NOT_DERIVED_BY_NETWORK = 9, + MBIM_NW_ERROR_IMPLICITLY_DETACHED = 10, + MBIM_NW_ERROR_PLMN_NOT_ALLOWED = 11, + MBIM_NW_ERROR_LOCATION_AREA_NOT_ALLOWED = 12, + MBIM_NW_ERROR_ROAMING_NOT_ALLOWED_IN_LOCATION_AREA = 13, + MBIM_NW_ERROR_GPRS_NOT_ALLOWED_IN_PLMN = 14, + MBIM_NW_ERROR_NO_CELLS_IN_LOCATION_AREA = 15, + MBIM_NW_ERROR_MSC_TEMPORARILY_NOT_REACHABLE = 16, + MBIM_NW_ERROR_NETWORK_FAILURE = 17, + MBIM_NW_ERROR_MAC_FAILURE = 20, + MBIM_NW_ERROR_SYNCH_FAILURE = 21, + MBIM_NW_ERROR_CONGESTION = 22, + MBIM_NW_ERROR_GSM_AUTHENTICATION_UNACCEPTABLE = 23, + MBIM_NW_ERROR_NOT_AUTHORIZED_FOR_CSG = 25, + MBIM_NW_ERROR_MISSING_OR_UNKNOWN_APN = 27, + MBIM_NW_ERROR_SERVICE_OPTION_NOT_SUPPORTED = 32, + MBIM_NW_ERROR_REQUESTED_SERVICE_OPTION_NOT_SUBSCRIBED = 33, + MBIM_NW_ERROR_SERVICE_OPTION_TEMPORARILY_OUT_OF_ORDER = 34, + MBIM_NW_ERROR_NO_PDP_CONTEXT_ACTIVATED = 40, + MBIM_NW_ERROR_SEMANTICALLY_INCORRECT_MESSAGE = 95, + MBIM_NW_ERROR_INVALID_MANDATORY_INFORMATION = 96, + MBIM_NW_ERROR_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED = 97, + MBIM_NW_ERROR_MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 98, + MBIM_NW_ERROR_INFORMATION_ELEMENT_NON_EXISTENT_OR_NOT_IMPLEMENTED = 99, + MBIM_NW_ERROR_CONDITIONAL_IE_ERROR = 100, + MBIM_NW_ERROR_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 101, + MBIM_NW_ERROR_PROTOCOL_ERROR_UNSPECIFIED = 111 } MbimNwError; /** @@ -449,14 +494,14 @@ * MbimRegistrationFlag: * @MBIM_REGISTRATION_FLAG_NONE: None. * @MBIM_REGISTRATION_FLAG_MANUAL_SELECTION_NOT_AVAILABLE: Network doesn't support manual network selection. - * @MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH: Modem should auto-attach to the network after registration. + * @MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH: Modem should auto-attach to the network after registration. * * Registration flags. */ typedef enum { - MBIM_REGISTRATION_FLAG_NONE = 0, - MBIM_REGISTRATION_FLAG_MANUAL_SELECTION_NOT_AVAILABLE = 1 << 0, - MBIM_REGISTRATION_FLAG_MANUAL_PACKET_SERVICE_AUTOMATIC_ATTACH = 1 << 2, + MBIM_REGISTRATION_FLAG_NONE = 0, + MBIM_REGISTRATION_FLAG_MANUAL_SELECTION_NOT_AVAILABLE = 1 << 0, + MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH = 1 << 1, } MbimRegistrationFlag; /*****************************************************************************/ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-errors.h libmbim-1.10.0/src/libmbim-glib/mbim-errors.h --- libmbim-1.6.0/src/libmbim-glib/mbim-errors.h 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-errors.h 2014-07-31 16:41:35.000000000 +0000 @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_MBIM_ERRORS_H_ @@ -30,6 +30,7 @@ /** * SECTION: mbim-errors * @title: Errors + * @short_description: Common error types. * * This section defines common error types used in the interface. */ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-message.c libmbim-1.10.0/src/libmbim-glib/mbim-message.c --- libmbim-1.6.0/src/libmbim-glib/mbim-message.c 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-message.c 2014-07-31 16:44:12.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include @@ -62,7 +62,7 @@ /*****************************************************************************/ -static GByteArray * +GByteArray * _mbim_message_allocate (MbimMessageType message_type, guint32 transaction_id, guint32 additional_size) @@ -1007,12 +1007,7 @@ mbim_message_set_transaction_id (MbimMessage *self, guint32 transaction_id) { - /* Only allow setting transaction ID in host-generated messages */ g_return_if_fail (self != NULL); - g_return_if_fail (MBIM_MESSAGE_GET_MESSAGE_TYPE (self) == MBIM_MESSAGE_TYPE_COMMAND || - MBIM_MESSAGE_GET_MESSAGE_TYPE (self) == MBIM_MESSAGE_TYPE_OPEN || - MBIM_MESSAGE_GET_MESSAGE_TYPE (self) == MBIM_MESSAGE_TYPE_CLOSE || - MBIM_MESSAGE_GET_MESSAGE_TYPE (self) == MBIM_MESSAGE_TYPE_HOST_ERROR); ((struct header *)(self->data))->transaction_id = GUINT32_TO_LE (transaction_id); } @@ -1198,7 +1193,7 @@ "%s cid = '%s' (0x%08x)\n" "%s type = '%s' (0x%08x)\n", line_prefix, - line_prefix, mbim_service_get_string (mbim_message_command_get_service (self)), uuid_printable, + line_prefix, mbim_service_lookup_name (mbim_message_command_get_service (self)), uuid_printable, line_prefix, cid_printable, mbim_message_command_get_cid (self), line_prefix, mbim_message_command_type_get_string (mbim_message_command_get_command_type (self)), mbim_message_command_get_command_type (self)); g_free (uuid_printable); @@ -1229,7 +1224,7 @@ "%s cid = '%s' (0x%08x)\n", line_prefix, line_prefix, mbim_status_error_get_string (status), status, - line_prefix, mbim_service_get_string (mbim_message_command_done_get_service (self)), uuid_printable, + line_prefix, mbim_service_lookup_name (mbim_message_command_done_get_service (self)), uuid_printable, line_prefix, cid_printable, mbim_message_command_done_get_cid (self)); g_free (uuid_printable); } @@ -1255,7 +1250,7 @@ "%s service = '%s' (%s)\n" "%s cid = '%s' (0x%08x)\n", line_prefix, - line_prefix, mbim_service_get_string (mbim_message_indicate_status_get_service (self)), uuid_printable, + line_prefix, mbim_service_lookup_name (mbim_message_indicate_status_get_service (self)), uuid_printable, line_prefix, cid_printable, mbim_message_indicate_status_get_cid (self)); g_free (uuid_printable); } @@ -1274,10 +1269,10 @@ MBIM_MESSAGE_GET_MESSAGE_TYPE (self) == MBIM_MESSAGE_TYPE_INDICATE_STATUS) #define MBIM_MESSAGE_FRAGMENT_GET_TOTAL(self) \ - GUINT32_FROM_LE (((struct full_message *)(self->data))->message.fragment.fragment_header.total) + GUINT32_FROM_LE (((struct full_message *)(self->data))->message.fragment.fragment_header.total) #define MBIM_MESSAGE_FRAGMENT_GET_CURRENT(self) \ - GUINT32_FROM_LE (((struct full_message *)(self->data))->message.fragment.fragment_header.current) + GUINT32_FROM_LE (((struct full_message *)(self->data))->message.fragment.fragment_header.current) gboolean @@ -1518,6 +1513,32 @@ /* 'Open Done' message interface */ /** + * mbim_message_open_done_new: + * @transaction_id: transaction ID. + * @error_status_code: a #MbimStatusError. + * + * Create a new #MbimMessage of type %MBIM_MESSAGE_TYPE_OPEN_DONE with the specified + * parameters. + * + * Returns: (transfer full): a newly created #MbimMessage, which should be freed with mbim_message_unref(). + */ +MbimMessage * +mbim_message_open_done_new (guint32 transaction_id, + MbimStatusError error_status_code) +{ + GByteArray *self; + + self = _mbim_message_allocate (MBIM_MESSAGE_TYPE_OPEN_DONE, + transaction_id, + sizeof (struct open_done_message)); + + /* Open header */ + ((struct full_message *)(self->data))->message.open_done.status_code = GUINT32_TO_LE (error_status_code); + + return (MbimMessage *)self; +} + +/** * mbim_message_open_done_get_status_code: * @self: a #MbimMessage. * @@ -1588,6 +1609,32 @@ /* 'Close Done' message interface */ /** + * mbim_message_close_done_new: + * @transaction_id: transaction ID. + * @error_status_code: a #MbimStatusError. + * + * Create a new #MbimMessage of type %MBIM_MESSAGE_TYPE_CLOSE_DONE with the specified + * parameters. + * + * Returns: (transfer full): a newly created #MbimMessage, which should be freed with mbim_message_unref(). + */ +MbimMessage * +mbim_message_close_done_new (guint32 transaction_id, + MbimStatusError error_status_code) +{ + GByteArray *self; + + self = _mbim_message_allocate (MBIM_MESSAGE_TYPE_CLOSE_DONE, + transaction_id, + sizeof (struct close_done_message)); + + /* Open header */ + ((struct full_message *)(self->data))->message.close_done.status_code = GUINT32_TO_LE (error_status_code); + + return (MbimMessage *)self; +} + +/** * mbim_message_close_done_get_status_code: * @self: a #MbimMessage. * @@ -1738,7 +1785,7 @@ /* Known service required */ g_return_val_if_fail (service > MBIM_SERVICE_INVALID, FALSE); - g_return_val_if_fail (service <= MBIM_SERVICE_DSS, FALSE); + g_return_val_if_fail (service <= MBIM_SERVICE_PROXY_CONTROL, FALSE); service_id = mbim_uuid_from_service (service); self = _mbim_message_allocate (MBIM_MESSAGE_TYPE_COMMAND, diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-message.h libmbim-1.10.0/src/libmbim-glib/mbim-message.h --- libmbim-1.6.0/src/libmbim-glib/mbim-message.h 2013-06-06 14:43:52.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-message.h 2014-07-31 16:44:12.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_MBIM_MESSAGE_H_ @@ -131,9 +131,11 @@ /*****************************************************************************/ /* 'Open Done' message interface */ -MbimStatusError mbim_message_open_done_get_status_code (const MbimMessage *self); -gboolean mbim_message_open_done_get_result (const MbimMessage *self, - GError **error); +MbimMessage *mbim_message_open_done_new (guint32 transaction_id, + MbimStatusError error_status_code); +MbimStatusError mbim_message_open_done_get_status_code (const MbimMessage *self); +gboolean mbim_message_open_done_get_result (const MbimMessage *self, + GError **error); /*****************************************************************************/ /* 'Close' message interface */ @@ -143,9 +145,11 @@ /*****************************************************************************/ /* 'Close Done' message interface */ -MbimStatusError mbim_message_close_done_get_status_code (const MbimMessage *self); -gboolean mbim_message_close_done_get_result (const MbimMessage *self, - GError **error); +MbimMessage *mbim_message_close_done_new (guint32 transaction_id, + MbimStatusError error_status_code); +MbimStatusError mbim_message_close_done_get_status_code (const MbimMessage *self); +gboolean mbim_message_close_done_get_result (const MbimMessage *self, + GError **error); /*****************************************************************************/ /* 'Error' message interface */ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-message-private.h libmbim-1.10.0/src/libmbim-glib/mbim-message-private.h --- libmbim-1.6.0/src/libmbim-glib/mbim-message-private.h 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-message-private.h 2014-07-31 16:44:12.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado * * This is a private non-installed header */ @@ -42,7 +42,7 @@ /* Defined in the same way as GByteArray */ struct _MbimMessage { guint8 *data; - guint len; + guint len; }; /*****************************************************************************/ @@ -129,6 +129,10 @@ } __attribute__((packed)); /*****************************************************************************/ +/* Message creation */ +GByteArray *_mbim_message_allocate (MbimMessageType message_type, guint32 transaction_id, guint32 additional_size); + +/*****************************************************************************/ /* Fragment interface */ gboolean _mbim_message_is_fragment (const MbimMessage *self); diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-proxy.c libmbim-1.10.0/src/libmbim-glib/mbim-proxy.c --- libmbim-1.6.0/src/libmbim-glib/mbim-proxy.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-proxy.c 2014-08-04 09:02:15.000000000 +0000 @@ -0,0 +1,1331 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +/* + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2014 Aleksander Morgado + * Copyright (C) 2014 Smith Micro Software, Inc. + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include "mbim-device.h" +#include "mbim-utils.h" +#include "mbim-proxy.h" +#include "mbim-message-private.h" +#include "mbim-cid.h" +#include "mbim-enum-types.h" +#include "mbim-error-types.h" +#include "mbim-basic-connect.h" +#include "mbim-proxy-helpers.h" + +#define BUFFER_SIZE 512 + +G_DEFINE_TYPE (MbimProxy, mbim_proxy, G_TYPE_OBJECT) + +enum { + PROP_0, + PROP_N_CLIENTS, + PROP_N_DEVICES, + PROP_LAST +}; + +static GParamSpec *properties[PROP_LAST]; + +struct _MbimProxyPrivate { + /* Unix socket service */ + GSocketService *socket_service; + + /* Clients */ + GList *clients; + + /* Devices */ + GList *devices; + GList *opening_devices; + + /* Global events array */ + MbimEventEntry **mbim_event_entry_array; + gsize mbim_event_entry_array_size; +}; + +static void track_device (MbimProxy *self, MbimDevice *device); +static void untrack_device (MbimProxy *self, MbimDevice *device); +static MbimDevice *peek_device_for_path (MbimProxy *self, const gchar *path); + +/*****************************************************************************/ + +/** + * mbim_proxy_get_n_clients: + * @self: a #MbimProxy. + * + * Get the number of clients currently connected to the proxy. + * + * Returns: a #guint. + */ +guint +mbim_proxy_get_n_clients (MbimProxy *self) +{ + g_return_val_if_fail (MBIM_IS_PROXY (self), 0); + + return g_list_length (self->priv->clients); +} + +/** + * mbim_proxy_get_n_devices: + * @self: a #MbimProxy. + * + * Get the number of devices currently connected to the proxy. + * + * Returns: a #guint. + */ +guint +mbim_proxy_get_n_devices (MbimProxy *self) +{ + g_return_val_if_fail (MBIM_IS_PROXY (self), 0); + + return g_list_length (self->priv->devices); +} + +/*****************************************************************************/ +/* Client info */ + +typedef struct { + volatile gint ref_count; + + MbimProxy *self; /* not full ref */ + GSocketConnection *connection; + GSource *connection_readable_source; + GByteArray *buffer; + + /* Only one proxy config allowed at a time */ + gboolean config_ongoing; + + MbimDevice *device; + guint indication_id; + gboolean service_subscriber_list_enabled; + MbimEventEntry **mbim_event_entry_array; + gsize mbim_event_entry_array_size; +} Client; + +static gboolean connection_readable_cb (GSocket *socket, GIOCondition condition, Client *client); +static void track_client (MbimProxy *self, Client *client); +static void untrack_client (MbimProxy *self, Client *client); + +static void +client_disconnect (Client *client) +{ + if (client->connection_readable_source) { + g_source_destroy (client->connection_readable_source); + g_source_unref (client->connection_readable_source); + client->connection_readable_source = 0; + } + + if (client->connection) { + g_debug ("Client (%d) connection closed...", g_socket_get_fd (g_socket_connection_get_socket (client->connection))); + g_output_stream_close (g_io_stream_get_output_stream (G_IO_STREAM (client->connection)), NULL, NULL); + g_object_unref (client->connection); + client->connection = NULL; + } +} + +static void client_indication_cb (MbimDevice *device, + MbimMessage *message, + Client *client); + +static void +client_set_device (Client *client, + MbimDevice *device) +{ + if (client->device) { + if (g_signal_handler_is_connected (client->device, client->indication_id)) + g_signal_handler_disconnect (client->device, client->indication_id); + g_object_unref (client->device); + } + + if (device) { + client->device = g_object_ref (device); + client->indication_id = g_signal_connect (client->device, + MBIM_DEVICE_SIGNAL_INDICATE_STATUS, + G_CALLBACK (client_indication_cb), + client); + } else { + client->device = NULL; + client->indication_id = 0; + } +} + +static void +client_unref (Client *client) +{ + if (g_atomic_int_dec_and_test (&client->ref_count)) { + /* Ensure disconnected */ + client_disconnect (client); + /* Reset device */ + client_set_device (client, NULL); + + if (client->buffer) + g_byte_array_unref (client->buffer); + + if (client->mbim_event_entry_array) + mbim_event_entry_array_free (client->mbim_event_entry_array); + + g_slice_free (Client, client); + } +} + +static Client * +client_ref (Client *client) +{ + g_atomic_int_inc (&client->ref_count); + return client; +} + +static gboolean +client_send_message (Client *client, + MbimMessage *message, + GError **error) +{ + if (!client->connection) { + g_set_error (error, + MBIM_CORE_ERROR, + MBIM_CORE_ERROR_WRONG_STATE, + "Cannot send message: not connected"); + return FALSE; + } + + g_debug ("Client (%d) TX: %u bytes", g_socket_get_fd (g_socket_connection_get_socket (client->connection)), message->len); + if (!g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (client->connection)), + message->data, + message->len, + NULL, /* bytes_written */ + NULL, /* cancellable */ + error)) { + g_prefix_error (error, "Cannot send message to client: "); + return FALSE; + } + + return TRUE; +} + +/*****************************************************************************/ +/* Track/untrack clients */ + +static void +track_client (MbimProxy *self, + Client *client) +{ + self->priv->clients = g_list_append (self->priv->clients, client_ref (client)); + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_N_CLIENTS]); +} + +static void +untrack_client (MbimProxy *self, + Client *client) +{ + /* Disconnect the client explicitly when untracking */ + client_disconnect (client); + + if (g_list_find (self->priv->clients, client)) { + self->priv->clients = g_list_remove (self->priv->clients, client); + client_unref (client); + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_N_CLIENTS]); + } +} + +/*****************************************************************************/ +/* Client indications */ + +static void +client_indication_cb (MbimDevice *device, + MbimMessage *message, + Client *client) +{ + guint i; + GError *error = NULL; + gboolean forward_indication = FALSE; + MbimEventEntry *event = NULL; + + if (client->service_subscriber_list_enabled) { + /* if client sent the device service subscribe list with element count 0 then + * ignore all indications */ + if (client->mbim_event_entry_array) { + for (i = 0; i < client->mbim_event_entry_array_size; i++) { + if (mbim_uuid_cmp (mbim_message_indicate_status_get_service_id (message), + &client->mbim_event_entry_array[i]->device_service_id)) { + event = client->mbim_event_entry_array[i]; + break; + } + } + + if (event) { + /* found matching service, search for cid */ + if (event->cids_count) { + for (i = 0; i < event->cids_count; i++) { + if (mbim_message_indicate_status_get_cid (message) == event->cids[i]) { + forward_indication = TRUE; + break; + } + } + } else + /* cids_count of 0 enables all indications for the service */ + forward_indication = TRUE; + } + } + } else if (mbim_message_indicate_status_get_service (message) != MBIM_SERVICE_INVALID && + !mbim_service_id_is_custom (mbim_message_indicate_status_get_service (message))) + /* only forward standard service indications if service subscriber list is not enabled */ + forward_indication = TRUE; + + if (forward_indication) { + if (!client_send_message (client, message, &error)) { + g_warning ("couldn't forward indication to client"); + g_error_free (error); + } + } +} + +/*****************************************************************************/ +/* Request info */ + +typedef struct { + MbimProxy *self; + Client *client; + MbimMessage *message; + MbimMessage *response; + guint32 original_transaction_id; + /* Only used in proxy config */ + guint32 timeout_secs; +} Request; + +static void +request_complete_and_free (Request *request) +{ + if (request->response) { + GError *error = NULL; + + /* Try to send response to client; if it fails, always assume we have + * to close the connection */ + if (!client_send_message (request->client, request->response, &error)) { + g_debug ("couldn't send response back to client: %s", error->message); + g_error_free (error); + /* Disconnect and untrack client */ + untrack_client (request->self, request->client); + } + + mbim_message_unref (request->response); + } + + if (request->message) + mbim_message_unref (request->message); + client_unref (request->client); + g_object_unref (request->self); + g_slice_free (Request, request); +} + +static Request * +request_new (MbimProxy *self, + Client *client, + MbimMessage *message) +{ + Request *request; + + request = g_slice_new0 (Request); + request->self = g_object_ref (self); + request->client = client_ref (client); + request->message = mbim_message_ref (message); + request->original_transaction_id = mbim_message_get_transaction_id (message); + + return request; +} + +/*****************************************************************************/ +/* Internal proxy device opening operation */ + +static gboolean +internal_device_open_finish (MbimProxy *self, + GAsyncResult *res, + GError **error) +{ + return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); +} + +typedef struct { + MbimDevice *device; + GList *pending; +} OpeningDevice; + +static void +opening_device_complete_and_free (OpeningDevice *info, + const GError *error) +{ + GList *l; + + /* Complete all pending open actions */ + for (l = info->pending; l; l = g_list_next (l)) { + GSimpleAsyncResult *simple = (GSimpleAsyncResult *)(l->data); + + if (error) + g_simple_async_result_set_from_error (simple, error); + else + g_simple_async_result_set_op_res_gboolean (simple, TRUE); + g_simple_async_result_complete_in_idle (simple); + g_object_unref (simple); + } + + g_list_free (info->pending); + g_object_unref (info->device); + g_slice_free (OpeningDevice, info); +} + +static OpeningDevice * +peek_opening_device_info (MbimProxy *self, + MbimDevice *device) +{ + GList *l; + + /* If already being opened, queue it up */ + for (l = self->priv->opening_devices; l; l = g_list_next (l)) { + OpeningDevice *info; + + info = (OpeningDevice *)(l->data); + if (g_str_equal (mbim_device_get_path (device), mbim_device_get_path (info->device))) + return info; + } + + return NULL; +} + +static void +cancel_opening_device (MbimProxy *self, + MbimDevice *device) +{ + OpeningDevice *info; + GError *error; + + info = peek_opening_device_info (self, device); + if (!info) + return; + + error = g_error_new (MBIM_CORE_ERROR, MBIM_CORE_ERROR_ABORTED, "Device is gone"); + opening_device_complete_and_free (info, error); + g_error_free (error); +} + +static void +device_open_ready (MbimDevice *device, + GAsyncResult *res, + MbimProxy *self) +{ + GError *error = NULL; + OpeningDevice *info; + + mbim_device_open_finish (device, res, &error); + + info = peek_opening_device_info (self, device); + g_assert (info != NULL); + + /* Remove opening device info */ + self->priv->opening_devices = g_list_remove (self->priv->opening_devices, info); + + /* Complete all pending open actions */ + opening_device_complete_and_free (info, error); + + if (error) { + /* Fully untrack the device as it wasn't correctly open */ + untrack_device (self, device); + g_error_free (error); + } +} + +static void +internal_device_open (MbimProxy *self, + MbimDevice *device, + guint32 timeout_secs, + GAsyncReadyCallback callback, + gpointer user_data) +{ + OpeningDevice *info; + GSimpleAsyncResult *simple; + + simple = g_simple_async_result_new (G_OBJECT (self), + callback, + user_data, + internal_device_open); + + /* If the device is already open, we are done */ + if (mbim_device_is_open (device)) { + g_simple_async_result_set_op_res_gboolean (simple, TRUE); + g_simple_async_result_complete_in_idle (simple); + g_object_unref (simple); + return; + } + + /* If already being opened, queue it up */ + info = peek_opening_device_info (self, device); + if (info) { + info->pending = g_list_append (info->pending, simple); + return; + } + + /* First time opening, go on */ + info = g_slice_new0 (OpeningDevice); + info->device = g_object_ref (device); + info->pending = g_list_append (info->pending, simple); + self->priv->opening_devices = g_list_prepend (self->priv->opening_devices, info); + + /* Note: for now, only the first timeout request is taken into account */ + + /* Need to open the device; and we must make sure the proxy only does this once, even + * when multiple clients request it */ + mbim_device_open (device, + timeout_secs, + NULL, + (GAsyncReadyCallback)device_open_ready, + g_object_ref (self)); +} + +/*****************************************************************************/ +/* Proxy open */ + +static gboolean +process_internal_proxy_open (MbimProxy *self, + Client *client, + MbimMessage *message) +{ + Request *request; + MbimStatusError status = MBIM_STATUS_ERROR_FAILURE; + + /* create request holder */ + request = request_new (self, client, message); + + if (!client->device) + g_warning ("cannot process Open: device not set"); + else if (!mbim_device_is_open (client->device)) + g_warning ("cannot process Open: device not opened by proxy"); + else { + g_debug ("connection to MBIM device '%s' established", mbim_device_get_path (client->device)); + status = MBIM_STATUS_ERROR_NONE; + } + + request->response = mbim_message_open_done_new (mbim_message_get_transaction_id (request->message), status); + request_complete_and_free (request); + return TRUE; +} + +/*****************************************************************************/ +/* Proxy close */ + +static gboolean +process_internal_proxy_close (MbimProxy *self, + Client *client, + MbimMessage *message) +{ + Request *request; + + request = request_new (self, client, message); + request->response = mbim_message_close_done_new (mbim_message_get_transaction_id (message), MBIM_STATUS_ERROR_NONE); + request_complete_and_free (request); + return TRUE; +} + +/*****************************************************************************/ +/* Proxy config */ + +static MbimMessage * +build_proxy_control_command_done (MbimMessage *message, + MbimStatusError status) +{ + MbimMessage *response; + struct command_done_message *command_done; + + response = (MbimMessage *) _mbim_message_allocate (MBIM_MESSAGE_TYPE_COMMAND_DONE, + mbim_message_get_transaction_id (message), + sizeof (struct command_done_message)); + command_done = &(((struct full_message *)(response->data))->message.command_done); + command_done->fragment_header.total = GUINT32_TO_LE (1); + command_done->fragment_header.current = 0; + memcpy (command_done->service_id, MBIM_UUID_PROXY_CONTROL, sizeof (MbimUuid)); + command_done->command_id = GUINT32_TO_LE (mbim_message_command_get_cid (message)); + command_done->status_code = GUINT32_TO_LE (status); + command_done->buffer_length = 0; + + return response; +} + +static void +proxy_config_internal_device_open_ready (MbimProxy *self, + GAsyncResult *res, + Request *request) +{ + GError *error = NULL; + + if (!internal_device_open_finish (self, res, &error)) { + g_warning ("error opening device: %s", error->message); + g_error_free (error); + /* Untrack client and complete without response */ + untrack_client (request->self, request->client); + request_complete_and_free (request); + return; + } + + if (request->client->config_ongoing == TRUE) + request->client->config_ongoing = FALSE; + request->response = build_proxy_control_command_done (request->message, MBIM_STATUS_ERROR_NONE); + request_complete_and_free (request); +} + +static void +device_new_ready (GObject *source, + GAsyncResult *res, + Request *request) +{ + GError *error = NULL; + MbimDevice *existing; + MbimDevice *device; + + device = mbim_device_new_finish (res, &error); + if (!device) { + g_warning ("couldn't create MBIM device: %s", error->message); + g_error_free (error); + /* Untrack client and complete without response */ + untrack_client (request->self, request->client); + request_complete_and_free (request); + return; + } + + /* Store device in the proxy independently */ + existing = peek_device_for_path (request->self, mbim_device_get_path (device)); + if (existing) { + /* Race condition, we created two MbimDevices for the same port, just skip ours, no big deal */ + client_set_device (request->client, existing); + } else { + /* Keep the newly added device in the proxy */ + track_device (request->self, device); + /* Also keep track of the device in the client */ + client_set_device (request->client, device); + } + g_object_unref (device); + + internal_device_open (request->self, + request->client->device, + request->timeout_secs, + (GAsyncReadyCallback)proxy_config_internal_device_open_ready, + request); +} + +static gboolean +process_internal_proxy_config (MbimProxy *self, + Client *client, + MbimMessage *message) +{ + Request *request; + MbimDevice *device; + gchar *path; + GFile *file; + + /* create request holder */ + request = request_new (self, client, message); + + /* Error out if there is already a proxy config ongoing */ + if (client->config_ongoing) { + request->response = build_proxy_control_command_done (message, MBIM_STATUS_ERROR_BUSY); + request_complete_and_free (request); + return TRUE; + } + + /* Only allow SET command */ + if (mbim_message_command_get_command_type (message) != MBIM_MESSAGE_COMMAND_TYPE_SET) { + request->response = build_proxy_control_command_done (message, MBIM_STATUS_ERROR_INVALID_PARAMETERS); + request_complete_and_free (request); + return TRUE; + } + + /* Retrieve path from request */ + path = _mbim_message_read_string (message, 0, 0); + if (!path) { + request->response = build_proxy_control_command_done (message, MBIM_STATUS_ERROR_INVALID_PARAMETERS); + request_complete_and_free (request); + return TRUE; + } + + /* Only allow subsequent requests with the same path */ + if (client->device) { + if (g_str_equal (path, mbim_device_get_path (client->device))) + request->response = build_proxy_control_command_done (message, MBIM_STATUS_ERROR_NONE); + else + request->response = build_proxy_control_command_done (message, MBIM_STATUS_ERROR_FAILURE); + request_complete_and_free (request); + g_free (path); + return TRUE; + } + + /* Read requested timeout value */ + request->timeout_secs = _mbim_message_read_guint32 (message, 8); + + /* Check if some other client already handled the same device */ + device = peek_device_for_path (self, path); + if (device) { + /* Keep reference and continue */ + client_set_device (client, device); + + internal_device_open (self, + device, + request->timeout_secs, + (GAsyncReadyCallback)proxy_config_internal_device_open_ready, + request); + g_free (path); + return TRUE; + } + + /* Flag as ongoing */ + client->config_ongoing = TRUE; + + /* Create new MBIM device */ + file = g_file_new_for_path (path); + mbim_device_new (file, + NULL, + (GAsyncReadyCallback)device_new_ready, + request); + g_object_unref (file); + g_free (path); + return TRUE; +} + +/*****************************************************************************/ +/* Subscriber list */ + +static void +track_service_subscribe_list (Client *client, + MbimMessage *message) +{ + client->service_subscriber_list_enabled = TRUE; + + if (client->mbim_event_entry_array) + mbim_event_entry_array_free (client->mbim_event_entry_array); + + client->mbim_event_entry_array = _mbim_proxy_helper_service_subscribe_request_parse (message, &client->mbim_event_entry_array_size); + + if (mbim_utils_get_traces_enabled ()) { + g_debug ("Client (%d) service subscribe list built", g_socket_get_fd (g_socket_connection_get_socket (client->connection))); + _mbim_proxy_helper_service_subscribe_list_debug ((const MbimEventEntry * const *)client->mbim_event_entry_array, + client->mbim_event_entry_array_size); + } +} + +static MbimEventEntry ** +merge_client_service_subscribe_lists (MbimProxy *self, + gsize *out_size) +{ + GList *l; + MbimEventEntry **updated; + gsize updated_size = 0; + + g_assert (out_size != NULL); + + /* Add previous global list */ + updated = _mbim_proxy_helper_service_subscribe_list_merge (NULL, 0, + self->priv->mbim_event_entry_array, self->priv->mbim_event_entry_array_size, + &updated_size); + + for (l = self->priv->clients; l; l = g_list_next (l)) { + Client *client; + + client = l->data; + if (!client->mbim_event_entry_array) + continue; + + /* Add per-client list */ + updated = _mbim_proxy_helper_service_subscribe_list_merge (updated, updated_size, + client->mbim_event_entry_array, client->mbim_event_entry_array_size, + &updated_size); + } + + if (mbim_utils_get_traces_enabled ()) { + g_debug ("Merged service subscribe list built"); + _mbim_proxy_helper_service_subscribe_list_debug ((const MbimEventEntry * const *)updated, updated_size); + } + + *out_size = updated_size; + return updated; +} + +static void +device_service_subscribe_list_set_complete (Request *request, + MbimStatusError status) +{ + struct command_done_message *command_done; + guint32 raw_len; + const guint8 *raw_data; + + /* The raw message data to send back as response to client */ + raw_data = mbim_message_command_get_raw_information_buffer (request->message, &raw_len); + + request->response = (MbimMessage *)_mbim_message_allocate (MBIM_MESSAGE_TYPE_COMMAND_DONE, + mbim_message_get_transaction_id (request->message), + sizeof (struct command_done_message) + + raw_len); + command_done = &(((struct full_message *)(request->response->data))->message.command_done); + command_done->fragment_header.total = GUINT32_TO_LE (1); + command_done->fragment_header.current = 0; + memcpy (command_done->service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + command_done->command_id = GUINT32_TO_LE (MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST); + command_done->status_code = GUINT32_TO_LE (status); + command_done->buffer_length = GUINT32_TO_LE (raw_len); + memcpy (&command_done->buffer[0], raw_data, raw_len); + + request_complete_and_free (request); +} + +static void +device_service_subscribe_list_set_ready (MbimDevice *device, + GAsyncResult *res, + Request *request) +{ + MbimMessage *tmp_response; + MbimStatusError error_status_code; + GError *error = NULL; + + tmp_response = mbim_device_command_finish (device, res, &error); + if (!tmp_response) { + g_debug ("sending request to device failed: %s", error->message); + g_error_free (error); + /* Don't disconnect client, just let the request timeout in its side */ + request_complete_and_free (request); + return; + } + + error_status_code = GUINT32_FROM_LE (((struct full_message *)(tmp_response->data))->message.command_done.status_code); + mbim_message_unref (tmp_response); + + device_service_subscribe_list_set_complete (request, error_status_code); +} + +static gboolean +process_device_service_subscribe_list (MbimProxy *self, + Client *client, + MbimMessage *message) +{ + MbimEventEntry **updated; + gsize updated_size = 0; + Request *request; + + /* create request holder */ + request = request_new (self, client, message); + + /* trace the service subscribe list for the client */ + track_service_subscribe_list (client, message); + + /* merge all service subscribe list for all clients to set on device */ + updated = merge_client_service_subscribe_lists (self, &updated_size); + + /* If lists are equal, ignore re-setting them up */ + if (_mbim_proxy_helper_service_subscribe_list_cmp ( + (const MbimEventEntry *const *)updated, updated_size, + (const MbimEventEntry *const *)self->priv->mbim_event_entry_array, self->priv->mbim_event_entry_array_size)) { + /* Complete directly without error */ + mbim_event_entry_array_free (updated); + device_service_subscribe_list_set_complete (request, MBIM_STATUS_ERROR_NONE); + return TRUE; + } + + /* Lists are different, updated stored one */ + mbim_event_entry_array_free (self->priv->mbim_event_entry_array); + self->priv->mbim_event_entry_array = updated; + self->priv->mbim_event_entry_array_size = updated_size; + + message = mbim_message_device_service_subscribe_list_set_new (self->priv->mbim_event_entry_array_size, + (const MbimEventEntry *const *)self->priv->mbim_event_entry_array, + NULL); + mbim_message_set_transaction_id (message, mbim_device_get_next_transaction_id (client->device)); + + mbim_device_command (client->device, + message, + 300, + NULL, + (GAsyncReadyCallback)device_service_subscribe_list_set_ready, + request); + + mbim_message_unref (message); + return TRUE; +} + +/*****************************************************************************/ +/* Standard command */ + +static void +device_command_ready (MbimDevice *device, + GAsyncResult *res, + Request *request) +{ + GError *error = NULL; + + request->response = mbim_device_command_finish (device, res, &error); + if (!request->response) { + g_debug ("sending request to device failed: %s", error->message); + g_error_free (error); + /* Don't disconnect client, just let the request timeout in its side */ + request_complete_and_free (request); + return; + } + + /* replace reponse transaction id with the requested transaction id */ + mbim_message_set_transaction_id (request->response, request->original_transaction_id); + + request_complete_and_free (request); +} + +static gboolean +process_command (MbimProxy *self, + Client *client, + MbimMessage *message) +{ + Request *request; + + /* create request holder */ + request = request_new (self, client, message); + + /* replace command transaction id with internal proxy transaction id to avoid collision */ + mbim_message_set_transaction_id (message, mbim_device_get_next_transaction_id (client->device)); + + /* The timeout needs to be big enough for any kind of transaction to + * complete, otherwise the remote clients will lose the reply if they + * configured a timeout bigger than this internal one. We should likely + * make this value configurable per-client, instead of a hardcoded value. + */ + mbim_device_command (client->device, + message, + 300, + NULL, + (GAsyncReadyCallback)device_command_ready, + request); + return TRUE; +} + +/*****************************************************************************/ + +static gboolean +process_message (MbimProxy *self, + Client *client, + MbimMessage *message) +{ + /* Filter by message type */ + switch (mbim_message_get_message_type (message)) { + case MBIM_MESSAGE_TYPE_OPEN: + return process_internal_proxy_open (self, client, message); + case MBIM_MESSAGE_TYPE_CLOSE: + return process_internal_proxy_close (self, client, message); + case MBIM_MESSAGE_TYPE_COMMAND: + /* Proxy control message? */ + if (mbim_message_command_get_service (message) == MBIM_SERVICE_PROXY_CONTROL && + mbim_message_command_get_cid (message) == MBIM_CID_PROXY_CONTROL_CONFIGURATION) + return process_internal_proxy_config (self, client, message); + /* device service subscribe list message? */ + if (mbim_message_command_get_service (message) == MBIM_SERVICE_BASIC_CONNECT && + mbim_message_command_get_cid (message) == MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST) + return process_device_service_subscribe_list (self, client, message); + /* Otherwise, standard command to forward */ + return process_command (self, client, message); + default: + g_debug ("invalid message from client: not a command message"); + return FALSE; + } + + g_assert_not_reached (); +} + +static void +parse_request (MbimProxy *self, + Client *client) +{ + do { + MbimMessage *message; + guint32 len = 0; + + if (client->buffer->len >= sizeof (struct header) && + (len = GUINT32_FROM_LE (((struct header *)client->buffer->data)->length)) > client->buffer->len) { + /* have not received complete message */ + return; + } + + if (!len) + return; + + message = mbim_message_new (client->buffer->data, len); + if (!message) + return; + g_byte_array_remove_range (client->buffer, 0, len); + + /* Play with the received message */ + process_message (self, client, message); + mbim_message_unref (message); + } while (client->buffer->len > 0); +} + +static gboolean +connection_readable_cb (GSocket *socket, + GIOCondition condition, + Client *client) +{ + MbimProxy *self; + guint8 buffer[BUFFER_SIZE]; + GError *error = NULL; + gssize r; + + /* Recover proxy pointer soon */ + self = client->self; + + if (condition & G_IO_HUP || condition & G_IO_ERR) { + untrack_client (self, client); + return FALSE; + } + + if (!(condition & G_IO_IN || condition & G_IO_PRI)) + return TRUE; + + r = g_input_stream_read (g_io_stream_get_input_stream (G_IO_STREAM (client->connection)), + buffer, + BUFFER_SIZE, + NULL, + &error); + if (r < 0) { + g_warning ("Error reading from istream: %s", error ? error->message : "unknown"); + if (error) + g_error_free (error); + /* Close the device */ + untrack_client (self, client); + return FALSE; + } + + if (r == 0) + return TRUE; + + /* else, r > 0 */ + if (!G_UNLIKELY (client->buffer)) + client->buffer = g_byte_array_sized_new (r); + g_byte_array_append (client->buffer, buffer, r); + + /* Try to parse input messages */ + parse_request (self, client); + + return TRUE; +} + +static void +incoming_cb (GSocketService *service, + GSocketConnection *connection, + GObject *unused, + MbimProxy *self) +{ + Client *client; + GCredentials *credentials; + GError *error = NULL; + uid_t uid; + + g_debug ("Client (%d) connection open...", g_socket_get_fd (g_socket_connection_get_socket (connection))); + + credentials = g_socket_get_credentials (g_socket_connection_get_socket (connection), &error); + if (!credentials) { + g_warning ("Client not allowed: Error getting socket credentials: %s", error->message); + g_error_free (error); + return; + } + + uid = g_credentials_get_unix_user (credentials, &error); + g_object_unref (credentials); + if (error) { + g_warning ("Client not allowed: Error getting unix user id: %s", error->message); + g_error_free (error); + return; + } + + if (uid != 0) { + g_warning ("Client not allowed: Not enough privileges"); + return; + } + + /* Create client */ + client = g_slice_new0 (Client); + client->self = self; + client->ref_count = 1; + client->connection = g_object_ref (connection); + client->connection_readable_source = g_socket_create_source (g_socket_connection_get_socket (client->connection), + G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP, + NULL); + g_source_set_callback (client->connection_readable_source, + (GSourceFunc)connection_readable_cb, + client, + NULL); + g_source_attach (client->connection_readable_source, NULL); + + /* Keep the client info around */ + track_client (self, client); + + client_unref (client); +} + +static gboolean +setup_socket_service (MbimProxy *self, + GError **error) +{ + GSocketAddress *socket_address; + GSocket *socket; + + socket = g_socket_new (G_SOCKET_FAMILY_UNIX, + G_SOCKET_TYPE_STREAM, + G_SOCKET_PROTOCOL_DEFAULT, + error); + if (!socket) + return FALSE; + + /* Bind to address */ + socket_address = (g_unix_socket_address_new_with_type ( + MBIM_PROXY_SOCKET_PATH, + -1, + G_UNIX_SOCKET_ADDRESS_ABSTRACT)); + if (!g_socket_bind (socket, socket_address, TRUE, error)) { + g_object_unref (socket_address); + g_object_unref (socket); + return FALSE; + } + g_object_unref (socket_address); + + g_debug ("creating UNIX socket service..."); + + /* Listen */ + if (!g_socket_listen (socket, error)) { + g_object_unref (socket); + return FALSE; + } + + /* Create socket service */ + self->priv->socket_service = g_socket_service_new (); + g_signal_connect (self->priv->socket_service, "incoming", G_CALLBACK (incoming_cb), self); + if (!g_socket_listener_add_socket (G_SOCKET_LISTENER (self->priv->socket_service), + socket, + NULL, /* don't pass an object, will take a reference */ + error)) { + g_prefix_error (error, "Error adding socket at '%s' to socket service: ", MBIM_PROXY_SOCKET_PATH); + g_object_unref (socket); + return FALSE; + } + + g_debug ("starting UNIX socket service at '%s'...", MBIM_PROXY_SOCKET_PATH); + g_socket_service_start (self->priv->socket_service); + g_object_unref (socket); + return TRUE; +} + +/*****************************************************************************/ +/* Device tracking */ + +static MbimDevice * +peek_device_for_path (MbimProxy *self, + const gchar *path) +{ + GList *l; + + for (l = self->priv->devices; l; l = g_list_next (l)) { + /* Return if found */ + if (g_str_equal (mbim_device_get_path ((MbimDevice *)l->data), path)) + return (MbimDevice *)l->data; + } + + return NULL; +} + +static void +proxy_device_removed_cb (MbimDevice *device, + MbimProxy *self) +{ + untrack_device (self, device); +} + +static void +untrack_device (MbimProxy *self, + MbimDevice *device) +{ + GList *l; + GList *to_remove = NULL; + + if (!g_list_find (self->priv->devices, device)) + return; + + /* Disconnect right away */ + g_signal_handlers_disconnect_by_func (device, proxy_device_removed_cb, self); + + /* If pending openings ongoing, complete them with error */ + cancel_opening_device (self, device); + + /* Lookup all clients with this device */ + for (l = self->priv->clients; l; l = g_list_next (l)) { + if (g_str_equal (mbim_device_get_path (((Client *)(l->data))->device), mbim_device_get_path (device))) + to_remove = g_list_append (to_remove, l->data); + } + + /* Remove all these clients */ + for (l = to_remove; l; l = g_list_next (l)) + untrack_client (self, (Client *)(l->data)); + g_list_free (to_remove); + + /* And finally, remove the device */ + self->priv->devices = g_list_remove (self->priv->devices, device); + g_object_unref (device); + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_N_DEVICES]); +} + +static void +track_device (MbimProxy *self, + MbimDevice *device) +{ + self->priv->devices = g_list_append (self->priv->devices, g_object_ref (device)); + g_signal_connect (device, + MBIM_DEVICE_SIGNAL_REMOVED, + G_CALLBACK (proxy_device_removed_cb), + self); + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_N_DEVICES]); +} + +/*****************************************************************************/ + +MbimProxy * +mbim_proxy_new (GError **error) +{ + MbimProxy *self; + + /* Only root can run the mbim-proxy */ + if (getuid () != 0) { + g_set_error (error, + MBIM_CORE_ERROR, + MBIM_CORE_ERROR_FAILED, + "Not enough privileges"); + return NULL; + } + + self = g_object_new (MBIM_TYPE_PROXY, NULL); + if (!setup_socket_service (self, error)) + g_clear_object (&self); + return self; +} + +static void +mbim_proxy_init (MbimProxy *self) +{ + /* Setup private data */ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + MBIM_TYPE_PROXY, + MbimProxyPrivate); + + /* By default, we assume we have all default services enabled */ + self->priv->mbim_event_entry_array = _mbim_proxy_helper_service_subscribe_standard_list_new (&self->priv->mbim_event_entry_array_size); +} + +static void +get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + MbimProxy *self = MBIM_PROXY (object); + + switch (prop_id) { + case PROP_N_CLIENTS: + g_value_set_uint (value, g_list_length (self->priv->clients)); + break; + case PROP_N_DEVICES: + g_value_set_uint (value, g_list_length (self->priv->devices)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +dispose (GObject *object) +{ + MbimProxyPrivate *priv = MBIM_PROXY (object)->priv; + + /* This list should always be empty when disposing */ + g_assert (priv->opening_devices == NULL); + + if (priv->clients) { + g_list_free_full (priv->clients, (GDestroyNotify) client_unref); + priv->clients = NULL; + } + + if (priv->devices) { + g_list_free_full (priv->devices, (GDestroyNotify) g_object_unref); + priv->devices = NULL; + } + + if (priv->socket_service) { + if (g_socket_service_is_active (priv->socket_service)) + g_socket_service_stop (priv->socket_service); + g_clear_object (&priv->socket_service); + g_unlink (MBIM_PROXY_SOCKET_PATH); + g_debug ("UNIX socket service at '%s' stopped", MBIM_PROXY_SOCKET_PATH); + } + + if (priv->mbim_event_entry_array) { + mbim_event_entry_array_free (priv->mbim_event_entry_array); + priv->mbim_event_entry_array = NULL; + priv->mbim_event_entry_array_size = 0; + } + + G_OBJECT_CLASS (mbim_proxy_parent_class)->dispose (object); +} + +static void +mbim_proxy_class_init (MbimProxyClass *proxy_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (proxy_class); + + g_type_class_add_private (object_class, sizeof (MbimProxyPrivate)); + + /* Virtual methods */ + object_class->get_property = get_property; + object_class->dispose = dispose; + + /* Properties */ + properties[PROP_N_CLIENTS] = + g_param_spec_uint (MBIM_PROXY_N_CLIENTS, + "Number of clients", + "Number of clients currently connected to the proxy", + 0, + G_MAXUINT, + 0, + G_PARAM_READABLE); + g_object_class_install_property (object_class, PROP_N_CLIENTS, properties[PROP_N_CLIENTS]); + + properties[PROP_N_DEVICES] = + g_param_spec_uint (MBIM_PROXY_N_DEVICES, + "Number of devices", + "Number of devices currently managed by the proxy", + 0, + G_MAXUINT, + 0, + G_PARAM_READABLE); + g_object_class_install_property (object_class, PROP_N_DEVICES, properties[PROP_N_DEVICES]); +} diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-proxy.h libmbim-1.10.0/src/libmbim-glib/mbim-proxy.h --- libmbim-1.6.0/src/libmbim-glib/mbim-proxy.h 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-proxy.h 2014-07-31 16:44:12.000000000 +0000 @@ -0,0 +1,61 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2014 Aleksander Morgado + * Copyright (C) 2014 Smith Micro Software, Inc. + */ + +#ifndef MBIM_PROXY_H +#define MBIM_PROXY_H + +#include +#include + +#define MBIM_TYPE_PROXY (mbim_proxy_get_type ()) +#define MBIM_PROXY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MBIM_TYPE_PROXY, MbimProxy)) +#define MBIM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MBIM_TYPE_PROXY, MbimProxyClass)) +#define MBIM_IS_PROXY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MBIM_TYPE_PROXY)) +#define MBIM_IS_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MBIM_TYPE_PROXY)) +#define MBIM_PROXY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MBIM_TYPE_PROXY, MbimProxyClass)) + +typedef struct _MbimProxy MbimProxy; +typedef struct _MbimProxyClass MbimProxyClass; +typedef struct _MbimProxyPrivate MbimProxyPrivate; + +#define MBIM_PROXY_SOCKET_PATH "mbim-proxy" + +#define MBIM_PROXY_N_CLIENTS "mbim-proxy-n-clients" +#define MBIM_PROXY_N_DEVICES "mbim-proxy-n-devices" + +struct _MbimProxy { + GObject parent; + MbimProxyPrivate *priv; +}; + +struct _MbimProxyClass { + GObjectClass parent; +}; + +GType mbim_proxy_get_type (void); + +MbimProxy *mbim_proxy_new (GError **error); +guint mbim_proxy_get_n_clients (MbimProxy *self); +guint mbim_proxy_get_n_devices (MbimProxy *self); + +#endif /* MBIM_PROXY_H */ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-proxy-helpers.c libmbim-1.10.0/src/libmbim-glib/mbim-proxy-helpers.c --- libmbim-1.6.0/src/libmbim-glib/mbim-proxy-helpers.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-proxy-helpers.c 2014-08-04 09:02:15.000000000 +0000 @@ -0,0 +1,283 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +/* + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2014 Aleksander Morgado + * Copyright (C) 2014 Smith Micro Software, Inc. + */ + +#include +#include "mbim-proxy-helpers.h" +#include "mbim-message-private.h" +#include "mbim-message.h" +#include "mbim-cid.h" +#include "mbim-uuid.h" + +/*****************************************************************************/ + +static gboolean +cmp_event_entry_contents (const MbimEventEntry *in, + const MbimEventEntry *out) +{ + guint i, o; + + g_assert (mbim_uuid_cmp (&(in->device_service_id), &(out->device_service_id))); + + /* First, compare number of cids in the array */ + if (in->cids_count != out->cids_count) + return FALSE; + + if (in->cids_count == 0) + g_assert (in->cids == NULL); + if (out->cids_count == 0) + g_assert (out->cids == NULL); + + for (i = 0; i < in->cids_count; i++) { + for (o = 0; o < out->cids_count; o++) { + if (in->cids[i] == out->cids[o]) + break; + } + if (o == out->cids_count) + return FALSE; + } + + return TRUE; +} + +gboolean +_mbim_proxy_helper_service_subscribe_list_cmp (const MbimEventEntry * const *a, + gsize a_size, + const MbimEventEntry * const *b, + gsize b_size) +{ + gsize i, o; + + /* First, compare number of entries a the array */ + if (a_size != b_size) + return FALSE; + + /* Now compare each service one by one */ + for (i = 0; i < a_size; i++) { + /* Look for this same service a the other array */ + for (o = 0; o < b_size; o++) { + /* When service found, compare contents */ + if (mbim_uuid_cmp (&(a[i]->device_service_id), &(b[o]->device_service_id))) { + if (!cmp_event_entry_contents (a[i], b[o])) + return FALSE; + break; + } + } + /* Service not found! */ + if (!b[o]) + return FALSE; + } + + return TRUE; +} + +/*****************************************************************************/ + +void +_mbim_proxy_helper_service_subscribe_list_debug (const MbimEventEntry * const *list, + gsize list_size) +{ + gsize i; + + for (i = 0; i < list_size; i++) { + const MbimEventEntry *entry = list[i]; + MbimService service; + gchar *str; + + service = mbim_uuid_to_service (&entry->device_service_id); + str = mbim_uuid_get_printable (&entry->device_service_id); + g_debug ("[service %u] %s (%s)", + (guint)i, str, mbim_service_lookup_name (service)); + g_free (str); + + if (entry->cids_count == 0) + g_debug ("[service %u] all CIDs enabled", (guint)i); + else { + guint j; + + g_debug ("[service %u] %u CIDs enabled", (guint)i, entry->cids_count);; + for (j = 0; j < entry->cids_count; j++) { + const gchar *cid_str; + + cid_str = mbim_cid_get_printable (service, entry->cids[j]); + g_debug ("[service %u] [cid %u] %u (%s)", + (guint)i, j, entry->cids[j], cid_str ? cid_str : "unknown"); + } + } + } +} + +/*****************************************************************************/ + +MbimEventEntry ** +_mbim_proxy_helper_service_subscribe_standard_list_new (gsize *out_size) +{ + gsize i; + MbimService service; + MbimEventEntry **out; + + g_assert (out_size != NULL); + + out = g_new0 (MbimEventEntry *, 1 + (MBIM_SERVICE_DSS - MBIM_SERVICE_BASIC_CONNECT + 1)); + + for (service = MBIM_SERVICE_BASIC_CONNECT, i = 0; + service <= MBIM_SERVICE_DSS; + service++, i++) { + out[i] = g_new0 (MbimEventEntry, 1); + memcpy (&out[i]->device_service_id, mbim_uuid_from_service (service), sizeof (MbimUuid)); + } + + *out_size = i; + return out; +} + +/*****************************************************************************/ + +MbimEventEntry ** +_mbim_proxy_helper_service_subscribe_request_parse (MbimMessage *message, + gsize *out_size) +{ + MbimEventEntry **array = NULL; + guint32 i; + guint32 element_count; + guint32 offset = 0; + guint32 array_offset; + MbimEventEntry *event; + + g_assert (message != NULL); + g_assert (out_size != NULL); + + element_count = _mbim_message_read_guint32 (message, offset); + if (element_count) { + array = g_new (MbimEventEntry *, element_count + 1); + + offset += 4; + for (i = 0; i < element_count; i++) { + array_offset = _mbim_message_read_guint32 (message, offset); + + event = g_new (MbimEventEntry, 1); + + memcpy (&(event->device_service_id), _mbim_message_read_uuid (message, array_offset), 16); + array_offset += 16; + + event->cids_count = _mbim_message_read_guint32 (message, array_offset); + array_offset += 4; + + if (event->cids_count) + event->cids = _mbim_message_read_guint32_array (message, event->cids_count, array_offset); + else + event->cids = NULL; + + array[i] = event; + offset += 8; + } + + array[element_count] = NULL; + } + + *out_size = element_count; + return array; +} + +/*****************************************************************************/ + +MbimEventEntry ** +_mbim_proxy_helper_service_subscribe_list_merge (MbimEventEntry **in, + gsize in_size, + MbimEventEntry **merge, + gsize merge_size, + gsize *out_size) +{ + gsize m; + + g_assert (out_size != NULL); + + *out_size = in_size; + + if (!merge || !merge_size) + return in; + + for (m = 0; m < merge_size; m++) { + MbimEventEntry *entry = NULL; + + /* look for matching uuid */ + if (in && in_size) { + gsize i; + + for (i = 0; i < in_size; i++) { + if (mbim_uuid_cmp (&merge[m]->device_service_id, &in[i]->device_service_id)) { + entry = in[i]; + break; + } + } + } + + /* matching uuid not found in merge array, add it */ + if (!entry) { + gsize o; + + /* Index of the new element to add... */ + o = *out_size; + + /* Increase number of events in the output array */ + (*out_size)++; + in = g_realloc (in, sizeof (MbimEventEntry *) * (*out_size + 1)); + in[o] = g_memdup (merge[m], sizeof (MbimEventEntry)); + if (merge[m]->cids_count) + in[o]->cids = g_memdup (merge[m]->cids, sizeof (guint32) * merge[m]->cids_count); + else + in[o]->cids = NULL; + in[*out_size] = NULL; + } else { + gsize cm, co; + + /* matching uuid found, add cids */ + if (!entry->cids_count) + /* all cids already enabled for uuid */ + continue; + + /* If we're adding all enabled cids, directly apply that */ + if (merge[m]->cids_count == 0) { + g_free (entry->cids); + entry->cids = NULL; + entry->cids_count = 0; + } + + for (cm = 0; cm < merge[m]->cids_count; cm++) { + for (co = 0; co < entry->cids_count; co++) { + if (merge[m]->cids[cm] == entry->cids[co]) { + break; + } + } + + if (co == entry->cids_count) { + /* cid not found in merge array, add it */ + entry->cids = g_realloc (entry->cids, sizeof (guint32) * (++entry->cids_count)); + entry->cids[co] = merge[m]->cids[cm]; + } + } + } + } + + return in; +} diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-proxy-helpers.h libmbim-1.10.0/src/libmbim-glib/mbim-proxy-helpers.h --- libmbim-1.6.0/src/libmbim-glib/mbim-proxy-helpers.h 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-proxy-helpers.h 2014-08-04 09:02:15.000000000 +0000 @@ -0,0 +1,57 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +/* + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2014 Aleksander Morgado + * Copyright (C) 2014 Smith Micro Software, Inc. + * + * This is a private non-installed header + */ + +#ifndef _LIBMBIM_GLIB_MBIM_PROXY_HELPERS_H_ +#define _LIBMBIM_GLIB_MBIM_PROXY_HELPERS_H_ + +#if !defined (LIBMBIM_GLIB_COMPILATION) +#error "This is a private header!!" +#endif + +#include + +#include "mbim-basic-connect.h" + +G_BEGIN_DECLS + +gboolean _mbim_proxy_helper_service_subscribe_list_cmp (const MbimEventEntry * const *a, + gsize a_size, + const MbimEventEntry * const *b, + gsize b_size); +void _mbim_proxy_helper_service_subscribe_list_debug (const MbimEventEntry * const *list, + gsize list_size); +MbimEventEntry **_mbim_proxy_helper_service_subscribe_standard_list_new (gsize *out_size); +MbimEventEntry **_mbim_proxy_helper_service_subscribe_request_parse (MbimMessage *message, + gsize *out_size); +MbimEventEntry **_mbim_proxy_helper_service_subscribe_list_merge (MbimEventEntry **original, + gsize original_size, + MbimEventEntry **merge, + gsize merge_size, + gsize *out_size); + +G_END_DECLS + +#endif /* _LIBMBIM_GLIB_MBIM_PROXY_HELPERS_H_ */ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-utils.c libmbim-1.10.0/src/libmbim-glib/mbim-utils.c --- libmbim-1.6.0/src/libmbim-glib/mbim-utils.c 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-utils.c 2014-07-31 16:41:35.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include @@ -44,32 +44,32 @@ gchar delimiter) { const guint8 *data = mem; - gsize i; - gsize j; - gsize new_str_length; - gchar *new_str; - - /* Get new string length. If input string has N bytes, we need: - * - 1 byte for last NUL char - * - 2N bytes for hexadecimal char representation of each byte... - * - N-1 bytes for the separator ':' - * So... a total of (1+2N+N-1) = 3N bytes are needed... */ - new_str_length = 3 * size; - - /* Allocate memory for new array and initialize contents to NUL */ - new_str = g_malloc0 (new_str_length); - - /* Print hexadecimal representation of each byte... */ - for (i = 0, j = 0; i < size; i++, j += 3) { - /* Print character in output string... */ - snprintf (&new_str[j], 3, "%02X", data[i]); - /* And if needed, add separator */ - if (i != (size - 1) ) - new_str[j + 2] = delimiter; - } + gsize i; + gsize j; + gsize new_str_length; + gchar *new_str; + + /* Get new string length. If input string has N bytes, we need: + * - 1 byte for last NUL char + * - 2N bytes for hexadecimal char representation of each byte... + * - N-1 bytes for the separator ':' + * So... a total of (1+2N+N-1) = 3N bytes are needed... */ + new_str_length = 3 * size; + + /* Allocate memory for new array and initialize contents to NUL */ + new_str = g_malloc0 (new_str_length); + + /* Print hexadecimal representation of each byte... */ + for (i = 0, j = 0; i < size; i++, j += 3) { + /* Print character in output string... */ + snprintf (&new_str[j], 3, "%02X", data[i]); + /* And if needed, add separator */ + if (i != (size - 1) ) + new_str[j + 2] = delimiter; + } - /* Set output string */ - return new_str; + /* Set output string */ + return new_str; } /*****************************************************************************/ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-utils.h libmbim-1.10.0/src/libmbim-glib/mbim-utils.h --- libmbim-1.6.0/src/libmbim-glib/mbim-utils.h 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-utils.h 2014-07-31 16:41:35.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_MBIM_UTILS_H_ diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-uuid.c libmbim-1.10.0/src/libmbim-glib/mbim-uuid.c --- libmbim-1.6.0/src/libmbim-glib/mbim-uuid.c 2013-05-21 15:34:26.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-uuid.c 2014-07-31 16:44:12.000000000 +0000 @@ -18,7 +18,9 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado + * Copyright (C) 2014 NVDIA Corporation + * Copyright (C) 2014 Smith Micro Software, Inc. */ #include @@ -26,14 +28,18 @@ #include #include "mbim-uuid.h" +#include "generated/mbim-enum-types.h" /** * SECTION: mbim-uuid * @title: UUIDs + * @short_description: Generic UUID handling routines. * * This section defines the data type for unique identifiers. */ +#define MBIM_SERVICE_LAST MBIM_SERVICE_PROXY_CONTROL + /*****************************************************************************/ /** @@ -77,6 +83,62 @@ uuid->e[0], uuid->e[1], uuid->e[2], uuid->e[3], uuid->e[4], uuid->e[5])); } +/** + * mbim_uuid_from_printable: + * @str: a MBIM UUID. + * @uuid: pointer to the target #MbimUuid. + * + * Fills in @uuid from the printable representation give in @str. + * + * Only ccepts @str written with dashes separating items, e.g.: + * a289cc33-bcbb-8b4f-b6b0-133ec2aae6df + * + * Returns: %TRUE if @uuid was correctly set, %FALSE otherwise. + */ +gboolean +mbim_uuid_from_printable (const gchar *str, + MbimUuid *uuid) +{ + guint8 tmp[16]; + guint i; + guint k; + gint d0; + gint d1; + + g_return_val_if_fail (str != NULL, FALSE); + g_return_val_if_fail (uuid != NULL, FALSE); + + if (strlen (str) != 36) + return FALSE; + + for (i = 0, k = 0, d0 = -1, d1 = -1; str[i]; i++) { + /* Accept dashes in expected positions */ + if (str[i] == '-') { + if (i == 8 || i == 13 || i == 18 || i == 23) + continue; + return FALSE; + } + /* Read first digit in the hex pair */ + else if (d0 == -1) { + d0 = g_ascii_xdigit_value (str[i]); + if (d0 == -1) + return FALSE; + } + /* Read second digit in the hex pair */ + else { + d1 = g_ascii_xdigit_value (str[i]); + if (d1 == -1) + return FALSE; + tmp[k++] = (d0 << 4) | d1; + d0 = d1 = -1; + } + } + + memcpy (uuid, tmp, sizeof (tmp)); + + return TRUE; +} + /*****************************************************************************/ static const MbimUuid uuid_invalid = { @@ -143,6 +205,151 @@ .e = { 0x6e, 0x0d, 0x58, 0x3c, 0x4d, 0x0e } }; +static const MbimUuid uuid_ms_firmware_id = { + .a = { 0xe9, 0xf7, 0xde, 0xa2 }, + .b = { 0xfe, 0xaf }, + .c = { 0x40, 0x09 }, + .d = { 0x93, 0xce }, + .e = { 0x90, 0xa3, 0x69, 0x41, 0x03, 0xb6 } +}; + +static const MbimUuid uuid_ms_host_shutdown = { + .a = { 0x88, 0x3b, 0x7c, 0x26 }, + .b = { 0x98, 0x5f }, + .c = { 0x43, 0xfa }, + .d = { 0x98, 0x04 }, + .e = { 0x27, 0xd7, 0xfb, 0x80, 0x95, 0x9c } +}; + +static const MbimUuid uuid_proxy_control = { + .a = { 0x83, 0x8c, 0xf7, 0xfb }, + .b = { 0x8d, 0x0d }, + .c = { 0x4d, 0x7f }, + .d = { 0x87, 0x1e }, + .e = { 0xd7, 0x1d , 0xbe, 0xfb, 0xb3, 0x9b } +}; + +static GList *mbim_custom_service_list = NULL; + +typedef struct { + guint service_id; + MbimUuid uuid; + gchar *nickname; +} MbimCustomService; + +/** + * mbim_register_custom_service: + * @uuid: MbimUuid structure corresponding to service + * @nickname: a printable name for service + * + * Register a custom service + * + * Returns: TRUE if service has been registered, FALSE otherwise. + */ +guint +mbim_register_custom_service (const MbimUuid *uuid, + const gchar *nickname) +{ + MbimCustomService *s; + GList *l; + guint service_id = 100; + + for (l = mbim_custom_service_list; l != NULL; l = l->next) { + s = (MbimCustomService *)l->data; + if (mbim_uuid_cmp (&s->uuid, uuid)) + return s->service_id; + else + service_id = MAX (service_id, s->service_id); + } + + /* create a new custom service */ + s = g_slice_new (MbimCustomService); + s->service_id = service_id + 1; + memcpy (&s->uuid, uuid, sizeof (MbimUuid)); + s->nickname = g_strdup (nickname); + + mbim_custom_service_list = g_list_append (mbim_custom_service_list, s); + return s->service_id; +} + +/** + * mbim_unregister_custom_service: + * @id: ID of the service to unregister.MbimUuid structure corresponding to service + * + * Unregister a custom service. + * + * Returns: TRUE if service has been unregistered, FALSE otherwise. + */ +gboolean +mbim_unregister_custom_service (const guint id) +{ + MbimCustomService *s; + GList *l; + + for (l = mbim_custom_service_list; l != NULL; l = l->next) { + s = (MbimCustomService *)l->data; + if (s->service_id == id) { + g_free (s->nickname); + g_slice_free (MbimCustomService, s); + mbim_custom_service_list = \ + g_list_delete_link (mbim_custom_service_list, l); + return TRUE; + } + } + + return FALSE; +} + +/** + * mbim_service_id_is_custom: + * @id: ID of the service + * + * Checks whether @id is a custom or standard service. + * + * Returns: TRUE if service is custom, FALSE otherwise. + */ +gboolean +mbim_service_id_is_custom (const guint id) +{ + GList *l; + + if (id <= MBIM_SERVICE_LAST) + return FALSE; + + for (l = mbim_custom_service_list; l != NULL; l = l->next) { + if (((MbimCustomService *)l->data)->service_id == id) + return TRUE; + } + + return FALSE; +} + +/** + * mbim_service_lookup_name: + * @service: a MbimService or custom service. + * + * Gets the nickname string for the @service. + * + * As opposed to mbim_service_get_string(), this methods takes into account + * custom services that may have been registered by the user. + * + * Returns: (transfer none): a string with the nickname, or %NULL if not found. Do not free the returned value. + */ +const gchar * +mbim_service_lookup_name (guint service) +{ + GList *l; + + if (service <= MBIM_SERVICE_LAST) + return mbim_service_get_string (service); + + for (l = mbim_custom_service_list; l != NULL; l = l->next) { + if (service == ((MbimCustomService *)l->data)->service_id) + return ((MbimCustomService *)l->data)->nickname; + } + return NULL; +} + /** * mbim_uuid_from_service: * @service: a #MbimService. @@ -154,7 +361,11 @@ const MbimUuid * mbim_uuid_from_service (MbimService service) { - g_return_val_if_fail (service >= MBIM_SERVICE_INVALID && service <= MBIM_SERVICE_DSS, + GList *l; + + g_return_val_if_fail (service >= MBIM_SERVICE_INVALID && + (service <= MBIM_SERVICE_PROXY_CONTROL || + mbim_service_id_is_custom (service)), &uuid_invalid); switch (service) { @@ -174,7 +385,17 @@ return &uuid_auth; case MBIM_SERVICE_DSS: return &uuid_dss; + case MBIM_SERVICE_MS_FIRMWARE_ID: + return &uuid_ms_firmware_id; + case MBIM_SERVICE_MS_HOST_SHUTDOWN: + return &uuid_ms_host_shutdown; + case MBIM_SERVICE_PROXY_CONTROL: + return &uuid_proxy_control; default: + for (l = mbim_custom_service_list; l != NULL; l = l->next) { + if (service == ((MbimCustomService *)l->data)->service_id) + return &((MbimCustomService *)l->data)->uuid; + } g_assert_not_reached (); } } @@ -190,6 +411,8 @@ MbimService mbim_uuid_to_service (const MbimUuid *uuid) { + GList *l; + if (mbim_uuid_cmp (uuid, &uuid_basic_connect)) return MBIM_SERVICE_BASIC_CONNECT; @@ -211,6 +434,20 @@ if (mbim_uuid_cmp (uuid, &uuid_dss)) return MBIM_SERVICE_DSS; + if (mbim_uuid_cmp (uuid, &uuid_ms_firmware_id)) + return MBIM_SERVICE_MS_FIRMWARE_ID; + + if (mbim_uuid_cmp (uuid, &uuid_ms_host_shutdown)) + return MBIM_SERVICE_MS_HOST_SHUTDOWN; + + if (mbim_uuid_cmp (uuid, &uuid_proxy_control)) + return MBIM_SERVICE_PROXY_CONTROL; + + for (l = mbim_custom_service_list; l != NULL; l = l->next) { + if (mbim_uuid_cmp (&((MbimCustomService *)l->data)->uuid, uuid)) + return ((MbimCustomService *)l->data)->service_id; + } + return MBIM_SERVICE_INVALID; } @@ -288,6 +525,7 @@ .e = { 0x03, 0x3C, 0x39, 0xF6, 0x0D, 0xB9 } }; + /** * mbim_uuid_from_context_type: * @context_type: a #MbimContextType. @@ -339,9 +577,6 @@ MbimContextType mbim_uuid_to_context_type (const MbimUuid *uuid) { - if (mbim_uuid_cmp (uuid, &uuid_dss)) - return MBIM_SERVICE_DSS; - if (mbim_uuid_cmp (uuid, &uuid_context_type_none)) return MBIM_CONTEXT_TYPE_NONE; diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-uuid.h libmbim-1.10.0/src/libmbim-glib/mbim-uuid.h --- libmbim-1.6.0/src/libmbim-glib/mbim-uuid.h 2013-05-21 15:34:26.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-uuid.h 2014-07-31 16:44:12.000000000 +0000 @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _LIBMBIM_GLIB_MBIM_UUID_H_ @@ -50,9 +50,11 @@ }; #undef MBIM_PACKED -gboolean mbim_uuid_cmp (const MbimUuid *a, - const MbimUuid *b); -gchar *mbim_uuid_get_printable (const MbimUuid *uuid); +gboolean mbim_uuid_cmp (const MbimUuid *a, + const MbimUuid *b); +gchar *mbim_uuid_get_printable (const MbimUuid *uuid); +gboolean mbim_uuid_from_printable (const gchar *str, + MbimUuid *uuid); /*****************************************************************************/ @@ -66,18 +68,25 @@ * @MBIM_SERVICE_STK: SIM toolkit service. * @MBIM_SERVICE_AUTH: Authentication service. * @MBIM_SERVICE_DSS: Device Service Stream service. + * @MBIM_SERVICE_MS_FIRMWARE_ID: Microsoft Firmware ID service. + * @MBIM_SERVICE_MS_HOST_SHUTDOWN: Microsoft Host Shutdown service. + * @MBIM_SERVICE_PROXY_CONTROL: Proxy Control service. * * Enumeration of the generic MBIM services. */ typedef enum { - MBIM_SERVICE_INVALID = 0, - MBIM_SERVICE_BASIC_CONNECT = 1, - MBIM_SERVICE_SMS = 2, - MBIM_SERVICE_USSD = 3, - MBIM_SERVICE_PHONEBOOK = 4, - MBIM_SERVICE_STK = 5, - MBIM_SERVICE_AUTH = 6, - MBIM_SERVICE_DSS = 7, + MBIM_SERVICE_INVALID = 0, + MBIM_SERVICE_BASIC_CONNECT = 1, + MBIM_SERVICE_SMS = 2, + MBIM_SERVICE_USSD = 3, + MBIM_SERVICE_PHONEBOOK = 4, + MBIM_SERVICE_STK = 5, + MBIM_SERVICE_AUTH = 6, + MBIM_SERVICE_DSS = 7, + MBIM_SERVICE_MS_FIRMWARE_ID = 8, + MBIM_SERVICE_MS_HOST_SHUTDOWN = 9, + MBIM_SERVICE_PROXY_CONTROL = 10, + /* Note: update MBIM_SERVICE_LAST when a new value is added */ } MbimService; /** @@ -152,6 +161,42 @@ */ #define MBIM_UUID_DSS mbim_uuid_from_service (MBIM_SERVICE_DSS) +/** + * MBIM_UUID_MS_FIRMWARE_ID: + * + * Get the UUID of the %MBIM_SERVICE_MS_FIRMWARE_ID service. + * + * Returns: (transfer none): a #MbimUuid. + */ +#define MBIM_UUID_MS_FIRMWARE_ID mbim_uuid_from_service (MBIM_SERVICE_MS_FIRMWARE_ID) + +/** + * MBIM_UUID_MS_HOST_SHUTDOWN: + * + * Get the UUID of the %MBIM_SERVICE_MS_HOST_SHUTDOWN service. + * + * Returns: (transfer none): a #MbimUuid. + */ +#define MBIM_UUID_MS_HOST_SHUTDOWN mbim_uuid_from_service (MBIM_SERVICE_MS_HOST_SHUTDOWN) + +/** + * MBIM_UUID_PROXY_CONTROL: + * + * Get the UUID of the %MBIM_SERVICE_PROXY_CONTROL service. + * + * Returns: (transfer none): a #MbimUuid. + */ +#define MBIM_UUID_PROXY_CONTROL mbim_uuid_from_service (MBIM_SERVICE_PROXY_CONTROL) + +const gchar *mbim_service_lookup_name (guint service); + +guint mbim_register_custom_service (const MbimUuid *uuid, + const gchar *nickname); + +gboolean mbim_unregister_custom_service (const guint id); + +gboolean mbim_service_id_is_custom (const guint id); + /* To/From service */ const MbimUuid *mbim_uuid_from_service (MbimService service); MbimService mbim_uuid_to_service (const MbimUuid *uuid); @@ -186,6 +231,8 @@ MBIM_CONTEXT_TYPE_LOCAL = 9, } MbimContextType; +const gchar *mbim_context_type_get_string (MbimContextType val); + /* To/From context type */ const MbimUuid *mbim_uuid_from_context_type (MbimContextType context_type); MbimContextType mbim_uuid_to_context_type (const MbimUuid *uuid); diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-version.h libmbim-1.10.0/src/libmbim-glib/mbim-version.h --- libmbim-1.6.0/src/libmbim-glib/mbim-version.h 2013-12-10 20:25:15.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-version.h 2014-08-04 13:00:38.000000000 +0000 @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ * Boston, MA 02110-1301 USA. * * Copyright (C) 2013 Lanedo GmbH + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _MBIM_VERSION_H_ @@ -42,7 +43,7 @@ * Evaluates to the minor version number of libmbim-glib which this source * is compiled against. */ -#define MBIM_MINOR_VERSION (6) +#define MBIM_MINOR_VERSION (10) /** * MBIM_MICRO_VERSION: diff -Nru libmbim-1.6.0/src/libmbim-glib/mbim-version.h.in libmbim-1.10.0/src/libmbim-glib/mbim-version.h.in --- libmbim-1.6.0/src/libmbim-glib/mbim-version.h.in 2013-06-21 07:34:05.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/mbim-version.h.in 2014-07-31 16:41:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ * Boston, MA 02110-1301 USA. * * Copyright (C) 2013 Lanedo GmbH + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #ifndef _MBIM_VERSION_H_ diff -Nru libmbim-1.6.0/src/libmbim-glib/test/Makefile.am libmbim-1.10.0/src/libmbim-glib/test/Makefile.am --- libmbim-1.6.0/src/libmbim-glib/test/Makefile.am 2013-12-10 19:13:44.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/Makefile.am 2014-07-31 16:44:12.000000000 +0000 @@ -6,7 +6,8 @@ test-message \ test-fragment \ test-message-parser \ - test-message-builder + test-message-builder \ + test-proxy-helpers TEST_PROGS += $(noinst_PROGRAMS) @@ -90,3 +91,19 @@ $(top_builddir)/src/libmbim-glib/libmbim-glib-core.la \ $(top_builddir)/src/libmbim-glib/generated/libmbim-glib-generated.la \ $(LIBMBIM_GLIB_LIBS) + +test_proxy_helpers_SOURCES = \ + test-proxy-helpers.c \ + $(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.h \ + $(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c +test_proxy_helpers_CPPFLAGS = \ + $(LIBMBIM_GLIB_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src/libmbim-glib \ + -I$(top_builddir)/src/libmbim-glib \ + -I$(top_builddir)/src/libmbim-glib/generated \ + -DLIBMBIM_GLIB_COMPILATION +test_proxy_helpers_LDADD = \ + $(top_builddir)/src/libmbim-glib/libmbim-glib-core.la \ + $(top_builddir)/src/libmbim-glib/generated/libmbim-glib-generated.la \ + $(LIBMBIM_GLIB_LIBS) diff -Nru libmbim-1.6.0/src/libmbim-glib/test/Makefile.in libmbim-1.10.0/src/libmbim-glib/test/Makefile.in --- libmbim-1.6.0/src/libmbim-glib/test/Makefile.in 2013-12-10 20:25:13.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -82,7 +82,8 @@ $(srcdir)/Makefile.am $(top_srcdir)/depcomp noinst_PROGRAMS = test-uuid$(EXEEXT) test-cid$(EXEEXT) \ test-message$(EXEEXT) test-fragment$(EXEEXT) \ - test-message-parser$(EXEEXT) test-message-builder$(EXEEXT) + test-message-parser$(EXEEXT) test-message-builder$(EXEEXT) \ + test-proxy-helpers$(EXEEXT) subdir = src/libmbim-glib/test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-warnings.m4 \ @@ -134,6 +135,14 @@ $(top_builddir)/src/libmbim-glib/libmbim-glib-core.la \ $(top_builddir)/src/libmbim-glib/generated/libmbim-glib-generated.la \ $(am__DEPENDENCIES_1) +am_test_proxy_helpers_OBJECTS = \ + test_proxy_helpers-test-proxy-helpers.$(OBJEXT) \ + test_proxy_helpers-mbim-proxy-helpers.$(OBJEXT) +test_proxy_helpers_OBJECTS = $(am_test_proxy_helpers_OBJECTS) +test_proxy_helpers_DEPENDENCIES = \ + $(top_builddir)/src/libmbim-glib/libmbim-glib-core.la \ + $(top_builddir)/src/libmbim-glib/generated/libmbim-glib-generated.la \ + $(am__DEPENDENCIES_1) am_test_uuid_OBJECTS = test_uuid-test-uuid.$(OBJEXT) test_uuid_OBJECTS = $(am_test_uuid_OBJECTS) test_uuid_DEPENDENCIES = \ @@ -176,10 +185,12 @@ am__v_CCLD_1 = SOURCES = $(test_cid_SOURCES) $(test_fragment_SOURCES) \ $(test_message_SOURCES) $(test_message_builder_SOURCES) \ - $(test_message_parser_SOURCES) $(test_uuid_SOURCES) + $(test_message_parser_SOURCES) $(test_proxy_helpers_SOURCES) \ + $(test_uuid_SOURCES) DIST_SOURCES = $(test_cid_SOURCES) $(test_fragment_SOURCES) \ $(test_message_SOURCES) $(test_message_builder_SOURCES) \ - $(test_message_parser_SOURCES) $(test_uuid_SOURCES) + $(test_message_parser_SOURCES) $(test_proxy_helpers_SOURCES) \ + $(test_uuid_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -233,6 +244,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -259,6 +271,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -440,6 +454,24 @@ $(top_builddir)/src/libmbim-glib/generated/libmbim-glib-generated.la \ $(LIBMBIM_GLIB_LIBS) +test_proxy_helpers_SOURCES = \ + test-proxy-helpers.c \ + $(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.h \ + $(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c + +test_proxy_helpers_CPPFLAGS = \ + $(LIBMBIM_GLIB_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src/libmbim-glib \ + -I$(top_builddir)/src/libmbim-glib \ + -I$(top_builddir)/src/libmbim-glib/generated \ + -DLIBMBIM_GLIB_COMPILATION + +test_proxy_helpers_LDADD = \ + $(top_builddir)/src/libmbim-glib/libmbim-glib-core.la \ + $(top_builddir)/src/libmbim-glib/generated/libmbim-glib-generated.la \ + $(LIBMBIM_GLIB_LIBS) + all: all-am .SUFFIXES: @@ -505,6 +537,10 @@ @rm -f test-message-parser$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_message_parser_OBJECTS) $(test_message_parser_LDADD) $(LIBS) +test-proxy-helpers$(EXEEXT): $(test_proxy_helpers_OBJECTS) $(test_proxy_helpers_DEPENDENCIES) $(EXTRA_test_proxy_helpers_DEPENDENCIES) + @rm -f test-proxy-helpers$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_proxy_helpers_OBJECTS) $(test_proxy_helpers_LDADD) $(LIBS) + test-uuid$(EXEEXT): $(test_uuid_OBJECTS) $(test_uuid_DEPENDENCIES) $(EXTRA_test_uuid_DEPENDENCIES) @rm -f test-uuid$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_uuid_OBJECTS) $(test_uuid_LDADD) $(LIBS) @@ -520,6 +556,8 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_message-test-message.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_message_builder-test-message-builder.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_message_parser-test-message-parser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_proxy_helpers-mbim-proxy-helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_proxy_helpers-test-proxy-helpers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_uuid-test-uuid.Po@am__quote@ .c.o: @@ -527,14 +565,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -613,6 +651,34 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_message_parser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_message_parser-test-message-parser.obj `if test -f 'test-message-parser.c'; then $(CYGPATH_W) 'test-message-parser.c'; else $(CYGPATH_W) '$(srcdir)/test-message-parser.c'; fi` +test_proxy_helpers-test-proxy-helpers.o: test-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_proxy_helpers-test-proxy-helpers.o -MD -MP -MF $(DEPDIR)/test_proxy_helpers-test-proxy-helpers.Tpo -c -o test_proxy_helpers-test-proxy-helpers.o `test -f 'test-proxy-helpers.c' || echo '$(srcdir)/'`test-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_proxy_helpers-test-proxy-helpers.Tpo $(DEPDIR)/test_proxy_helpers-test-proxy-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-proxy-helpers.c' object='test_proxy_helpers-test-proxy-helpers.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_proxy_helpers-test-proxy-helpers.o `test -f 'test-proxy-helpers.c' || echo '$(srcdir)/'`test-proxy-helpers.c + +test_proxy_helpers-test-proxy-helpers.obj: test-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_proxy_helpers-test-proxy-helpers.obj -MD -MP -MF $(DEPDIR)/test_proxy_helpers-test-proxy-helpers.Tpo -c -o test_proxy_helpers-test-proxy-helpers.obj `if test -f 'test-proxy-helpers.c'; then $(CYGPATH_W) 'test-proxy-helpers.c'; else $(CYGPATH_W) '$(srcdir)/test-proxy-helpers.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_proxy_helpers-test-proxy-helpers.Tpo $(DEPDIR)/test_proxy_helpers-test-proxy-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-proxy-helpers.c' object='test_proxy_helpers-test-proxy-helpers.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_proxy_helpers-test-proxy-helpers.obj `if test -f 'test-proxy-helpers.c'; then $(CYGPATH_W) 'test-proxy-helpers.c'; else $(CYGPATH_W) '$(srcdir)/test-proxy-helpers.c'; fi` + +test_proxy_helpers-mbim-proxy-helpers.o: $(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_proxy_helpers-mbim-proxy-helpers.o -MD -MP -MF $(DEPDIR)/test_proxy_helpers-mbim-proxy-helpers.Tpo -c -o test_proxy_helpers-mbim-proxy-helpers.o `test -f '$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c' || echo '$(srcdir)/'`$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_proxy_helpers-mbim-proxy-helpers.Tpo $(DEPDIR)/test_proxy_helpers-mbim-proxy-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c' object='test_proxy_helpers-mbim-proxy-helpers.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_proxy_helpers-mbim-proxy-helpers.o `test -f '$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c' || echo '$(srcdir)/'`$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c + +test_proxy_helpers-mbim-proxy-helpers.obj: $(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_proxy_helpers-mbim-proxy-helpers.obj -MD -MP -MF $(DEPDIR)/test_proxy_helpers-mbim-proxy-helpers.Tpo -c -o test_proxy_helpers-mbim-proxy-helpers.obj `if test -f '$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c'; then $(CYGPATH_W) '$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_proxy_helpers-mbim-proxy-helpers.Tpo $(DEPDIR)/test_proxy_helpers-mbim-proxy-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c' object='test_proxy_helpers-mbim-proxy-helpers.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_proxy_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_proxy_helpers-mbim-proxy-helpers.obj `if test -f '$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c'; then $(CYGPATH_W) '$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libmbim-glib/mbim-proxy-helpers.c'; fi` + test_uuid-test-uuid.o: test-uuid.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_uuid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_uuid-test-uuid.o -MD -MP -MF $(DEPDIR)/test_uuid-test-uuid.Tpo -c -o test_uuid-test-uuid.o `test -f 'test-uuid.c' || echo '$(srcdir)/'`test-uuid.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_uuid-test-uuid.Tpo $(DEPDIR)/test_uuid-test-uuid.Po diff -Nru libmbim-1.6.0/src/libmbim-glib/test/test-cid.c libmbim-1.10.0/src/libmbim-glib/test/test-cid.c --- libmbim-1.6.0/src/libmbim-glib/test/test-cid.c 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/test-cid.c 2014-07-31 16:41:35.000000000 +0000 @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details: * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include @@ -105,17 +105,35 @@ TRUE, FALSE, FALSE); } +static void +test_cid_ms_firmware_id (void) +{ + test_common (MBIM_SERVICE_MS_FIRMWARE_ID, + MBIM_CID_MS_FIRMWARE_ID_GET, + FALSE, TRUE, FALSE); +} + +static void +test_cid_ms_host_shutdown (void) +{ + test_common (MBIM_SERVICE_MS_HOST_SHUTDOWN, + MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY, + TRUE, FALSE, FALSE); +} + int main (int argc, char **argv) { g_test_init (&argc, &argv, NULL); - g_test_add_func ("/libmbim-glib/cid/basic-connect", test_cid_basic_connect); - g_test_add_func ("/libmbim-glib/cid/sms", test_cid_sms); - g_test_add_func ("/libmbim-glib/cid/ussd", test_cid_ussd); - g_test_add_func ("/libmbim-glib/cid/phonebook", test_cid_phonebook); - g_test_add_func ("/libmbim-glib/cid/stk", test_cid_stk); - g_test_add_func ("/libmbim-glib/cid/auth", test_cid_auth); - g_test_add_func ("/libmbim-glib/cid/dss", test_cid_dss); + g_test_add_func ("/libmbim-glib/cid/basic-connect", test_cid_basic_connect); + g_test_add_func ("/libmbim-glib/cid/sms", test_cid_sms); + g_test_add_func ("/libmbim-glib/cid/ussd", test_cid_ussd); + g_test_add_func ("/libmbim-glib/cid/phonebook", test_cid_phonebook); + g_test_add_func ("/libmbim-glib/cid/stk", test_cid_stk); + g_test_add_func ("/libmbim-glib/cid/auth", test_cid_auth); + g_test_add_func ("/libmbim-glib/cid/dss", test_cid_dss); + g_test_add_func ("/libmbim-glib/cid/ms-firmware-id", test_cid_ms_firmware_id); + g_test_add_func ("/libmbim-glib/cid/ms-host-shutdown", test_cid_ms_host_shutdown); return g_test_run (); } diff -Nru libmbim-1.6.0/src/libmbim-glib/test/test-fragment.c libmbim-1.10.0/src/libmbim-glib/test/test-fragment.c --- libmbim-1.6.0/src/libmbim-glib/test/test-fragment.c 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/test-fragment.c 2014-07-31 16:41:35.000000000 +0000 @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details: * - * Copyright (C) 2012 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include diff -Nru libmbim-1.6.0/src/libmbim-glib/test/test-message-builder.c libmbim-1.10.0/src/libmbim-glib/test/test-message-builder.c --- libmbim-1.6.0/src/libmbim-glib/test/test-message-builder.c 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/test-message-builder.c 2014-07-31 16:41:35.000000000 +0000 @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details: * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include @@ -26,6 +26,7 @@ #include "mbim-auth.h" #include "mbim-stk.h" #include "mbim-dss.h" +#include "mbim-ms-host-shutdown.h" #if defined ENABLE_TEST_MESSAGE_TRACES static void @@ -410,7 +411,7 @@ } static void -test_message_builder_basic_connect_device_service_subscriber_list_set (void) +test_message_builder_basic_connect_device_service_subscribe_list_set (void) { GError *error = NULL; MbimEventEntry **entries; @@ -470,7 +471,7 @@ entries[1]->cids = g_new0 (guint32, 1); entries[1]->cids[0] = MBIM_CID_SMS_READ; - message = (mbim_message_device_service_subscriber_list_set_new ( + message = (mbim_message_device_service_subscribe_list_set_new ( 2, (const MbimEventEntry *const *)entries, &error)); @@ -490,7 +491,7 @@ g_assert_cmpuint (mbim_message_get_message_length (message), ==, sizeof (expected_message)); g_assert_cmpuint (mbim_message_command_get_service (message), ==, MBIM_SERVICE_BASIC_CONNECT); - g_assert_cmpuint (mbim_message_command_get_cid (message), ==, MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBER_LIST); + g_assert_cmpuint (mbim_message_command_get_cid (message), ==, MBIM_CID_BASIC_CONNECT_DEVICE_SERVICE_SUBSCRIBE_LIST); g_assert_cmpuint (mbim_message_command_get_command_type (message), ==, MBIM_MESSAGE_COMMAND_TYPE_SET); g_assert_cmpuint (((GByteArray *)message)->len, ==, sizeof (expected_message)); @@ -1296,6 +1297,55 @@ mbim_provider_array_free (providers); } +static void +test_message_builder_ms_host_shutdown_notify_set (void) +{ + GError *error = NULL; + MbimMessage *message; + const guint8 expected_message [] = { + /* header */ + 0x03, 0x00, 0x00, 0x00, /* type */ + 0x30, 0x00, 0x00, 0x00, /* length */ + 0x01, 0x00, 0x00, 0x00, /* transaction id */ + /* fragment header */ + 0x01, 0x00, 0x00, 0x00, /* total */ + 0x00, 0x00, 0x00, 0x00, /* current */ + /* command_message */ + 0x88, 0x3B, 0x7C, 0x26, /* service id */ + 0x98, 0x5F, 0x43, 0xFA, + 0x98, 0x04, 0x27, 0xD7, + 0xFB, 0x80, 0x95, 0x9C, + 0x01, 0x00, 0x00, 0x00, /* command id */ + 0x01, 0x00, 0x00, 0x00, /* command_type */ + 0x00, 0x00, 0x00, 0x00, /* buffer_length */ + /* information buffer */ + }; + + /* MS Host Shutdown set message */ + message = mbim_message_ms_host_shutdown_notify_set_new (&error); + g_assert_no_error (error); + g_assert (message != NULL); + mbim_message_set_transaction_id (message, 1); + + test_message_trace ((const guint8 *)((GByteArray *)message)->data, + ((GByteArray *)message)->len, + expected_message, + sizeof (expected_message)); + + g_assert_cmpuint (mbim_message_get_transaction_id (message), ==, 1); + g_assert_cmpuint (mbim_message_get_message_type (message), ==, MBIM_MESSAGE_TYPE_COMMAND); + g_assert_cmpuint (mbim_message_get_message_length (message), ==, sizeof (expected_message)); + + g_assert_cmpuint (mbim_message_command_get_service (message), ==, MBIM_SERVICE_MS_HOST_SHUTDOWN); + g_assert_cmpuint (mbim_message_command_get_cid (message), ==, MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY); + g_assert_cmpuint (mbim_message_command_get_command_type (message), ==, MBIM_MESSAGE_COMMAND_TYPE_SET); + + g_assert_cmpuint (((GByteArray *)message)->len, ==, sizeof (expected_message)); + g_assert (memcmp (((GByteArray *)message)->data, expected_message, sizeof (expected_message)) == 0); + + mbim_message_unref (message); +} + int main (int argc, char **argv) { g_test_init (&argc, &argv, NULL); @@ -1305,7 +1355,7 @@ g_test_add_func ("/libmbim-glib/message/builder/basic-connect/connect/set/raw", test_message_builder_basic_connect_connect_set_raw); g_test_add_func ("/libmbim-glib/message/builder/basic-connect/connect/set", test_message_builder_basic_connect_connect_set); g_test_add_func ("/libmbim-glib/message/builder/basic-connect/service-activation/set", test_message_builder_basic_connect_service_activation_set); - g_test_add_func ("/libmbim-glib/message/builder/basic-connect/device-service-subscriber-list/set", test_message_builder_basic_connect_device_service_subscriber_list_set); + g_test_add_func ("/libmbim-glib/message/builder/basic-connect/device-service-subscribe-list/set", test_message_builder_basic_connect_device_service_subscribe_list_set); g_test_add_func ("/libmbim-glib/message/builder/ussd/set", test_message_builder_ussd_set); g_test_add_func ("/libmbim-glib/message/builder/auth/akap/query", test_message_builder_auth_akap_query); g_test_add_func ("/libmbim-glib/message/builder/stk/pac/set", test_message_builder_stk_pac_set); @@ -1316,6 +1366,7 @@ g_test_add_func ("/libmbim-glib/message/builder/basic-connect/ip-packet-filters/set/two", test_message_builder_basic_connect_ip_packet_filters_set_two); g_test_add_func ("/libmbim-glib/message/builder/dss/connect/set", test_message_builder_dss_connect_set); g_test_add_func ("/libmbim-glib/message/builder/basic-connect/multicarrier-providers/set", test_message_builder_basic_connect_multicarrier_providers_set); + g_test_add_func ("/libmbim-glib/message/builder/ms-host-shutdown/notify/set", test_message_builder_ms_host_shutdown_notify_set); return g_test_run (); } diff -Nru libmbim-1.6.0/src/libmbim-glib/test/test-message.c libmbim-1.10.0/src/libmbim-glib/test/test-message.c --- libmbim-1.6.0/src/libmbim-glib/test/test-message.c 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/test-message.c 2014-07-31 16:41:35.000000000 +0000 @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details: * - * Copyright (C) 2012 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include diff -Nru libmbim-1.6.0/src/libmbim-glib/test/test-message-parser.c libmbim-1.10.0/src/libmbim-glib/test/test-message-parser.c --- libmbim-1.6.0/src/libmbim-glib/test/test-message-parser.c 2013-07-14 15:05:54.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/test-message-parser.c 2014-07-31 16:41:35.000000000 +0000 @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details: * - * Copyright (C) 2012 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include @@ -21,6 +21,7 @@ #include "mbim-ussd.h" #include "mbim-auth.h" #include "mbim-stk.h" +#include "mbim-ms-firmware-id.h" #include "mbim-message.h" #include "mbim-cid.h" #include "mbim-utils.h" @@ -152,7 +153,7 @@ g_assert_cmpuint (providers[0]->rssi, ==, 11); g_assert_cmpuint (providers[0]->error_rate, ==, 0); - /* Provider [1]: + /* Provider [1]: * Provider ID: '21403' * Provider Name: 'Orange' * State: 'home, visible, registered' @@ -579,6 +580,88 @@ } static void +test_message_parser_basic_connect_register_state (void) +{ + MbimMessage *response; + MbimNwError nw_error; + MbimRegisterState register_state; + MbimRegisterMode register_mode; + MbimDataClass available_data_classes; + MbimCellularClass current_cellular_class; + gchar *provider_id; + gchar *provider_name; + gchar *roaming_text; + MbimRegistrationFlag registration_flag; + GError *error = NULL; + const guint8 buffer [] = { + /* header */ + 0x03, 0x00, 0x00, 0x80, /* type */ + 0x6C, 0x00, 0x00, 0x00, /* length */ + 0x12, 0x00, 0x00, 0x00, /* transaction id */ + /* fragment header */ + 0x01, 0x00, 0x00, 0x00, /* total */ + 0x00, 0x00, 0x00, 0x00, /* current */ + /* command_done message */ + 0xA2, 0x89, 0xCC, 0x33, /* service id */ + 0xBC, 0xBB, 0x8B, 0x4F, + 0xB6, 0xB0, 0x13, 0x3E, + 0xC2, 0xAA, 0xE6, 0xDF, + 0x09, 0x00, 0x00, 0x00, /* command id */ + 0x00, 0x00, 0x00, 0x00, /* status code */ + 0x3C, 0x00, 0x00, 0x00, /* buffer length */ + /* information buffer */ + 0x00, 0x00, 0x00, 0x00, /* nw error */ + 0x03, 0x00, 0x00, 0x00, /* register state */ + 0x01, 0x00, 0x00, 0x00, /* register mode */ + 0x1C, 0x00, 0x00, 0x00, /* available data classes */ + 0x01, 0x00, 0x00, 0x00, /* current cellular class */ + 0x30, 0x00, 0x00, 0x00, /* provider id offset */ + 0x0A, 0x00, 0x00, 0x00, /* provider id size */ + 0x00, 0x00, 0x00, 0x00, /* provider name offset */ + 0x00, 0x00, 0x00, 0x00, /* provider name size */ + 0x00, 0x00, 0x00, 0x00, /* roaming text offset */ + 0x00, 0x00, 0x00, 0x00, /* roaming text size */ + 0x02, 0x00, 0x00, 0x00, /* registration flag */ + /* data buffer */ + 0x32, 0x00, 0x36, 0x00, + 0x30, 0x00, 0x30, 0x00, + 0x36, 0x00, 0x00, 0x00 }; + + response = mbim_message_new (buffer, sizeof (buffer)); + + + g_assert (mbim_message_register_state_response_parse ( + response, + &nw_error, + ®ister_state, + ®ister_mode, + &available_data_classes, + ¤t_cellular_class, + &provider_id, + &provider_name, + &roaming_text, + ®istration_flag, + &error)); + + g_assert_no_error (error); + + g_assert_cmpuint (nw_error, ==, MBIM_NW_ERROR_UNKNOWN); + g_assert_cmpuint (register_state, ==, MBIM_REGISTER_STATE_HOME); + g_assert_cmpuint (register_mode, ==, MBIM_REGISTER_MODE_AUTOMATIC); + g_assert_cmpuint (available_data_classes, ==, (MBIM_DATA_CLASS_UMTS | + MBIM_DATA_CLASS_HSDPA | + MBIM_DATA_CLASS_HSUPA)); + g_assert_cmpuint (current_cellular_class, ==, MBIM_CELLULAR_CLASS_GSM); + g_assert_cmpstr (provider_id, ==, "26006"); + g_free (provider_id); + g_assert (provider_name == NULL); + g_assert (roaming_text == NULL); + g_assert_cmpuint (registration_flag, ==, MBIM_REGISTRATION_FLAG_PACKET_SERVICE_AUTOMATIC_ATTACH); + + mbim_message_unref (response); +} + +static void test_message_parser_sms_read_zero_pdu (void) { MbimSmsFormat format; @@ -1561,6 +1644,56 @@ mbim_message_unref (response); } +static void +test_message_parser_ms_firmware_id_get (void) +{ + const MbimUuid *firmware_id; + MbimMessage *response; + GError *error = NULL; + const guint8 buffer [] = { + /* header */ + 0x03, 0x00, 0x00, 0x80, /* type */ + 0x40, 0x00, 0x00, 0x00, /* length */ + 0x02, 0x00, 0x00, 0x00, /* transaction id */ + /* fragment header */ + 0x01, 0x00, 0x00, 0x00, /* total */ + 0x00, 0x00, 0x00, 0x00, /* current */ + /* command_done_message */ + 0xE9, 0xF7, 0xDE, 0xA2, /* service id */ + 0xFE, 0xAF, 0x40, 0x09, + 0x93, 0xCE, 0x90, 0xA3, + 0x69, 0x41, 0x03, 0xB6, + 0x01, 0x00, 0x00, 0x00, /* command id */ + 0x00, 0x00, 0x00, 0x00, /* status code */ + 0x10, 0x00, 0x00, 0x00, /* buffer length */ + /* information buffer */ + 0x00, 0x11, 0x22, 0x33, /* firmware id */ + 0x44, 0x55, 0x66, 0x77, + 0x88, 0x99, 0xAA, 0xBB, + 0xCC, 0xDD, 0xEE, 0xFF }; + + const MbimUuid expected_firmware_id = { + .a = { 0x00, 0x11, 0x22, 0x33 }, + .b = { 0x44, 0x55 }, + .c = { 0x66, 0x77 }, + .d = { 0x88, 0x99 }, + .e = { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF } + }; + + response = mbim_message_new (buffer, sizeof (buffer)); + + g_assert (mbim_message_ms_firmware_id_get_response_parse ( + response, + &firmware_id, + &error)); + + g_assert_no_error (error); + + g_assert (mbim_uuid_cmp (firmware_id, &expected_firmware_id)); + + mbim_message_unref (response); +} + int main (int argc, char **argv) { g_test_init (&argc, &argv, NULL); @@ -1570,6 +1703,7 @@ g_test_add_func ("/libmbim-glib/message/parser/basic-connect/device-caps", test_message_parser_basic_connect_device_caps); g_test_add_func ("/libmbim-glib/message/parser/basic-connect/ip-configuration", test_message_parser_basic_connect_ip_configuration); g_test_add_func ("/libmbim-glib/message/parser/basic-connect/service-activation", test_message_parser_basic_connect_service_activation); + g_test_add_func ("/libmbim-glib/message/parser/basic-connect/register-state", test_message_parser_basic_connect_register_state); g_test_add_func ("/libmbim-glib/message/parser/sms/read/zero-pdu", test_message_parser_sms_read_zero_pdu); g_test_add_func ("/libmbim-glib/message/parser/sms/read/single-pdu", test_message_parser_sms_read_single_pdu); g_test_add_func ("/libmbim-glib/message/parser/sms/read/multiple-pdu", test_message_parser_sms_read_multiple_pdu); @@ -1582,6 +1716,7 @@ g_test_add_func ("/libmbim-glib/message/parser/basic-connect/ip-packet-filters/none", test_message_parser_basic_connect_ip_packet_filters_none); g_test_add_func ("/libmbim-glib/message/parser/basic-connect/ip-packet-filters/one", test_message_parser_basic_connect_ip_packet_filters_one); g_test_add_func ("/libmbim-glib/message/parser/basic-connect/ip-packet-filters/two", test_message_parser_basic_connect_ip_packet_filters_two); + g_test_add_func ("/libmbim-glib/message/parser/ms-firmware-id/get", test_message_parser_ms_firmware_id_get); return g_test_run (); } diff -Nru libmbim-1.6.0/src/libmbim-glib/test/test-proxy-helpers.c libmbim-1.10.0/src/libmbim-glib/test/test-proxy-helpers.c --- libmbim-1.6.0/src/libmbim-glib/test/test-proxy-helpers.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/test-proxy-helpers.c 2014-08-04 09:02:15.000000000 +0000 @@ -0,0 +1,534 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details: + * + * Copyright (C) 2014 Aleksander Morgado + */ + +#include +#include + +#include "mbim-cid.h" +#include "mbim-uuid.h" +#include "mbim-basic-connect.h" +#include "mbim-proxy-helpers.h" + +/*****************************************************************************/ + +static void +test_parse_single_service_0_cids (void) +{ + MbimMessage *message; + MbimEventEntry **in; + MbimEventEntry **out; + GError *error = NULL; + gsize out_size = 0; + + in = g_new0 (MbimEventEntry *, 2); + in[0] = g_new0 (MbimEventEntry, 1); + memcpy (&in[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + in[0]->cids_count = 0; + in[0]->cids = NULL; + + message = mbim_message_device_service_subscribe_list_set_new (1, (const MbimEventEntry *const *)in, &error); + g_assert_no_error (error); + g_assert (message != NULL); + + out = _mbim_proxy_helper_service_subscribe_request_parse (message, &out_size); + g_assert (out != NULL); + g_assert (_mbim_proxy_helper_service_subscribe_list_cmp ((const MbimEventEntry * const *)in, 1, + (const MbimEventEntry * const *)out, out_size)); + g_assert_cmpuint (out_size, ==, 1); + + mbim_message_unref (message); + mbim_event_entry_array_free (in); + mbim_event_entry_array_free (out); +} + +static void +test_parse_single_service_1_cids (void) +{ + MbimMessage *message; + MbimEventEntry **in; + MbimEventEntry **out; + GError *error = NULL; + gsize out_size = 0; + + in = g_new0 (MbimEventEntry *, 2); + in[0] = g_new0 (MbimEventEntry, 1); + memcpy (&in[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + in[0]->cids_count = 1; + in[0]->cids = g_new0 (guint32, in[0]->cids_count); + in[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + + message = mbim_message_device_service_subscribe_list_set_new (1, (const MbimEventEntry *const *)in, &error); + g_assert_no_error (error); + g_assert (message != NULL); + + out = _mbim_proxy_helper_service_subscribe_request_parse (message, &out_size); + g_assert (out != NULL); + g_assert (_mbim_proxy_helper_service_subscribe_list_cmp ((const MbimEventEntry * const *)in, 1, + (const MbimEventEntry * const *)out, out_size)); + g_assert_cmpuint (out_size, ==, 1); + + mbim_message_unref (message); + mbim_event_entry_array_free (in); + mbim_event_entry_array_free (out); +} + +static void +test_parse_single_service_5_cids (void) +{ + MbimMessage *message; + MbimEventEntry **in; + MbimEventEntry **out; + GError *error = NULL; + gsize out_size = 0; + + in = g_new0 (MbimEventEntry *, 2); + in[0] = g_new0 (MbimEventEntry, 1); + memcpy (&in[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + in[0]->cids_count = 5; + in[0]->cids = g_new0 (guint32, in[0]->cids_count); + in[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + in[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + in[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + in[0]->cids[3] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + in[0]->cids[4] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + + message = mbim_message_device_service_subscribe_list_set_new (1, (const MbimEventEntry *const *)in, &error); + g_assert_no_error (error); + g_assert (message != NULL); + + out = _mbim_proxy_helper_service_subscribe_request_parse (message, &out_size); + g_assert (out != NULL); + g_assert (_mbim_proxy_helper_service_subscribe_list_cmp ((const MbimEventEntry * const *)in, 1, + (const MbimEventEntry * const *)out, out_size)); + g_assert_cmpuint (out_size, ==, 1); + + mbim_message_unref (message); + mbim_event_entry_array_free (in); + mbim_event_entry_array_free (out); +} + +/*****************************************************************************/ + +static MbimEventEntry * +find_service_in_list (MbimEventEntry **list, + gsize list_size, + MbimService service) +{ + gsize i; + + for (i = 0; i < list_size; i++) { + if (mbim_uuid_cmp (&(list[i]->device_service_id), mbim_uuid_from_service (service))) + return list[i]; + } + + return NULL; +} + +static void +check_standard_list (MbimEventEntry **list, + gsize list_size) +{ + MbimEventEntry *tmp; + MbimService s; + gsize i; + + for (i = 0; list[i]; i++); + g_assert_cmpuint (i, ==, list_size); + g_assert_cmpuint (i, ==, (MBIM_SERVICE_DSS - MBIM_SERVICE_BASIC_CONNECT + 1)); + + for (s = MBIM_SERVICE_BASIC_CONNECT; s <= MBIM_SERVICE_DSS; s++) { + tmp = find_service_in_list (list, list_size, s); + g_assert (tmp != NULL); + g_assert_cmpuint (tmp->cids_count, ==, 0); + g_assert (tmp->cids == NULL); + } +} + +static void +test_standard_list (void) +{ + MbimEventEntry **out; + gsize out_size = 0; + + out = _mbim_proxy_helper_service_subscribe_standard_list_new (&out_size); + check_standard_list (out, out_size); + mbim_event_entry_array_free (out); +} + +/*****************************************************************************/ + +static void +test_merge_standard_list_full_none (void) +{ + MbimEventEntry **list; + gsize list_size = 0; + gsize out_size = 0; + + /* list with all standard services */ + list = _mbim_proxy_helper_service_subscribe_standard_list_new (&list_size); + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (list, list_size, NULL, 0, &out_size); + + check_standard_list (list, out_size); + + mbim_event_entry_array_free (list); +} + +static void +test_merge_standard_list_full_subset (void) +{ + MbimEventEntry **list; + gsize list_size = 0; + MbimEventEntry **addition; + gsize addition_size; + gsize out_size = 0; + + /* list with all standard services */ + list = _mbim_proxy_helper_service_subscribe_standard_list_new (&list_size); + + /* setup a new list with a subset of standard services */ + addition_size = 2; + addition = g_new0 (MbimEventEntry *, addition_size + 1); + addition[0] = g_new0 (MbimEventEntry, 1); + memcpy (&addition[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + addition[0]->cids_count = 5; + addition[0]->cids = g_new0 (guint32, addition[0]->cids_count); + addition[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + addition[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + addition[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + addition[0]->cids[3] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + addition[0]->cids[4] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + addition[1] = g_new0 (MbimEventEntry, 1); + memcpy (&addition[1]->device_service_id, MBIM_UUID_SMS, sizeof (MbimUuid)); + addition[1]->cids_count = 2; + addition[1]->cids = g_new0 (guint32, addition[1]->cids_count); + addition[1]->cids[0] = MBIM_CID_SMS_READ; + addition[1]->cids[1] = MBIM_CID_SMS_SEND; + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (list, list_size, addition, addition_size, &out_size); + + /* Now, as we added a subset of the elements of the standard list to the + * full standard list, we should still get as output the full standard list + */ + check_standard_list (list, out_size); + + mbim_event_entry_array_free (list); + mbim_event_entry_array_free (addition); +} + +static void +test_merge_standard_list_full_full (void) +{ + MbimEventEntry **list; + gsize list_size = 0; + MbimEventEntry **addition; + gsize addition_size = 0; + gsize out_size = 0; + + /* list with all standard services */ + list = _mbim_proxy_helper_service_subscribe_standard_list_new (&list_size); + /* again, list with all standard services */ + addition = _mbim_proxy_helper_service_subscribe_standard_list_new (&addition_size); + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (list, list_size, addition, addition_size, &out_size); + + /* Now, as we added a subset of the elements of the standard list to the + * full standard list, we should still get as output the full standard list + */ + check_standard_list (list, out_size); + + mbim_event_entry_array_free (list); + mbim_event_entry_array_free (addition); +} + +static void +test_merge_standard_list_subset_full (void) +{ + MbimEventEntry **list; + gsize list_size; + MbimEventEntry **addition; + gsize addition_size = 0; + gsize out_size = 0; + + /* setup a new list with a subset of standard services */ + list_size = 2; + list = g_new0 (MbimEventEntry *, list_size + 1); + list[0] = g_new0 (MbimEventEntry, 1); + memcpy (&list[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + list[0]->cids_count = 5; + list[0]->cids = g_new0 (guint32, list[0]->cids_count); + list[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + list[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + list[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + list[0]->cids[3] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + list[0]->cids[4] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + list[1] = g_new0 (MbimEventEntry, 1); + memcpy (&list[1]->device_service_id, MBIM_UUID_SMS, sizeof (MbimUuid)); + list[1]->cids_count = 2; + list[1]->cids = g_new0 (guint32, list[1]->cids_count); + list[1]->cids[0] = MBIM_CID_SMS_READ; + list[1]->cids[1] = MBIM_CID_SMS_SEND; + + /* list with all standard services */ + addition = _mbim_proxy_helper_service_subscribe_standard_list_new (&addition_size); + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (list, list_size, addition, addition_size, &out_size); + + /* Now, as we added the full standard list to a subset, we should still get + * as output the full standard list */ + check_standard_list (list, out_size); + + mbim_event_entry_array_free (list); + mbim_event_entry_array_free (addition); +} + +static void +test_merge_standard_list_none_full (void) +{ + MbimEventEntry **list; + gsize addition_size = 0; + gsize out_size = 0; + + /* list with all standard services */ + list = _mbim_proxy_helper_service_subscribe_standard_list_new (&addition_size); + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (NULL, 0, list, addition_size, &out_size); + + check_standard_list (list, out_size); + + mbim_event_entry_array_free (list); +} + +static void +test_merge_list_same_service (void) +{ + MbimEventEntry **list; + gsize list_size; + MbimEventEntry **addition; + gsize addition_size; + MbimEventEntry **expected; + gsize expected_size; + gsize out_size = 0; + + /* setup a new list with a subset of standard services */ + list_size = 1; + list = g_new0 (MbimEventEntry *, list_size + 1); + list[0] = g_new0 (MbimEventEntry, 1); + memcpy (&list[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + list[0]->cids_count = 2; + list[0]->cids = g_new0 (guint32, list[0]->cids_count); + list[0]->cids[0] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + list[0]->cids[1] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + + /* setup a new list with a subset of standard services */ + addition_size = 1; + addition = g_new0 (MbimEventEntry *, addition_size + 1); + addition[0] = g_new0 (MbimEventEntry, 1); + memcpy (&addition[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + addition[0]->cids_count = 3; + addition[0]->cids = g_new0 (guint32, addition[0]->cids_count); + addition[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + addition[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + addition[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (list, list_size, addition, addition_size, &out_size); + + /* setup the expected list */ + expected_size = 1; + expected = g_new0 (MbimEventEntry *, expected_size + 1); + expected[0] = g_new0 (MbimEventEntry, 1); + memcpy (&expected[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + expected[0]->cids_count = 5; + expected[0]->cids = g_new0 (guint32, expected[0]->cids_count); + expected[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + expected[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + expected[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + expected[0]->cids[3] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + expected[0]->cids[4] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + + /* Compare */ + g_assert (_mbim_proxy_helper_service_subscribe_list_cmp ((const MbimEventEntry * const *)list, out_size, + (const MbimEventEntry * const *)expected, expected_size)); + + mbim_event_entry_array_free (list); + mbim_event_entry_array_free (addition); + mbim_event_entry_array_free (expected); +} + +static void +test_merge_list_different_services (void) +{ + MbimEventEntry **list; + gsize list_size; + MbimEventEntry **addition; + gsize addition_size; + MbimEventEntry **expected; + gsize expected_size; + gsize out_size = 0; + + /* setup a new list with a subset of standard services */ + list_size = 1; + list = g_new0 (MbimEventEntry *, list_size + 1); + list[0] = g_new0 (MbimEventEntry, 1); + memcpy (&list[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + list[0]->cids_count = 5; + list[0]->cids = g_new0 (guint32, list[0]->cids_count); + list[0]->cids[0] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + list[0]->cids[1] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + list[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + list[0]->cids[3] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + list[0]->cids[4] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + + /* setup a new list with a subset of standard services */ + addition_size = 1; + addition = g_new0 (MbimEventEntry *, addition_size + 1); + addition[0] = g_new0 (MbimEventEntry, 1); + memcpy (&addition[0]->device_service_id, MBIM_UUID_SMS, sizeof (MbimUuid)); + addition[0]->cids_count = 2; + addition[0]->cids = g_new0 (guint32, addition[0]->cids_count); + addition[0]->cids[0] = MBIM_CID_SMS_READ; + addition[0]->cids[1] = MBIM_CID_SMS_SEND; + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (list, list_size, addition, addition_size, &out_size); + + /* setup the expected list */ + expected_size = 2; + expected = g_new0 (MbimEventEntry *, expected_size + 1); + expected[0] = g_new0 (MbimEventEntry, 1); + memcpy (&expected[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + expected[0]->cids_count = 5; + expected[0]->cids = g_new0 (guint32, expected[0]->cids_count); + expected[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + expected[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + expected[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + expected[0]->cids[3] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + expected[0]->cids[4] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + expected[1] = g_new0 (MbimEventEntry, 1); + memcpy (&expected[1]->device_service_id, MBIM_UUID_SMS, sizeof (MbimUuid)); + expected[1]->cids_count = 2; + expected[1]->cids = g_new0 (guint32, expected[1]->cids_count); + expected[1]->cids[0] = MBIM_CID_SMS_READ; + expected[1]->cids[1] = MBIM_CID_SMS_SEND; + + /* Compare */ + g_assert (_mbim_proxy_helper_service_subscribe_list_cmp ((const MbimEventEntry * const *)list, out_size, + (const MbimEventEntry * const *)expected, expected_size)); + + mbim_event_entry_array_free (list); + mbim_event_entry_array_free (addition); + mbim_event_entry_array_free (expected); +} + +static void +test_merge_list_merged_services (void) +{ + MbimEventEntry **list; + gsize list_size; + MbimEventEntry **addition; + gsize addition_size; + MbimEventEntry **expected; + gsize expected_size; + gsize out_size = 0; + + /* setup a new list with a subset of standard services */ + list_size = 2; + list = g_new0 (MbimEventEntry *, list_size + 1); + list[0] = g_new0 (MbimEventEntry, 1); + memcpy (&list[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + list[0]->cids_count = 3; + list[0]->cids = g_new0 (guint32, list[0]->cids_count); + list[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + list[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + list[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + list[1] = g_new0 (MbimEventEntry, 1); + memcpy (&list[1]->device_service_id, MBIM_UUID_SMS, sizeof (MbimUuid)); + list[1]->cids_count = 1; + list[1]->cids = g_new0 (guint32, list[1]->cids_count); + list[1]->cids[0] = MBIM_CID_SMS_READ; + + /* setup a new list with a subset of standard services */ + addition_size = 2; + addition = g_new0 (MbimEventEntry *, addition_size + 1); + addition[0] = g_new0 (MbimEventEntry, 1); + memcpy (&addition[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + addition[0]->cids_count = 2; + addition[0]->cids = g_new0 (guint32, addition[0]->cids_count); + addition[0]->cids[0] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + addition[0]->cids[1] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + addition[1] = g_new0 (MbimEventEntry, 1); + memcpy (&addition[1]->device_service_id, MBIM_UUID_SMS, sizeof (MbimUuid)); + addition[1]->cids_count = 1; + addition[1]->cids = g_new0 (guint32, addition[1]->cids_count); + addition[1]->cids[0] = MBIM_CID_SMS_SEND; + + /* merge */ + list = _mbim_proxy_helper_service_subscribe_list_merge (list, list_size, addition, addition_size, &out_size); + + /* setup the expected list */ + expected_size = 2; + expected = g_new0 (MbimEventEntry *, expected_size + 1); + expected[0] = g_new0 (MbimEventEntry, 1); + memcpy (&expected[0]->device_service_id, MBIM_UUID_BASIC_CONNECT, sizeof (MbimUuid)); + expected[0]->cids_count = 5; + expected[0]->cids = g_new0 (guint32, expected[0]->cids_count); + expected[0]->cids[0] = MBIM_CID_BASIC_CONNECT_SUBSCRIBER_READY_STATUS; + expected[0]->cids[1] = MBIM_CID_BASIC_CONNECT_RADIO_STATE; + expected[0]->cids[2] = MBIM_CID_BASIC_CONNECT_SIGNAL_STATE; + expected[0]->cids[3] = MBIM_CID_BASIC_CONNECT_IP_CONFIGURATION; + expected[0]->cids[4] = MBIM_CID_BASIC_CONNECT_NETWORK_IDLE_HINT; + expected[1] = g_new0 (MbimEventEntry, 1); + memcpy (&expected[1]->device_service_id, MBIM_UUID_SMS, sizeof (MbimUuid)); + expected[1]->cids_count = 2; + expected[1]->cids = g_new0 (guint32, expected[1]->cids_count); + expected[1]->cids[0] = MBIM_CID_SMS_READ; + expected[1]->cids[1] = MBIM_CID_SMS_SEND; + + /* Compare */ + g_assert (_mbim_proxy_helper_service_subscribe_list_cmp ((const MbimEventEntry * const *)list, out_size, + (const MbimEventEntry * const *)expected, expected_size)); + + mbim_event_entry_array_free (list); + mbim_event_entry_array_free (addition); + mbim_event_entry_array_free (expected); +} + +/*****************************************************************************/ + +int main (int argc, char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/libmbim-glib/proxy/standard-list", test_standard_list); + g_test_add_func ("/libmbim-glib/proxy/parse/single-service/0", test_parse_single_service_0_cids); + g_test_add_func ("/libmbim-glib/proxy/parse/single-service/1", test_parse_single_service_1_cids); + g_test_add_func ("/libmbim-glib/proxy/parse/single-service/5", test_parse_single_service_5_cids); + g_test_add_func ("/libmbim-glib/proxy/merge/standard/full_none", test_merge_standard_list_full_none); + g_test_add_func ("/libmbim-glib/proxy/merge/standard/full_subset", test_merge_standard_list_full_subset); + g_test_add_func ("/libmbim-glib/proxy/merge/standard/full_full", test_merge_standard_list_full_full); + g_test_add_func ("/libmbim-glib/proxy/merge/standard/subset_full", test_merge_standard_list_subset_full); + g_test_add_func ("/libmbim-glib/proxy/merge/standard/none_full", test_merge_standard_list_none_full); + g_test_add_func ("/libmbim-glib/proxy/merge/same-service", test_merge_list_same_service); + g_test_add_func ("/libmbim-glib/proxy/merge/different-services", test_merge_list_different_services); + g_test_add_func ("/libmbim-glib/proxy/merge/merged-services", test_merge_list_merged_services); + + return g_test_run (); +} diff -Nru libmbim-1.6.0/src/libmbim-glib/test/test-uuid.c libmbim-1.10.0/src/libmbim-glib/test/test-uuid.c --- libmbim-1.6.0/src/libmbim-glib/test/test-uuid.c 2013-04-21 17:44:50.000000000 +0000 +++ libmbim-1.10.0/src/libmbim-glib/test/test-uuid.c 2014-07-31 16:41:35.000000000 +0000 @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details: * - * Copyright (C) 2012 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include @@ -77,17 +77,140 @@ "c08a26dd-7718-4382-8482-6e0d583c4d0e"); } +static void +test_uuid_ms_firmware_id (void) +{ + compare_uuid_strings (MBIM_UUID_MS_FIRMWARE_ID, + "e9f7dea2-feaf-4009-93ce-90a3694103b6"); +} + +static void +test_uuid_ms_host_shutdown (void) +{ + compare_uuid_strings (MBIM_UUID_MS_HOST_SHUTDOWN, + "883b7c26-985f-43fa-9804-27d7fb80959c"); +} + +/*****************************************************************************/ + +static void +compare_uuid_types (const gchar *uuid_str, + const MbimUuid *other_uuid) +{ + MbimUuid uuid; + + g_assert (mbim_uuid_from_printable (uuid_str, &uuid)); + g_assert (mbim_uuid_cmp (&uuid, other_uuid)); +} + +static void +invalid_uuid_str (const gchar *uuid_str) +{ + MbimUuid uuid; + + g_assert (mbim_uuid_from_printable (uuid_str, &uuid) == FALSE); +} + +static void +test_uuid_valid (void) +{ + compare_uuid_types ("a289cc33-bcbb-8b4f-b6b0-133ec2aae6df", + MBIM_UUID_BASIC_CONNECT); +} + +static void +test_uuid_valid_camelcase (void) +{ + compare_uuid_types ("A289cC33-BcBb-8B4f-B6b0-133Ec2Aae6Df", + MBIM_UUID_BASIC_CONNECT); +} + +static void +test_uuid_invalid_empty (void) +{ + invalid_uuid_str (""); +} + +static void +test_uuid_invalid_short (void) +{ + invalid_uuid_str ("a289cc33-bcbb-8b4f-b6b0-"); +} + +static void +test_uuid_invalid_long (void) +{ + invalid_uuid_str ("a289cc33-bcbb-8b4f-b6b0-133ec2aae6dfaaa"); +} + +static void +test_uuid_invalid_dashes (void) +{ + /* Dashes one too early */ + invalid_uuid_str ("289cc33-bcbb-8b4f-b6b0-133ec2aae6dfa"); +} + +static void +test_uuid_invalid_no_hex (void) +{ + invalid_uuid_str ("hello wo-rld -8b4f-b6b0-133ec2aae6df"); +} + +/*****************************************************************************/ + +static void +test_uuid_custom (void) +{ + static const gchar *nick = "register_custom"; + static const MbimUuid uuid_custom = { + .a = { 0x52, 0x65, 0x67, 0x69 }, + .b = { 0x73, 0x74 }, + .c = { 0x65, 0x72 }, + .d = { 0x20, 0x63 }, + .e = { 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x21 } + }; + guint service; + + /* SERVICE_AUTH is not a custom service */ + g_assert (!mbim_service_id_is_custom (MBIM_SERVICE_AUTH)); + + service = mbim_register_custom_service (&uuid_custom, nick); + g_assert (mbim_service_id_is_custom (service)); + g_assert (g_strcmp0 (mbim_service_lookup_name (service), nick) == 0); + g_assert (mbim_uuid_cmp (mbim_uuid_from_service (service), &uuid_custom)); + g_assert (mbim_uuid_to_service (&uuid_custom) == service); + g_assert (mbim_unregister_custom_service (service)); + + /* once removed service is not custom */ + g_assert (!mbim_service_id_is_custom (service)); +} + +/*****************************************************************************/ + int main (int argc, char **argv) { g_test_init (&argc, &argv, NULL); - g_test_add_func ("/libmbim-glib/uuid/basic-connect", test_uuid_basic_connect); - g_test_add_func ("/libmbim-glib/uuid/sms", test_uuid_sms); - g_test_add_func ("/libmbim-glib/uuid/ussd", test_uuid_ussd); - g_test_add_func ("/libmbim-glib/uuid/phonebook", test_uuid_phonebook); - g_test_add_func ("/libmbim-glib/uuid/stk", test_uuid_stk); - g_test_add_func ("/libmbim-glib/uuid/auth", test_uuid_auth); - g_test_add_func ("/libmbim-glib/uuid/dss", test_uuid_dss); + g_test_add_func ("/libmbim-glib/uuid/basic-connect", test_uuid_basic_connect); + g_test_add_func ("/libmbim-glib/uuid/sms", test_uuid_sms); + g_test_add_func ("/libmbim-glib/uuid/ussd", test_uuid_ussd); + g_test_add_func ("/libmbim-glib/uuid/phonebook", test_uuid_phonebook); + g_test_add_func ("/libmbim-glib/uuid/stk", test_uuid_stk); + g_test_add_func ("/libmbim-glib/uuid/auth", test_uuid_auth); + g_test_add_func ("/libmbim-glib/uuid/dss", test_uuid_dss); + g_test_add_func ("/libmbim-glib/uuid/ms-firmware-id", test_uuid_ms_firmware_id); + g_test_add_func ("/libmbim-glib/uuid/ms-host-shutdown", test_uuid_ms_host_shutdown); + + g_test_add_func ("/libmbim-glib/uuid/valid", test_uuid_valid); + g_test_add_func ("/libmbim-glib/uuid/valid/camelcase", test_uuid_valid_camelcase); + + g_test_add_func ("/libmbim-glib/uuid/invalid/empty", test_uuid_invalid_empty); + g_test_add_func ("/libmbim-glib/uuid/invalid/short", test_uuid_invalid_short); + g_test_add_func ("/libmbim-glib/uuid/invalid/long", test_uuid_invalid_long); + g_test_add_func ("/libmbim-glib/uuid/invalid/dashes", test_uuid_invalid_dashes); + g_test_add_func ("/libmbim-glib/uuid/invalid/no-hex", test_uuid_invalid_no_hex); + + g_test_add_func ("/libmbim-glib/uuid/custom", test_uuid_custom); return g_test_run (); } diff -Nru libmbim-1.6.0/src/Makefile.am libmbim-1.10.0/src/Makefile.am --- libmbim-1.6.0/src/Makefile.am 2013-12-10 19:13:44.000000000 +0000 +++ libmbim-1.10.0/src/Makefile.am 2014-07-31 16:44:12.000000000 +0000 @@ -1,2 +1,2 @@ -SUBDIRS = libmbim-glib mbimcli +SUBDIRS = libmbim-glib mbimcli mbim-proxy diff -Nru libmbim-1.6.0/src/Makefile.in libmbim-1.10.0/src/Makefile.in --- libmbim-1.6.0/src/Makefile.in 2013-12-10 20:25:12.000000000 +0000 +++ libmbim-1.10.0/src/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -200,6 +200,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -226,6 +227,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -309,7 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = libmbim-glib mbimcli +SUBDIRS = libmbim-glib mbimcli mbim-proxy all: all-recursive .SUFFIXES: diff -Nru libmbim-1.6.0/src/mbimcli/Makefile.am libmbim-1.10.0/src/mbimcli/Makefile.am --- libmbim-1.6.0/src/mbimcli/Makefile.am 2013-12-10 18:40:30.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/Makefile.am 2014-03-05 09:52:08.000000000 +0000 @@ -10,10 +10,13 @@ -I$(top_builddir)/src/libmbim-glib/generated mbimcli_SOURCES = \ - mbimcli.h \ - mbimcli.c \ + mbimcli.h mbimcli.c \ + mbimcli-helpers.h mbimcli-helpers.c \ mbimcli-basic-connect.c \ - mbimcli-phonebook.c + mbimcli-phonebook.c \ + mbimcli-dss.c \ + mbimcli-ms-firmware-id.c \ + mbimcli-ms-host-shutdown.c mbimcli_LDADD = \ $(MBIMCLI_LIBS) \ diff -Nru libmbim-1.6.0/src/mbimcli/Makefile.in libmbim-1.10.0/src/mbimcli/Makefile.in --- libmbim-1.6.0/src/mbimcli/Makefile.in 2013-12-10 20:25:13.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -97,8 +97,12 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_mbimcli_OBJECTS = mbimcli-mbimcli.$(OBJEXT) \ + mbimcli-mbimcli-helpers.$(OBJEXT) \ mbimcli-mbimcli-basic-connect.$(OBJEXT) \ - mbimcli-mbimcli-phonebook.$(OBJEXT) + mbimcli-mbimcli-phonebook.$(OBJEXT) \ + mbimcli-mbimcli-dss.$(OBJEXT) \ + mbimcli-mbimcli-ms-firmware-id.$(OBJEXT) \ + mbimcli-mbimcli-ms-host-shutdown.$(OBJEXT) mbimcli_OBJECTS = $(am_mbimcli_OBJECTS) am__DEPENDENCIES_1 = mbimcli_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -196,6 +200,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -222,6 +227,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ @@ -314,10 +321,13 @@ -I$(top_builddir)/src/libmbim-glib/generated mbimcli_SOURCES = \ - mbimcli.h \ - mbimcli.c \ + mbimcli.h mbimcli.c \ + mbimcli-helpers.h mbimcli-helpers.c \ mbimcli-basic-connect.c \ - mbimcli-phonebook.c + mbimcli-phonebook.c \ + mbimcli-dss.c \ + mbimcli-ms-firmware-id.c \ + mbimcli-ms-host-shutdown.c mbimcli_LDADD = \ $(MBIMCLI_LIBS) \ @@ -418,6 +428,10 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbimcli-mbimcli-basic-connect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbimcli-mbimcli-dss.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbimcli-mbimcli-helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbimcli-mbimcli-ms-firmware-id.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbimcli-mbimcli-ms-host-shutdown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbimcli-mbimcli-phonebook.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbimcli-mbimcli.Po@am__quote@ @@ -426,14 +440,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -456,6 +470,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli.obj `if test -f 'mbimcli.c'; then $(CYGPATH_W) 'mbimcli.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli.c'; fi` +mbimcli-mbimcli-helpers.o: mbimcli-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-helpers.o -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-helpers.Tpo -c -o mbimcli-mbimcli-helpers.o `test -f 'mbimcli-helpers.c' || echo '$(srcdir)/'`mbimcli-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-helpers.Tpo $(DEPDIR)/mbimcli-mbimcli-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-helpers.c' object='mbimcli-mbimcli-helpers.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-helpers.o `test -f 'mbimcli-helpers.c' || echo '$(srcdir)/'`mbimcli-helpers.c + +mbimcli-mbimcli-helpers.obj: mbimcli-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-helpers.obj -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-helpers.Tpo -c -o mbimcli-mbimcli-helpers.obj `if test -f 'mbimcli-helpers.c'; then $(CYGPATH_W) 'mbimcli-helpers.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-helpers.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-helpers.Tpo $(DEPDIR)/mbimcli-mbimcli-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-helpers.c' object='mbimcli-mbimcli-helpers.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-helpers.obj `if test -f 'mbimcli-helpers.c'; then $(CYGPATH_W) 'mbimcli-helpers.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-helpers.c'; fi` + mbimcli-mbimcli-basic-connect.o: mbimcli-basic-connect.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-basic-connect.o -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-basic-connect.Tpo -c -o mbimcli-mbimcli-basic-connect.o `test -f 'mbimcli-basic-connect.c' || echo '$(srcdir)/'`mbimcli-basic-connect.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-basic-connect.Tpo $(DEPDIR)/mbimcli-mbimcli-basic-connect.Po @@ -484,6 +512,48 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-phonebook.obj `if test -f 'mbimcli-phonebook.c'; then $(CYGPATH_W) 'mbimcli-phonebook.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-phonebook.c'; fi` +mbimcli-mbimcli-dss.o: mbimcli-dss.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-dss.o -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-dss.Tpo -c -o mbimcli-mbimcli-dss.o `test -f 'mbimcli-dss.c' || echo '$(srcdir)/'`mbimcli-dss.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-dss.Tpo $(DEPDIR)/mbimcli-mbimcli-dss.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-dss.c' object='mbimcli-mbimcli-dss.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-dss.o `test -f 'mbimcli-dss.c' || echo '$(srcdir)/'`mbimcli-dss.c + +mbimcli-mbimcli-dss.obj: mbimcli-dss.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-dss.obj -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-dss.Tpo -c -o mbimcli-mbimcli-dss.obj `if test -f 'mbimcli-dss.c'; then $(CYGPATH_W) 'mbimcli-dss.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-dss.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-dss.Tpo $(DEPDIR)/mbimcli-mbimcli-dss.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-dss.c' object='mbimcli-mbimcli-dss.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-dss.obj `if test -f 'mbimcli-dss.c'; then $(CYGPATH_W) 'mbimcli-dss.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-dss.c'; fi` + +mbimcli-mbimcli-ms-firmware-id.o: mbimcli-ms-firmware-id.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-ms-firmware-id.o -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-ms-firmware-id.Tpo -c -o mbimcli-mbimcli-ms-firmware-id.o `test -f 'mbimcli-ms-firmware-id.c' || echo '$(srcdir)/'`mbimcli-ms-firmware-id.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-ms-firmware-id.Tpo $(DEPDIR)/mbimcli-mbimcli-ms-firmware-id.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-ms-firmware-id.c' object='mbimcli-mbimcli-ms-firmware-id.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-ms-firmware-id.o `test -f 'mbimcli-ms-firmware-id.c' || echo '$(srcdir)/'`mbimcli-ms-firmware-id.c + +mbimcli-mbimcli-ms-firmware-id.obj: mbimcli-ms-firmware-id.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-ms-firmware-id.obj -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-ms-firmware-id.Tpo -c -o mbimcli-mbimcli-ms-firmware-id.obj `if test -f 'mbimcli-ms-firmware-id.c'; then $(CYGPATH_W) 'mbimcli-ms-firmware-id.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-ms-firmware-id.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-ms-firmware-id.Tpo $(DEPDIR)/mbimcli-mbimcli-ms-firmware-id.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-ms-firmware-id.c' object='mbimcli-mbimcli-ms-firmware-id.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-ms-firmware-id.obj `if test -f 'mbimcli-ms-firmware-id.c'; then $(CYGPATH_W) 'mbimcli-ms-firmware-id.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-ms-firmware-id.c'; fi` + +mbimcli-mbimcli-ms-host-shutdown.o: mbimcli-ms-host-shutdown.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-ms-host-shutdown.o -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-ms-host-shutdown.Tpo -c -o mbimcli-mbimcli-ms-host-shutdown.o `test -f 'mbimcli-ms-host-shutdown.c' || echo '$(srcdir)/'`mbimcli-ms-host-shutdown.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-ms-host-shutdown.Tpo $(DEPDIR)/mbimcli-mbimcli-ms-host-shutdown.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-ms-host-shutdown.c' object='mbimcli-mbimcli-ms-host-shutdown.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-ms-host-shutdown.o `test -f 'mbimcli-ms-host-shutdown.c' || echo '$(srcdir)/'`mbimcli-ms-host-shutdown.c + +mbimcli-mbimcli-ms-host-shutdown.obj: mbimcli-ms-host-shutdown.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbimcli-mbimcli-ms-host-shutdown.obj -MD -MP -MF $(DEPDIR)/mbimcli-mbimcli-ms-host-shutdown.Tpo -c -o mbimcli-mbimcli-ms-host-shutdown.obj `if test -f 'mbimcli-ms-host-shutdown.c'; then $(CYGPATH_W) 'mbimcli-ms-host-shutdown.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-ms-host-shutdown.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbimcli-mbimcli-ms-host-shutdown.Tpo $(DEPDIR)/mbimcli-mbimcli-ms-host-shutdown.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbimcli-ms-host-shutdown.c' object='mbimcli-mbimcli-ms-host-shutdown.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbimcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbimcli-mbimcli-ms-host-shutdown.obj `if test -f 'mbimcli-ms-host-shutdown.c'; then $(CYGPATH_W) 'mbimcli-ms-host-shutdown.c'; else $(CYGPATH_W) '$(srcdir)/mbimcli-ms-host-shutdown.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli-basic-connect.c libmbim-1.10.0/src/mbimcli/mbimcli-basic-connect.c --- libmbim-1.6.0/src/mbimcli/mbimcli-basic-connect.c 2013-12-09 12:12:33.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli-basic-connect.c 2014-07-31 16:41:35.000000000 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include "config.h" @@ -43,6 +43,7 @@ static gboolean query_device_caps_flag; static gboolean query_subscriber_ready_status_flag; static gboolean query_radio_state_flag; +static gchar *set_radio_state_str; static gboolean query_device_services_flag; static gboolean query_pin_flag; static gchar *set_pin_enter_str; @@ -77,6 +78,10 @@ "Query radio state", NULL }, + { "set-radio-state", 0, 0, G_OPTION_ARG_STRING, &set_radio_state_str, + "Set radio state", + "[(on|off)]" + }, { "query-device-services", 0, 0, G_OPTION_ARG_NONE, &query_device_services_flag, "Query device services", NULL @@ -163,16 +168,16 @@ GOptionGroup * mbimcli_basic_connect_get_option_group (void) { - GOptionGroup *group; + GOptionGroup *group; - group = g_option_group_new ("basic-connect", - "Basic Connect options", - "Show Basic Connect Service options", - NULL, - NULL); - g_option_group_add_entries (group, entries); + group = g_option_group_new ("basic-connect", + "Basic Connect options", + "Show Basic Connect Service options", + NULL, + NULL); + g_option_group_add_entries (group, entries); - return group; + return group; } gboolean @@ -187,6 +192,7 @@ n_actions = (query_device_caps_flag + query_subscriber_ready_status_flag + query_radio_state_flag + + !!set_radio_state_str + query_device_services_flag + query_pin_flag + !!set_pin_enter_str + @@ -265,9 +271,11 @@ gchar *hardware_info; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -295,15 +303,12 @@ device_type_str = mbim_device_type_get_string (device_type); cellular_class_str = mbim_cellular_class_build_string_from_mask (cellular_class); - voice_class_str = mbim_device_type_get_string (voice_class); + voice_class_str = mbim_voice_class_get_string (voice_class); sim_class_str = mbim_sim_class_build_string_from_mask (sim_class); data_class_str = mbim_data_class_build_string_from_mask (data_class); sms_caps_str = mbim_sms_caps_build_string_from_mask (sms_caps); ctrl_caps_str = mbim_ctrl_caps_build_string_from_mask (ctrl_caps); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("[%s] Device capabilities retrieved:\n" "\t Device type: '%s'\n" "\t Cellular class: '%s'\n" @@ -362,9 +367,11 @@ gchar *telephone_numbers_str; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -388,9 +395,6 @@ ready_state_str = mbim_subscriber_ready_state_get_string (ready_state); ready_info_str = mbim_ready_info_flag_build_string_from_mask (ready_info); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("[%s] Subscriber ready status retrieved:\n" "\t Ready state: '%s'\n" "\t Subscriber ID: '%s'\n" @@ -426,9 +430,11 @@ const gchar *software_radio_state_str; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -447,9 +453,6 @@ hardware_radio_state_str = mbim_radio_switch_state_get_string (hardware_radio_state); software_radio_state_str = mbim_radio_switch_state_get_string (software_radio_state); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("[%s] Radio state retrieved:\n" "\t Hardware Radio State: '%s'\n" "\t Software Radio State: '%s'\n", @@ -472,9 +475,11 @@ guint32 max_dss_sessions; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -565,6 +570,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -585,9 +592,6 @@ g_print ("[%s] PIN operation successful\n\n", mbim_device_get_path_display (device)); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - pin_state_str = mbim_pin_state_get_string (pin_state); g_print ("[%s] Pin Info:\n" @@ -639,10 +643,10 @@ return FALSE; } - *pin = split[0]; - *new_pin = split[1] ? split[1] : NULL; + *pin = g_strdup (split[0]); + *new_pin = g_strdup (split[1]); - g_free (split); + g_strfreev (split); return TRUE; } @@ -670,6 +674,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -702,9 +708,6 @@ break; } -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("[%s] Connection status:\n" "\t Session ID: '%u'\n" "\tActivation state: '%s'\n" @@ -756,7 +759,7 @@ } /* APN */ - *apn = split[0]; + *apn = g_strdup (split[0]); /* Some defaults */ *auth_protocol = MBIM_AUTH_PROTOCOL_NONE; @@ -776,15 +779,14 @@ /* Username */ if (split[2]) { - *username = split[2]; + *username = g_strdup (split[2]); /* Password */ - if (split[3]) - *password = split[3]; + *password = g_strdup (split[3]); } } - g_free (split); + g_strfreev (split); return TRUE; } @@ -803,6 +805,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -819,9 +823,6 @@ provider_state_str = mbim_provider_state_build_string_from_mask (provider->provider_state); cellular_class_str = mbim_cellular_class_build_string_from_mask (provider->cellular_class); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("[%s] Home provider:\n" "\t Provider ID: '%s'\n" "\t Provider Name: '%s'\n" @@ -860,6 +861,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -889,9 +892,6 @@ provider_state_str = mbim_provider_state_build_string_from_mask (providers[i]->provider_state); cellular_class_str = mbim_cellular_class_build_string_from_mask (providers[i]->cellular_class); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("\tProvider [%u]:\n" "\t\t Provider ID: '%s'\n" "\t\t Provider Name: '%s'\n" @@ -931,6 +931,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -960,9 +962,6 @@ provider_state_str = mbim_provider_state_build_string_from_mask (providers[i]->provider_state); cellular_class_str = mbim_cellular_class_build_string_from_mask (providers[i]->cellular_class); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("\tProvider [%u]:\n" "\t\t Provider ID: '%s'\n" "\t\t Provider Name: '%s'\n" @@ -1011,6 +1010,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -1040,9 +1041,6 @@ cellular_class_str = mbim_cellular_class_build_string_from_mask (cellular_class); registration_flag_str = mbim_registration_flag_build_string_from_mask (registration_flag); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("[%s] Registration status:\n" "\t Network error: '%s'\n" "\t Register state: '%s'\n" @@ -1092,6 +1090,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -1153,6 +1153,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -1183,9 +1185,6 @@ break; } -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - highest_available_data_class_str = mbim_data_class_build_string_from_mask (highest_available_data_class); g_print ("[%s] Packet service status:\n" @@ -1226,6 +1225,8 @@ if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -1327,6 +1328,34 @@ return; } + /* Request to set radio state? */ + if (set_radio_state_str) { + MbimMessage *request; + MbimRadioSwitchState radio_state; + + if (g_ascii_strcasecmp (set_radio_state_str, "on") == 0) { + radio_state = MBIM_RADIO_SWITCH_STATE_ON; + } else if (g_ascii_strcasecmp (set_radio_state_str, "off") == 0) { + radio_state = MBIM_RADIO_SWITCH_STATE_OFF; + } else { + g_printerr ("error: invalid radio state: '%s'\n", set_radio_state_str); + shutdown (FALSE); + return; + } + + g_debug ("Asynchronously setting radio state to %s...", + radio_state == MBIM_RADIO_SWITCH_STATE_ON ? "on" : "off"); + request = mbim_message_radio_state_set_new (radio_state, NULL); + mbim_device_command (ctx->device, + request, + 10, + ctx->cancellable, + (GAsyncReadyCallback)query_radio_state_ready, + NULL); + mbim_message_unref (request); + return; + } + /* Request to query device services? */ if (query_device_services_flag) { MbimMessage *request; @@ -1592,7 +1621,7 @@ GError *error = NULL; request = mbim_message_connect_query_new (0, - MBIM_ACTIVATION_COMMAND_ACTIVATE, + MBIM_ACTIVATION_STATE_UNKNOWN, MBIM_VOICE_CALL_STATE_NONE, MBIM_CONTEXT_IP_TYPE_DEFAULT, mbim_uuid_from_context_type (MBIM_CONTEXT_TYPE_INTERNET), diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli.c libmbim-1.10.0/src/mbimcli/mbimcli.c --- libmbim-1.6.0/src/mbimcli/mbimcli.c 2013-10-09 07:45:31.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli.c 2014-07-31 16:44:12.000000000 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include "config.h" @@ -33,6 +33,7 @@ #include #include "mbimcli.h" +#include "mbimcli-helpers.h" #define PROGRAM_NAME "mbimcli" #define PROGRAM_VERSION PACKAGE_VERSION @@ -46,6 +47,7 @@ /* Main options */ static gchar *device_str; +static gboolean device_open_proxy_flag; static gchar *no_open_str; static gboolean no_close_flag; static gboolean noop_flag; @@ -58,6 +60,10 @@ "Specify device path", "[PATH]" }, + { "device-open-proxy", 'p', 0, G_OPTION_ARG_NONE, &device_open_proxy_flag, + "Request to use the 'mbim-proxy' proxy", + NULL + }, { "no-open", 0, 0, G_OPTION_ARG_STRING, &no_open_str, "Do not explicitly open the MBIM device before running the command", "[Transaction ID]" @@ -164,7 +170,7 @@ { g_print ("\n" PROGRAM_NAME " " PROGRAM_VERSION "\n" - "Copyright (2013) Aleksander Morgado\n" + "Copyright (2013-2014) Aleksander Morgado\n" "License GPLv2+: GNU GPL version 2 or later \n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" @@ -257,37 +263,26 @@ case MBIM_SERVICE_PHONEBOOK: mbimcli_phonebook_run (dev, cancellable); return; + case MBIM_SERVICE_DSS: + mbimcli_dss_run (dev, cancellable); + return; + case MBIM_SERVICE_MS_FIRMWARE_ID: + mbimcli_ms_firmware_id_run (dev, cancellable); + return; + case MBIM_SERVICE_MS_HOST_SHUTDOWN: + mbimcli_ms_host_shutdown_run (dev, cancellable); + return; default: g_assert_not_reached (); } } -static guint -read_transaction_id (const gchar *str) -{ - gulong num; - - if (!str || !str[0]) - return 0; - - for (num = 0; str[num]; num++) { - if (!g_ascii_isdigit (str[num])) - return 0; - } - - errno = 0; - num = strtoul (str, NULL, 10); - if (!errno && num <= G_MAXUINT) { - return (guint)num; - } - return 0; -} - static void device_new_ready (GObject *unused, GAsyncResult *res) { GError *error = NULL; + MbimDeviceOpenFlags open_flags = MBIM_DEVICE_OPEN_FLAGS_NONE; device = mbim_device_new_finish (res, &error); if (!device) { @@ -300,8 +295,7 @@ if (no_open_str) { guint transaction_id; - transaction_id = read_transaction_id (no_open_str); - if (!transaction_id) { + if (!mbimcli_read_uint_from_string (no_open_str, &transaction_id)) { g_printerr ("error: invalid transaction ID specified: %s\n", no_open_str); exit (EXIT_FAILURE); @@ -313,12 +307,17 @@ NULL); } + /* Setup device open flags */ + if (device_open_proxy_flag) + open_flags |= MBIM_DEVICE_OPEN_FLAGS_PROXY; + /* Open the device */ - mbim_device_open (device, - 15, - cancellable, - (GAsyncReadyCallback) device_open_ready, - NULL); + mbim_device_open_full (device, + open_flags, + 30, + cancellable, + (GAsyncReadyCallback) device_open_ready, + NULL); } /*****************************************************************************/ @@ -335,6 +334,15 @@ } else if (mbimcli_phonebook_options_enabled ()) { service = MBIM_SERVICE_PHONEBOOK; actions_enabled++; + } else if (mbimcli_dss_options_enabled ()) { + service = MBIM_SERVICE_DSS; + actions_enabled++; + } else if (mbimcli_ms_firmware_id_options_enabled ()) { + service = MBIM_SERVICE_MS_FIRMWARE_ID; + actions_enabled++; + } else if (mbimcli_ms_host_shutdown_options_enabled ()) { + service = MBIM_SERVICE_MS_HOST_SHUTDOWN; + actions_enabled++; } /* Noop */ @@ -369,16 +377,22 @@ /* Setup option context, process it and destroy it */ context = g_option_context_new ("- Control MBIM devices"); g_option_context_add_group (context, - mbimcli_basic_connect_get_option_group ()); + mbimcli_basic_connect_get_option_group ()); + g_option_context_add_group (context, + mbimcli_phonebook_get_option_group ()); + g_option_context_add_group (context, + mbimcli_dss_get_option_group ()); + g_option_context_add_group (context, + mbimcli_ms_firmware_id_get_option_group ()); g_option_context_add_group (context, - mbimcli_phonebook_get_option_group ()); + mbimcli_ms_host_shutdown_get_option_group ()); g_option_context_add_main_entries (context, main_entries, NULL); if (!g_option_context_parse (context, &argc, &argv, &error)) { g_printerr ("error: %s\n", error->message); exit (EXIT_FAILURE); } - g_option_context_free (context); + g_option_context_free (context); if (version_flag) print_version_and_exit (); diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli-dss.c libmbim-1.10.0/src/mbimcli/mbimcli-dss.c --- libmbim-1.6.0/src/mbimcli/mbimcli-dss.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli-dss.c 2014-03-06 07:45:40.000000000 +0000 @@ -0,0 +1,272 @@ +/* + * mbimcli -- Command line interface to control MBIM devices + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright (C) 2014 NVIDIA CORPORATION + * Copyright (C) 2014 Aleksander Morgado + */ + +#include "config.h" + +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include "mbimcli.h" +#include "mbimcli-helpers.h" + +/* Context */ +typedef struct { + MbimDevice *device; + GCancellable *cancellable; +} Context; +static Context *ctx; + +/* Options */ +static gchar *connect_str; +static gchar *disconnect_str; + +static GOptionEntry entries[] = { + { "dss-connect", 0, 0, G_OPTION_ARG_STRING, &connect_str, + "Connect DSS session", + "[(UUID),(Session ID)]" + }, + { "dss-disconnect", 0, 0, G_OPTION_ARG_STRING, &disconnect_str, + "Disconnect DSS session", + "[(UUID),(Session ID)]" + }, + { NULL } +}; + +GOptionGroup * +mbimcli_dss_get_option_group (void) +{ + GOptionGroup *group; + + group = g_option_group_new ("dss", + "Device Service Stream options", + "Show Device Service Stream options", + NULL, + NULL); + g_option_group_add_entries (group, entries); + + return group; +} + +gboolean +mbimcli_dss_options_enabled (void) +{ + static guint n_actions = 0; + static gboolean checked = FALSE; + + if (checked) + return !!n_actions; + + n_actions = (!!connect_str + + !!disconnect_str ); + + if (n_actions > 1) { + g_printerr ("error: too many DSS actions requested\n"); + exit (EXIT_FAILURE); + } + + checked = TRUE; + return !!n_actions; +} + +static void +context_free (Context *context) +{ + if (!context) + return; + + if (context->cancellable) + g_object_unref (context->cancellable); + if (context->device) + g_object_unref (context->device); + g_slice_free (Context, context); +} + +static void +shutdown (gboolean operation_status) +{ + /* Cleanup context and finish async operation */ + context_free (ctx); + mbimcli_async_operation_done (operation_status); +} + +enum { + CONNECT, + DISCONNECT +}; + +static void +set_dss_ready (MbimDevice *device, + GAsyncResult *res, + gpointer user_data) +{ + MbimMessage *response; + GError *error = NULL; + + response = mbim_device_command_finish (device, res, &error); + if (!response || !mbim_message_command_done_get_result (response, &error)) { + g_printerr ("error: operation failed: %s\n", error->message); + g_error_free (error); + shutdown (FALSE); + return; + } + + if (!mbim_message_dss_connect_response_parse (response, &error)) { + g_printerr ("error: couldn't parse response message: %s\n", error->message); + g_error_free (error); + mbim_message_unref (response); + shutdown (FALSE); + return; + } + + switch (GPOINTER_TO_UINT (user_data)) { + case CONNECT: + g_print ("[%s] Successfully connected\n", + mbim_device_get_path_display (device)); + break; + case DISCONNECT: + g_print ("[%s] Successfully disconnected\n", + mbim_device_get_path_display (device)); + break; + default: + g_assert_not_reached (); + break; + } + + mbim_message_unref (response); + shutdown (TRUE); +} + +static gboolean +common_parse (const gchar *str, + MbimUuid *dsid, + guint32 *ssid) +{ + gchar **split; + gboolean status = FALSE; + + g_assert (dsid != NULL); + g_assert (ssid != NULL); + + /* Format of the string is: + * [(UUID),(Session ID)] + */ + split = g_strsplit (str, ",", -1); + + if (g_strv_length (split) > 2) + g_printerr ("error: couldn't parse input string, too many arguments\n"); + else if (g_strv_length (split) < 1) + g_printerr ("error: couldn't parse input string, missing arguments\n"); + else if (!mbim_uuid_from_printable (split[0], dsid)) + g_printerr ("error: couldn't parse UUID, should be xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n"); + else if (!mbimcli_read_uint_from_string (split[1], ssid)) + g_printerr ("error: couldn't parse Session ID, should be a number\n"); + else + status = TRUE; + + g_strfreev (split); + return status; +} + +void +mbimcli_dss_run (MbimDevice *device, + GCancellable *cancellable) +{ + MbimMessage *request; + GError *error = NULL; + + /* Initialize context */ + ctx = g_slice_new (Context); + ctx->device = g_object_ref (device); + if (cancellable) + ctx->cancellable = g_object_ref (cancellable); + + /* Connect? */ + if (connect_str) { + MbimUuid service_id; + guint32 session_id; + + if (!common_parse (connect_str, &service_id, &session_id)) { + shutdown (FALSE); + return; + } + + request = mbim_message_dss_connect_set_new (&service_id, + session_id, + MBIM_DSS_LINK_STATE_ACTIVATE, + &error); + + if (!request) { + g_printerr ("error: couldn't create request: %s\n", error->message); + g_error_free (error); + shutdown (FALSE); + return; + } + + mbim_device_command (ctx->device, + request, + 10, + ctx->cancellable, + (GAsyncReadyCallback)set_dss_ready, + GUINT_TO_POINTER (CONNECT)); + mbim_message_unref (request); + return; + } + + /* Disconnect? */ + if (disconnect_str) { + MbimUuid service_id; + guint32 session_id; + + if (!common_parse (disconnect_str, &service_id, &session_id)) { + shutdown (FALSE); + return; + } + + request = mbim_message_dss_connect_set_new (&service_id, + session_id, + MBIM_DSS_LINK_STATE_DEACTIVATE, + &error); + if (!request) { + g_printerr ("error: couldn't create request: %s\n", error->message); + g_error_free (error); + shutdown (FALSE); + return; + } + + mbim_device_command (ctx->device, + request, + 10, + ctx->cancellable, + (GAsyncReadyCallback)set_dss_ready, + GUINT_TO_POINTER (DISCONNECT)); + mbim_message_unref (request); + return; + } + + g_warn_if_reached (); +} diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli.h libmbim-1.10.0/src/mbimcli/mbimcli.h --- libmbim-1.6.0/src/mbimcli/mbimcli.h 2013-10-09 07:45:23.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli.h 2014-07-31 16:41:35.000000000 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Copyright (C) 2013 Aleksander Morgado + * Copyright (C) 2013 - 2014 Aleksander Morgado */ #include @@ -23,17 +23,33 @@ #ifndef __MBIMCLI_H__ #define __MBIMCLI_H__ +#define VALIDATE_UNKNOWN(str) ((str) ? (str) : "unknown") + /* Common */ void mbimcli_async_operation_done (gboolean operation_status); /* Basic Connect group */ -GOptionGroup *mbimcli_basic_connect_get_option_group (void); -GOptionGroup *mbimcli_phonebook_get_option_group (void); -gboolean mbimcli_basic_connect_options_enabled (void); -gboolean mbimcli_phonebook_options_enabled (void); -void mbimcli_basic_connect_run (MbimDevice *device, - GCancellable *cancellable); -void mbimcli_phonebook_run (MbimDevice *device, - GCancellable *cancellable); +GOptionGroup *mbimcli_basic_connect_get_option_group (void); +GOptionGroup *mbimcli_phonebook_get_option_group (void); +GOptionGroup *mbimcli_dss_get_option_group (void); +GOptionGroup *mbimcli_ms_firmware_id_get_option_group (void); +GOptionGroup *mbimcli_ms_host_shutdown_get_option_group (void); + +gboolean mbimcli_basic_connect_options_enabled (void); +gboolean mbimcli_phonebook_options_enabled (void); +gboolean mbimcli_dss_options_enabled (void); +gboolean mbimcli_ms_firmware_id_options_enabled (void); +gboolean mbimcli_ms_host_shutdown_options_enabled (void); + +void mbimcli_basic_connect_run (MbimDevice *device, + GCancellable *cancellable); +void mbimcli_phonebook_run (MbimDevice *device, + GCancellable *cancellable); +void mbimcli_dss_run (MbimDevice *device, + GCancellable *cancellable); +void mbimcli_ms_firmware_id_run (MbimDevice *device, + GCancellable *cancellable); +void mbimcli_ms_host_shutdown_run (MbimDevice *device, + GCancellable *cancellable); #endif /* __MBIMCLI_H__ */ diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli-helpers.c libmbim-1.10.0/src/mbimcli/mbimcli-helpers.c --- libmbim-1.6.0/src/mbimcli/mbimcli-helpers.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli-helpers.c 2014-03-05 09:51:55.000000000 +0000 @@ -0,0 +1,49 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * mbimcli -- Command line interface to control MBIM devices + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright (C) 2014 Aleksander Morgado + */ + +#include +#include +#include +#include + +#include "mbimcli-helpers.h" + +gboolean +mbimcli_read_uint_from_string (const gchar *str, + guint *out) +{ + gulong num; + + if (!str || !str[0]) + return FALSE; + + for (num = 0; str[num]; num++) { + if (!g_ascii_isdigit (str[num])) + return FALSE; + } + + errno = 0; + num = strtoul (str, NULL, 10); + if (!errno && num <= G_MAXUINT) { + *out = (guint)num; + return TRUE; + } + return FALSE; +} diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli-helpers.h libmbim-1.10.0/src/mbimcli/mbimcli-helpers.h --- libmbim-1.6.0/src/mbimcli/mbimcli-helpers.h 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli-helpers.h 2014-03-05 09:51:55.000000000 +0000 @@ -0,0 +1,31 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * mbimcli -- Command line interface to control QMI devices + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright (C) 2014 Aleksander Morgado + */ + +#include + +#include + +#ifndef __MBIMCLI_HELPERS_H__ +#define __MBIMCLI_HELPERS_H__ + +gboolean mbimcli_read_uint_from_string (const gchar *str, + guint *out); + +#endif /* __MBIMCLI_H__ */ diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli-ms-firmware-id.c libmbim-1.10.0/src/mbimcli/mbimcli-ms-firmware-id.c --- libmbim-1.6.0/src/mbimcli/mbimcli-ms-firmware-id.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli-ms-firmware-id.c 2014-02-28 08:04:02.000000000 +0000 @@ -0,0 +1,176 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * mbimcli -- Command line interface to control MBIM devices + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright (C) 2014 Google, Inc. + */ + +#include "config.h" + +#include +#include +#include +#include + +#include +#include + +#include + +#include "mbimcli.h" + +/* Context */ +typedef struct { + MbimDevice *device; + GCancellable *cancellable; +} Context; +static Context *ctx; + +/* Options */ +static gboolean query_firmware_id_flag; + +static GOptionEntry entries[] = { + { "ms-query-firmware-id", 0, 0, G_OPTION_ARG_NONE, &query_firmware_id_flag, + "Query firmware ID", + NULL + }, + { NULL } +}; + +GOptionGroup * +mbimcli_ms_firmware_id_get_option_group (void) +{ + GOptionGroup *group; + + group = g_option_group_new ("ms-firmware-id", + "Microsoft Firmware ID options", + "Show Microsoft Firmware ID Service options", + NULL, + NULL); + g_option_group_add_entries (group, entries); + + return group; +} + +gboolean +mbimcli_ms_firmware_id_options_enabled (void) +{ + static guint n_actions = 0; + static gboolean checked = FALSE; + + if (checked) + return !!n_actions; + + n_actions = query_firmware_id_flag; + + if (n_actions > 1) { + g_printerr ("error: too many Microsoft Firmware ID actions requested\n"); + exit (EXIT_FAILURE); + } + + checked = TRUE; + return !!n_actions; +} + +static void +context_free (Context *context) +{ + if (!context) + return; + + if (context->cancellable) + g_object_unref (context->cancellable); + if (context->device) + g_object_unref (context->device); + g_slice_free (Context, context); +} + +static void +shutdown (gboolean operation_status) +{ + /* Cleanup context and finish async operation */ + context_free (ctx); + mbimcli_async_operation_done (operation_status); +} + +static void +query_firmware_id_ready (MbimDevice *device, + GAsyncResult *res) +{ + MbimMessage *response; + GError *error = NULL; + const MbimUuid *firmware_id; + gchar *firmware_id_str; + + response = mbim_device_command_finish (device, res, &error); + if (!response || !mbim_message_command_done_get_result (response, &error)) { + g_printerr ("error: operation failed: %s\n", error->message); + g_error_free (error); + if (response) + mbim_message_unref (response); + shutdown (FALSE); + return; + } + + if (!mbim_message_ms_firmware_id_get_response_parse ( + response, + &firmware_id, + &error)) { + g_printerr ("error: couldn't parse response message: %s\n", error->message); + g_error_free (error); + shutdown (FALSE); + return; + } + + firmware_id_str = firmware_id ? mbim_uuid_get_printable (firmware_id) : NULL; + + g_print ("[%s] Firmware ID retrieved: '%s'\n\n", + mbim_device_get_path_display (device), + VALIDATE_UNKNOWN (firmware_id_str)); + g_free (firmware_id_str); + + mbim_message_unref (response); + shutdown (TRUE); +} + +void +mbimcli_ms_firmware_id_run (MbimDevice *device, + GCancellable *cancellable) +{ + /* Initialize context */ + ctx = g_slice_new (Context); + ctx->device = g_object_ref (device); + if (cancellable) + ctx->cancellable = g_object_ref (cancellable); + + /* Request to get firmware ID? */ + if (query_firmware_id_flag) { + MbimMessage *request; + + g_debug ("Asynchronously querying firmware ID..."); + request = (mbim_message_ms_firmware_id_get_query_new (NULL)); + mbim_device_command (ctx->device, + request, + 10, + ctx->cancellable, + (GAsyncReadyCallback)query_firmware_id_ready, + NULL); + mbim_message_unref (request); + return; + } + + g_warn_if_reached (); +} diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli-ms-host-shutdown.c libmbim-1.10.0/src/mbimcli/mbimcli-ms-host-shutdown.c --- libmbim-1.6.0/src/mbimcli/mbimcli-ms-host-shutdown.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli-ms-host-shutdown.c 2014-03-05 09:52:08.000000000 +0000 @@ -0,0 +1,160 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * mbimcli -- Command line interface to control MBIM devices + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright (C) 2014 Google, Inc. + */ + +#include "config.h" + +#include +#include +#include +#include + +#include +#include + +#include + +#include "mbimcli.h" + +/* Context */ +typedef struct { + MbimDevice *device; + GCancellable *cancellable; +} Context; +static Context *ctx; + +/* Options */ +static gboolean notify_host_shutdown_flag; + +static GOptionEntry entries[] = { + { "ms-notify-host-shutdown", 0, 0, G_OPTION_ARG_NONE, ¬ify_host_shutdown_flag, + "Notify that host is shutting down", + NULL + }, + { NULL } +}; + +GOptionGroup * +mbimcli_ms_host_shutdown_get_option_group (void) +{ + GOptionGroup *group; + + group = g_option_group_new ("ms-host-shutdown", + "Microsoft Host Shutdown options", + "Show Microsoft Host Shutdown Service options", + NULL, + NULL); + g_option_group_add_entries (group, entries); + + return group; +} + +gboolean +mbimcli_ms_host_shutdown_options_enabled (void) +{ + static guint n_actions = 0; + static gboolean checked = FALSE; + + if (checked) + return !!n_actions; + + n_actions = notify_host_shutdown_flag; + + if (n_actions > 1) { + g_printerr ("error: too many Microsoft Host Shutdown actions requested\n"); + exit (EXIT_FAILURE); + } + + checked = TRUE; + return !!n_actions; +} + +static void +context_free (Context *context) +{ + if (!context) + return; + + if (context->cancellable) + g_object_unref (context->cancellable); + if (context->device) + g_object_unref (context->device); + g_slice_free (Context, context); +} + +static void +shutdown (gboolean operation_status) +{ + /* Cleanup context and finish async operation */ + context_free (ctx); + mbimcli_async_operation_done (operation_status); +} + +static void +ms_host_shutdown_ready (MbimDevice *device, + GAsyncResult *res) +{ + MbimMessage *response; + GError *error = NULL; + + response = mbim_device_command_finish (device, res, &error); + if (!response || !mbim_message_command_done_get_result (response, &error)) { + g_printerr ("error: operation failed: %s\n", error->message); + g_error_free (error); + if (response) + mbim_message_unref (response); + shutdown (FALSE); + return; + } + + g_print ("[%s] Successfully notified that host is shutting down\n\n", + mbim_device_get_path_display (device)); + + mbim_message_unref (response); + shutdown (TRUE); +} + +void +mbimcli_ms_host_shutdown_run (MbimDevice *device, + GCancellable *cancellable) +{ + /* Initialize context */ + ctx = g_slice_new (Context); + ctx->device = g_object_ref (device); + if (cancellable) + ctx->cancellable = g_object_ref (cancellable); + + /* Request to notify that host is shutting down */ + if (notify_host_shutdown_flag) { + MbimMessage *request; + + g_debug ("Asynchronously notifying host is shutting down..."); + request = (mbim_message_ms_host_shutdown_notify_set_new (NULL)); + mbim_device_command (ctx->device, + request, + 10, + ctx->cancellable, + (GAsyncReadyCallback)ms_host_shutdown_ready, + NULL); + mbim_message_unref (request); + return; + } + + g_warn_if_reached (); +} diff -Nru libmbim-1.6.0/src/mbimcli/mbimcli-phonebook.c libmbim-1.10.0/src/mbimcli/mbimcli-phonebook.c --- libmbim-1.6.0/src/mbimcli/mbimcli-phonebook.c 2013-10-09 07:45:31.000000000 +0000 +++ libmbim-1.10.0/src/mbimcli/mbimcli-phonebook.c 2014-07-31 16:41:35.000000000 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Copyright (C) 2013 Nagaraju Kadiri + * Copyright (C) 2013 - 2014 Nagaraju Kadiri */ #include "config.h" @@ -32,6 +32,7 @@ #include #include "mbimcli.h" +#include "mbimcli-helpers.h" /* Context */ typedef struct { @@ -79,16 +80,16 @@ GOptionGroup * mbimcli_phonebook_get_option_group (void) { - GOptionGroup *group; + GOptionGroup *group; - group = g_option_group_new ("phonebook", - "Phonebook options", - "Show Phonebook Service options", - NULL, - NULL); - g_option_group_add_entries (group, entries); + group = g_option_group_new ("phonebook", + "Phonebook options", + "Show Phonebook Service options", + NULL, + NULL); + g_option_group_add_entries (group, entries); - return group; + return group; } gboolean @@ -169,17 +170,11 @@ /* Check whether we have the optional Index item */ if (split[2]) { - gulong num; - - errno = 0; - num = strtoul (split[2], NULL, 10); - if (errno || num > G_MAXUINT) { + if (!mbimcli_read_uint_from_string (split[2], idx)) { g_printerr ("error: couldn't parse input string, invalid index '%s'\n", split[2]); g_strfreev (split); return FALSE; } - - *idx = (guint)num; } else { /* Default to index 0, which is an invalid one */ *idx = 0; @@ -201,9 +196,11 @@ GError *error = NULL; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -229,9 +226,11 @@ GError *error = NULL; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -259,9 +258,11 @@ gint i = 0; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -276,9 +277,6 @@ return; } -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - g_print ("Successfully read phonebook entries (%d)\n", entry_count); for (i = 0; i < entry_count; i++) { g_print ("\tEntry index : %d \n" @@ -308,9 +306,11 @@ guint32 max_name; response = mbim_device_command_finish (device, res, &error); - if (!response) { + if (!response || !mbim_message_command_done_get_result (response, &error)) { g_printerr ("error: operation failed: %s\n", error->message); g_error_free (error); + if (response) + mbim_message_unref (response); shutdown (FALSE); return; } @@ -330,16 +330,13 @@ state_str = mbim_phonebook_state_get_string (state); -#undef VALIDATE_UNKNOWN -#define VALIDATE_UNKNOWN(str) (str ? str : "unknown") - - g_print ("\n Phonebook configuration retrived... \n" + g_print ("\n Phonebook configuration retrieved... \n" "\t Phonebook state: %s \n" "\t Number of entries: %d \n" "\t used entries: %d \n" "\t max number length: %d \n" "\t max name : %d \n", - VALIDATE_UNKNOWN(state_str), + VALIDATE_UNKNOWN (state_str), number_of_entries, used_entries, max_number_length, diff -Nru libmbim-1.6.0/src/mbim-proxy/Makefile.am libmbim-1.10.0/src/mbim-proxy/Makefile.am --- libmbim-1.6.0/src/mbim-proxy/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbim-proxy/Makefile.am 2014-07-31 16:44:12.000000000 +0000 @@ -0,0 +1,16 @@ + +libexec_PROGRAMS = mbim-proxy + +mbim_proxy_CPPFLAGS = \ + $(MBIMPROXY_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src/libmbim-glib \ + -I$(top_srcdir)/src/libmbim-glib/generated \ + -I$(top_builddir)/src/libmbim-glib \ + -I$(top_builddir)/src/libmbim-glib/generated + +mbim_proxy_SOURCES = mbim-proxy.c + +mbim_proxy_LDADD = \ + $(MBIMPROXY_LIBS) \ + $(top_builddir)/src/libmbim-glib/libmbim-glib.la diff -Nru libmbim-1.6.0/src/mbim-proxy/Makefile.in libmbim-1.10.0/src/mbim-proxy/Makefile.in --- libmbim-1.6.0/src/mbim-proxy/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbim-proxy/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -0,0 +1,669 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +libexec_PROGRAMS = mbim-proxy$(EXEEXT) +subdir = src/mbim-proxy +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-warnings.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(libexecdir)" +PROGRAMS = $(libexec_PROGRAMS) +am_mbim_proxy_OBJECTS = mbim_proxy-mbim-proxy.$(OBJEXT) +mbim_proxy_OBJECTS = $(am_mbim_proxy_OBJECTS) +am__DEPENDENCIES_1 = +mbim_proxy_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libmbim-glib/libmbim-glib.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(mbim_proxy_SOURCES) +DIST_SOURCES = $(mbim_proxy_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HELP2MAN = @HELP2MAN@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMBIM_GLIB_CFLAGS = @LIBMBIM_GLIB_CFLAGS@ +LIBMBIM_GLIB_LIBS = @LIBMBIM_GLIB_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ +MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ +MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ +MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ +MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@ +MBIM_MAJOR_VERSION = @MBIM_MAJOR_VERSION@ +MBIM_MICRO_VERSION = @MBIM_MICRO_VERSION@ +MBIM_MINOR_VERSION = @MBIM_MINOR_VERSION@ +MBIM_VERSION = @MBIM_VERSION@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +mbim_proxy_CPPFLAGS = \ + $(MBIMPROXY_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src/libmbim-glib \ + -I$(top_srcdir)/src/libmbim-glib/generated \ + -I$(top_builddir)/src/libmbim-glib \ + -I$(top_builddir)/src/libmbim-glib/generated + +mbim_proxy_SOURCES = mbim-proxy.c +mbim_proxy_LDADD = \ + $(MBIMPROXY_LIBS) \ + $(top_builddir)/src/libmbim-glib/libmbim-glib.la + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/mbim-proxy/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/mbim-proxy/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + +clean-libexecPROGRAMS: + @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +mbim-proxy$(EXEEXT): $(mbim_proxy_OBJECTS) $(mbim_proxy_DEPENDENCIES) $(EXTRA_mbim_proxy_DEPENDENCIES) + @rm -f mbim-proxy$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(mbim_proxy_OBJECTS) $(mbim_proxy_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbim_proxy-mbim-proxy.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mbim_proxy-mbim-proxy.o: mbim-proxy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbim_proxy_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbim_proxy-mbim-proxy.o -MD -MP -MF $(DEPDIR)/mbim_proxy-mbim-proxy.Tpo -c -o mbim_proxy-mbim-proxy.o `test -f 'mbim-proxy.c' || echo '$(srcdir)/'`mbim-proxy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbim_proxy-mbim-proxy.Tpo $(DEPDIR)/mbim_proxy-mbim-proxy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-proxy.c' object='mbim_proxy-mbim-proxy.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbim_proxy_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbim_proxy-mbim-proxy.o `test -f 'mbim-proxy.c' || echo '$(srcdir)/'`mbim-proxy.c + +mbim_proxy-mbim-proxy.obj: mbim-proxy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbim_proxy_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mbim_proxy-mbim-proxy.obj -MD -MP -MF $(DEPDIR)/mbim_proxy-mbim-proxy.Tpo -c -o mbim_proxy-mbim-proxy.obj `if test -f 'mbim-proxy.c'; then $(CYGPATH_W) 'mbim-proxy.c'; else $(CYGPATH_W) '$(srcdir)/mbim-proxy.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mbim_proxy-mbim-proxy.Tpo $(DEPDIR)/mbim_proxy-mbim-proxy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbim-proxy.c' object='mbim_proxy-mbim-proxy.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mbim_proxy_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mbim_proxy-mbim-proxy.obj `if test -f 'mbim-proxy.c'; then $(CYGPATH_W) 'mbim-proxy.c'; else $(CYGPATH_W) '$(srcdir)/mbim-proxy.c'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(libexecdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-libexecPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-libexecPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru libmbim-1.6.0/src/mbim-proxy/mbim-proxy.c libmbim-1.10.0/src/mbim-proxy/mbim-proxy.c --- libmbim-1.6.0/src/mbim-proxy/mbim-proxy.c 1970-01-01 00:00:00.000000000 +0000 +++ libmbim-1.10.0/src/mbim-proxy/mbim-proxy.c 2014-07-31 16:44:12.000000000 +0000 @@ -0,0 +1,252 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * mbim-proxy -- A proxy to communicate with MBIM ports + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright (C) 2014 Aleksander Morgado + * Copyright (C) 2014 Smith Micro Software, Inc. + */ + +#include "config.h" + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#define PROGRAM_NAME "mbim-proxy" +#define PROGRAM_VERSION PACKAGE_VERSION + +#define EMPTY_PROXY_LIFETIME_SECS 30 + +/* Globals */ +static GMainLoop *loop; +static MbimProxy *proxy; +static guint timeout_id; +static guint client_connected_once = FALSE; + +/* Main options */ +static gboolean verbose_flag; +static gboolean version_flag; + +static GOptionEntry main_entries[] = { + { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose_flag, + "Run action with verbose logs, including the debug ones", + NULL + }, + { "version", 'V', 0, G_OPTION_ARG_NONE, &version_flag, + "Print version", + NULL + }, + { NULL } +}; + +static gboolean +quit_cb (gpointer user_data) +{ + if (loop) { + g_warning ("Caught signal, stopping the loop..."); + g_idle_add ((GSourceFunc) g_main_loop_quit, loop); + } + + return FALSE; +} + +static void +log_handler (const gchar *log_domain, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data) +{ + const gchar *log_level_str; + time_t now; + gchar time_str[64]; + struct tm *local_time; + gboolean err; + + now = time ((time_t *) NULL); + local_time = localtime (&now); + strftime (time_str, 64, "%d %b %Y, %H:%M:%S", local_time); + err = FALSE; + + switch (log_level) { + case G_LOG_LEVEL_WARNING: + log_level_str = "-Warning **"; + err = TRUE; + break; + + case G_LOG_LEVEL_CRITICAL: + case G_LOG_FLAG_FATAL: + case G_LOG_LEVEL_ERROR: + log_level_str = "-Error **"; + err = TRUE; + break; + + case G_LOG_LEVEL_DEBUG: + log_level_str = "[Debug]"; + break; + + default: + log_level_str = ""; + break; + } + + if (!verbose_flag && !err) + return; + + g_fprintf (err ? stderr : stdout, + "[%s] %s %s\n", + time_str, + log_level_str, + message); +} + +static void +print_version_and_exit (void) +{ + g_print ("\n" + PROGRAM_NAME " " PROGRAM_VERSION "\n" + "Copyright (C) 2013 Aleksander Morgado\n" + "Copyright (C) 2014 Greg Suarez\n" + "License GPLv2+: GNU GPL version 2 or later \n" + "This is free software: you are free to change and redistribute it.\n" + "There is NO WARRANTY, to the extent permitted by law.\n" + "\n"); + exit (EXIT_SUCCESS); +} + +/*****************************************************************************/ + +static gboolean +stop_loop_cb (void) +{ + timeout_id = 0; + if (loop) + g_main_loop_quit (loop); + return FALSE; +} + +static void +proxy_n_clients_changed (MbimProxy *_proxy) +{ + /* once a client has connected only exit if there are no devices */ + if (client_connected_once) + return; + + if (mbim_proxy_get_n_clients (proxy) == 0) { + g_assert (timeout_id == 0); + timeout_id = g_timeout_add_seconds (EMPTY_PROXY_LIFETIME_SECS, + (GSourceFunc)stop_loop_cb, + NULL); + return; + } + + /* At least one client, remove timeout if any */ + if (timeout_id) { + g_source_remove (timeout_id); + timeout_id = 0; + } + + client_connected_once = TRUE; +} + +static void +proxy_n_devices_changed (MbimProxy *_proxy) +{ + if (mbim_proxy_get_n_devices (proxy) == 0) { + g_assert (timeout_id == 0); + timeout_id = g_timeout_add_seconds (EMPTY_PROXY_LIFETIME_SECS, + (GSourceFunc)stop_loop_cb, + NULL); + return; + } + + /* At least one device, remove timeout if any */ + if (timeout_id) { + g_source_remove (timeout_id); + timeout_id = 0; + } +} + +/*****************************************************************************/ + +int main (int argc, char **argv) +{ + GError *error = NULL; + GOptionContext *context; + + setlocale (LC_ALL, ""); + + g_type_init (); + + /* Setup option context, process it and destroy it */ + context = g_option_context_new ("- Proxy for MBIM devices"); + g_option_context_add_main_entries (context, main_entries, NULL); + if (!g_option_context_parse (context, &argc, &argv, &error)) { + g_printerr ("error: %s\n", + error->message); + exit (EXIT_FAILURE); + } + g_option_context_free (context); + + if (version_flag) + print_version_and_exit (); + + g_log_set_handler (NULL, G_LOG_LEVEL_MASK, log_handler, NULL); + g_log_set_handler ("Mbim", G_LOG_LEVEL_MASK, log_handler, NULL); + if (verbose_flag) + mbim_utils_set_traces_enabled (TRUE); + + /* Setup signals */ + g_unix_signal_add (SIGINT, quit_cb, NULL); + g_unix_signal_add (SIGHUP, quit_cb, NULL); + g_unix_signal_add (SIGTERM, quit_cb, NULL); + + /* Setup proxy */ + proxy = mbim_proxy_new (&error); + if (!proxy) { + g_printerr ("error: %s\n", error->message); + exit (EXIT_FAILURE); + } + + proxy_n_clients_changed (proxy); + g_signal_connect (proxy, + "notify::" MBIM_PROXY_N_CLIENTS, + G_CALLBACK (proxy_n_clients_changed), + NULL); + g_signal_connect (proxy, + "notify::" MBIM_PROXY_N_DEVICES, + G_CALLBACK (proxy_n_devices_changed), + NULL); + + /* Loop */ + loop = g_main_loop_new (NULL, FALSE); + g_main_loop_run (loop); + g_main_loop_unref (loop); + + /* Cleanup; releases socket and such */ + g_object_unref (proxy); + + g_debug ("exiting 'mbim-proxy'..."); + + return EXIT_SUCCESS; +} diff -Nru libmbim-1.6.0/utils/Makefile.in libmbim-1.10.0/utils/Makefile.in --- libmbim-1.6.0/utils/Makefile.in 2013-12-10 20:25:13.000000000 +0000 +++ libmbim-1.10.0/utils/Makefile.in 2014-08-04 13:00:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -170,6 +170,7 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -196,6 +197,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIMCLI_CFLAGS = @MBIMCLI_CFLAGS@ MBIMCLI_LIBS = @MBIMCLI_LIBS@ +MBIMPROXY_CFLAGS = @MBIMPROXY_CFLAGS@ +MBIMPROXY_LIBS = @MBIMPROXY_LIBS@ MBIM_GLIB_LT_AGE = @MBIM_GLIB_LT_AGE@ MBIM_GLIB_LT_CURRENT = @MBIM_GLIB_LT_CURRENT@ MBIM_GLIB_LT_REVISION = @MBIM_GLIB_LT_REVISION@