diff options
author | Michal Čihař <nijel@debian.org> | 2017-08-07 12:45:47 -0400 |
---|---|---|
committer | Michal Čihař <nijel@debian.org> | 2017-08-07 12:45:47 -0400 |
commit | 1942e0940e4459a76d55004b28b4e2e37e1f51a6 (patch) | |
tree | cc73ea4221d0bc8c6df09fa897273b8e3ec39b1d | |
parent | 53cd487b194ca2943205769f4aed03d4f2b06f72 (diff) | |
parent | ad63af86a2598862de5d58ab2e7ce4d747a47f25 (diff) |
Updated version 0.2.11 from 'upstream/0.2.11'
with Debian dir bed6bf847b364d05536fb269564f2e2b85e74849
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | NEWS | 10 | ||||
-rw-r--r-- | aclocal.m4 | 74 | ||||
-rw-r--r-- | config.h | 6 | ||||
-rwxr-xr-x | configure | 40 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | docs/api/gusb-sections.txt | 3 | ||||
-rw-r--r-- | docs/api/html/GUsbContext.html | 130 | ||||
-rw-r--r-- | docs/api/html/GUsbDevice.html | 66 | ||||
-rw-r--r-- | docs/api/html/GUsbDeviceList.html | 10 | ||||
-rw-r--r-- | docs/api/html/faq.html | 2 | ||||
-rw-r--r-- | docs/api/html/gusb-gusb-interface.html | 4 | ||||
-rw-r--r-- | docs/api/html/gusb-gusb-source.html | 2 | ||||
-rw-r--r-- | docs/api/html/gusb-gusb-version.html | 4 | ||||
-rw-r--r-- | docs/api/html/gusb.devhelp2 | 5 | ||||
-rw-r--r-- | docs/api/html/index.html | 4 | ||||
-rw-r--r-- | docs/api/html/introduction.html | 2 | ||||
-rw-r--r-- | docs/api/html/libgusb-helpers.html | 2 | ||||
-rw-r--r-- | docs/api/html/libgusb.html | 2 | ||||
-rw-r--r-- | docs/api/html/specification.html | 2 | ||||
-rw-r--r-- | docs/api/version.xml | 2 | ||||
-rw-r--r-- | gusb/gusb-context.c | 43 | ||||
-rw-r--r-- | gusb/gusb-context.h | 16 | ||||
-rw-r--r-- | gusb/gusb-device-private.h | 2 | ||||
-rw-r--r-- | gusb/gusb-device.c | 46 | ||||
-rw-r--r-- | gusb/gusb-version.h | 2 | ||||
-rw-r--r-- | gusb/libgusb.ver | 6 | ||||
-rw-r--r-- | tools/gusb-main.c | 29 |
28 files changed, 411 insertions, 109 deletions
diff --git a/Makefile.in b/Makefile.in index dfc4dd6..7ea377f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,7 +169,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/build-aux/ltmain.sh \ $(top_srcdir)/build-aux/missing AUTHORS COPYING ChangeLog \ INSTALL NEWS README TODO build-aux/compile \ - build-aux/config.guess build-aux/config.sub \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -1,3 +1,13 @@ +Version 0.2.11 +~~~~~~~~~~~~~~ +Released: 2017-07-24 + +New Features: + - Add g_usb_context_set_flags() (Richard Hughes) + +Bugfixes: + - Fix the actual required GLib version (Richard Hughes) + Version 0.2.10 ~~~~~~~~~~~~~~ Released: 2017-04-10 @@ -117,9 +117,9 @@ AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) + dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> dnl @@ -393,6 +393,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -44,7 +44,7 @@ #define PACKAGE_NAME "libgusb" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libgusb 0.2.10" +#define PACKAGE_STRING "libgusb 0.2.11" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libgusb" @@ -53,10 +53,10 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.2.10" +#define PACKAGE_VERSION "0.2.11" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.2.10" +#define VERSION "0.2.11" @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libgusb 0.2.10. +# Generated by GNU Autoconf 2.69 for libgusb 0.2.11. # # Report bugs to <http://www.hughsie.com>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libgusb' PACKAGE_TARNAME='libgusb' -PACKAGE_VERSION='0.2.10' -PACKAGE_STRING='libgusb 0.2.10' +PACKAGE_VERSION='0.2.11' +PACKAGE_STRING='libgusb 0.2.11' PACKAGE_BUGREPORT='http://www.hughsie.com' PACKAGE_URL='' @@ -1380,7 +1380,7 @@ if test "$ac_init_help" = "long"; then # 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 libgusb 0.2.10 to adapt to many kinds of systems. +\`configure' configures libgusb 0.2.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1450,7 +1450,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libgusb 0.2.10:";; + short | recursive ) echo "Configuration of libgusb 0.2.11:";; esac cat <<\_ACEOF @@ -1582,7 +1582,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libgusb configure 0.2.10 +libgusb configure 0.2.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1860,7 +1860,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libgusb $as_me 0.2.10, which was +It was created by libgusb $as_me 0.2.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2728,7 +2728,7 @@ fi # Define the identity of the package. PACKAGE='libgusb' - VERSION='0.2.10' + VERSION='0.2.11' cat >>confdefs.h <<_ACEOF @@ -3438,7 +3438,7 @@ fi # use this in cd-version.h G_USB_MAJOR_VERSION=0 G_USB_MINOR_VERSION=2 -G_USB_MICRO_VERSION=10 +G_USB_MICRO_VERSION=11 @@ -13030,12 +13030,12 @@ if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_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.38.0 gobject-2.0 gthread-2.0 gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.44.0 gobject-2.0 gthread-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_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13047,12 +13047,12 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_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.38.0 gobject-2.0 gthread-2.0 gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.44.0 gobject-2.0 gthread-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_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13073,14 +13073,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0) were not met: $GLIB_PKG_ERRORS @@ -13788,7 +13788,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libgusb $as_me 0.2.10, which was +This file was extended by libgusb $as_me 0.2.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13854,7 +13854,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libgusb config.status 0.2.10 +libgusb config.status 0.2.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index a1f4420..2b78f70 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.63) m4_define([gusb_major_version], [0]) m4_define([gusb_minor_version], [2]) -m4_define([gusb_micro_version], [10]) +m4_define([gusb_micro_version], [11]) m4_define([gusb_version], [gusb_major_version.gusb_minor_version.gusb_micro_version]) @@ -98,7 +98,7 @@ AC_SUBST(WARNINGFLAGS_C) dnl --------------------------------------------------------------------------- dnl - Check library dependencies dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38.0 gobject-2.0 gthread-2.0 gio-2.0) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0) PKG_CHECK_MODULES(USB, libusb-1.0 >= 1.0.19) dnl --------------------------------------------------------------------------- diff --git a/docs/api/gusb-sections.txt b/docs/api/gusb-sections.txt index 55c85d3..1873045 100644 --- a/docs/api/gusb-sections.txt +++ b/docs/api/gusb-sections.txt @@ -5,8 +5,11 @@ G_USB_CONTEXT_ERROR GUsbContext GUsbContextClass GUsbContextError +GUsbContextFlags g_usb_context_error_quark g_usb_context_new +g_usb_context_set_flags +g_usb_context_get_flags g_usb_context_get_source g_usb_context_get_main_context g_usb_context_set_main_context diff --git a/docs/api/html/GUsbContext.html b/docs/api/html/GUsbContext.html index 71c6c08..9c3bf67 100644 --- a/docs/api/html/GUsbContext.html +++ b/docs/api/html/GUsbContext.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>GUsbContext: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="libgusb.html" title="libgusb GObject library"> <link rel="prev" href="libgusb.html" title="libgusb GObject library"> @@ -61,6 +61,22 @@ </tr> <tr> <td class="function_type"> +<span class="returnvalue">void</span> +</td> +<td class="function_name"> +<a class="link" href="GUsbContext.html#g-usb-context-set-flags" title="g_usb_context_set_flags ()">g_usb_context_set_flags</a> <span class="c_punctuation">()</span> +</td> +</tr> +<tr> +<td class="function_type"> +<a class="link" href="GUsbContext.html#GUsbContextFlags" title="enum GUsbContextFlags"><span class="returnvalue">GUsbContextFlags</span></a> +</td> +<td class="function_name"> +<a class="link" href="GUsbContext.html#g-usb-context-get-flags" title="g_usb_context_get_flags ()">g_usb_context_get_flags</a> <span class="c_punctuation">()</span> +</td> +</tr> +<tr> +<td class="function_type"> <a class="link" href="gusb-gusb-source.html#GUsbSource" title="GUsbSource"><span class="returnvalue">GUsbSource</span></a> * </td> <td class="function_name"> @@ -211,6 +227,10 @@ <td class="function_name"><a class="link" href="GUsbContext.html#GUsbContextError" title="enum GUsbContextError">GUsbContextError</a></td> </tr> <tr> +<td class="datatype_keyword">enum</td> +<td class="function_name"><a class="link" href="GUsbContext.html#GUsbContextFlags" title="enum GUsbContextFlags">GUsbContextFlags</a></td> +</tr> +<tr> <td class="datatype_keyword"> </td> <td class="function_name"><a class="link" href="GUsbContext.html#GUsbContextPrivate" title="GUsbContextPrivate">GUsbContextPrivate</a></td> </tr> @@ -261,19 +281,78 @@ g_usb_context_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/ </colgroup> <tbody><tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr></tbody> </table></div> </div> <div class="refsect3"> <a name="g-usb-context-new.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GUsbContext.html" title="GUsbContext"><code class="literal">GUsbContext</code></a> object or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on error.</p> +<p> a new <a class="link" href="GUsbContext.html" title="GUsbContext"><code class="literal">GUsbContext</code></a> object or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error.</p> </div> <p class="since">Since: 0.1.0</p> </div> <hr> <div class="refsect2"> +<a name="g-usb-context-set-flags"></a><h3>g_usb_context_set_flags ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> +g_usb_context_set_flags (<em class="parameter"><code><a class="link" href="GUsbContext.html" title="GUsbContext"><span class="type">GUsbContext</span></a> *context</code></em>, + <em class="parameter"><code><a class="link" href="GUsbContext.html#GUsbContextFlags" title="enum GUsbContextFlags"><span class="type">GUsbContextFlags</span></a> flags</code></em>);</pre> +<p>Sets the flags to use for the context. These should be set before +<a class="link" href="GUsbContext.html#g-usb-context-enumerate" title="g_usb_context_enumerate ()"><code class="function">g_usb_context_enumerate()</code></a> is called.</p> +<div class="refsect3"> +<a name="g-usb-context-set-flags.parameters"></a><h4>Parameters</h4> +<div class="informaltable"><table class="informaltable" width="100%" border="0"> +<colgroup> +<col width="150px" class="parameters_name"> +<col class="parameters_description"> +<col width="200px" class="parameters_annotations"> +</colgroup> +<tbody> +<tr> +<td class="parameter_name"><p>context</p></td> +<td class="parameter_description"><p>a <a class="link" href="GUsbContext.html" title="GUsbContext"><span class="type">GUsbContext</span></a></p></td> +<td class="parameter_annotations"> </td> +</tr> +<tr> +<td class="parameter_name"><p>flags</p></td> +<td class="parameter_description"><p>some <a class="link" href="GUsbContext.html#GUsbContextFlags" title="enum GUsbContextFlags"><span class="type">GUsbContextFlags</span></a>, e.g. <a class="link" href="GUsbContext.html#G-USB-CONTEXT-FLAGS-AUTO-OPEN-DEVICES:CAPS"><code class="literal">G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES</code></a></p></td> +<td class="parameter_annotations"> </td> +</tr> +</tbody> +</table></div> +</div> +<p class="since">Since: 0.2.11</p> +</div> +<hr> +<div class="refsect2"> +<a name="g-usb-context-get-flags"></a><h3>g_usb_context_get_flags ()</h3> +<pre class="programlisting"><a class="link" href="GUsbContext.html#GUsbContextFlags" title="enum GUsbContextFlags"><span class="returnvalue">GUsbContextFlags</span></a> +g_usb_context_get_flags (<em class="parameter"><code><a class="link" href="GUsbContext.html" title="GUsbContext"><span class="type">GUsbContext</span></a> *context</code></em>);</pre> +<p>Sets the flags to use for the context.</p> +<div class="refsect3"> +<a name="g-usb-context-get-flags.parameters"></a><h4>Parameters</h4> +<div class="informaltable"><table class="informaltable" width="100%" border="0"> +<colgroup> +<col width="150px" class="parameters_name"> +<col class="parameters_description"> +<col width="200px" class="parameters_annotations"> +</colgroup> +<tbody><tr> +<td class="parameter_name"><p>context</p></td> +<td class="parameter_description"><p>a <a class="link" href="GUsbContext.html" title="GUsbContext"><span class="type">GUsbContext</span></a></p></td> +<td class="parameter_annotations"> </td> +</tr></tbody> +</table></div> +</div> +<div class="refsect3"> +<a name="g-usb-context-get-flags.returns"></a><h4>Returns</h4> +<p> the <a class="link" href="GUsbContext.html#GUsbContextFlags" title="enum GUsbContextFlags"><span class="type">GUsbContextFlags</span></a>, e.g. <a class="link" href="GUsbContext.html#G-USB-CONTEXT-FLAGS-AUTO-OPEN-DEVICES:CAPS"><code class="literal">G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES</code></a></p> +</div> +<p class="since">Since: 0.2.11</p> +</div> +<hr> +<div class="refsect2"> <a name="g-usb-context-get-source"></a><h3>g_usb_context_get_source ()</h3> <pre class="programlisting"><a class="link" href="gusb-gusb-source.html#GUsbSource" title="GUsbSource"><span class="returnvalue">GUsbSource</span></a> * g_usb_context_get_source (<em class="parameter"><code><a class="link" href="GUsbContext.html" title="GUsbContext"><span class="type">GUsbContext</span></a> *context</code></em>, @@ -296,7 +375,7 @@ g_usb_context_get_source (<em class="parameter"><code><a class="link" href="GUsb </tr> <tr> <td class="parameter_name"><p>main_ctx</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -482,7 +561,7 @@ g_usb_context_find_by_bus_address (<em class="parameter"><code><a class="link" h </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -490,7 +569,7 @@ g_usb_context_find_by_bus_address (<em class="parameter"><code><a class="link" h </div> <div class="refsect3"> <a name="g-usb-context-find-by-bus-address.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> +<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.2.2</p> @@ -530,7 +609,7 @@ g_usb_context_find_by_vid_pid (<em class="parameter"><code><a class="link" href= </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -538,7 +617,7 @@ g_usb_context_find_by_vid_pid (<em class="parameter"><code><a class="link" href= </div> <div class="refsect3"> <a name="g-usb-context-find-by-vid-pid.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> +<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.2.2</p> @@ -572,7 +651,7 @@ g_usb_context_find_by_platform_id (<em class="parameter"><code><a class="link" h </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -580,7 +659,7 @@ g_usb_context_find_by_platform_id (<em class="parameter"><code><a class="link" h </div> <div class="refsect3"> <a name="g-usb-context-find-by-platform-id.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> +<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.2.4</p> @@ -623,7 +702,7 @@ back or the timeout triggers.</p> </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -631,7 +710,7 @@ back or the timeout triggers.</p> </div> <div class="refsect3"> <a name="g-usb-context-wait-for-replug.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> for invalid. </p> +<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for invalid. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.2.9</p> @@ -682,6 +761,33 @@ back or the timeout triggers.</p> </div> <hr> <div class="refsect2"> +<a name="GUsbContextFlags"></a><h3>enum GUsbContextFlags</h3> +<p>The flags to use for the context.</p> +<div class="refsect3"> +<a name="GUsbContextFlags.members"></a><h4>Members</h4> +<div class="informaltable"><table class="informaltable" width="100%" border="0"> +<colgroup> +<col width="300px" class="enum_members_name"> +<col class="enum_members_description"> +<col width="200px" class="enum_members_annotations"> +</colgroup> +<tbody> +<tr> +<td class="enum_member_name"><p><a name="G-USB-CONTEXT-FLAGS-NONE:CAPS"></a>G_USB_CONTEXT_FLAGS_NONE</p></td> +<td> </td> +<td> </td> +</tr> +<tr> +<td class="enum_member_name"><p><a name="G-USB-CONTEXT-FLAGS-AUTO-OPEN-DEVICES:CAPS"></a>G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES</p></td> +<td> </td> +<td> </td> +</tr> +</tbody> +</table></div> +</div> +</div> +<hr> +<div class="refsect2"> <a name="GUsbContextPrivate"></a><h3>GUsbContextPrivate</h3> <pre class="programlisting">typedef struct _GUsbContextPrivate GUsbContextPrivate;</pre> <p>Private <a class="link" href="GUsbContext.html" title="GUsbContext"><span class="type">GUsbContext</span></a> data</p> diff --git a/docs/api/html/GUsbDevice.html b/docs/api/html/GUsbDevice.html index 46f0624..5d711a3 100644 --- a/docs/api/html/GUsbDevice.html +++ b/docs/api/html/GUsbDevice.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>GUsbDevice: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="libgusb.html" title="libgusb GObject library"> <link rel="prev" href="gusb-gusb-source.html" title="gusb-source"> @@ -515,7 +515,7 @@ g_usb_device_get_parent (<em class="parameter"><code><a class="link" href="GUsbD </div> <div class="refsect3"> <a name="g-usb-device-get-parent.returns"></a><h4>Returns</h4> -<p> <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> +<p> <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.2.4</p> @@ -733,7 +733,7 @@ g_usb_device_get_vid_as_str (<em class="parameter"><code><a class="link" href="G </div> <div class="refsect3"> <a name="g-usb-device-get-vid-as-str.returns"></a><h4>Returns</h4> -<p> an string ID, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not available.</p> +<p> an string ID, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not available.</p> </div> <p class="since">Since: 0.2.4</p> </div> @@ -760,7 +760,7 @@ g_usb_device_get_pid_as_str (<em class="parameter"><code><a class="link" href="G </div> <div class="refsect3"> <a name="g-usb-device-get-pid-as-str.returns"></a><h4>Returns</h4> -<p> an string ID, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not available.</p> +<p> an string ID, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not available.</p> </div> <p class="since">Since: 0.2.4</p> </div> @@ -969,7 +969,7 @@ g_usb_device_get_custom_index (<em class="parameter"><code><a class="link" href= </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1025,7 +1025,7 @@ check each one manally.</p> </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1033,7 +1033,7 @@ check each one manally.</p> </div> <div class="refsect3"> <a name="g-usb-device-get-interface.returns"></a><h4>Returns</h4> -<p> a <a class="link" href="gusb-gusb-interface.html#GUsbInterface"><span class="type">GUsbInterface</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> for not found. </p> +<p> a <a class="link" href="gusb-gusb-interface.html#GUsbInterface"><span class="type">GUsbInterface</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for not found. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.2.8</p> @@ -1061,7 +1061,7 @@ g_usb_device_get_interfaces (<em class="parameter"><code><a class="link" href="G </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1069,7 +1069,7 @@ g_usb_device_get_interfaces (<em class="parameter"><code><a class="link" href="G </div> <div class="refsect3"> <a name="g-usb-device-get-interfaces.returns"></a><h4>Returns</h4> -<p> an array of interfaces or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> for error. </p> +<p> an array of interfaces or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for error. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20container"><span class="acronym">transfer container</span></a>][<a href="http://foldoc.org/element-type"><span class="acronym">element-type</span></a> GUsbInterface]</span></p> </div> <p class="since">Since: 0.2.8</p> @@ -1098,7 +1098,7 @@ g_usb_device_open (<em class="parameter"><code><a class="link" href="GUsbDevice. </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1133,7 +1133,7 @@ g_usb_device_close (<em class="parameter"><code><a class="link" href="GUsbDevice </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1172,7 +1172,7 @@ rediscovered.</p> </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1207,7 +1207,7 @@ g_usb_device_get_configuration (<em class="parameter"><code><a class="link" href </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1249,7 +1249,7 @@ g_usb_device_set_configuration (<em class="parameter"><code><a class="link" href </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1296,7 +1296,7 @@ g_usb_device_claim_interface (<em class="parameter"><code><a class="link" href=" </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1343,7 +1343,7 @@ g_usb_device_release_interface (<em class="parameter"><code><a class="link" href </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1390,7 +1390,7 @@ g_usb_device_set_interface_alt (<em class="parameter"><code><a class="link" href </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1427,7 +1427,7 @@ with <a href="/usr/share/gtk-doc/html/glibglib-Memory-Allocation.html#g-free"><c </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1505,7 +1505,7 @@ either input or output. </p></td> </tr> <tr> <td class="parameter_name"><p>actual_length</p></td> -<td class="parameter_description"><p>the actual number of bytes sent, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>the actual number of bytes sent, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -1517,12 +1517,12 @@ timeout, use 0.</p></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1580,7 +1580,7 @@ either input or output. </p></td> </tr> <tr> <td class="parameter_name"><p>actual_length</p></td> -<td class="parameter_description"><p>the actual number of bytes sent, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>the actual number of bytes sent, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -1592,12 +1592,12 @@ timeout, use 0.</p></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1655,7 +1655,7 @@ either input or output. </p></td> </tr> <tr> <td class="parameter_name"><p>actual_length</p></td> -<td class="parameter_description"><p>the actual number of bytes sent, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>the actual number of bytes sent, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -1667,12 +1667,12 @@ timeout, use 0.</p></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1736,7 +1736,7 @@ timeout, use 0.</p></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -1784,7 +1784,7 @@ g_usb_device_control_transfer_finish (<em class="parameter"><code><a class="link </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1848,7 +1848,7 @@ timeout, use 0.</p></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -1896,7 +1896,7 @@ g_usb_device_bulk_transfer_finish (<em class="parameter"><code><a class="link" h </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1960,7 +1960,7 @@ timeout, use 0.</p></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> -<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/gioGCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -2009,7 +2009,7 @@ g_usb_device_interrupt_transfer_finish </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> diff --git a/docs/api/html/GUsbDeviceList.html b/docs/api/html/GUsbDeviceList.html index 6c6771b..5262cef 100644 --- a/docs/api/html/GUsbDeviceList.html +++ b/docs/api/html/GUsbDeviceList.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>GUsbDeviceList: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="libgusb.html" title="libgusb GObject library"> <link rel="prev" href="GUsbDevice.html" title="GUsbDevice"> @@ -275,7 +275,7 @@ g_usb_device_list_find_by_bus_address (<em class="parameter"><code><a class="lin </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -283,7 +283,7 @@ g_usb_device_list_find_by_bus_address (<em class="parameter"><code><a class="lin </div> <div class="refsect3"> <a name="g-usb-device-list-find-by-bus-address.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> +<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.1.0</p> @@ -324,7 +324,7 @@ g_usb_device_list_find_by_vid_pid (<em class="parameter"><code><a class="link" h </tr> <tr> <td class="parameter_name"><p>error</p></td> -<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> +<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -332,7 +332,7 @@ g_usb_device_list_find_by_vid_pid (<em class="parameter"><code><a class="link" h </div> <div class="refsect3"> <a name="g-usb-device-list-find-by-vid-pid.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> +<p> a new <a class="link" href="GUsbDevice.html" title="GUsbDevice"><span class="type">GUsbDevice</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not found. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p> </div> <p class="since">Since: 0.1.0</p> diff --git a/docs/api/html/faq.html b/docs/api/html/faq.html index 29bbc70..7de2337 100644 --- a/docs/api/html/faq.html +++ b/docs/api/html/faq.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Frequently asked questions: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="index.html" title="GUsb Reference Manual"> <link rel="prev" href="gusb-gusb-version.html" title="gusb-version"> diff --git a/docs/api/html/gusb-gusb-interface.html b/docs/api/html/gusb-gusb-interface.html index f1c54e2..028637e 100644 --- a/docs/api/html/gusb-gusb-interface.html +++ b/docs/api/html/gusb-gusb-interface.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>gusb-interface: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="libgusb.html" title="libgusb GObject library"> <link rel="prev" href="GUsbDeviceList.html" title="GUsbDeviceList"> @@ -388,7 +388,7 @@ g_usb_interface_get_extra (<em class="parameter"><code><a class="link" href="gus </div> <div class="refsect3"> <a name="g-usb-interface-get-extra.returns"></a><h4>Returns</h4> -<p> a <a href="/usr/share/gtk-doc/html/glibglib-Byte-Arrays.html#GBytes"><span class="type">GBytes</span></a>, or <a href="/usr/share/gtk-doc/html/liboilliboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> for failure. </p> +<p> a <a href="/usr/share/gtk-doc/html/glibglib-Byte-Arrays.html#GBytes"><span class="type">GBytes</span></a>, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for failure. </p> <p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p> </div> <p class="since">Since: 0.2.8</p> diff --git a/docs/api/html/gusb-gusb-source.html b/docs/api/html/gusb-gusb-source.html index 1103351..2cdf186 100644 --- a/docs/api/html/gusb-gusb-source.html +++ b/docs/api/html/gusb-gusb-source.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>gusb-source: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="libgusb.html" title="libgusb GObject library"> <link rel="prev" href="GUsbContext.html" title="GUsbContext"> diff --git a/docs/api/html/gusb-gusb-version.html b/docs/api/html/gusb-gusb-version.html index 399cb24..ca4d392 100644 --- a/docs/api/html/gusb-gusb-version.html +++ b/docs/api/html/gusb-gusb-version.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>gusb-version: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="libgusb-helpers.html" title="libgusb glib helpers"> <link rel="prev" href="libgusb-helpers.html" title="libgusb glib helpers"> @@ -101,7 +101,7 @@ major.minor.micro.</p> <hr> <div class="refsect2"> <a name="G-USB-MICRO-VERSION:CAPS"></a><h3>G_USB_MICRO_VERSION</h3> -<pre class="programlisting">#define G_USB_MICRO_VERSION (10) +<pre class="programlisting">#define G_USB_MICRO_VERSION (11) </pre> <p>The compile-time micro version</p> </div> diff --git a/docs/api/html/gusb.devhelp2 b/docs/api/html/gusb.devhelp2 index 7aff7a3..1cbb623 100644 --- a/docs/api/html/gusb.devhelp2 +++ b/docs/api/html/gusb.devhelp2 @@ -25,6 +25,8 @@ <functions> <keyword type="function" name="g_usb_context_error_quark ()" link="GUsbContext.html#g-usb-context-error-quark" since="0.1.0"/> <keyword type="function" name="g_usb_context_new ()" link="GUsbContext.html#g-usb-context-new" since="0.1.0"/> + <keyword type="function" name="g_usb_context_set_flags ()" link="GUsbContext.html#g-usb-context-set-flags" since="0.2.11"/> + <keyword type="function" name="g_usb_context_get_flags ()" link="GUsbContext.html#g-usb-context-get-flags" since="0.2.11"/> <keyword type="function" name="g_usb_context_get_source ()" link="GUsbContext.html#g-usb-context-get-source" deprecated="" since="0.1.0"/> <keyword type="function" name="g_usb_context_get_main_context ()" link="GUsbContext.html#g-usb-context-get-main-context" since="0.2.5"/> <keyword type="function" name="g_usb_context_set_main_context ()" link="GUsbContext.html#g-usb-context-set-main-context" since="0.2.5"/> @@ -39,6 +41,7 @@ <keyword type="struct" name="struct GUsbContext" link="GUsbContext.html#GUsbContext-struct"/> <keyword type="struct" name="struct GUsbContextClass" link="GUsbContext.html#GUsbContextClass"/> <keyword type="enum" name="enum GUsbContextError" link="GUsbContext.html#GUsbContextError"/> + <keyword type="enum" name="enum GUsbContextFlags" link="GUsbContext.html#GUsbContextFlags"/> <keyword type="struct" name="GUsbContextPrivate" link="GUsbContext.html#GUsbContextPrivate"/> <keyword type="property" name="The “debug-level” property" link="GUsbContext.html#GUsbContext--debug-level"/> <keyword type="property" name="The “libusb-context” property" link="GUsbContext.html#GUsbContext--libusb-context"/> @@ -128,6 +131,8 @@ <keyword type="macro" name="G_USB_MINOR_VERSION" link="gusb-gusb-version.html#G-USB-MINOR-VERSION:CAPS"/> <keyword type="macro" name="G_USB_MICRO_VERSION" link="gusb-gusb-version.html#G-USB-MICRO-VERSION:CAPS"/> <keyword type="constant" name="G_USB_CONTEXT_ERROR_INTERNAL" link="GUsbContext.html#G-USB-CONTEXT-ERROR-INTERNAL:CAPS"/> + <keyword type="constant" name="G_USB_CONTEXT_FLAGS_NONE" link="GUsbContext.html#G-USB-CONTEXT-FLAGS-NONE:CAPS"/> + <keyword type="constant" name="G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES" link="GUsbContext.html#G-USB-CONTEXT-FLAGS-AUTO-OPEN-DEVICES:CAPS"/> <keyword type="constant" name="G_USB_SOURCE_ERROR_INTERNAL" link="gusb-gusb-source.html#G-USB-SOURCE-ERROR-INTERNAL:CAPS"/> <keyword type="constant" name="G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST" link="GUsbDevice.html#G-USB-DEVICE-DIRECTION-DEVICE-TO-HOST:CAPS"/> <keyword type="constant" name="G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE" link="GUsbDevice.html#G-USB-DEVICE-DIRECTION-HOST-TO-DEVICE:CAPS"/> diff --git a/docs/api/html/index.html b/docs/api/html/index.html index d502a44..0cdb7be 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>GUsb Reference Manual: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="next" href="specification.html" title="GUSB Specification"> <meta name="generator" content="GTK-Doc V1.25 (XML mode)"> @@ -23,7 +23,7 @@ </p></div></div> </div></div></div> <div><p class="releaseinfo"> - for GUsb 0.2.10 + for GUsb 0.2.11 </p></div> <div><p class="copyright">Copyright © 2011 Richard Hughes</p></div> diff --git a/docs/api/html/introduction.html b/docs/api/html/introduction.html index f0ba577..81fbfd4 100644 --- a/docs/api/html/introduction.html +++ b/docs/api/html/introduction.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>GUSB Introduction: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="specification.html" title="GUSB Specification"> <link rel="prev" href="specification.html" title="GUSB Specification"> diff --git a/docs/api/html/libgusb-helpers.html b/docs/api/html/libgusb-helpers.html index 23638e7..78b0dc7 100644 --- a/docs/api/html/libgusb-helpers.html +++ b/docs/api/html/libgusb-helpers.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>libgusb glib helpers: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="index.html" title="GUsb Reference Manual"> <link rel="prev" href="gusb-gusb-interface.html" title="gusb-interface"> diff --git a/docs/api/html/libgusb.html b/docs/api/html/libgusb.html index 543052f..8a9d459 100644 --- a/docs/api/html/libgusb.html +++ b/docs/api/html/libgusb.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>libgusb GObject library: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="index.html" title="GUsb Reference Manual"> <link rel="prev" href="introduction.html" title="GUSB Introduction"> diff --git a/docs/api/html/specification.html b/docs/api/html/specification.html index f489a7c..10c1184 100644 --- a/docs/api/html/specification.html +++ b/docs/api/html/specification.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>GUSB Specification: GUsb Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> +<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUsb Reference Manual"> <link rel="up" href="index.html" title="GUsb Reference Manual"> <link rel="prev" href="index.html" title="GUsb Reference Manual"> diff --git a/docs/api/version.xml b/docs/api/version.xml index 13dead7..d3b5ba4 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -0.2.10 +0.2.11 diff --git a/gusb/gusb-context.c b/gusb/gusb-context.c index fbd56d7..8b86a37 100644 --- a/gusb/gusb-context.c +++ b/gusb/gusb-context.c @@ -64,6 +64,7 @@ struct _GUsbContextPrivate volatile gint thread_event_run; guint hotplug_poll_id; int debug_level; + GUsbContextFlags flags; libusb_context *ctx; libusb_hotplug_callback_handle hotplug_id; }; @@ -324,6 +325,15 @@ g_usb_context_add_device (GUsbContext *context, goto out; } + /* auto-open */ + if (priv->flags & G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES) { + if (!_g_usb_device_open_internal (device, &error)) { + g_warning ("cannot open the device: %s", error->message); + g_error_free (error); + goto out; + } + } + /* add to enumerated list */ g_ptr_array_add (priv->devices, g_object_ref (device)); @@ -527,6 +537,38 @@ g_usb_context_enumerate (GUsbContext *context) priv->done_enumerate = TRUE; } +/** + * g_usb_context_set_flags: + * @context: a #GUsbContext + * @flags: some #GUsbContextFlags, e.g. %G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES + * + * Sets the flags to use for the context. These should be set before + * g_usb_context_enumerate() is called. + * + * Since: 0.2.11 + **/ +void +g_usb_context_set_flags (GUsbContext *context, GUsbContextFlags flags) +{ + context->priv->flags = flags; +} + +/** + * g_usb_context_get_flags: + * @context: a #GUsbContext + * + * Sets the flags to use for the context. + * + * Return value: the #GUsbContextFlags, e.g. %G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES + * + * Since: 0.2.11 + **/ +GUsbContextFlags +g_usb_context_get_flags (GUsbContext *context) +{ + return context->priv->flags; +} + static gpointer g_usb_context_event_thread_cb (gpointer data) { @@ -545,6 +587,7 @@ g_usb_context_init (GUsbContext *context) GUsbContextPrivate *priv; priv = context->priv = g_usb_context_get_instance_private (context); + priv->flags = G_USB_CONTEXT_FLAGS_NONE; priv->devices = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); priv->dict_usb_ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); priv->dict_replug = g_hash_table_new_full (g_str_hash, g_str_equal, diff --git a/gusb/gusb-context.h b/gusb/gusb-context.h index 8b59d49..3232d3c 100644 --- a/gusb/gusb-context.h +++ b/gusb/gusb-context.h @@ -63,11 +63,27 @@ typedef enum { G_USB_CONTEXT_ERROR_INTERNAL } GUsbContextError; +/** + * GUsbContextFlags: + * + * The flags to use for the context. + **/ +typedef enum { + G_USB_CONTEXT_FLAGS_NONE = 0, + G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES = 1 << 0, + /*< private >*/ + G_USB_CONTEXT_FLAGS_LAST +} GUsbContextFlags; + GType g_usb_context_get_type (void); GQuark g_usb_context_error_quark (void); GUsbContext *g_usb_context_new (GError **error); +void g_usb_context_set_flags (GUsbContext *context, + GUsbContextFlags flags); +GUsbContextFlags g_usb_context_get_flags (GUsbContext *context); + G_DEPRECATED GUsbSource *g_usb_context_get_source (GUsbContext *context, GMainContext *main_ctx); diff --git a/gusb/gusb-device-private.h b/gusb/gusb-device-private.h index f073141..bceb8be 100644 --- a/gusb/gusb-device-private.h +++ b/gusb/gusb-device-private.h @@ -30,6 +30,8 @@ GUsbDevice *_g_usb_device_new (GUsbContext *context, GError **error); libusb_device *_g_usb_device_get_device (GUsbDevice *device); +gboolean _g_usb_device_open_internal (GUsbDevice *device, + GError **error); G_END_DECLS diff --git a/gusb/gusb-device.c b/gusb/gusb-device.c index c240c81..747fc5b 100644 --- a/gusb/gusb-device.c +++ b/gusb/gusb-device.c @@ -390,6 +390,26 @@ g_usb_device_async_not_open_error (GUsbDevice *device, g_usb_device_get_pid (device)); } +gboolean +_g_usb_device_open_internal (GUsbDevice *device, GError **error) +{ + gint rc; + + if (device->priv->handle != NULL) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_ALREADY_OPEN, + "Device %04x:%04x is already open", + g_usb_device_get_vid (device), + g_usb_device_get_pid (device)); + return FALSE; + } + + /* open device */ + rc = libusb_open (device->priv->device, &device->priv->handle); + return g_usb_device_libusb_error_to_gerror (device, rc, error); +} + /** * g_usb_device_open: * @device: a #GUsbDevice @@ -404,27 +424,17 @@ g_usb_device_async_not_open_error (GUsbDevice *device, * Since: 0.1.0 **/ gboolean -g_usb_device_open (GUsbDevice *device, - GError **error) +g_usb_device_open (GUsbDevice *device, GError **error) { - gint rc; - g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if (device->priv->handle != NULL) { - g_set_error (error, - G_USB_DEVICE_ERROR, - G_USB_DEVICE_ERROR_ALREADY_OPEN, - "Device %04x:%04x is already open", - g_usb_device_get_vid (device), - g_usb_device_get_pid (device)); - return FALSE; - } + /* ignore */ + if (g_usb_context_get_flags (device->priv->context) & G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES) + return TRUE; - /* open device */ - rc = libusb_open (device->priv->device, &device->priv->handle); - return g_usb_device_libusb_error_to_gerror (device, rc, error); + /* open */ + return _g_usb_device_open_internal (device, error); } /** @@ -608,6 +618,10 @@ g_usb_device_close (GUsbDevice *device, g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + /* ignore */ + if (g_usb_context_get_flags (device->priv->context) & G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES) + return TRUE; + if (device->priv->handle == NULL) return g_usb_device_not_open_error (device, error); diff --git a/gusb/gusb-version.h b/gusb/gusb-version.h index 1fe6713..c0dd91d 100644 --- a/gusb/gusb-version.h +++ b/gusb/gusb-version.h @@ -53,7 +53,7 @@ * * The compile-time micro version */ -#define G_USB_MICRO_VERSION (10) +#define G_USB_MICRO_VERSION (11) /** * G_USB_CHECK_VERSION: diff --git a/gusb/libgusb.ver b/gusb/libgusb.ver index fc6f922..c4f9181 100644 --- a/gusb/libgusb.ver +++ b/gusb/libgusb.ver @@ -62,3 +62,9 @@ LIBGUSB_0.2.9 { global: g_usb_context_wait_for_replug; } LIBGUSB_0.2.8; + +LIBGUSB_0.2.11 { + global: + g_usb_context_set_flags; + g_usb_context_get_flags; +} LIBGUSB_0.2.9; diff --git a/tools/gusb-main.c b/tools/gusb-main.c index 234115c..7626719 100644 --- a/tools/gusb-main.c +++ b/tools/gusb-main.c @@ -158,6 +158,32 @@ gusb_cmd_get_descriptions (GPtrArray *array) return g_string_free (string, FALSE); } +static void +gusb_main_device_open (GUsbDevice *device) +{ + GError *error = NULL; + guint8 idx; + + /* open */ + if (!g_usb_device_open (device, &error)) { + g_print ("failed to open: %s\n", error->message); + g_error_free (error); + return; + } + + /* print info we can only get whilst open */ + idx = g_usb_device_get_product_index (device); + if (idx != 0x00) { + gchar *product = g_usb_device_get_string_descriptor (device, idx, &error); + if (product == NULL) { + g_print ("failed to get string desc: %s\n", error->message); + g_error_free (error); + return; + } + g_print ("product: %s\n", product); + } +} + /** * gusb_device_list_added_cb: **/ @@ -170,6 +196,7 @@ gusb_device_list_added_cb (GUsbContext *context, g_usb_device_get_platform_id (device), g_usb_device_get_bus (device), g_usb_device_get_address (device)); + gusb_main_device_open (device); } /** @@ -339,6 +366,7 @@ gusb_cmd_watch (GUsbCmdPrivate *priv, gchar **values, GError **error) g_usb_device_get_platform_id (device), g_usb_device_get_bus (device), g_usb_device_get_address (device)); + gusb_main_device_open (device); } loop = g_main_loop_new (NULL, FALSE); @@ -478,6 +506,7 @@ main (int argc, char *argv[]) /* GUsbContext */ priv->usb_ctx = g_usb_context_new (NULL); + g_usb_context_set_flags (priv->usb_ctx, G_USB_CONTEXT_FLAGS_AUTO_OPEN_DEVICES); /* add commands */ priv->cmd_array = g_ptr_array_new_with_free_func ((GDestroyNotify) gusb_cmd_item_free); |