Re: usb/185968: commit references a PR
The following reply was made to PR usb/185968; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/185968: commit references a PR Date: Tue, 4 Feb 2014 08:37:48 + (UTC) Author: hselasky Date: Tue Feb 4 08:37:39 2014 New Revision: 261463 URL: http://svnweb.freebsd.org/changeset/base/261463 Log: MFC r261003: Add new quirk. PR: usb/185968 Modified: stable/10/sys/dev/usb/quirk/usb_quirk.c stable/10/sys/dev/usb/usbdevs Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/quirk/usb_quirk.c == --- stable/10/sys/dev/usb/quirk/usb_quirk.cTue Feb 4 07:13:56 2014 (r261462) +++ stable/10/sys/dev/usb/quirk/usb_quirk.cTue Feb 4 08:37:39 2014 (r261463) @@ -286,6 +286,7 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_IGNORE_RESIDUE), USB_QUIRK(NETCHIP, CLIK_40, 0x, 0x, UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY), + USB_QUIRK(NETCHIP, POCKETBOOK, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(NIKON, D300, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(OLYMPUS, C1, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, Modified: stable/10/sys/dev/usb/usbdevs == --- stable/10/sys/dev/usb/usbdevs Tue Feb 4 07:13:56 2014 (r261462) +++ stable/10/sys/dev/usb/usbdevs Tue Feb 4 08:37:39 2014 (r261463) @@ -3083,6 +3083,7 @@ product NETCHIP TURBOCONNECT 0x1080 Turb product NETCHIP CLIK_40 0xa140 USB Clik! 40 product NETCHIP GADGETZERO0xa4a0 Linux Gadget Zero product NETCHIP ETHERNETGADGET0xa4a2 Linux Ethernet/RNDIS gadget on pxa210/25x/26x +product NETCHIP POCKETBOOK0xa4a5 PocketBook /* Netgear products */ product NETGEAR EA101 0x1001 Ethernet ___ svn-src-...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: usb/185454: commit references a PR
The following reply was made to PR usb/185454; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/185454: commit references a PR Date: Tue, 4 Feb 2014 10:18:37 + (UTC) Author: hselasky Date: Tue Feb 4 10:18:29 2014 New Revision: 261482 URL: http://svnweb.freebsd.org/changeset/base/261482 Log: MFC r260315: Implement two new libusb API functions. PR: usb/185454 Modified: stable/10/lib/libusb/Makefile stable/10/lib/libusb/libusb.3 stable/10/lib/libusb/libusb.h stable/10/lib/libusb/libusb10_io.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libusb/Makefile == --- stable/10/lib/libusb/Makefile Tue Feb 4 09:47:14 2014 (r261481) +++ stable/10/lib/libusb/Makefile Tue Feb 4 10:18:29 2014 (r261482) @@ -130,6 +130,8 @@ MLINKS += libusb.3 libusb_event_handler_ MLINKS += libusb.3 libusb_lock_event_waiters.3 MLINKS += libusb.3 libusb_unlock_event_waiters.3 MLINKS += libusb.3 libusb_wait_for_event.3 +MLINKS += libusb.3 libusb_handle_events_timeout_completed.3 +MLINKS += libusb.3 libusb_handle_events_completed.3 MLINKS += libusb.3 libusb_handle_events_timeout.3 MLINKS += libusb.3 libusb_handle_events.3 MLINKS += libusb.3 libusb_handle_events_locked.3 Modified: stable/10/lib/libusb/libusb.3 == --- stable/10/lib/libusb/libusb.3 Tue Feb 4 09:47:14 2014 (r261481) +++ stable/10/lib/libusb/libusb.3 Tue Feb 4 10:18:29 2014 (r261482) @@ -26,7 +26,7 @@ .\ .\ $FreeBSD$ .\ -.Dd June 7, 2013 +.Dd January 5, 2014 .Dt LIBUSB 3 .Os .Sh NAME @@ -485,11 +485,40 @@ transfer completes or another thread sto timeout expired. .Pp .Ft int +.Fn libusb_handle_events_timeout_completed libusb_context *ctx struct timeval *tv int *completed +Handle any pending events by checking if timeouts have expired and by +checking the set of file descriptors for activity. +If the +.Fa completed +argument is not equal to NULL, this function will +loop until a transfer completion callback sets the variable pointed to +by the +.Fa completed +argument to non-zero. +If the +.Fa tv +argument is not equal to NULL, this function will return +LIBUSB_ERROR_TIMEOUT after the given timeout. +Returns 0 on success, or a LIBUSB_ERROR code on failure or timeout. +.Pp +.Ft int +.Fn libusb_handle_events_completed libusb_context *ctx int *completed +Handle any pending events by checking the set of file descriptors for activity. +If the +.Fa completed +argument is not equal to NULL, this function will +loop until a transfer completion callback sets the variable pointed to +by the +.Fa completed +argument to non-zero. +Returns 0 on success, or a LIBUSB_ERROR code on failure. +.Pp +.Ft int .Fn libusb_handle_events_timeout libusb_context *ctx struct timeval *tv Handle any pending events by checking if timeouts have expired and by checking the set of file descriptors for activity. Returns 0 on success, or a -LIBUSB_ERROR code on failure. +LIBUSB_ERROR code on failure or timeout. .Pp .Ft int .Fn libusb_handle_events libusb_context *ctx @@ -508,7 +537,7 @@ Must be called with the event lock held. Determine the next internal timeout that libusb needs to handle. Returns 0 if there are no pending timeouts, 1 if a timeout was returned, or a LIBUSB_ERROR -code on failure. +code on failure or timeout. .Pp .Ft void .Fn libusb_set_pollfd_notifiers libusb_context *ctx libusb_pollfd_added_cb added_cb libusb_pollfd_removed_cb remove_cb void *user_data Modified: stable/10/lib/libusb/libusb.h == --- stable/10/lib/libusb/libusb.h Tue Feb 4 09:47:14 2014 (r261481) +++ stable/10/lib/libusb/libusb.h Tue Feb 4 10:18:29 2014 (r261482) @@ -438,6 +438,8 @@ intlibusb_event_handler_active(libusb_c void libusb_lock_event_waiters(libusb_context * ctx); void libusb_unlock_event_waiters(libusb_context * ctx); int libusb_wait_for_event(libusb_context * ctx, struct timeval *tv); +int libusb_handle_events_timeout_completed(libusb_context * ctx, struct timeval *tv, int *completed); +int libusb_handle_events_completed(libusb_context * ctx, int *completed); int libusb_handle_events_timeout(libusb_context * ctx, struct timeval *tv); int libusb_handle_events(libusb_context * ctx); int libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv); Modified: stable/10/lib/libusb/libusb10_io.c == --- stable/10/lib/libusb/libusb10_io.c Tue Feb 4 09:47:14 2014 (r261481) +++ stable/10/lib/libusb/libusb10_io.c Tue
Re: usb/185454: commit references a PR
The following reply was made to PR usb/185454; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/185454: commit references a PR Date: Tue, 4 Feb 2014 10:22:37 + (UTC) Author: hselasky Date: Tue Feb 4 10:22:28 2014 New Revision: 261483 URL: http://svnweb.freebsd.org/changeset/base/261483 Log: MFC r260315: Implement two new libusb API functions. PR: usb/185454 Modified: stable/9/lib/libusb/Makefile stable/9/lib/libusb/libusb.3 stable/9/lib/libusb/libusb.h stable/9/lib/libusb/libusb10_io.c Directory Properties: stable/9/lib/ (props changed) stable/9/lib/libusb/ (props changed) Modified: stable/9/lib/libusb/Makefile == --- stable/9/lib/libusb/Makefile Tue Feb 4 10:18:29 2014 (r261482) +++ stable/9/lib/libusb/Makefile Tue Feb 4 10:22:28 2014 (r261483) @@ -98,6 +98,8 @@ MLINKS += libusb.3 libusb_event_handler_ MLINKS += libusb.3 libusb_lock_event_waiters.3 MLINKS += libusb.3 libusb_unlock_event_waiters.3 MLINKS += libusb.3 libusb_wait_for_event.3 +MLINKS += libusb.3 libusb_handle_events_timeout_completed.3 +MLINKS += libusb.3 libusb_handle_events_completed.3 MLINKS += libusb.3 libusb_handle_events_timeout.3 MLINKS += libusb.3 libusb_handle_events.3 MLINKS += libusb.3 libusb_handle_events_locked.3 Modified: stable/9/lib/libusb/libusb.3 == --- stable/9/lib/libusb/libusb.3 Tue Feb 4 10:18:29 2014 (r261482) +++ stable/9/lib/libusb/libusb.3 Tue Feb 4 10:22:28 2014 (r261483) @@ -485,11 +485,40 @@ transfer completes or another thread sto timeout expired. .Pp .Ft int +.Fn libusb_handle_events_timeout_completed libusb_context *ctx struct timeval *tv int *completed +Handle any pending events by checking if timeouts have expired and by +checking the set of file descriptors for activity. +If the +.Fa completed +argument is not equal to NULL, this function will +loop until a transfer completion callback sets the variable pointed to +by the +.Fa completed +argument to non-zero. +If the +.Fa tv +argument is not equal to NULL, this function will return +LIBUSB_ERROR_TIMEOUT after the given timeout. +Returns 0 on success, or a LIBUSB_ERROR code on failure or timeout. +.Pp +.Ft int +.Fn libusb_handle_events_completed libusb_context *ctx int *completed +Handle any pending events by checking the set of file descriptors for activity. +If the +.Fa completed +argument is not equal to NULL, this function will +loop until a transfer completion callback sets the variable pointed to +by the +.Fa completed +argument to non-zero. +Returns 0 on success, or a LIBUSB_ERROR code on failure. +.Pp +.Ft int .Fn libusb_handle_events_timeout libusb_context *ctx struct timeval *tv Handle any pending events by checking if timeouts have expired and by checking the set of file descriptors for activity. Returns 0 on success, or a -LIBUSB_ERROR code on failure. +LIBUSB_ERROR code on failure or timeout. .Pp .Ft int .Fn libusb_handle_events libusb_context *ctx @@ -508,7 +537,7 @@ Must be called with the event lock held. Determine the next internal timeout that libusb needs to handle. Returns 0 if there are no pending timeouts, 1 if a timeout was returned, or a LIBUSB_ERROR -code on failure. +code on failure or timeout. .Pp .Ft void .Fn libusb_set_pollfd_notifiers libusb_context *ctx libusb_pollfd_added_cb added_cb libusb_pollfd_removed_cb remove_cb void *user_data Modified: stable/9/lib/libusb/libusb.h == --- stable/9/lib/libusb/libusb.h Tue Feb 4 10:18:29 2014 (r261482) +++ stable/9/lib/libusb/libusb.h Tue Feb 4 10:22:28 2014 (r261483) @@ -436,6 +436,8 @@ intlibusb_event_handler_active(libusb_c void libusb_lock_event_waiters(libusb_context * ctx); void libusb_unlock_event_waiters(libusb_context * ctx); int libusb_wait_for_event(libusb_context * ctx, struct timeval *tv); +int libusb_handle_events_timeout_completed(libusb_context * ctx, struct timeval *tv, int *completed); +int libusb_handle_events_completed(libusb_context * ctx, int *completed); int libusb_handle_events_timeout(libusb_context * ctx, struct timeval *tv); int libusb_handle_events(libusb_context * ctx); int libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv); Modified: stable/9/lib/libusb/libusb10_io.c == --- stable/9/lib/libusb/libusb10_io.c Tue Feb 4 10:18:29 2014 (r261482) +++ stable/9/lib/libusb/libusb10_io.c Tue Feb 4 10:22:28 2014 (r261483) @@ -331,29 +331,50 @@
Re: usb/185454: commit references a PR
The following reply was made to PR usb/185454; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/185454: commit references a PR Date: Tue, 4 Feb 2014 10:25:45 + (UTC) Author: hselasky Date: Tue Feb 4 10:25:31 2014 New Revision: 261484 URL: http://svnweb.freebsd.org/changeset/base/261484 Log: MFC r260315: Implement two new libusb API functions. PR: usb/185454 Modified: stable/8/lib/libusb/Makefile stable/8/lib/libusb/libusb.3 stable/8/lib/libusb/libusb.h stable/8/lib/libusb/libusb10_io.c Directory Properties: stable/8/lib/ (props changed) stable/8/lib/libusb/ (props changed) Modified: stable/8/lib/libusb/Makefile == --- stable/8/lib/libusb/Makefile Tue Feb 4 10:22:28 2014 (r261483) +++ stable/8/lib/libusb/Makefile Tue Feb 4 10:25:31 2014 (r261484) @@ -96,6 +96,8 @@ MLINKS += libusb.3 libusb_event_handler_ MLINKS += libusb.3 libusb_lock_event_waiters.3 MLINKS += libusb.3 libusb_unlock_event_waiters.3 MLINKS += libusb.3 libusb_wait_for_event.3 +MLINKS += libusb.3 libusb_handle_events_timeout_completed.3 +MLINKS += libusb.3 libusb_handle_events_completed.3 MLINKS += libusb.3 libusb_handle_events_timeout.3 MLINKS += libusb.3 libusb_handle_events.3 MLINKS += libusb.3 libusb_handle_events_locked.3 Modified: stable/8/lib/libusb/libusb.3 == --- stable/8/lib/libusb/libusb.3 Tue Feb 4 10:22:28 2014 (r261483) +++ stable/8/lib/libusb/libusb.3 Tue Feb 4 10:25:31 2014 (r261484) @@ -26,7 +26,7 @@ .\ .\ $FreeBSD$ .\ -.Dd May 7, 2012 +.Dd January 5, 2014 .Dt LIBUSB 3 .Os .Sh NAME @@ -472,11 +472,40 @@ transfer completes or another thread sto timeout expired. .Pp .Ft int +.Fn libusb_handle_events_timeout_completed libusb_context *ctx struct timeval *tv int *completed +Handle any pending events by checking if timeouts have expired and by +checking the set of file descriptors for activity. +If the +.Fa completed +argument is not equal to NULL, this function will +loop until a transfer completion callback sets the variable pointed to +by the +.Fa completed +argument to non-zero. +If the +.Fa tv +argument is not equal to NULL, this function will return +LIBUSB_ERROR_TIMEOUT after the given timeout. +Returns 0 on success, or a LIBUSB_ERROR code on failure or timeout. +.Pp +.Ft int +.Fn libusb_handle_events_completed libusb_context *ctx int *completed +Handle any pending events by checking the set of file descriptors for activity. +If the +.Fa completed +argument is not equal to NULL, this function will +loop until a transfer completion callback sets the variable pointed to +by the +.Fa completed +argument to non-zero. +Returns 0 on success, or a LIBUSB_ERROR code on failure. +.Pp +.Ft int .Fn libusb_handle_events_timeout libusb_context *ctx struct timeval *tv Handle any pending events by checking if timeouts have expired and by checking the set of file descriptors for activity. Returns 0 on success, or a -LIBUSB_ERROR code on failure. +LIBUSB_ERROR code on failure or timeout. .Pp .Ft int .Fn libusb_handle_events libusb_context *ctx @@ -495,7 +524,7 @@ Must be called with the event lock held. Determine the next internal timeout that libusb needs to handle. Returns 0 if there are no pending timeouts, 1 if a timeout was returned, or a LIBUSB_ERROR -code on failure. +code on failure or timeout. .Pp .Ft void .Fn libusb_set_pollfd_notifiers libusb_context *ctx libusb_pollfd_added_cb added_cb libusb_pollfd_removed_cb remove_cb void *user_data Modified: stable/8/lib/libusb/libusb.h == --- stable/8/lib/libusb/libusb.h Tue Feb 4 10:22:28 2014 (r261483) +++ stable/8/lib/libusb/libusb.h Tue Feb 4 10:25:31 2014 (r261484) @@ -434,6 +434,8 @@ intlibusb_event_handler_active(libusb_c void libusb_lock_event_waiters(libusb_context * ctx); void libusb_unlock_event_waiters(libusb_context * ctx); int libusb_wait_for_event(libusb_context * ctx, struct timeval *tv); +int libusb_handle_events_timeout_completed(libusb_context * ctx, struct timeval *tv, int *completed); +int libusb_handle_events_completed(libusb_context * ctx, int *completed); int libusb_handle_events_timeout(libusb_context * ctx, struct timeval *tv); int libusb_handle_events(libusb_context * ctx); int libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv); Modified: stable/8/lib/libusb/libusb10_io.c == --- stable/8/lib/libusb/libusb10_io.c Tue Feb 4 10:22:28 2014 (r261483) +++
Re: usb/185454: libusb lacks libusb_handle_events_completed()
Synopsis: libusb lacks libusb_handle_events_completed() State-Changed-From-To: open-closed State-Changed-By: tijl State-Changed-When: Tue Feb 4 17:48:25 CET 2014 State-Changed-Why: MFCed down to stable/8. http://www.freebsd.org/cgi/query-pr.cgi?pr=185454 ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
