Re: usb/190204: commit references a PR
The following reply was made to PR usb/190204; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/190204: commit references a PR
Date: Sun, 25 May 2014 18:06:35 + (UTC)
Author: hselasky
Date: Sun May 25 18:06:32 2014
New Revision: 24
URL: http://svnweb.freebsd.org/changeset/base/24
Log:
Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API
from sourceforge.
PR: usb/190204
MFC after: 1 week
Modified:
head/lib/libusb/libusb.h
Modified: head/lib/libusb/libusb.h
==
--- head/lib/libusb/libusb.h Sun May 25 18:06:28 2014(r23)
+++ head/lib/libusb/libusb.h Sun May 25 18:06:32 2014(r24)
@@ -33,6 +33,8 @@
#include sys/types.h
#endif
+#define LIBUSB_CALL
+
#ifdef __cplusplus
externC {
#endif
___
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/188683: commit references a PR
The following reply was made to PR usb/188683; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/188683: commit references a PR
Date: Fri, 18 Apr 2014 08:32:00 + (UTC)
Author: hselasky
Date: Fri Apr 18 08:31:55 2014
New Revision: 264642
URL: http://svnweb.freebsd.org/changeset/base/264642
Log:
Add support for specifying USB controller mode via FDT.
Add FDT support to the DWC OTG kernel module.
Submitted by:John Wehle j...@feith.com
PR: usb/188683
MFC after: 1 week
Modified:
head/sys/dev/usb/controller/dwc_otg.c
head/sys/dev/usb/controller/dwc_otg_fdt.c
head/sys/modules/usb/dwc_otg/Makefile
Modified: head/sys/dev/usb/controller/dwc_otg.c
==
--- head/sys/dev/usb/controller/dwc_otg.c Fri Apr 18 07:50:25 2014
(r264641)
+++ head/sys/dev/usb/controller/dwc_otg.c Fri Apr 18 08:31:55 2014
(r264642)
@@ -2149,7 +2149,12 @@ dwc_otg_vbus_interrupt(struct dwc_otg_so
{
DPRINTFN(5, vbus = %u\n, is_on);
- if (is_on) {
+ /*
+ * If the USB host mode is forced, then assume VBUS is always
+ * present else rely on the input to this function:
+ */
+ if ((is_on != 0) || (sc-sc_mode == DWC_MODE_HOST)) {
+
if (!sc-sc_flags.status_vbus) {
sc-sc_flags.status_vbus = 1;
@@ -3182,7 +3187,7 @@ dwc_otg_init(struct dwc_otg_softc *sc)
sc-sc_host_ch_max);
/* setup FIFO */
- if (dwc_otg_init_fifo(sc, DWC_MODE_OTG))
+ if (dwc_otg_init_fifo(sc, sc-sc_mode))
return (EINVAL);
/* enable interrupts */
Modified: head/sys/dev/usb/controller/dwc_otg_fdt.c
==
--- head/sys/dev/usb/controller/dwc_otg_fdt.c Fri Apr 18 07:50:25 2014
(r264641)
+++ head/sys/dev/usb/controller/dwc_otg_fdt.c Fri Apr 18 08:31:55 2014
(r264642)
@@ -91,6 +91,7 @@ static int
dwc_otg_attach(device_t dev)
{
struct dwc_otg_super_softc *sc = device_get_softc(dev);
+ char usb_mode[24];
int err;
int rid;
@@ -99,6 +100,23 @@ dwc_otg_attach(device_t dev)
sc-sc_otg.sc_bus.devices = sc-sc_otg.sc_devices;
sc-sc_otg.sc_bus.devices_max = DWC_OTG_MAX_DEVICES;
+ /* get USB mode, if any */
+ if (OF_getprop(ofw_bus_get_node(dev), dr_mode,
+ usb_mode, sizeof(usb_mode)) 0) {
+
+ /* ensure proper zero termination */
+ usb_mode[sizeof(usb_mode) - 1] = 0;
+
+ if (strcasecmp(usb_mode, host) == 0)
+ sc-sc_otg.sc_mode = DWC_MODE_HOST;
+ else if (strcasecmp(usb_mode, peripheral) == 0)
+ sc-sc_otg.sc_mode = DWC_MODE_DEVICE;
+ else if (strcasecmp(usb_mode, otg) != 0) {
+ device_printf(dev, Invalid FDT dr_mode: %s\n,
+ usb_mode);
+ }
+ }
+
/* get all DMA memory */
if (usb_bus_mem_alloc_all(sc-sc_otg.sc_bus,
USB_GET_DMA_TAG(dev), NULL)) {
Modified: head/sys/modules/usb/dwc_otg/Makefile
==
--- head/sys/modules/usb/dwc_otg/Makefile Fri Apr 18 07:50:25 2014
(r264641)
+++ head/sys/modules/usb/dwc_otg/Makefile Fri Apr 18 08:31:55 2014
(r264642)
@@ -31,8 +31,8 @@ S= ${.CURDIR}/../../..
KMOD= dwc_otg
SRCS= bus_if.h device_if.h usb_if.h \
- opt_bus.h opt_usb.h \
- dwc_otg.c \
+ opt_bus.h opt_usb.h ofw_bus_if.h \
+ dwc_otg.c dwc_otg_fdt.c \
pci_if.h
.if defined(HAS_ATMELARM)
___
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/188046: commit references a PR
The following reply was made to PR usb/188046; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/188046: commit references a PR Date: Tue, 1 Apr 2014 10:34:43 + (UTC) Author: hselasky Date: Tue Apr 1 10:34:39 2014 New Revision: 263985 URL: http://svnweb.freebsd.org/changeset/base/263985 Log: Add new USB ID. Submitted by:Tuomo Latto djv+f...@iki.fi PR: usb/188046 MFC after: 1 week Modified: head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Tue Apr 1 08:19:30 2014(r263984) +++ head/sys/dev/usb/usbdevs Tue Apr 1 10:34:39 2014(r263985) @@ -4535,5 +4535,6 @@ product ZYXEL G220V2 0x340f G-220 v2 product ZYXEL G2020x3410 G-202 product ZYXEL RT2870_10x3416 RT2870 product ZYXEL RT2870_20x341a RT2870 +product ZYXEL RT3070 0x341e NWD2105 product ZYXEL RTL8192CU 0x341f RTL8192CU product ZYXEL NWD2705 0x3421 NWD2705 Modified: head/sys/dev/usb/wlan/if_run.c == --- head/sys/dev/usb/wlan/if_run.c Tue Apr 1 08:19:30 2014 (r263984) +++ head/sys/dev/usb/wlan/if_run.c Tue Apr 1 10:34:39 2014 (r263985) @@ -316,6 +316,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(ZINWELL, RT3072_2), RUN_DEV(ZYXEL,RT2870_1), RUN_DEV(ZYXEL,RT2870_2), +RUN_DEV(ZYXEL,RT3070), RUN_DEV_EJECT(ZYXEL, NWD2705), RUN_DEV_EJECT(RALINK, RT_STOR), #undef RUN_DEV_EJECT ___ 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/187188: commit references a PR
The following reply was made to PR usb/187188; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/187188: commit references a PR Date: Tue, 4 Mar 2014 12:33:26 + (UTC) Author: hselasky Date: Tue Mar 4 12:33:18 2014 New Revision: 262732 URL: http://svnweb.freebsd.org/changeset/base/262732 Log: Add new quirk. MFC after: 1 week PR: usb/187188 Submitted by:Hiroo Ono hiroo.ono+free...@gmail.com Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Tue Mar 4 11:43:01 2014 (r262731) +++ head/sys/dev/usb/quirk/usb_quirk.c Tue Mar 4 12:33:18 2014 (r262732) @@ -93,6 +93,7 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(TELEX, MIC1, 0x009, 0x009, UQ_AU_NO_FRAC), USB_QUIRK(SILICONPORTALS, YAPPHONE, 0x100, 0x100, UQ_AU_INP_ASYNC), USB_QUIRK(LOGITECH, UN53B, 0x, 0x, UQ_NO_STRINGS), + USB_QUIRK(REALTEK, RTL8196EU, 0x, 0x, UQ_CFG_INDEX_1), USB_QUIRK(ELSA, MODEM1, 0x, 0x, UQ_CFG_INDEX_1), USB_QUIRK(PLANEX2, MZKUE150N, 0x, 0x, UQ_CFG_INDEX_1), /* Quirks for printer devices */ Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Tue Mar 4 11:43:01 2014(r262731) +++ head/sys/dev/usb/usbdevs Tue Mar 4 12:33:18 2014(r262732) @@ -3688,6 +3688,7 @@ product REALTEK RTL8188CU_1 0x817a RTL81 product REALTEK RTL8188CU_2 0x817b RTL8188CU product REALTEK RTL8187 0x8187 RTL8187 Wireless Adapter product REALTEK RTL8187B_00x8189 RTL8187B Wireless Adapter +product REALTEK RTL8196EU 0x8196 RTL8196EU product REALTEK RTL8187B_10x8197 RTL8187B Wireless Adapter product REALTEK RTL8187B_20x8198 RTL8187B Wireless Adapter product REALTEK RTL8188CUS0x818a RTL8188CUS ___ 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/186811: commit references a PR
The following reply was made to PR usb/186811; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/186811: commit references a PR
Date: Sun, 16 Feb 2014 14:37:31 + (UTC)
Author: hselasky
Date: Sun Feb 16 14:37:23 2014
New Revision: 261981
URL: http://svnweb.freebsd.org/changeset/base/261981
Log:
Add new PCI ID for hardware which needs port routing for USB 3.0.
PR: usb/186811
MFC after: 1 week
Submitted by:Philipp Maechler philipp.maech...@mamo.li
Modified:
head/sys/dev/usb/controller/xhci_pci.c
Modified: head/sys/dev/usb/controller/xhci_pci.c
==
--- head/sys/dev/usb/controller/xhci_pci.c Sun Feb 16 14:35:19 2014
(r261980)
+++ head/sys/dev/usb/controller/xhci_pci.c Sun Feb 16 14:37:23 2014
(r261981)
@@ -102,6 +102,7 @@ xhci_pci_match(device_t self)
case 0x10421b21:
return (ASMedia ASM1042 USB 3.0 controller);
+ case 0x9c318086:
case 0x1e318086:
return (Intel Panther Point USB 3.0 controller);
case 0x8c318086:
@@ -237,6 +238,7 @@ xhci_pci_attach(device_t self)
/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
switch (pci_get_devid(self)) {
+ case 0x9c318086:/* Panther Point */
case 0x1e318086:/* Panther Point */
case 0x8c318086:/* Lynx Point */
sc-sc_port_route = xhci_pci_port_route;
___
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/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/185628: commit references a PR
The following reply was made to PR usb/185628; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/185628: commit references a PR
Date: Sun, 12 Jan 2014 21:21:27 + (UTC)
Author: hselasky
Date: Sun Jan 12 21:21:19 2014
New Revision: 260575
URL: http://svnweb.freebsd.org/changeset/base/260575
Log:
MFC r244607 and r244650:
Fix regression issues after r244503.
PR: usb/185628
Modified:
stable/9/sys/dev/usb/storage/ustorage_fs.c
stable/9/sys/dev/usb/usb_msctest.c
stable/9/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/storage/ustorage_fs.c
==
--- stable/9/sys/dev/usb/storage/ustorage_fs.c Sun Jan 12 21:19:49 2014
(r260574)
+++ stable/9/sys/dev/usb/storage/ustorage_fs.c Sun Jan 12 21:21:19 2014
(r260575)
@@ -603,6 +603,8 @@ tr_setup:
usbd_xfer_set_stall(xfer);
DPRINTF(stall pipe\n);
}
+ usbd_xfer_set_frame_len(xfer, 0,
+ sizeof(ustorage_fs_bbb_cbw_t));
usbd_transfer_submit(xfer);
break;
@@ -827,6 +829,8 @@ tr_setup:
sc-sc_transfer.data_error = 0;
usbd_xfer_set_stall(xfer);
}
+ usbd_xfer_set_frame_len(xfer, 0,
+ sizeof(ustorage_fs_bbb_csw_t));
usbd_transfer_submit(xfer);
break;
Modified: stable/9/sys/dev/usb/usb_msctest.c
==
--- stable/9/sys/dev/usb/usb_msctest.c Sun Jan 12 21:19:49 2014
(r260574)
+++ stable/9/sys/dev/usb/usb_msctest.c Sun Jan 12 21:21:19 2014
(r260575)
@@ -83,7 +83,7 @@ enum {
DIR_NONE,
};
-#define SCSI_MAX_LEN0x100
+#define SCSI_MAX_LENMAX(0x100, BULK_SIZE)
#define SCSI_INQ_LEN0x24
#define SCSI_SENSE_LEN 0xFF
@@ -150,6 +150,7 @@ struct bbb_transfer {
usb_size_t data_rem;/* bytes */
usb_timeout_t data_timeout; /* ms */
usb_frlength_t actlen; /* bytes */
+ usb_frlength_t buffer_size; /* bytes */
uint8_t cmd_len;/* bytes */
uint8_t dir;
@@ -192,7 +193,7 @@ static const struct usb_config bbb_confi
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
- .bufsize = MAX(SCSI_MAX_LEN, BULK_SIZE),
+ .bufsize = SCSI_MAX_LEN,
.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
.callback = bbb_data_read_callback,
.timeout = 4 * USB_MS_HZ, /* 4 seconds */
@@ -211,7 +212,7 @@ static const struct usb_config bbb_confi
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
- .bufsize = BULK_SIZE,
+ .bufsize = SCSI_MAX_LEN,
.flags = {.ext_buffer = 1,.proxy_buffer = 1,},
.callback = bbb_data_write_callback,
.timeout = 4 * USB_MS_HZ, /* 4 seconds */
@@ -299,6 +300,8 @@ bbb_command_callback(struct usb_xfer *xf
sc-cbw-bCDBLength = sizeof(sc-cbw-CBWCDB);
DPRINTFN(0, Truncating long command\n);
}
+ usbd_xfer_set_frame_len(xfer, 0,
+ sizeof(struct bbb_cbw));
usbd_transfer_submit(xfer);
break;
@@ -385,7 +388,7 @@ bbb_data_write_callback(struct usb_xfer
if (sc-data_rem == 0) {
bbb_transfer_start(sc, ST_STATUS);
- return;
+ break;
}
if (max_bulk sc-data_rem) {
max_bulk = sc-data_rem;
@@ -393,7 +396,7 @@ bbb_data_write_callback(struct usb_xfer
usbd_xfer_set_timeout(xfer, sc-data_timeout);
usbd_xfer_set_frame_data(xfer, 0, sc-data_ptr, max_bulk);
usbd_transfer_submit(xfer);
- return;
+ break;
default:/* Error */
if (error == USB_ERR_CANCELLED) {
@@ -401,8 +404,7 @@ bbb_data_write_callback(struct usb_xfer
} else {
bbb_transfer_start(sc, ST_DATA_WR_CS);
}
- return;
-
+ break;
}
}
@@ -437,6 +439,8 @@ bbb_status_callback(struct usb_xfer *xfe
break;
case USB_ST_SETUP:
+ usbd_xfer_set_frame_len(xfer, 0,
+ sizeof(struct bbb_csw));
usbd_transfer_submit(xfer
Re: usb/182936: commit references a PR
The following reply was made to PR usb/182936; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/182936: commit references a PR Date: Mon, 16 Dec 2013 08:10:48 + (UTC) Author: hselasky Date: Mon Dec 16 08:10:38 2013 New Revision: 259453 URL: http://svnweb.freebsd.org/changeset/base/259453 Log: MFC r238274, r246752, r256720, r256721, r256722, r256955, r257409 r257429, r257435, r257712, r257732, r257743, r257748, r257955 r257957, r257958, r258082, r258641, r258643, r258732, r258733, r258840, r258919, r258921, r259029, r259030, r259031, r259032 and r259046: - Add support for the MediaTek/Ralink RT5370/RT5372 chipset. - Various minor USB WLAN fixes and improvements. PR: usb/182936 Modified: stable/10/share/man/man4/run.4 stable/10/share/man/man4/runfw.4 stable/10/sys/dev/usb/usbdevs stable/10/sys/dev/usb/wlan/if_rsu.c stable/10/sys/dev/usb/wlan/if_rum.c stable/10/sys/dev/usb/wlan/if_run.c stable/10/sys/dev/usb/wlan/if_runreg.h stable/10/sys/dev/usb/wlan/if_runvar.h stable/10/sys/dev/usb/wlan/if_uath.c stable/10/sys/dev/usb/wlan/if_upgt.c stable/10/sys/dev/usb/wlan/if_ural.c stable/10/sys/dev/usb/wlan/if_urtw.c stable/10/sys/dev/usb/wlan/if_urtwn.c stable/10/sys/dev/usb/wlan/if_zyd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/run.4 == --- stable/10/share/man/man4/run.4 Mon Dec 16 06:56:38 2013 (r259452) +++ stable/10/share/man/man4/run.4 Mon Dec 16 08:10:38 2013 (r259453) @@ -16,7 +16,7 @@ .\ .\ $FreeBSD$ .\ -.Dd July 9, 2012 +.Dd November 11, 2013 .Dt RUN 4 .Os .Sh NAME @@ -52,7 +52,7 @@ runfw_load=YES The .Nm driver supports USB 2.0 wireless adapters based on the Ralink RT2700U, -RT2800U and RT3000U chipsets. +RT2800U, RT3000U and RT3900E chipsets. .Pp The RT2700U chipset consists of two integrated chips, an RT2770 MAC/BBP and an RT2720 (1T2R) or RT2750 (dual-band 1T2R) radio transceiver. @@ -64,6 +64,9 @@ The RT3000U is a single-chip solution ba an RT3020 (1T1R), RT3021 (1T2R) or RT3022 (2T2R) single-band radio transceiver. .Pp +The RT3900E is a single-chip solution based on an RT5390 MAC/BBP and +an RT5370 (1T1R) or RT5372 (2T2R) single-band radio transceiver. +.Pp These are the modes the .Nm driver can operate in: @@ -129,7 +132,8 @@ driver supports the following wireless a .It Corega CG-WLUSB300AGN .It Corega CG-WLUSB300GNM .It D-Link DWA-130 rev B1 -.It D-Link DWA-140 rev B1, B2 +.It D-Link DWA-140 rev B1, B2, B3 +.It D-Link DWA-160 rev B2 .It DrayTek Vigor N61 .It Edimax EW-7711UAn .It Edimax EW-7711UTn @@ -156,6 +160,8 @@ driver supports the following wireless a .It SMC SMCWUSBS-N2 .It Sweex LW303 .It Sweex LW313 +.It TP-LINK TL-WDN3200 +.It TP-LINK TL-WN727N v3 .It Unex DNUR-81 .It Unex DNUR-82 .It ZyXEL NWD210N Modified: stable/10/share/man/man4/runfw.4 == --- stable/10/share/man/man4/runfw.4 Mon Dec 16 06:56:38 2013 (r259452) +++ stable/10/share/man/man4/runfw.4 Mon Dec 16 08:10:38 2013 (r259453) @@ -18,7 +18,7 @@ .\ .\ $FreeBSD$ .\ -.Dd January 12, 2011 +.Dd November 11, 2013 .Dt RUNFW 4 .Os .Sh NAME @@ -43,7 +43,7 @@ runfw_load=YES .Ed .Sh DESCRIPTION This module provides firmware sets for the Ralink RT2700U, -RT2800U and RT3000U chip based USB WiFi adapters. +RT2800U, RT3000U and RT3900E chip based USB WiFi adapters. Please read Ralink's license, src/sys/contrib/dev/run/LICENSE. .Sh SEE ALSO .Xr run 4 , Modified: stable/10/sys/dev/usb/usbdevs == --- stable/10/sys/dev/usb/usbdevs Mon Dec 16 06:56:38 2013 (r259452) +++ stable/10/sys/dev/usb/usbdevs Mon Dec 16 08:10:38 2013 (r259453) @@ -1549,6 +1549,8 @@ product DLINK DWLG1220x3c00 DWL-G122 b product DLINK DUBE100B1 0x3c05 DUB-E100 rev B1 product DLINK RT2870 0x3c09 RT2870 product DLINK RT3072 0x3c0a RT3072 +product DLINK DWA140B30x3c15 DWA-140 rev B3 +product DLINK DWA160B20x3c1a DWA-160 rev B2 product DLINK DWA127 0x3c1b DWA-127 Wireless Adapter product DLINK DSB650C 0x4000 10Mbps Ethernet product DLINK DSB650TX1 0x4001 10/100 Ethernet @@ -3572,6 +3574,7 @@ product RALINK RT30720x3072 RT3072 product RALINK RT3370 0x3370 RT3370 product RALINK RT3572 0x3572 RT3572 product RALINK RT5370 0x5370 RT5370 +product RALINK RT5572 0x5572 RT5572 product RALINK RT8070 0x8070 RT8070 product RALINK RT2570_3 0x9020
Re: usb/182936: commit references a PR
The following reply was made to PR usb/182936; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/182936: commit references a PR Date: Mon, 16 Dec 2013 09:07:19 + (UTC) Author: hselasky Date: Mon Dec 16 09:07:09 2013 New Revision: 259457 URL: http://svnweb.freebsd.org/changeset/base/259457 Log: MFC r238274, r246752, r256720, r256721, r256722, r256955, r257409 r257429, r257435, r257712, r257732, r257743, r257748, r257955 r257957, r257958, r258082, r258641, r258643, r258732, r258733, r258840, r258919, r258921, r259029, r259030, r259031, r259032 and r259046: - Add support for the MediaTek/Ralink RT5370/RT5372 chipset. - Various minor USB WLAN fixes and improvements. PR: usb/182936 Modified: stable/9/sys/dev/usb/usbdevs stable/9/sys/dev/usb/wlan/if_rum.c stable/9/sys/dev/usb/wlan/if_run.c stable/9/sys/dev/usb/wlan/if_runreg.h stable/9/sys/dev/usb/wlan/if_runvar.h stable/9/sys/dev/usb/wlan/if_uath.c stable/9/sys/dev/usb/wlan/if_upgt.c stable/9/sys/dev/usb/wlan/if_ural.c stable/9/sys/dev/usb/wlan/if_urtw.c stable/9/sys/dev/usb/wlan/if_zyd.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevs Mon Dec 16 08:56:45 2013 (r259456) +++ stable/9/sys/dev/usb/usbdevs Mon Dec 16 09:07:09 2013 (r259457) @@ -569,10 +569,12 @@ vendor FALCOM0x0f94 Falcom Wireless Co vendor RIM0x0fca Research In Motion vendor DYNASTREAM 0x0fcf Dynastream Innovations vendor LARSENBRUSGAARD0x0fd8 Larsen and Brusgaard +vendor OWL0x0fde OWL vendor KONTRON0x0fe6 Kontron AG vendor QUALCOMM 0x1004 Qualcomm vendor APACER 0x1005 Apacer vendor MOTOROLA4 0x100d Motorola +vendor HP30x103c Hewlett Packard vendor AIRPLUS0x1011 Airplus vendor DESKNOTE 0x1019 Desknote vendor NEC3 0x1033 NEC @@ -584,6 +586,7 @@ vendor CCYU0x1065 CCYU Technology vendor CURITEL0x106c Curitel Communications Inc vendor SILABS20x10a6 SILABS2 vendor USI0x10ab USI +vendor LIEBERT2 0x10af Liebert vendor PLX0x10b5 PLX vendor ASANTE 0x10bd Asante vendor SILABS 0x10c4 Silicon Labs @@ -652,6 +655,8 @@ vendor OWEN0x1555 Owen vendor OQO0x1557 OQO vendor UMEDIA 0x157e U-MEDIA Communications vendor FIBERLINE 0x1582 Fiberline +vendor FREESCALE 0x15a2 Freescale Semiconductor, Inc. +vendor AFATECH0x15a4 Afatech Technologies, Inc. vendor SPARKLAN 0x15a9 SparkLAN vendor OLIMEX 0x15ba Olimex vendor SOUNDGRAPH 0x15c2 Soundgraph, Inc. @@ -692,8 +697,9 @@ vendor QUALCOMMINC 0x19d2 Qualcomm, Inco vendor BAYER 0x1a79 Bayer vendor WCH2 0x1a86 QinHeng Electronics vendor STELERA0x1a8d Stelera Wireless +vendor SEL0x1adb Schweitzer Engineering Laboratories vendor CORSAIR0x1b1c Corsair -vendor MATRIXORBITAL 0x1b3d Matrix Orbital +vendor MATRIXORBITAL 0x1b3d Matrix Orbital vendor OVISLINK 0x1b75 OvisLink vendor TML0x1b91 The Mobility Lab vendor TCTMOBILE 0x1bbb TCT Mobile @@ -712,6 +718,7 @@ vendor METAGEEK2 0x1dd5 MetaGeek vendor ALINK 0x1e0e Alink vendor AIRTIES0x1eda AirTies vendor FESTO 0x1e29 Festo +vendor LAKESHORE 0x1fb9 Lake Shore Cryotronics, Inc. vendor VERTEX 0x1fe7 Vertex Wireless Co., Ltd. vendor DLINK 0x2001 D-Link vendor PLANEX20x2019 Planex Communications @@ -721,10 +728,13 @@ vendor ENCORE0x203d Encore vendor QIHARDWARE 0x20b7 QI-hardware vendor PARA 0x20b8 PARA Industrial vendor SIMTEC 0x20df Simtec Electronics +vendor TRENDNET 0x20f4 TRENDnet vendor RTSYSTEMS 0x2100 RTSYSTEMS vendor VIALABS0x2109 VIA Labs vendor ERICSSON 0x2282 Ericsson vendor MOTOROLA2 0x22b8 Motorola +vendor WETELECOM 0x22de WeTelecom +vendor WESTMOUNTAIN 0x2405 West Mountain Radio vendor TRIPPLITE 0x2478 Tripp-Lite vendor HIROSE 0x2631 Hirose Electric vendor NHJ0x2770 NHJ @@ -742,6 +752,7 @@ vendor IRIVER 0x4102 iRiver vendor DELL 0x413c Dell vendor WCH0x4348 QinHeng Electronics vendor ACEECA 0x4766 Aceeca +vendor FEIXUN 0x4855 FeiXun Communication vendor PAPOUCH0x5050 Papouch
Re: usb/183728: commit references a PR
The following reply was made to PR usb/183728; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/183728: commit references a PR Date: Thu, 7 Nov 2013 14:05:57 + (UTC) Author: glebius Date: Thu Nov 7 14:05:49 2013 New Revision: 257796 URL: http://svnweb.freebsd.org/changeset/base/257796 Log: Finish r257779. PR: usb/183728 Modified: head/ObsoleteFiles.inc head/share/examples/Makefile Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Nov 7 12:40:42 2013(r257795) +++ head/ObsoleteFiles.inc Thu Nov 7 14:05:49 2013(r257796) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20131107: example files removed +OLD_FILES+=usr/share/examples/libusb20/aux.c +OLD_FILES+=usr/share/examples/libusb20/aux.h # 20131103: WITH_LIBICONV_COMPAT removal OLD_FILES+=usr/include/_libiconv_compat.h OLD_FILES+=usr/lib/libiconv.a Modified: head/share/examples/Makefile == --- head/share/examples/Makefile Thu Nov 7 12:40:42 2013 (r257795) +++ head/share/examples/Makefile Thu Nov 7 14:05:49 2013 (r257796) @@ -107,8 +107,8 @@ XFILES=BSD_daemon/FreeBSD.pfa \ kld/syscall/test/call.c \ libusb20/Makefile \ libusb20/README \ - libusb20/aux.c \ - libusb20/aux.h \ + libusb20/util.c \ + libusb20/util.h \ libusb20/bulk.c \ libusb20/control.c \ libvgl/Makefile \ ___ 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/183728: commit references a PR
The following reply was made to PR usb/183728; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/183728: commit references a PR
Date: Thu, 7 Nov 2013 07:23:01 + (UTC)
Author: hselasky
Date: Thu Nov 7 07:22:51 2013
New Revision: 257779
URL: http://svnweb.freebsd.org/changeset/base/257779
Log:
- Use libusb20_strerror() function instead of custom usb_error() one.
- Rename aux.[ch] to util.[ch] which is a more common name for
utility functions and allows checkout on some non-FreeBSD systems
where the aux.* namespace is reserved.
- Fix some compile warnings while at it.
PR: usb/183728
MFC after: 2 weeks
Added:
head/share/examples/libusb20/util.c
- copied, changed from r238603, head/share/examples/libusb20/aux.c
head/share/examples/libusb20/util.h
- copied, changed from r238603, head/share/examples/libusb20/aux.h
Deleted:
head/share/examples/libusb20/aux.c
head/share/examples/libusb20/aux.h
Modified:
head/share/examples/libusb20/Makefile
head/share/examples/libusb20/bulk.c
head/share/examples/libusb20/control.c
Modified: head/share/examples/libusb20/Makefile
==
--- head/share/examples/libusb20/Makefile Thu Nov 7 04:52:25 2013
(r257778)
+++ head/share/examples/libusb20/Makefile Thu Nov 7 07:22:51 2013
(r257779)
@@ -1,13 +1,14 @@
# $FreeBSD$
TARGETS= bulk control
+CFLAGS+= -Wall
all: $(TARGETS)
-bulk: bulk.o aux.o
- $(CC) $(CFLAGS) -o bulk bulk.o aux.o -lusb
+bulk: bulk.o util.o
+ $(CC) $(CFLAGS) -o bulk bulk.o util.o -lusb
-control: control.o aux.o
- $(CC) $(CFLAGS) -o control control.o aux.o -lusb
+control: control.o util.o
+ $(CC) $(CFLAGS) -o control control.o util.o -lusb
clean:
rm -f $(TARGETS) *.o *~
Modified: head/share/examples/libusb20/bulk.c
==
--- head/share/examples/libusb20/bulk.cThu Nov 7 04:52:25 2013
(r257778)
+++ head/share/examples/libusb20/bulk.cThu Nov 7 07:22:51 2013
(r257779)
@@ -41,7 +41,7 @@
#include libusb20.h
#include libusb20_desc.h
-#include aux.h
+#include util.h
/*
* If you want to see the details of the internal datastructures
@@ -74,7 +74,7 @@ doit(struct libusb20_device *dev)
*/
if ((rv = libusb20_dev_open(dev, 2)) != 0)
{
- fprintf(stderr, libusb20_dev_open: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_dev_open: %s\n, libusb20_strerror(rv));
return;
}
@@ -84,7 +84,7 @@ doit(struct libusb20_device *dev)
*/
if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0)
{
- fprintf(stderr, libusb20_dev_set_config_index: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_dev_set_config_index: %s\n,
libusb20_strerror(rv));
return;
}
@@ -97,7 +97,7 @@ doit(struct libusb20_device *dev)
if (xfr_in == NULL || xfr_out == NULL)
{
- fprintf(stderr, libusb20_tr_get_pointer: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_get_pointer: %s\n, libusb20_strerror(rv));
return;
}
@@ -107,12 +107,12 @@ doit(struct libusb20_device *dev)
*/
if ((rv = libusb20_tr_open(xfr_out, 0, 1, out_ep)) != 0)
{
- fprintf(stderr, libusb20_tr_open: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_open: %s\n, libusb20_strerror(rv));
return;
}
if ((rv = libusb20_tr_open(xfr_in, 0, 1, in_ep)) != 0)
{
- fprintf(stderr, libusb20_tr_open: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_open: %s\n, libusb20_strerror(rv));
return;
}
@@ -124,7 +124,7 @@ doit(struct libusb20_device *dev)
if ((rv = libusb20_tr_bulk_intr_sync(xfr_out, out_buf, out_len, rlen,
TIMEOUT))
!= 0)
{
-fprintf(stderr, libusb20_tr_bulk_intr_sync (OUT): %s\n,
usb_error(rv));
+fprintf(stderr, libusb20_tr_bulk_intr_sync (OUT): %s\n,
libusb20_strerror(rv));
}
printf(sent %d bytes\n, rlen);
}
@@ -132,7 +132,7 @@ doit(struct libusb20_device *dev)
if ((rv = libusb20_tr_bulk_intr_sync(xfr_in, in_buf, BUFLEN, rlen,
TIMEOUT))
!= 0)
{
- fprintf(stderr, libusb20_tr_bulk_intr_sync: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_bulk_intr_sync: %s\n,
libusb20_strerror(rv));
}
printf(received %d bytes\n, rlen);
if (rlen 0)
Modified: head/share/examples/libusb20/control.c
==
--- head/share/examples/libusb20/control.c Thu Nov 7 04:52:25 2013
(r257778)
+++ head/share/examples/libusb20/control.c Thu Nov 7 07:22:51 2013
(r257779)
@@ -11,8 +11,6
Re: usb/183505: commit references a PR
The following reply was made to PR usb/183505; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/183505: commit references a PR
Date: Thu, 31 Oct 2013 13:54:59 + (UTC)
Author: adrian
Date: Thu Oct 31 13:54:51 2013
New Revision: 257446
URL: http://svnweb.freebsd.org/changeset/base/257446
Log:
Allow the Arduino Leonardo to work by supporting CDC=0 devices.
CDC=0 simply means no command codes, CDC=1 means AT command codes.
There's no driver change required! It's purely to tell the application
layer whether to speak AT commands or not. Things are all still serial.
PR: usb/183505
Reviewed by: hps
MFC after: 1 week
Modified:
head/sys/dev/usb/serial/umodem.c
head/sys/dev/usb/usb.h
Modified: head/sys/dev/usb/serial/umodem.c
==
--- head/sys/dev/usb/serial/umodem.c Thu Oct 31 13:47:39 2013
(r257445)
+++ head/sys/dev/usb/serial/umodem.c Thu Oct 31 13:54:51 2013
(r257446)
@@ -128,6 +128,9 @@ static const STRUCT_USB_HOST_ID umodem_d
{USB_IFACE_CLASS(UICLASS_CDC),
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
USB_IFACE_PROTOCOL(UIPROTO_CDC_AT)},
+ {USB_IFACE_CLASS(UICLASS_CDC),
+ USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
+ USB_IFACE_PROTOCOL(UIPROTO_CDC_NONE)},
/* Huawei Modem class match */
{USB_IFACE_CLASS(UICLASS_CDC),
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
Modified: head/sys/dev/usb/usb.h
==
--- head/sys/dev/usb/usb.h Thu Oct 31 13:47:39 2013(r257445)
+++ head/sys/dev/usb/usb.h Thu Oct 31 13:54:51 2013(r257446)
@@ -441,6 +441,7 @@ typedef struct usb_interface_assoc_descr
#define UISUBCLASS_ETHERNET_EMULATION_MODEL 12
#define UISUBCLASS_NETWORK_CONTROL_MODEL 13
+#define UIPROTO_CDC_NONE0
#define UIPROTO_CDC_AT 1
#define UICLASS_HID 0x03
___
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/181987: commit references a PR
The following reply was made to PR usb/181987; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181987: commit references a PR
Date: Thu, 24 Oct 2013 06:22:52 + (UTC)
Author: hselasky
Date: Thu Oct 24 06:22:43 2013
New Revision: 257041
URL: http://svnweb.freebsd.org/changeset/base/257041
Log:
MFC r252912, r254828 and r256548:
Add host mode support to the Mentor Graphics USB OTG controller driver.
PR: usb/181987
Modified:
stable/9/sys/dev/usb/controller/musb_otg.c
stable/9/sys/dev/usb/controller/musb_otg.h
stable/9/sys/dev/usb/controller/musb_otg_atmelarm.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/controller/musb_otg.c
==
--- stable/9/sys/dev/usb/controller/musb_otg.c Thu Oct 24 06:06:17 2013
(r257040)
+++ stable/9/sys/dev/usb/controller/musb_otg.c Thu Oct 24 06:22:43 2013
(r257041)
@@ -90,6 +90,8 @@ SYSCTL_INT(_hw_usb_musbotg, OID_AUTO, de
musbotgdebug, 0, Debug level);
#endif
+#define MAX_NAK_TO 16
+
/* prototypes */
struct usb_bus_methods musbotg_bus_methods;
@@ -98,17 +100,35 @@ struct usb_pipe_methods musbotg_device_c
struct usb_pipe_methods musbotg_device_intr_methods;
struct usb_pipe_methods musbotg_device_isoc_methods;
-static musbotg_cmd_t musbotg_setup_rx;
-static musbotg_cmd_t musbotg_setup_data_rx;
-static musbotg_cmd_t musbotg_setup_data_tx;
-static musbotg_cmd_t musbotg_setup_status;
-static musbotg_cmd_t musbotg_data_rx;
-static musbotg_cmd_t musbotg_data_tx;
+/* Control transfers: Device mode */
+static musbotg_cmd_t musbotg_dev_ctrl_setup_rx;
+static musbotg_cmd_t musbotg_dev_ctrl_data_rx;
+static musbotg_cmd_t musbotg_dev_ctrl_data_tx;
+static musbotg_cmd_t musbotg_dev_ctrl_status;
+
+/* Control transfers: Host mode */
+static musbotg_cmd_t musbotg_host_ctrl_setup_tx;
+static musbotg_cmd_t musbotg_host_ctrl_data_rx;
+static musbotg_cmd_t musbotg_host_ctrl_data_tx;
+static musbotg_cmd_t musbotg_host_ctrl_status_rx;
+static musbotg_cmd_t musbotg_host_ctrl_status_tx;
+
+/* Bulk, Interrupt, Isochronous: Device mode */
+static musbotg_cmd_t musbotg_dev_data_rx;
+static musbotg_cmd_t musbotg_dev_data_tx;
+
+/* Bulk, Interrupt, Isochronous: Host mode */
+static musbotg_cmd_t musbotg_host_data_rx;
+static musbotg_cmd_t musbotg_host_data_tx;
+
static void musbotg_device_done(struct usb_xfer *, usb_error_t);
static void musbotg_do_poll(struct usb_bus *);
static void musbotg_standard_done(struct usb_xfer *);
static void musbotg_interrupt_poll(struct musbotg_softc *);
static void musbotg_root_intr(struct musbotg_softc *);
+static intmusbotg_channel_alloc(struct musbotg_softc *, struct musbotg_td
*td);
+static void musbotg_channel_free(struct musbotg_softc *, struct musbotg_td
*td);
+static void musbotg_ep_int_set(struct musbotg_softc *sc, int channel, int
on);
/*
* Here is a configuration that the chip supports.
@@ -123,6 +143,64 @@ static const struct usb_hw_ep_profile mu
}
};
+static int
+musbotg_channel_alloc(struct musbotg_softc *sc, struct musbotg_td *td)
+{
+ int ch;
+ int ep;
+
+ ep = td-ep_no;
+
+ /* In device mode each EP got its own channel */
+ if (sc-sc_mode == MUSB2_DEVICE_MODE) {
+ musbotg_ep_int_set(sc, ep, 1);
+ return (ep);
+ }
+
+ /*
+ * All control transactions go through EP0
+ */
+ if (ep == 0) {
+ if (sc-sc_channel_mask (1 0))
+ return (-1);
+ sc-sc_channel_mask |= (1 0);
+ musbotg_ep_int_set(sc, ep, 1);
+ return (0);
+ }
+
+ for (ch = 1; ch MUSB2_EP_MAX; ch++) {
+ if (!(sc-sc_channel_mask (1 ch))) {
+ sc-sc_channel_mask |= (1 ch);
+ musbotg_ep_int_set(sc, ch, 1);
+ return (ch);
+ }
+ }
+
+ DPRINTFN(-1, No available channels. Mask: %04x\n,
sc-sc_channel_mask);
+
+ return (-1);
+}
+
+static void
+musbotg_channel_free(struct musbotg_softc *sc, struct musbotg_td *td)
+{
+
+ DPRINTFN(1, ep_no=%d\n, td-channel);
+
+ if (sc-sc_mode == MUSB2_DEVICE_MODE)
+ return;
+
+ if (td == NULL)
+ return;
+ if (td-channel == -1)
+ return;
+
+ musbotg_ep_int_set(sc, td-channel, 0);
+ sc-sc_channel_mask = ~(1 td-channel);
+
+ td-channel = -1;
+}
+
static void
musbotg_get_hw_ep_profile(struct usb_device *udev,
const struct usb_hw_ep_profile **ppf, uint8_t ep_addr)
@@ -213,6 +291,46 @@ musbotg_pull_down(struct musbotg_softc *
}
static void
Re: usb/182936: commit references a PR
The following reply was made to PR usb/182936; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/182936: commit references a PR Date: Thu, 24 Oct 2013 06:26:00 + (UTC) Author: hselasky Date: Thu Oct 24 06:25:52 2013 New Revision: 257042 URL: http://svnweb.freebsd.org/changeset/base/257042 Log: MFC r256500: Add new USB ID. PR: usb/182936 Modified: stable/9/sys/dev/usb/usbdevs stable/9/sys/dev/usb/wlan/if_run.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevs Thu Oct 24 06:22:43 2013 (r257041) +++ stable/9/sys/dev/usb/usbdevs Thu Oct 24 06:25:52 2013 (r257042) @@ -1228,6 +1228,7 @@ product BELKIN F5D8055V2 0x825b F5D8055 product BELKIN F5D9050V3 0x905b F5D9050 ver 3 Wireless Adapter product BELKIN2 F5U0020x0002 F5U002 Parallel printer product BELKIN F6D4050V1 0x935a F6D4050 v1 +product BELKIN F6D4050V2 0x935b F6D4050 v2 /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet Modified: stable/9/sys/dev/usb/wlan/if_run.c == --- stable/9/sys/dev/usb/wlan/if_run.c Thu Oct 24 06:22:43 2013 (r257041) +++ stable/9/sys/dev/usb/wlan/if_run.c Thu Oct 24 06:25:52 2013 (r257042) @@ -147,6 +147,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(BELKIN, F5D8055), RUN_DEV(BELKIN, F5D8055V2), RUN_DEV(BELKIN, F6D4050V1), +RUN_DEV(BELKIN, F6D4050V2), RUN_DEV(BELKIN, RT2870_1), RUN_DEV(BELKIN, RT2870_2), RUN_DEV(CISCOLINKSYS, AE1000), ___ 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/181987: commit references a PR
The following reply was made to PR usb/181987; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181987: commit references a PR
Date: Thu, 24 Oct 2013 07:38:40 + (UTC)
Author: hselasky
Date: Thu Oct 24 07:38:32 2013
New Revision: 257043
URL: http://svnweb.freebsd.org/changeset/base/257043
Log:
MFC r256548:
Correct programming of XXX_MAXP register. This register is 16-bit wide
and not 8-bit. Fix support for isochronous transfers in USB host mode.
Fix a whitespace while at it.
PR: usb/181987
Approved by: re (Xin Li)
Modified:
stable/10/sys/dev/usb/controller/musb_otg.c
stable/10/sys/dev/usb/controller/musb_otg.h
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/dev/usb/controller/musb_otg.c
==
--- stable/10/sys/dev/usb/controller/musb_otg.cThu Oct 24 06:25:52
2013(r257042)
+++ stable/10/sys/dev/usb/controller/musb_otg.cThu Oct 24 07:38:32
2013(r257043)
@@ -1661,7 +1661,7 @@ repeat:
}
/* Max packet size */
- MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, td-max_packet);
+ MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, td-reg_max_packet);
/* write command */
MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL,
@@ -1726,13 +1726,16 @@ repeat:
td-hport);
/* RX NAK timeout */
- MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, MAX_NAK_TO);
+ if (td-transfer_type MUSB2_MASK_TI_PROTO_ISOC)
+ MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, 0);
+ else
+ MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, MAX_NAK_TO);
/* Protocol, speed, device endpoint */
MUSB2_WRITE_1(sc, MUSB2_REG_RXTI, td-transfer_type);
/* Max packet size */
- MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, td-max_packet);
+ MUSB2_WRITE_2(sc, MUSB2_REG_RXMAXP, td-reg_max_packet);
/* Data Toggle */
csrh = MUSB2_READ_1(sc, MUSB2_REG_RXCSRH);
@@ -1938,7 +1941,7 @@ musbotg_host_data_tx(struct musbotg_td *
return (0); /* complete */
}
- if (csr MUSB2_MASK_CSRL_TXNAKTO ) {
+ if (csr MUSB2_MASK_CSRL_TXNAKTO) {
/*
* Flush TX FIFO before clearing NAK TO
*/
@@ -2069,13 +2072,16 @@ musbotg_host_data_tx(struct musbotg_td *
td-hport);
/* TX NAK timeout */
- MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, MAX_NAK_TO);
+ if (td-transfer_type MUSB2_MASK_TI_PROTO_ISOC)
+ MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, 0);
+ else
+ MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, MAX_NAK_TO);
/* Protocol, speed, device endpoint */
MUSB2_WRITE_1(sc, MUSB2_REG_TXTI, td-transfer_type);
/* Max packet size */
- MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, td-max_packet);
+ MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, td-reg_max_packet);
if (!td-transaction_started) {
csrh = MUSB2_READ_1(sc, MUSB2_REG_TXCSRH);
@@ -2406,7 +2412,6 @@ musbotg_setup_standard_chain(struct usb_
if (xfer-flags_int.usb_mode == USB_MODE_HOST) {
speed = usbd_get_speed(xfer-xroot-udev);
- xfer_type = xfer-endpoint-edesc-bmAttributes UE_XFERTYPE;
switch (speed) {
case USB_SPEED_LOW:
@@ -2444,7 +2449,6 @@ musbotg_setup_standard_chain(struct usb_
}
temp.transfer_type |= ep_no;
- td-max_packet = xfer-max_packet_size;
td-toggle = xfer-endpoint-toggle_next;
}
@@ -2469,9 +2473,9 @@ musbotg_setup_standard_chain(struct usb_
x = 0;
}
- if (x != xfer-nframes) {
- tx = 0;
+ tx = 0;
+ if (x != xfer-nframes) {
if (xfer-endpointno UE_DIR_IN)
tx = 1;
@@ -2532,9 +2536,14 @@ musbotg_setup_standard_chain(struct usb_
} else {
- /* regular data transfer */
-
- temp.short_pkt = (xfer-flags.force_short_xfer) ? 0 : 1;
+ if (xfer-flags_int.isochronous_xfr) {
+ /* isochronous data transfer */
+ /* don't force short */
+ temp.short_pkt = 1;
+ } else {
+ /* regular data transfer */
+ temp.short_pkt = (xfer-flags.force_short_xfer
? 0 : 1);
+ }
}
musbotg_setup_standard_chain_sub(temp);
@@ -3158,7 +3167,12 @@ musbotg_init(struct musbotg_softc *sc
Re: usb/182936: commit references a PR
The following reply was made to PR usb/182936; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/182936: commit references a PR Date: Thu, 24 Oct 2013 07:43:42 + (UTC) Author: hselasky Date: Thu Oct 24 07:43:35 2013 New Revision: 257044 URL: http://svnweb.freebsd.org/changeset/base/257044 Log: MFC r256500: Add new USB ID. PR: usb/182936 Approved by: re (Xin LI) Obtainedrom: Modified: stable/10/sys/dev/usb/usbdevs stable/10/sys/dev/usb/wlan/if_run.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/usb/usbdevs == --- stable/10/sys/dev/usb/usbdevs Thu Oct 24 07:38:32 2013 (r257043) +++ stable/10/sys/dev/usb/usbdevs Thu Oct 24 07:43:35 2013 (r257044) @@ -1259,6 +1259,7 @@ product BELKIN F5D8055V2 0x825b F5D8055 product BELKIN F5D9050V3 0x905b F5D9050 ver 3 Wireless Adapter product BELKIN2 F5U0020x0002 F5U002 Parallel printer product BELKIN F6D4050V1 0x935a F6D4050 v1 +product BELKIN F6D4050V2 0x935b F6D4050 v2 /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet Modified: stable/10/sys/dev/usb/wlan/if_run.c == --- stable/10/sys/dev/usb/wlan/if_run.cThu Oct 24 07:38:32 2013 (r257043) +++ stable/10/sys/dev/usb/wlan/if_run.cThu Oct 24 07:43:35 2013 (r257044) @@ -147,6 +147,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(BELKIN, F5D8055), RUN_DEV(BELKIN, F5D8055V2), RUN_DEV(BELKIN, F6D4050V1), +RUN_DEV(BELKIN, F6D4050V2), RUN_DEV(BELKIN, RT2870_1), RUN_DEV(BELKIN, RT2870_2), RUN_DEV(CISCOLINKSYS, AE1000), ___ 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/182936: commit references a PR
The following reply was made to PR usb/182936; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/182936: commit references a PR Date: Tue, 15 Oct 2013 06:24:01 + (UTC) Author: hselasky Date: Tue Oct 15 06:23:54 2013 New Revision: 256500 URL: http://svnweb.freebsd.org/changeset/base/256500 Log: Add new USB ID. PR: usb/182936 Submitted by:Keith White kwh...@site.uottawa.ca MFC after: 1 week Modified: head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Tue Oct 15 05:50:02 2013(r256499) +++ head/sys/dev/usb/usbdevs Tue Oct 15 06:23:54 2013(r256500) @@ -1259,6 +1259,7 @@ product BELKIN F5D8055V2 0x825b F5D8055 product BELKIN F5D9050V3 0x905b F5D9050 ver 3 Wireless Adapter product BELKIN2 F5U0020x0002 F5U002 Parallel printer product BELKIN F6D4050V1 0x935a F6D4050 v1 +product BELKIN F6D4050V2 0x935b F6D4050 v2 /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet Modified: head/sys/dev/usb/wlan/if_run.c == --- head/sys/dev/usb/wlan/if_run.c Tue Oct 15 05:50:02 2013 (r256499) +++ head/sys/dev/usb/wlan/if_run.c Tue Oct 15 06:23:54 2013 (r256500) @@ -147,6 +147,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(BELKIN, F5D8055), RUN_DEV(BELKIN, F5D8055V2), RUN_DEV(BELKIN, F6D4050V1), +RUN_DEV(BELKIN, F6D4050V2), RUN_DEV(BELKIN, RT2870_1), RUN_DEV(BELKIN, RT2870_2), RUN_DEV(CISCOLINKSYS, AE1000), ___ 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/181987: commit references a PR
The following reply was made to PR usb/181987; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181987: commit references a PR
Date: Tue, 15 Oct 2013 17:11:22 + (UTC)
Author: hselasky
Date: Tue Oct 15 17:11:13 2013
New Revision: 256548
URL: http://svnweb.freebsd.org/changeset/base/256548
Log:
Correct programming of XXX_MAXP register. This register is 16-bit wide
and not 8-bit. Fix support for isochronous transfers in USB host mode.
Fix a whitespace while at it.
MFC after: 1 week
Reported by: SAITOU Toshihide to...@ruby.ocn.ne.jp
PR: usb/181987
Modified:
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/musb_otg.h
Modified: head/sys/dev/usb/controller/musb_otg.c
==
--- head/sys/dev/usb/controller/musb_otg.c Tue Oct 15 17:03:02 2013
(r256547)
+++ head/sys/dev/usb/controller/musb_otg.c Tue Oct 15 17:11:13 2013
(r256548)
@@ -1661,7 +1661,7 @@ repeat:
}
/* Max packet size */
- MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, td-max_packet);
+ MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, td-reg_max_packet);
/* write command */
MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL,
@@ -1726,13 +1726,16 @@ repeat:
td-hport);
/* RX NAK timeout */
- MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, MAX_NAK_TO);
+ if (td-transfer_type MUSB2_MASK_TI_PROTO_ISOC)
+ MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, 0);
+ else
+ MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, MAX_NAK_TO);
/* Protocol, speed, device endpoint */
MUSB2_WRITE_1(sc, MUSB2_REG_RXTI, td-transfer_type);
/* Max packet size */
- MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, td-max_packet);
+ MUSB2_WRITE_2(sc, MUSB2_REG_RXMAXP, td-reg_max_packet);
/* Data Toggle */
csrh = MUSB2_READ_1(sc, MUSB2_REG_RXCSRH);
@@ -1938,7 +1941,7 @@ musbotg_host_data_tx(struct musbotg_td *
return (0); /* complete */
}
- if (csr MUSB2_MASK_CSRL_TXNAKTO ) {
+ if (csr MUSB2_MASK_CSRL_TXNAKTO) {
/*
* Flush TX FIFO before clearing NAK TO
*/
@@ -2069,13 +2072,16 @@ musbotg_host_data_tx(struct musbotg_td *
td-hport);
/* TX NAK timeout */
- MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, MAX_NAK_TO);
+ if (td-transfer_type MUSB2_MASK_TI_PROTO_ISOC)
+ MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, 0);
+ else
+ MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, MAX_NAK_TO);
/* Protocol, speed, device endpoint */
MUSB2_WRITE_1(sc, MUSB2_REG_TXTI, td-transfer_type);
/* Max packet size */
- MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, td-max_packet);
+ MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, td-reg_max_packet);
if (!td-transaction_started) {
csrh = MUSB2_READ_1(sc, MUSB2_REG_TXCSRH);
@@ -2406,7 +2412,6 @@ musbotg_setup_standard_chain(struct usb_
if (xfer-flags_int.usb_mode == USB_MODE_HOST) {
speed = usbd_get_speed(xfer-xroot-udev);
- xfer_type = xfer-endpoint-edesc-bmAttributes UE_XFERTYPE;
switch (speed) {
case USB_SPEED_LOW:
@@ -2444,7 +2449,6 @@ musbotg_setup_standard_chain(struct usb_
}
temp.transfer_type |= ep_no;
- td-max_packet = xfer-max_packet_size;
td-toggle = xfer-endpoint-toggle_next;
}
@@ -2469,9 +2473,9 @@ musbotg_setup_standard_chain(struct usb_
x = 0;
}
- if (x != xfer-nframes) {
- tx = 0;
+ tx = 0;
+ if (x != xfer-nframes) {
if (xfer-endpointno UE_DIR_IN)
tx = 1;
@@ -2532,9 +2536,14 @@ musbotg_setup_standard_chain(struct usb_
} else {
- /* regular data transfer */
-
- temp.short_pkt = (xfer-flags.force_short_xfer) ? 0 : 1;
+ if (xfer-flags_int.isochronous_xfr) {
+ /* isochronous data transfer */
+ /* don't force short */
+ temp.short_pkt = 1;
+ } else {
+ /* regular data transfer */
+ temp.short_pkt = (xfer-flags.force_short_xfer
? 0 : 1);
+ }
}
musbotg_setup_standard_chain_sub(temp);
@@ -3158,7 +3167,12 @@ musbotg_init(struct musbotg_softc *sc)
if (dynfifo) {
if (frx (temp = nrx
Re: usb/182820: commit references a PR
The following reply was made to PR usb/182820; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/182820: commit references a PR Date: Thu, 10 Oct 2013 09:43:22 + (UTC) Author: hrs Date: Thu Oct 10 09:43:15 2013 New Revision: 256258 URL: http://svnweb.freebsd.org/changeset/base/256258 Log: Do not try to detach if the interface does not support IPv6. Tested by: hselasky PR: usb/182820 Approved by: re (glebius) Modified: head/sys/netinet6/in6_ifattach.c Modified: head/sys/netinet6/in6_ifattach.c == --- head/sys/netinet6/in6_ifattach.c Thu Oct 10 09:42:41 2013 (r256257) +++ head/sys/netinet6/in6_ifattach.c Thu Oct 10 09:43:15 2013 (r256258) @@ -809,6 +809,9 @@ in6_ifdetach(struct ifnet *ifp) struct sockaddr_in6 sin6; struct in6_multi_mship *imm; + if (ifp-if_afdata[AF_INET6] == NULL) + return; + /* remove neighbor management table */ nd6_purge(ifp); ___ 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/181159: commit references a PR
The following reply was made to PR usb/181159; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181159: commit references a PR
Date: Tue, 1 Oct 2013 08:41:43 + (UTC)
Author: hselasky
Date: Tue Oct 1 08:41:28 2013
New Revision: 255966
URL: http://svnweb.freebsd.org/changeset/base/255966
Log:
MFC r255768:
Stability fixes for Intel LynxPoint XHCI controllers. Disable XHCI port
routing if we get certain errors. Poll for command completion upon
command timeouts. The XHCI error events might not generate interrupts.
PR: usb/181159
Modified:
stable/8/sys/dev/usb/controller/xhci.c
stable/8/sys/dev/usb/controller/xhci.h
stable/8/sys/dev/usb/controller/xhci_pci.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/usb/ (props changed)
Modified: stable/8/sys/dev/usb/controller/xhci.c
==
--- stable/8/sys/dev/usb/controller/xhci.c Tue Oct 1 08:38:47 2013
(r255965)
+++ stable/8/sys/dev/usb/controller/xhci.c Tue Oct 1 08:41:28 2013
(r255966)
@@ -94,6 +94,8 @@ TUNABLE_INT(hw.usb.xhci.debug, xhcide
SYSCTL_INT(_hw_usb_xhci, OID_AUTO, xhci_port_route, CTLFLAG_RW | CTLFLAG_TUN,
xhciroute, 0, Routing bitmap for switching EHCI ports to XHCI
controller);
TUNABLE_INT(hw.usb.xhci.xhci_port_route, xhciroute);
+#else
+#define xhciroute 0
#endif
#define XHCI_INTR_ENDPT 1
@@ -179,16 +181,6 @@ xhci_dump_device(struct xhci_softc *sc,
}
#endif
-uint32_t
-xhci_get_port_route(void)
-{
-#ifdef USB_DEBUG
- return (0xU ^ ((uint32_t)xhciroute));
-#else
- return (0xU);
-#endif
-}
-
static void
xhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
{
@@ -480,6 +472,11 @@ xhci_start_controller(struct xhci_softc
/* catch any lost interrupts */
xhci_do_poll(sc-sc_bus);
+ if (sc-sc_port_route != NULL) {
+ /* Route all ports to the XHCI by default */
+ sc-sc_port_route(sc-sc_bus.parent,
+ ~xhciroute, xhciroute);
+ }
return (0);
}
@@ -917,7 +914,7 @@ xhci_check_transfer(struct xhci_softc *s
}
}
-static void
+static int
xhci_check_command(struct xhci_softc *sc, struct xhci_trb *trb)
{
if (sc-sc_cmd_addr == trb-qwTrb0) {
@@ -925,16 +922,19 @@ xhci_check_command(struct xhci_softc *sc
sc-sc_cmd_result[0] = trb-dwTrb2;
sc-sc_cmd_result[1] = trb-dwTrb3;
cv_signal(sc-sc_cmd_cv);
+ return (1); /* command match */
}
+ return (0);
}
-static void
+static int
xhci_interrupt_poll(struct xhci_softc *sc)
{
struct usb_page_search buf_res;
struct xhci_hw_root *phwr;
uint64_t addr;
uint32_t temp;
+ int retval = 0;
uint16_t i;
uint8_t event;
uint8_t j;
@@ -974,7 +974,7 @@ xhci_interrupt_poll(struct xhci_softc *s
xhci_check_transfer(sc, phwr-hwr_events[i]);
break;
case XHCI_TRB_EVENT_CMD_COMPLETE:
- xhci_check_command(sc, phwr-hwr_events[i]);
+ retval |= xhci_check_command(sc, phwr-hwr_events[i]);
break;
default:
DPRINTF(Unhandled event = %u\n, event);
@@ -1011,6 +1011,8 @@ xhci_interrupt_poll(struct xhci_softc *s
XWRITE4(sc, runt, XHCI_ERDP_LO(0), (uint32_t)addr);
XWRITE4(sc, runt, XHCI_ERDP_HI(0), (uint32_t)(addr 32));
+
+ return (retval);
}
static usb_error_t
@@ -1098,7 +1100,15 @@ xhci_do_command(struct xhci_softc *sc, s
err = cv_timedwait(sc-sc_cmd_cv, sc-sc_bus.bus_mtx,
USB_MS_TO_TICKS(timeout_ms));
- if (err) {
+ /*
+ * In some error cases event interrupts are not generated.
+ * Poll one time to see if the command has completed.
+ */
+ if (err != 0 xhci_interrupt_poll(sc) != 0) {
+ DPRINTF(Command was completed when polling\n);
+ err = 0;
+ }
+ if (err != 0) {
DPRINTFN(0, Command timeout!\n);
err = USB_ERR_TIMEOUT;
trb-dwTrb2 = 0;
@@ -1277,6 +1287,14 @@ xhci_set_address(struct usb_device *udev
(address == 0), index);
if (err != 0) {
+ temp = le32toh(sc-sc_cmd_result[0]);
+ if (address == 0 sc-sc_port_route != NULL
+ XHCI_TRB_2_ERROR_GET(temp) ==
+ XHCI_TRB_ERROR_PARAMETER) {
+ /* LynxPoint XHCI - ports are not switchable */
+ /* Un-route all ports from
Re: usb/181159: commit references a PR
The following reply was made to PR usb/181159; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181159: commit references a PR
Date: Sat, 21 Sep 2013 21:41:05 + (UTC)
Author: hselasky
Date: Sat Sep 21 21:40:57 2013
New Revision: 255768
URL: http://svnweb.freebsd.org/changeset/base/255768
Log:
Stability fixes for Intel LynxPoint XHCI controllers. Disable XHCI port
routing if we get certain errors. Poll for command completion upon
command timeouts. The XHCI error events might not generate interrupts.
MFC after: 1 week
Reported by: Daniel Gerzo dan...@rulez.sk, Antonis Anastasiadis
anastasia...@datalive.gr
PR: usb/181159
Approved by: re (gjb)
Modified:
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/controller/xhci.h
head/sys/dev/usb/controller/xhci_pci.c
Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c Sat Sep 21 21:36:09 2013
(r255767)
+++ head/sys/dev/usb/controller/xhci.c Sat Sep 21 21:40:57 2013
(r255768)
@@ -108,6 +108,8 @@ TUNABLE_INT(hw.usb.xhci.xhci_port_route
SYSCTL_INT(_hw_usb_xhci, OID_AUTO, use_polling, CTLFLAG_RW | CTLFLAG_TUN,
xhcipolling, 0, Set to enable software interrupt polling for XHCI
controller);
TUNABLE_INT(hw.usb.xhci.use_polling, xhcipolling);
+#else
+#define xhciroute 0
#endif
#define XHCI_INTR_ENDPT 1
@@ -194,16 +196,6 @@ xhci_dump_device(struct xhci_softc *sc,
}
#endif
-uint32_t
-xhci_get_port_route(void)
-{
-#ifdef USB_DEBUG
- return (0xU ^ ((uint32_t)xhciroute));
-#else
- return (0xU);
-#endif
-}
-
uint8_t
xhci_use_polling(void)
{
@@ -505,6 +497,11 @@ xhci_start_controller(struct xhci_softc
/* catch any lost interrupts */
xhci_do_poll(sc-sc_bus);
+ if (sc-sc_port_route != NULL) {
+ /* Route all ports to the XHCI by default */
+ sc-sc_port_route(sc-sc_bus.parent,
+ ~xhciroute, xhciroute);
+ }
return (0);
}
@@ -951,7 +948,7 @@ xhci_check_transfer(struct xhci_softc *s
}
}
-static void
+static int
xhci_check_command(struct xhci_softc *sc, struct xhci_trb *trb)
{
if (sc-sc_cmd_addr == trb-qwTrb0) {
@@ -959,16 +956,19 @@ xhci_check_command(struct xhci_softc *sc
sc-sc_cmd_result[0] = trb-dwTrb2;
sc-sc_cmd_result[1] = trb-dwTrb3;
cv_signal(sc-sc_cmd_cv);
+ return (1); /* command match */
}
+ return (0);
}
-static void
+static int
xhci_interrupt_poll(struct xhci_softc *sc)
{
struct usb_page_search buf_res;
struct xhci_hw_root *phwr;
uint64_t addr;
uint32_t temp;
+ int retval = 0;
uint16_t i;
uint8_t event;
uint8_t j;
@@ -1008,7 +1008,7 @@ xhci_interrupt_poll(struct xhci_softc *s
xhci_check_transfer(sc, phwr-hwr_events[i]);
break;
case XHCI_TRB_EVENT_CMD_COMPLETE:
- xhci_check_command(sc, phwr-hwr_events[i]);
+ retval |= xhci_check_command(sc, phwr-hwr_events[i]);
break;
default:
DPRINTF(Unhandled event = %u\n, event);
@@ -1045,6 +1045,8 @@ xhci_interrupt_poll(struct xhci_softc *s
XWRITE4(sc, runt, XHCI_ERDP_LO(0), (uint32_t)addr);
XWRITE4(sc, runt, XHCI_ERDP_HI(0), (uint32_t)(addr 32));
+
+ return (retval);
}
static usb_error_t
@@ -1132,7 +1134,15 @@ xhci_do_command(struct xhci_softc *sc, s
err = cv_timedwait(sc-sc_cmd_cv, sc-sc_bus.bus_mtx,
USB_MS_TO_TICKS(timeout_ms));
- if (err) {
+ /*
+ * In some error cases event interrupts are not generated.
+ * Poll one time to see if the command has completed.
+ */
+ if (err != 0 xhci_interrupt_poll(sc) != 0) {
+ DPRINTF(Command was completed when polling\n);
+ err = 0;
+ }
+ if (err != 0) {
DPRINTFN(0, Command timeout!\n);
err = USB_ERR_TIMEOUT;
trb-dwTrb2 = 0;
@@ -1311,6 +1321,14 @@ xhci_set_address(struct usb_device *udev
(address == 0), index);
if (err != 0) {
+ temp = le32toh(sc-sc_cmd_result[0]);
+ if (address == 0 sc-sc_port_route != NULL
+ XHCI_TRB_2_ERROR_GET(temp) ==
+ XHCI_TRB_ERROR_PARAMETER) {
+ /* LynxPoint XHCI - ports are not switchable */
+ /* Un-route all ports from the XHCI */
+ sc-sc_port_route(sc-sc_bus.parent, 0, ~0
Re: usb/181425: commit references a PR
The following reply was made to PR usb/181425; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181425: commit references a PR
Date: Tue, 17 Sep 2013 12:58:29 + (UTC)
Author: hselasky
Date: Tue Sep 17 12:58:17 2013
New Revision: 255633
URL: http://svnweb.freebsd.org/changeset/base/255633
Log:
MFC r254572:
Force keyboards which don't have the required
HID fields to use the USB BOOT protocol for now.
PR: usb/181425
Modified:
stable/8/sys/dev/usb/input/ukbd.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/usb/ (props changed)
Modified: stable/8/sys/dev/usb/input/ukbd.c
==
--- stable/8/sys/dev/usb/input/ukbd.c Tue Sep 17 12:56:37 2013
(r255632)
+++ stable/8/sys/dev/usb/input/ukbd.c Tue Sep 17 12:58:17 2013
(r255633)
@@ -1118,8 +1118,12 @@ ukbd_parse_hid(struct ukbd_softc *sc, co
HID_USAGE2(HUP_KEYBOARD, 0x00),
hid_input, 0, sc-sc_loc_events, flags,
sc-sc_id_events)) {
- sc-sc_flags |= UKBD_FLAG_EVENTS;
- DPRINTFN(1, Found keyboard events\n);
+ if (flags HIO_VARIABLE) {
+ DPRINTFN(1, Ignoring keyboard event control\n);
+ } else {
+ sc-sc_flags |= UKBD_FLAG_EVENTS;
+ DPRINTFN(1, Found keyboard event array\n);
+ }
}
/* figure out leds on keyboard */
___
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/181425: commit references a PR
The following reply was made to PR usb/181425; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181425: commit references a PR
Date: Tue, 17 Sep 2013 12:53:16 + (UTC)
Author: hselasky
Date: Tue Sep 17 12:53:09 2013
New Revision: 255631
URL: http://svnweb.freebsd.org/changeset/base/255631
Log:
MFC r254572:
Force keyboards which don't have the required
HID fields to use the USB BOOT protocol for now.
PR: usb/181425
Modified:
stable/9/sys/dev/usb/input/ukbd.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/input/ukbd.c
==
--- stable/9/sys/dev/usb/input/ukbd.c Tue Sep 17 12:50:57 2013
(r255630)
+++ stable/9/sys/dev/usb/input/ukbd.c Tue Sep 17 12:53:09 2013
(r255631)
@@ -1126,8 +1126,12 @@ ukbd_parse_hid(struct ukbd_softc *sc, co
HID_USAGE2(HUP_KEYBOARD, 0x00),
hid_input, 0, sc-sc_loc_events, flags,
sc-sc_id_events)) {
- sc-sc_flags |= UKBD_FLAG_EVENTS;
- DPRINTFN(1, Found keyboard events\n);
+ if (flags HIO_VARIABLE) {
+ DPRINTFN(1, Ignoring keyboard event control\n);
+ } else {
+ sc-sc_flags |= UKBD_FLAG_EVENTS;
+ DPRINTFN(1, Found keyboard event array\n);
+ }
}
/* figure out leds on keyboard */
___
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/181425: commit references a PR
The following reply was made to PR usb/181425; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/181425: commit references a PR
Date: Tue, 20 Aug 2013 16:21:17 + (UTC)
Author: hselasky
Date: Tue Aug 20 16:21:05 2013
New Revision: 254572
URL: http://svnweb.freebsd.org/changeset/base/254572
Log:
Force keyboards which don't have the required
HID fields to use the USB BOOT protocol for now.
PR: usb/181425
Submitted by:Andrey Zholos a...@q-fu.com
MFC after: 4 weeks
Modified:
head/sys/dev/usb/input/ukbd.c
Modified: head/sys/dev/usb/input/ukbd.c
==
--- head/sys/dev/usb/input/ukbd.c Tue Aug 20 14:59:31 2013
(r254571)
+++ head/sys/dev/usb/input/ukbd.c Tue Aug 20 16:21:05 2013
(r254572)
@@ -1130,8 +1130,12 @@ ukbd_parse_hid(struct ukbd_softc *sc, co
HID_USAGE2(HUP_KEYBOARD, 0x00),
hid_input, 0, sc-sc_loc_events, flags,
sc-sc_id_events)) {
- sc-sc_flags |= UKBD_FLAG_EVENTS;
- DPRINTFN(1, Found keyboard events\n);
+ if (flags HIO_VARIABLE) {
+ DPRINTFN(1, Ignoring keyboard event control\n);
+ } else {
+ sc-sc_flags |= UKBD_FLAG_EVENTS;
+ DPRINTFN(1, Found keyboard event array\n);
+ }
}
/* figure out leds on keyboard */
___
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/180726: commit references a PR
The following reply was made to PR usb/180726; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/180726: commit references a PR
Date: Fri, 26 Jul 2013 06:28:49 + (UTC)
Author: hselasky
Date: Fri Jul 26 06:28:41 2013
New Revision: 253666
URL: http://svnweb.freebsd.org/changeset/base/253666
Log:
MFC r253532:
Fix an XHCI regression:
The Block Event Interrupts, BEI, feature does not
work like expected with the Renesas XHCI chipsets.
Revert feature.
While at it correct the TD SIZE computation in
case of Zero Length Packet, ZLP, in the end of a
multi frame USB transfer.
PR: usb/180726
Modified:
stable/8/sys/dev/usb/controller/xhci.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/usb/ (props changed)
Modified: stable/8/sys/dev/usb/controller/xhci.c
==
--- stable/8/sys/dev/usb/controller/xhci.c Fri Jul 26 06:24:33 2013
(r253665)
+++ stable/8/sys/dev/usb/controller/xhci.c Fri Jul 26 06:28:41 2013
(r253666)
@@ -1654,7 +1654,6 @@ restart:
/* fill out buffer pointers */
if (average == 0) {
- npkt = 0;
memset(buf_res, 0, sizeof(buf_res));
} else {
usbd_get_page(temp-pc, temp-offset +
@@ -1669,15 +1668,17 @@ restart:
buf_res.length = XHCI_TD_PAGE_SIZE;
npkt_off += buf_res.length;
-
- /* setup npkt */
- npkt = (len_old - npkt_off +
temp-max_packet_size - 1) /
- temp-max_packet_size;
-
- if (npkt 31)
- npkt = 31;
}
+ /* setup npkt */
+ npkt = (len_old - npkt_off + temp-max_packet_size - 1)
/
+ temp-max_packet_size;
+
+ if (npkt == 0)
+ npkt = 1;
+ else if (npkt 31)
+ npkt = 31;
+
/* fill out TRB's */
td-td_trb[x].qwTrb0 =
htole64((uint64_t)buf_res.physaddr);
@@ -1691,9 +1692,7 @@ restart:
switch (temp-trb_type) {
case XHCI_TRB_TYPE_ISOCH:
- /* BEI: Interrupts are inhibited until EOT */
dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
- XHCI_TRB_3_BEI_BIT |
XHCI_TRB_3_TBC_SET(temp-tbc) |
XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
if (td != td_first) {
@@ -1728,10 +1727,8 @@ restart:
dword |= XHCI_TRB_3_DIR_IN;
break;
default:/* XHCI_TRB_TYPE_NORMAL */
- /* BEI: Interrupts are inhibited until EOT */
dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
- XHCI_TRB_3_BEI_BIT |
XHCI_TRB_3_TBC_SET(temp-tbc) |
XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
if (temp-direction == UE_DIR_IN)
@@ -1810,6 +1807,7 @@ restart:
usb_pc_cpu_flush(td_first-page_cache);
}
+ /* clear TD SIZE to zero, hence this is the last TRB */
/* remove chain bit because this is the last TRB in the chain */
td-td_trb[td-ntrb - 1].dwTrb2 = ~htole32(XHCI_TRB_2_TDSZ_SET(15));
td-td_trb[td-ntrb - 1].dwTrb3 = ~htole32(XHCI_TRB_3_CHAIN_BIT);
___
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/180726: commit references a PR
The following reply was made to PR usb/180726; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/180726: commit references a PR
Date: Fri, 26 Jul 2013 06:24:51 + (UTC)
Author: hselasky
Date: Fri Jul 26 06:24:33 2013
New Revision: 253665
URL: http://svnweb.freebsd.org/changeset/base/253665
Log:
MFC r253532:
Fix an XHCI regression:
The Block Event Interrupts, BEI, feature does not
work like expected with the Renesas XHCI chipsets.
Revert feature.
While at it correct the TD SIZE computation in
case of Zero Length Packet, ZLP, in the end of a
multi frame USB transfer.
PR: usb/180726
Approved by:re, hrs
Modified:
stable/9/sys/dev/usb/controller/xhci.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/controller/xhci.c
==
--- stable/9/sys/dev/usb/controller/xhci.c Fri Jul 26 06:23:57 2013
(r253664)
+++ stable/9/sys/dev/usb/controller/xhci.c Fri Jul 26 06:24:33 2013
(r253665)
@@ -1654,7 +1654,6 @@ restart:
/* fill out buffer pointers */
if (average == 0) {
- npkt = 0;
memset(buf_res, 0, sizeof(buf_res));
} else {
usbd_get_page(temp-pc, temp-offset +
@@ -1669,15 +1668,17 @@ restart:
buf_res.length = XHCI_TD_PAGE_SIZE;
npkt_off += buf_res.length;
-
- /* setup npkt */
- npkt = (len_old - npkt_off +
temp-max_packet_size - 1) /
- temp-max_packet_size;
-
- if (npkt 31)
- npkt = 31;
}
+ /* setup npkt */
+ npkt = (len_old - npkt_off + temp-max_packet_size - 1)
/
+ temp-max_packet_size;
+
+ if (npkt == 0)
+ npkt = 1;
+ else if (npkt 31)
+ npkt = 31;
+
/* fill out TRB's */
td-td_trb[x].qwTrb0 =
htole64((uint64_t)buf_res.physaddr);
@@ -1691,9 +1692,7 @@ restart:
switch (temp-trb_type) {
case XHCI_TRB_TYPE_ISOCH:
- /* BEI: Interrupts are inhibited until EOT */
dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
- XHCI_TRB_3_BEI_BIT |
XHCI_TRB_3_TBC_SET(temp-tbc) |
XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
if (td != td_first) {
@@ -1728,10 +1727,8 @@ restart:
dword |= XHCI_TRB_3_DIR_IN;
break;
default:/* XHCI_TRB_TYPE_NORMAL */
- /* BEI: Interrupts are inhibited until EOT */
dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
- XHCI_TRB_3_BEI_BIT |
XHCI_TRB_3_TBC_SET(temp-tbc) |
XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
if (temp-direction == UE_DIR_IN)
@@ -1810,6 +1807,7 @@ restart:
usb_pc_cpu_flush(td_first-page_cache);
}
+ /* clear TD SIZE to zero, hence this is the last TRB */
/* remove chain bit because this is the last TRB in the chain */
td-td_trb[td-ntrb - 1].dwTrb2 = ~htole32(XHCI_TRB_2_TDSZ_SET(15));
td-td_trb[td-ntrb - 1].dwTrb3 = ~htole32(XHCI_TRB_3_CHAIN_BIT);
___
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/180726: commit references a PR
The following reply was made to PR usb/180726; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/180726: commit references a PR
Date: Sun, 21 Jul 2013 20:45:32 + (UTC)
Author: hselasky
Date: Sun Jul 21 20:45:23 2013
New Revision: 253532
URL: http://svnweb.freebsd.org/changeset/base/253532
Log:
Fix an XHCI regression:
The Block Event Interrupts, BEI, feature does not
work like expected with the Renesas XHCI chipsets.
Revert feature.
While at it correct the TD SIZE computation in
case of Zero Length Packet, ZLP, in the end of a
multi frame USB transfer.
MFC after: 1 week
PR: usb/180726
Modified:
head/sys/dev/usb/controller/xhci.c
Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c Sun Jul 21 19:44:53 2013
(r253531)
+++ head/sys/dev/usb/controller/xhci.c Sun Jul 21 20:45:23 2013
(r253532)
@@ -1682,7 +1682,6 @@ restart:
/* fill out buffer pointers */
if (average == 0) {
- npkt = 0;
memset(buf_res, 0, sizeof(buf_res));
} else {
usbd_get_page(temp-pc, temp-offset +
@@ -1697,15 +1696,17 @@ restart:
buf_res.length = XHCI_TD_PAGE_SIZE;
npkt_off += buf_res.length;
-
- /* setup npkt */
- npkt = (len_old - npkt_off +
temp-max_packet_size - 1) /
- temp-max_packet_size;
-
- if (npkt 31)
- npkt = 31;
}
+ /* setup npkt */
+ npkt = (len_old - npkt_off + temp-max_packet_size - 1)
/
+ temp-max_packet_size;
+
+ if (npkt == 0)
+ npkt = 1;
+ else if (npkt 31)
+ npkt = 31;
+
/* fill out TRB's */
td-td_trb[x].qwTrb0 =
htole64((uint64_t)buf_res.physaddr);
@@ -1719,9 +1720,7 @@ restart:
switch (temp-trb_type) {
case XHCI_TRB_TYPE_ISOCH:
- /* BEI: Interrupts are inhibited until EOT */
dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
- XHCI_TRB_3_BEI_BIT |
XHCI_TRB_3_TBC_SET(temp-tbc) |
XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
if (td != td_first) {
@@ -1756,10 +1755,8 @@ restart:
dword |= XHCI_TRB_3_DIR_IN;
break;
default:/* XHCI_TRB_TYPE_NORMAL */
- /* BEI: Interrupts are inhibited until EOT */
dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
- XHCI_TRB_3_BEI_BIT |
XHCI_TRB_3_TBC_SET(temp-tbc) |
XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
if (temp-direction == UE_DIR_IN)
@@ -1838,6 +1835,7 @@ restart:
usb_pc_cpu_flush(td_first-page_cache);
}
+ /* clear TD SIZE to zero, hence this is the last TRB */
/* remove chain bit because this is the last TRB in the chain */
td-td_trb[td-ntrb - 1].dwTrb2 = ~htole32(XHCI_TRB_2_TDSZ_SET(15));
td-td_trb[td-ntrb - 1].dwTrb3 = ~htole32(XHCI_TRB_3_CHAIN_BIT);
___
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/179342: commit references a PR
The following reply was made to PR usb/179342; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/179342: commit references a PR
Date: Fri, 7 Jun 2013 14:30:20 + (UTC)
Author: hselasky
Date: Fri Jun 7 14:30:06 2013
New Revision: 251499
URL: http://svnweb.freebsd.org/changeset/base/251499
Log:
Add support for polling the XHCI interrupt handler when
the regular interrupt handler is not working properly or
in case of MSI interrupts which are not yet supported.
Remove interrupt setup code for FreeBSD versions older
than 700031.
MFC after: 1 week
PR: usb/179342
Modified:
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/controller/xhci.h
head/sys/dev/usb/controller/xhci_pci.c
Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c Fri Jun 7 14:23:11 2013
(r251498)
+++ head/sys/dev/usb/controller/xhci.c Fri Jun 7 14:30:06 2013
(r251499)
@@ -90,6 +90,7 @@
#ifdef USB_DEBUG
static int xhcidebug;
static int xhciroute;
+static int xhcipolling;
static SYSCTL_NODE(_hw_usb, OID_AUTO, xhci, CTLFLAG_RW, 0, USB XHCI);
SYSCTL_INT(_hw_usb_xhci, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
@@ -98,6 +99,9 @@ TUNABLE_INT(hw.usb.xhci.debug, xhcide
SYSCTL_INT(_hw_usb_xhci, OID_AUTO, xhci_port_route, CTLFLAG_RW | CTLFLAG_TUN,
xhciroute, 0, Routing bitmap for switching EHCI ports to XHCI
controller);
TUNABLE_INT(hw.usb.xhci.xhci_port_route, xhciroute);
+SYSCTL_INT(_hw_usb_xhci, OID_AUTO, use_polling, CTLFLAG_RW | CTLFLAG_TUN,
+xhcipolling, 0, Set to enable software interrupt polling for XHCI
controller);
+TUNABLE_INT(hw.usb.xhci.use_polling, xhcipolling);
#endif
#define XHCI_INTR_ENDPT 1
@@ -194,6 +198,16 @@ xhci_get_port_route(void)
#endif
}
+uint8_t
+xhci_use_polling(void)
+{
+#ifdef USB_DEBUG
+ return (xhcipolling != 0);
+#else
+ return (0);
+#endif
+}
+
static void
xhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
{
Modified: head/sys/dev/usb/controller/xhci.h
==
--- head/sys/dev/usb/controller/xhci.h Fri Jun 7 14:23:11 2013
(r251498)
+++ head/sys/dev/usb/controller/xhci.h Fri Jun 7 14:30:06 2013
(r251499)
@@ -438,6 +438,8 @@ struct xhci_softc {
/* configure message */
struct usb_bus_msg sc_config_msg[2];
+ struct usb_callout sc_callout;
+
union xhci_hub_desc sc_hub_desc;
struct cv sc_cmd_cv;
@@ -500,6 +502,7 @@ struct xhci_softc {
/* prototypes */
uint32_t xhci_get_port_route(void);
+uint8_t xhci_use_polling(void);
usb_error_t xhci_halt_controller(struct xhci_softc *);
usb_error_t xhci_init(struct xhci_softc *, device_t);
usb_error_t xhci_start_controller(struct xhci_softc *);
Modified: head/sys/dev/usb/controller/xhci_pci.c
==
--- head/sys/dev/usb/controller/xhci_pci.c Fri Jun 7 14:23:11 2013
(r251498)
+++ head/sys/dev/usb/controller/xhci_pci.c Fri Jun 7 14:30:06 2013
(r251499)
@@ -132,6 +132,16 @@ xhci_pci_probe(device_t self)
}
}
+static void
+xhci_interrupt_poll(void *_sc)
+{
+ struct xhci_softc *sc = _sc;
+ USB_BUS_UNLOCK(sc-sc_bus);
+ xhci_interrupt(sc);
+ USB_BUS_LOCK(sc-sc_bus);
+ usb_callout_reset(sc-sc_callout, 1, (void *)xhci_interrupt_poll, sc);
+}
+
static int
xhci_pci_attach(device_t self)
{
@@ -159,12 +169,13 @@ xhci_pci_attach(device_t self)
sc-sc_io_hdl = rman_get_bushandle(sc-sc_io_res);
sc-sc_io_size = rman_get_size(sc-sc_io_res);
+ usb_callout_init_mtx(sc-sc_callout, sc-sc_bus.bus_mtx, 0);
+
rid = 0;
sc-sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, rid,
RF_SHAREABLE | RF_ACTIVE);
if (sc-sc_irq_res == NULL) {
device_printf(self, Could not allocate IRQ\n);
- goto error;
}
sc-sc_bus.bdev = device_add_child(self, usbus, -1);
if (sc-sc_bus.bdev == NULL) {
@@ -175,18 +186,22 @@ xhci_pci_attach(device_t self)
sprintf(sc-sc_vendor, 0x%04x, pci_get_vendor(self));
-#if (__FreeBSD_version = 700031)
- err = bus_setup_intr(self, sc-sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
- NULL, (driver_intr_t *)xhci_interrupt, sc, sc-sc_intr_hdl);
-#else
- err = bus_setup_intr(self, sc-sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
- (driver_intr_t *)xhci_interrupt, sc, sc-sc_intr_hdl);
-#endif
- if (err) {
- device_printf(self, Could not setup IRQ, err=%d\n, err);
- sc-sc_intr_hdl = NULL;
- goto error
Re: usb/179342: commit references a PR
The following reply was made to PR usb/179342; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/179342: commit references a PR
Date: Fri, 7 Jun 2013 22:36:05 + (UTC)
Author: hselasky
Date: Fri Jun 7 22:35:58 2013
New Revision: 251515
URL: http://svnweb.freebsd.org/changeset/base/251515
Log:
Fix some recent regression issues:
1) Only multi-TD isochronous transfers should use NORMAL
type after specific type as per XHCI specification.
2) BEI bit is only available in NORMAL and ISOCHRONOUS
TRB types. Don't use this bit for other types to avoid
hardware asserts. Reserved bits should be don't care
though ...
MFC after: 1 week
PR: usb/179342
Modified:
head/sys/dev/usb/controller/xhci.c
Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c Fri Jun 7 22:01:06 2013
(r251514)
+++ head/sys/dev/usb/controller/xhci.c Fri Jun 7 22:35:58 2013
(r251515)
@@ -1561,6 +1561,7 @@ xhci_setup_generic_chain_sub(struct xhci
struct xhci_td *td;
struct xhci_td *td_next;
struct xhci_td *td_alt_next;
+ struct xhci_td *td_first;
uint32_t buf_offset;
uint32_t average;
uint32_t len_old;
@@ -1569,7 +1570,6 @@ xhci_setup_generic_chain_sub(struct xhci
uint8_t shortpkt_old;
uint8_t precompute;
uint8_t x;
- uint8_t first_trb = 1;
td_alt_next = NULL;
buf_offset = 0;
@@ -1581,7 +1581,7 @@ xhci_setup_generic_chain_sub(struct xhci
restart:
td = temp-td;
- td_next = temp-td_next;
+ td_next = td_first = temp-td_next;
while (1) {
@@ -1717,48 +1717,55 @@ restart:
td-td_trb[x].dwTrb2 = htole32(dword);
- /* BEI: Interrupts are inhibited until EOT */
- dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
-XHCI_TRB_3_BEI_BIT |
-XHCI_TRB_3_TBC_SET(temp-tbc) |
-XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
-
- if (first_trb != 0) {
- first_trb = 0;
- dword |= XHCI_TRB_3_TYPE_SET(temp-trb_type);
- /*
- * Remove cycle bit from the first TRB
- * if we are stepping them:
- */
- if (temp-step_td != 0)
- dword = ~XHCI_TRB_3_CYCLE_BIT;
- } else {
- dword |=
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL);
- }
- if (temp-trb_type == XHCI_TRB_TYPE_ISOCH) {
- if (temp-do_isoc_sync != 0) {
+ switch (temp-trb_type) {
+ case XHCI_TRB_TYPE_ISOCH:
+ /* BEI: Interrupts are inhibited until EOT */
+ dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
+ XHCI_TRB_3_BEI_BIT |
+ XHCI_TRB_3_TBC_SET(temp-tbc) |
+ XHCI_TRB_3_TLBPC_SET(temp-tlbpc);
+ if (td != td_first) {
+ dword |=
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL);
+ } else if (temp-do_isoc_sync != 0) {
temp-do_isoc_sync = 0;
- dword |=
XHCI_TRB_3_FRID_SET(temp-isoc_frame / 8);
+ /* wait until isoc_frame */
+ dword |=
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_ISOCH) |
+
XHCI_TRB_3_FRID_SET(temp-isoc_frame / 8);
} else {
- dword |= XHCI_TRB_3_ISO_SIA_BIT;
+ /* start data transfer at next interval
*/
+ dword |=
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_ISOCH) |
+ XHCI_TRB_3_ISO_SIA_BIT;
}
+ if (temp-direction == UE_DIR_IN)
+ dword |= XHCI_TRB_3_DIR_IN |
XHCI_TRB_3_ISP_BIT;
+ break;
+ case XHCI_TRB_TYPE_DATA_STAGE:
+ dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
+
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE) |
+ XHCI_TRB_3_TBC_SET(temp-tbc
Re: usb/178722: commit references a PR
The following reply was made to PR usb/178722; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/178722: commit references a PR
Date: Sat, 25 May 2013 17:19:14 + (UTC)
Author: hselasky
Date: Sat May 25 17:19:06 2013
New Revision: 250988
URL: http://svnweb.freebsd.org/changeset/base/250988
Log:
MFC r250763 and r250765:
Fix some USB audio device issues.
PR: usb/178722
Modified:
stable/8/sys/dev/sound/usb/uaudio.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/sound/ (props changed)
stable/8/sys/dev/sound/usb/ (props changed)
Modified: stable/8/sys/dev/sound/usb/uaudio.c
==
--- stable/8/sys/dev/sound/usb/uaudio.cSat May 25 17:16:31 2013
(r250987)
+++ stable/8/sys/dev/sound/usb/uaudio.cSat May 25 17:19:06 2013
(r250988)
@@ -868,6 +868,7 @@ uaudio_attach(device_t dev)
struct usb_attach_arg *uaa = device_get_ivars(dev);
struct uaudio_softc *sc = device_get_softc(dev);
struct usb_interface_descriptor *id;
+ usb_error_t err;
device_t child;
sc-sc_play_chan.priv_sc = sc;
@@ -925,6 +926,19 @@ uaudio_attach(device_t dev)
if (sc-sc_play_chan.num_alt 0) {
uint8_t x;
+
+ /*
+ * Need to set a default alternate interface, else
+ * some USB audio devices might go into an infinte
+ * re-enumeration loop:
+ */
+ err = usbd_set_alt_interface_index(sc-sc_udev,
+ sc-sc_play_chan.usb_alt[0].iface_index,
+ sc-sc_play_chan.usb_alt[0].iface_alt_index);
+ if (err) {
+ DPRINTF(setting of alternate index failed: %s!\n,
+ usbd_errstr(err));
+ }
for (x = 0; x != sc-sc_play_chan.num_alt; x++) {
device_printf(dev, Play: %d Hz, %d ch, %s format,
2x8ms buffer.\n,
@@ -938,6 +952,19 @@ uaudio_attach(device_t dev)
if (sc-sc_rec_chan.num_alt 0) {
uint8_t x;
+
+ /*
+ * Need to set a default alternate interface, else
+ * some USB audio devices might go into an infinte
+ * re-enumeration loop:
+ */
+ err = usbd_set_alt_interface_index(sc-sc_udev,
+ sc-sc_rec_chan.usb_alt[0].iface_index,
+ sc-sc_rec_chan.usb_alt[0].iface_alt_index);
+ if (err) {
+ DPRINTF(setting of alternate index failed: %s!\n,
+ usbd_errstr(err));
+ }
for (x = 0; x != sc-sc_rec_chan.num_alt; x++) {
device_printf(dev, Record: %d Hz, %d ch, %s format,
2x8ms buffer.\n,
@@ -5565,7 +5592,6 @@ umidi_open(struct usb_fifo *fifo, int ff
}
/* clear stall first */
mtx_lock(chan-mtx);
- usbd_xfer_set_stall(chan-xfer[UMIDI_TX_TRANSFER]);
chan-write_open_refcount++;
sub-write_open = 1;
@@ -5664,9 +5690,6 @@ umidi_probe(device_t dev)
mtx_lock(chan-mtx);
- /* clear stall first */
- usbd_xfer_set_stall(chan-xfer[UMIDI_RX_TRANSFER]);
-
/*
* NOTE: At least one device will not work properly unless the
* BULK IN pipe is open all the time. This might have to do
@@ -5771,8 +5794,11 @@ tr_setup:
break;
default:/* Error */
+
+ DPRINTF(error=%s\n, usbd_errstr(error));
+
if (error != USB_ERR_CANCELLED) {
- /* try clear stall first */
+ /* try to clear stall first */
usbd_xfer_set_stall(xfer);
goto tr_setup;
}
___
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/178722: commit references a PR
The following reply was made to PR usb/178722; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/178722: commit references a PR
Date: Sat, 25 May 2013 17:16:44 + (UTC)
Author: hselasky
Date: Sat May 25 17:16:31 2013
New Revision: 250987
URL: http://svnweb.freebsd.org/changeset/base/250987
Log:
MFC r250763 and r250765:
Fix some USB audio device issues.
PR: usb/178722
Modified:
stable/9/sys/dev/sound/usb/uaudio.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/sound/usb/uaudio.c
==
--- stable/9/sys/dev/sound/usb/uaudio.cSat May 25 17:09:58 2013
(r250986)
+++ stable/9/sys/dev/sound/usb/uaudio.cSat May 25 17:16:31 2013
(r250987)
@@ -868,6 +868,7 @@ uaudio_attach(device_t dev)
struct usb_attach_arg *uaa = device_get_ivars(dev);
struct uaudio_softc *sc = device_get_softc(dev);
struct usb_interface_descriptor *id;
+ usb_error_t err;
device_t child;
sc-sc_play_chan.priv_sc = sc;
@@ -925,6 +926,19 @@ uaudio_attach(device_t dev)
if (sc-sc_play_chan.num_alt 0) {
uint8_t x;
+
+ /*
+ * Need to set a default alternate interface, else
+ * some USB audio devices might go into an infinte
+ * re-enumeration loop:
+ */
+ err = usbd_set_alt_interface_index(sc-sc_udev,
+ sc-sc_play_chan.usb_alt[0].iface_index,
+ sc-sc_play_chan.usb_alt[0].iface_alt_index);
+ if (err) {
+ DPRINTF(setting of alternate index failed: %s!\n,
+ usbd_errstr(err));
+ }
for (x = 0; x != sc-sc_play_chan.num_alt; x++) {
device_printf(dev, Play: %d Hz, %d ch, %s format,
2x8ms buffer.\n,
@@ -938,6 +952,19 @@ uaudio_attach(device_t dev)
if (sc-sc_rec_chan.num_alt 0) {
uint8_t x;
+
+ /*
+ * Need to set a default alternate interface, else
+ * some USB audio devices might go into an infinte
+ * re-enumeration loop:
+ */
+ err = usbd_set_alt_interface_index(sc-sc_udev,
+ sc-sc_rec_chan.usb_alt[0].iface_index,
+ sc-sc_rec_chan.usb_alt[0].iface_alt_index);
+ if (err) {
+ DPRINTF(setting of alternate index failed: %s!\n,
+ usbd_errstr(err));
+ }
for (x = 0; x != sc-sc_rec_chan.num_alt; x++) {
device_printf(dev, Record: %d Hz, %d ch, %s format,
2x8ms buffer.\n,
@@ -5565,7 +5592,6 @@ umidi_open(struct usb_fifo *fifo, int ff
}
/* clear stall first */
mtx_lock(chan-mtx);
- usbd_xfer_set_stall(chan-xfer[UMIDI_TX_TRANSFER]);
chan-write_open_refcount++;
sub-write_open = 1;
@@ -5664,9 +5690,6 @@ umidi_probe(device_t dev)
mtx_lock(chan-mtx);
- /* clear stall first */
- usbd_xfer_set_stall(chan-xfer[UMIDI_RX_TRANSFER]);
-
/*
* NOTE: At least one device will not work properly unless the
* BULK IN pipe is open all the time. This might have to do
@@ -5771,8 +5794,11 @@ tr_setup:
break;
default:/* Error */
+
+ DPRINTF(error=%s\n, usbd_errstr(error));
+
if (error != USB_ERR_CANCELLED) {
- /* try clear stall first */
+ /* try to clear stall first */
usbd_xfer_set_stall(xfer);
goto tr_setup;
}
___
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/178771: commit references a PR
The following reply was made to PR usb/178771; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/178771: commit references a PR Date: Tue, 21 May 2013 06:13:50 + (UTC) Author: hselasky Date: Tue May 21 06:13:38 2013 New Revision: 250848 URL: http://svnweb.freebsd.org/changeset/base/250848 Log: Add new USB quirk. MFC after: 1 week PR: usb/178771 Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Tue May 21 06:10:26 2013 (r250847) +++ head/sys/dev/usb/quirk/usb_quirk.c Tue May 21 06:13:38 2013 (r250848) @@ -427,6 +427,7 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY_EVPD, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSWORD, 0x, 0x, UQ_MSC_FORCE_SHORT_INQ), + USB_QUIRK(WESTERN, MYPASSPORT, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Tue May 21 06:10:26 2013(r250847) +++ head/sys/dev/usb/usbdevs Tue May 21 06:13:38 2013(r250848) @@ -4219,6 +4219,7 @@ product WESTERN EXTHDD 0x0400 External product WESTERN HUB 0x0500 USB HUB product WESTERN MYBOOK0x0901 MyBook External HDD product WESTERN MYPASSWORD0x0704 MyPassword External HDD +product WESTERN MYPASSPORT0x0748 MyPassport External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 ___ 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/178722: commit references a PR
The following reply was made to PR usb/178722; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/178722: commit references a PR
Date: Sat, 18 May 2013 07:03:15 + (UTC)
Author: hselasky
Date: Sat May 18 07:03:06 2013
New Revision: 250763
URL: http://svnweb.freebsd.org/changeset/base/250763
Log:
Fix issue with Logitech Webcam C525:
Set a valid alternate interface setting
when enumerating USB audio devices else
the device mentioned will not work like
expected.
PR: usb/178722
MFC after: 1 week
Modified:
head/sys/dev/sound/usb/uaudio.c
Modified: head/sys/dev/sound/usb/uaudio.c
==
--- head/sys/dev/sound/usb/uaudio.cSat May 18 05:48:46 2013
(r250762)
+++ head/sys/dev/sound/usb/uaudio.cSat May 18 07:03:06 2013
(r250763)
@@ -868,6 +868,7 @@ uaudio_attach(device_t dev)
struct usb_attach_arg *uaa = device_get_ivars(dev);
struct uaudio_softc *sc = device_get_softc(dev);
struct usb_interface_descriptor *id;
+ usb_error_t err;
device_t child;
sc-sc_play_chan.priv_sc = sc;
@@ -925,6 +926,19 @@ uaudio_attach(device_t dev)
if (sc-sc_play_chan.num_alt 0) {
uint8_t x;
+
+ /*
+ * Need to set a default alternate interface, else
+ * some USB audio devices might go into an infinte
+ * re-enumeration loop:
+ */
+ err = usbd_set_alt_interface_index(sc-sc_udev,
+ sc-sc_play_chan.usb_alt[0].iface_index,
+ sc-sc_play_chan.usb_alt[0].iface_alt_index);
+ if (err) {
+ DPRINTF(setting of alternate index failed: %s!\n,
+ usbd_errstr(err));
+ }
for (x = 0; x != sc-sc_play_chan.num_alt; x++) {
device_printf(dev, Play: %d Hz, %d ch, %s format,
2x8ms buffer.\n,
@@ -938,6 +952,19 @@ uaudio_attach(device_t dev)
if (sc-sc_rec_chan.num_alt 0) {
uint8_t x;
+
+ /*
+ * Need to set a default alternate interface, else
+ * some USB audio devices might go into an infinte
+ * re-enumeration loop:
+ */
+ err = usbd_set_alt_interface_index(sc-sc_udev,
+ sc-sc_rec_chan.usb_alt[0].iface_index,
+ sc-sc_rec_chan.usb_alt[0].iface_alt_index);
+ if (err) {
+ DPRINTF(setting of alternate index failed: %s!\n,
+ usbd_errstr(err));
+ }
for (x = 0; x != sc-sc_rec_chan.num_alt; x++) {
device_printf(dev, Record: %d Hz, %d ch, %s format,
2x8ms buffer.\n,
___
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/177896: commit references a PR
The following reply was made to PR usb/177896; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/177896: commit references a PR Date: Sun, 21 Apr 2013 16:09:42 + (UTC) Author: hselasky Date: Sun Apr 21 16:09:35 2013 New Revision: 249726 URL: http://svnweb.freebsd.org/changeset/base/249726 Log: Fix manual page. PR: usb/177896 Submitted by:Leif Velcro velcrol...@rocketmail.com Modified: head/share/man/man4/usb_quirk.4 Modified: head/share/man/man4/usb_quirk.4 == --- head/share/man/man4/usb_quirk.4Sun Apr 21 16:02:50 2013 (r249725) +++ head/share/man/man4/usb_quirk.4Sun Apr 21 16:09:35 2013 (r249726) @@ -16,7 +16,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 8, 2012 +.Dd April 21, 2013 .Dt USB_QUIRK 4 .Os .Sh NAME @@ -27,7 +27,7 @@ To compile this module into the kernel, place the following line in your kernel configuration file: .Bd -ragged -offset indent -.Cd device usb_quirk +.Cd device usb .Ed .Pp Alternatively, to load the module at boot ___ 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/177666: commit references a PR
The following reply was made to PR usb/177666; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/177666: commit references a PR Date: Sat, 6 Apr 2013 17:00:19 + (UTC) Author: hselasky Date: Sat Apr 6 17:00:11 2013 New Revision: 249204 URL: http://svnweb.freebsd.org/changeset/base/249204 Log: Add new USB ID. PR: usb/177666 Submitted by:Nicolai Petri nico...@petri.dk Modified: head/sys/dev/usb/serial/uftdi.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/uftdi.c == --- head/sys/dev/usb/serial/uftdi.cSat Apr 6 15:02:06 2013 (r249203) +++ head/sys/dev/usb/serial/uftdi.cSat Apr 6 17:00:11 2013 (r249204) @@ -384,6 +384,7 @@ static const STRUCT_USB_HOST_ID uftdi_de UFTDI_DEV(FTDI, LK204, UFTDI_TYPE_8U232AM), UFTDI_DEV(FTDI, LM3S_DEVEL_BOARD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG), UFTDI_DEV(FTDI, LM3S_EVAL_BOARD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG), + UFTDI_DEV(FTDI, LM3S_ICDI_B_BOARD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG), UFTDI_DEV(FTDI, MASTERDEVEL2, UFTDI_TYPE_AUTO), UFTDI_DEV(FTDI, MAXSTREAM, UFTDI_TYPE_8U232AM), UFTDI_DEV(FTDI, MHAM_DB9, UFTDI_TYPE_AUTO), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Sat Apr 6 15:02:06 2013(r249203) +++ head/sys/dev/usb/usbdevs Sat Apr 6 17:00:11 2013(r249204) @@ -1878,6 +1878,7 @@ product FTDI IRTRANS 0xfc60 FTDI compat product FTDI LENZ_LIUSB 0xd780 FTDI compatible adapter product FTDI LM3S_DEVEL_BOARD 0xbcd8 FTDI compatible adapter product FTDI LM3S_EVAL_BOARD 0xbcd9 FTDI compatible adapter +product FTDI LM3S_ICDI_B_BOARD0xbcda FTDI compatible adapter product FTDI MASTERDEVEL2 0xf449 FTDI compatible adapter product FTDI MHAM_DB9 0xeeed FTDI compatible adapter product FTDI MHAM_IC 0xeeec FTDI compatible adapter ___ 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/177173: commit references a PR
The following reply was made to PR usb/177173; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/177173: commit references a PR Date: Thu, 21 Mar 2013 07:04:30 + (UTC) Author: hselasky Date: Thu Mar 21 07:04:17 2013 New Revision: 248566 URL: http://svnweb.freebsd.org/changeset/base/248566 Log: Add new USB ID. PR: usb/177173 MFC after: 1 week Modified: head/sys/dev/usb/wlan/if_rum.c Modified: head/sys/dev/usb/wlan/if_rum.c == --- head/sys/dev/usb/wlan/if_rum.c Thu Mar 21 06:56:35 2013 (r248565) +++ head/sys/dev/usb/wlan/if_rum.c Thu Mar 21 07:04:17 2013 (r248566) @@ -120,6 +120,7 @@ static const STRUCT_USB_HOST_ID rum_devs RUM_DEV(HUAWEI3COM, WUB320G), RUM_DEV(MELCO, G54HP), RUM_DEV(MELCO, SG54HP), +RUM_DEV(MELCO, SG54HG), RUM_DEV(MELCO, WLIUCG), RUM_DEV(MELCO, WLRUCG), RUM_DEV(MELCO, WLRUCGAOSS), ___ 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/177013: commit references a PR
The following reply was made to PR usb/177013; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/177013: commit references a PR Date: Mon, 18 Mar 2013 11:12:15 + (UTC) Author: hselasky Date: Mon Mar 18 07:02:58 2013 New Revision: 248458 URL: http://svnweb.freebsd.org/changeset/base/248458 Log: Add new USB ID. PR: usb/177013 MFC after: 1 week Modified: head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Mon Mar 18 05:30:18 2013(r248457) +++ head/sys/dev/usb/usbdevs Mon Mar 18 07:02:58 2013(r248458) @@ -2499,6 +2499,7 @@ product LOGITEC RT2870_2 0x0163 RT2870 product LOGITEC RT2870_3 0x0164 RT2870 product LOGITEC LANW300NU20x0166 LAN-W300N/U2 product LOGITEC LANW150NU20x0168 LAN-W150N/U2 +product LOGITEC LANW300NU2S 0x0169 LAN-W300N/U2S /* Longcheer Holdings, Ltd. products */ product LONGCHEER WM660x6061 Longcheer WM66 HSDPA Modified: head/sys/dev/usb/wlan/if_run.c == --- head/sys/dev/usb/wlan/if_run.c Mon Mar 18 05:30:18 2013 (r248457) +++ head/sys/dev/usb/wlan/if_run.c Mon Mar 18 07:02:58 2013 (r248458) @@ -211,6 +211,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(LOGITEC, RT2870_3), RUN_DEV(LOGITEC, LANW300NU2), RUN_DEV(LOGITEC, LANW150NU2), +RUN_DEV(LOGITEC, LANW300NU2S), RUN_DEV(MELCO,RT2870_1), RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), ___ 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/175639: commit references a PR
The following reply was made to PR usb/175639; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/175639: commit references a PR Date: Thu, 28 Feb 2013 16:32:38 + (UTC) Author: hselasky Date: Thu Feb 28 16:32:25 2013 New Revision: 247469 URL: http://svnweb.freebsd.org/changeset/base/247469 Log: MFC r246021 and r228637: Add new USB IDs. PR: usb/175639 Modified: stable/8/sys/dev/usb/net/if_axe.c stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/net/if_axe.c == --- stable/8/sys/dev/usb/net/if_axe.c Thu Feb 28 16:25:34 2013 (r247468) +++ stable/8/sys/dev/usb/net/if_axe.c Thu Feb 28 16:32:25 2013 (r247469) @@ -151,6 +151,7 @@ static const STRUCT_USB_HOST_ID axe_devs AXE_DEV(ASIX, AX88772, AXE_FLAG_772), AXE_DEV(ASIX, AX88772A, AXE_FLAG_772A), AXE_DEV(ASIX, AX88772B, AXE_FLAG_772B), + AXE_DEV(ASIX, AX88772B_1, AXE_FLAG_772B), AXE_DEV(ATEN, UC210T, 0), AXE_DEV(BELKIN, F5D5055, AXE_FLAG_178), AXE_DEV(BILLIONTON, USB2AR, 0), @@ -158,6 +159,7 @@ static const STRUCT_USB_HOST_ID axe_devs AXE_DEV(COREGA, FETHER_USB2_TX, 0), AXE_DEV(DLINK, DUBE100, 0), AXE_DEV(DLINK, DUBE100B1, AXE_FLAG_772), + AXE_DEV(DLINK, DUBE100C1, AXE_FLAG_772B), AXE_DEV(GOODWAY, GWUSB2E, 0), AXE_DEV(IODATA, ETGUS2, AXE_FLAG_178), AXE_DEV(JVC, MP_PRX1, 0), Modified: stable/8/sys/dev/usb/usbdevs == --- stable/8/sys/dev/usb/usbdevs Thu Feb 28 16:25:34 2013 (r247468) +++ stable/8/sys/dev/usb/usbdevs Thu Feb 28 16:32:25 2013 (r247469) @@ -1486,6 +1486,7 @@ product DIGIANSWER ZIGBEE802154 0x000a Z /* D-Link products */ /*product DLINK DSBS250x0100 DSB-S25 serial*/ product DLINK DUBE100 0x1a00 10/100 Ethernet +product DLINK DUBE100C1 0x1a02 DUB-E100 rev C1 product DLINK DSB650TX4 0x200c 10/100 Ethernet product DLINK DWL120E 0x3200 DWL-120 rev E product DLINK DWL122 0x3700 DWL-122 ___ 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/175454: commit references a PR
The following reply was made to PR usb/175454; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/175454: commit references a PR Date: Mon, 28 Jan 2013 07:29:11 + (UTC) Author: hselasky Date: Mon Jan 28 07:28:52 2013 New Revision: 246023 URL: http://svnweb.freebsd.org/changeset/base/246023 Log: MFC r245725: Add new quirk and correct old one. PR: usb/175454 MFC after: 1 week Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c == --- stable/8/sys/dev/usb/quirk/usb_quirk.c Mon Jan 28 07:26:45 2013 (r246022) +++ stable/8/sys/dev/usb/quirk/usb_quirk.c Mon Jan 28 07:28:52 2013 (r246023) @@ -299,7 +299,7 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(ONSPEC, READER, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(ONSPEC, UCF100, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, - UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY | UQ_MSC_NO_GETMAXLUN), + UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(ONSPEC2, IMAGEMATE_SDDR55, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(PANASONIC, KXL840AN, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -335,6 +335,8 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_IGNORE_RESIDUE), USB_QUIRK(SANDISK, SDDR31, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_READ_CAP_OFFBY1), + USB_QUIRK(SANDISK, IMAGEMATE_SDDR289, 0x, 0x, + UQ_MSC_NO_SYNC_CACHE, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(SCANLOGIC, SL11R, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY), USB_QUIRK(SHUTTLE, EUSB, 0x, 0x, UQ_MSC_FORCE_WIRE_CBI_I, Modified: stable/8/sys/dev/usb/usbdevs == --- stable/8/sys/dev/usb/usbdevs Mon Jan 28 07:26:45 2013 (r246022) +++ stable/8/sys/dev/usb/usbdevs Mon Jan 28 07:28:52 2013 (r246023) @@ -3559,6 +3559,7 @@ product SANDISK SDDR75 0x0810 ImageMate product SANDISK SDCZ2_256 0x7104 Cruzer Mini 256MB product SANDISK SDCZ4_128 0x7112 Cruzer Micro 128MB product SANDISK SDCZ4_256 0x7113 Cruzer Micro 256MB +product SANDISK IMAGEMATE_SDDR289 0xb6ba ImageMate SDDR-289 /* Sanwa Electric Instrument Co., Ltd. products */ product SANWA KB_USB2 0x0701 KB-USB2 multimeter cable ___ 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/175639: commit references a PR
The following reply was made to PR usb/175639; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/175639: commit references a PR Date: Mon, 28 Jan 2013 07:22:52 + (UTC) Author: hselasky Date: Mon Jan 28 07:22:44 2013 New Revision: 246021 URL: http://svnweb.freebsd.org/changeset/base/246021 Log: Add new USB ID. Submitted by:Ramil PR: usb/175639 MFC after: 1 week Modified: head/sys/dev/usb/net/if_axe.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/net/if_axe.c == --- head/sys/dev/usb/net/if_axe.c Mon Jan 28 07:04:52 2013 (r246020) +++ head/sys/dev/usb/net/if_axe.c Mon Jan 28 07:22:44 2013 (r246021) @@ -159,6 +159,7 @@ static const STRUCT_USB_HOST_ID axe_devs AXE_DEV(COREGA, FETHER_USB2_TX, 0), AXE_DEV(DLINK, DUBE100, 0), AXE_DEV(DLINK, DUBE100B1, AXE_FLAG_772), + AXE_DEV(DLINK, DUBE100C1, AXE_FLAG_772B), AXE_DEV(GOODWAY, GWUSB2E, 0), AXE_DEV(IODATA, ETGUS2, AXE_FLAG_178), AXE_DEV(JVC, MP_PRX1, 0), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Mon Jan 28 07:04:52 2013(r246020) +++ head/sys/dev/usb/usbdevs Mon Jan 28 07:22:44 2013(r246021) @@ -1487,6 +1487,7 @@ product DIGIANSWER ZIGBEE802154 0x000a Z /* D-Link products */ /*product DLINK DSBS250x0100 DSB-S25 serial*/ product DLINK DUBE100 0x1a00 10/100 Ethernet +product DLINK DUBE100C1 0x1a02 DUB-E100 rev C1 product DLINK DSB650TX4 0x200c 10/100 Ethernet product DLINK DWL120E 0x3200 DWL-120 rev E product DLINK DWL122 0x3700 DWL-122 ___ 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/175599: commit references a PR
The following reply was made to PR usb/175599; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/175599: commit references a PR Date: Sat, 26 Jan 2013 13:44:32 + (UTC) Author: hselasky Date: Sat Jan 26 13:44:24 2013 New Revision: 245947 URL: http://svnweb.freebsd.org/changeset/base/245947 Log: Add new USB quirk. PR: usb/175599 Submitted by:Juan J Lopez MFC after: 1 week Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Sat Jan 26 10:50:04 2013 (r245946) +++ head/sys/dev/usb/quirk/usb_quirk.c Sat Jan 26 13:44:24 2013 (r245947) @@ -111,6 +111,7 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(ITUNERNET, USBLCD2X20, 0x, 0x, UQ_HID_IGNORE), USB_QUIRK(ITUNERNET, USBLCD4X20, 0x, 0x, UQ_HID_IGNORE), USB_QUIRK(LIEBERT, POWERSURE_PXT, 0x, 0x, UQ_HID_IGNORE), + USB_QUIRK(LIEBERT2, PSI1000, 0x, 0x, UQ_HID_IGNORE), USB_QUIRK(MGE, UPS1, 0x, 0x, UQ_HID_IGNORE), USB_QUIRK(MGE, UPS2, 0x, 0x, UQ_HID_IGNORE), USB_QUIRK(APPLE, IPHONE, 0x, 0x, UQ_HID_IGNORE), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Sat Jan 26 10:50:04 2013(r245946) +++ head/sys/dev/usb/usbdevs Sat Jan 26 13:44:24 2013(r245947) @@ -581,6 +581,7 @@ vendor CCYU0x1065 CCYU Technology vendor CURITEL0x106c Curitel Communications Inc vendor SILABS20x10a6 SILABS2 vendor USI0x10ab USI +vendor LIEBERT2 0x10af Liebert vendor PLX0x10b5 PLX vendor ASANTE 0x10bd Asante vendor SILABS 0x10c4 Silicon Labs @@ -2426,6 +2427,7 @@ product LEXMARK S24500x0009 Optra S 24 /* Liebert products */ product LIEBERT POWERSURE_PXT 0x PowerSure Personal XT +product LIEBERT2 PSI1000 0x0004 UPS PSI 1000 FW:08 /* Link Instruments Inc. products */ product LINKINSTRUMENTS MSO19 0xf190 Link Instruments MSO-19 ___ 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/175454: commit references a PR
The following reply was made to PR usb/175454; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/175454: commit references a PR Date: Mon, 21 Jan 2013 07:02:52 + (UTC) Author: hselasky Date: Mon Jan 21 07:02:41 2013 New Revision: 245725 URL: http://svnweb.freebsd.org/changeset/base/245725 Log: Add new quirk and correct old one. PR: usb/175454 MFC after: 1 week Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Mon Jan 21 07:02:21 2013 (r245724) +++ head/sys/dev/usb/quirk/usb_quirk.c Mon Jan 21 07:02:41 2013 (r245725) @@ -302,7 +302,7 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(ONSPEC, READER, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(ONSPEC, UCF100, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, - UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY | UQ_MSC_NO_GETMAXLUN), + UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(ONSPEC2, IMAGEMATE_SDDR55, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(PANASONIC, KXL840AN, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -338,6 +338,8 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_IGNORE_RESIDUE), USB_QUIRK(SANDISK, SDDR31, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_READ_CAP_OFFBY1), + USB_QUIRK(SANDISK, IMAGEMATE_SDDR289, 0x, 0x, + UQ_MSC_NO_SYNC_CACHE, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(SCANLOGIC, SL11R, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY), USB_QUIRK(SHUTTLE, EUSB, 0x, 0x, UQ_MSC_FORCE_WIRE_CBI_I, Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Mon Jan 21 07:02:21 2013(r245724) +++ head/sys/dev/usb/usbdevs Mon Jan 21 07:02:41 2013(r245725) @@ -3561,6 +3561,7 @@ product SANDISK SDDR75 0x0810 ImageMate product SANDISK SDCZ2_256 0x7104 Cruzer Mini 256MB product SANDISK SDCZ4_128 0x7112 Cruzer Micro 128MB product SANDISK SDCZ4_256 0x7113 Cruzer Micro 256MB +product SANDISK IMAGEMATE_SDDR289 0xb6ba ImageMate SDDR-289 /* Sanwa Electric Instrument Co., Ltd. products */ product SANWA KB_USB2 0x0701 KB-USB2 multimeter cable ___ 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/174814: commit references a PR
The following reply was made to PR usb/174814; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/174814: commit references a PR Date: Mon, 21 Jan 2013 07:10:35 + (UTC) Author: hselasky Date: Mon Jan 21 07:10:27 2013 New Revision: 245727 URL: http://svnweb.freebsd.org/changeset/base/245727 Log: MFC r244837 and r245427: Add new USB IDs. PR: usb/174814 Submitted by:Andy Balholm, Lowell Gilbert Modified: stable/9/sys/dev/usb/serial/u3g.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/serial/u3g.c == --- stable/9/sys/dev/usb/serial/u3g.c Mon Jan 21 07:03:13 2013 (r245726) +++ stable/9/sys/dev/usb/serial/u3g.c Mon Jan 21 07:10:27 2013 (r245727) @@ -342,6 +342,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(NOVATEL, MC760, 0), U3G_DEV(NOVATEL, MC547, 0), U3G_DEV(NOVATEL, MC950D, 0), + U3G_DEV(NOVATEL, MIFI2200, U3GINIT_SCSIEJECT), U3G_DEV(NOVATEL, U720, 0), U3G_DEV(NOVATEL, U727, 0), U3G_DEV(NOVATEL, U727_2, 0), @@ -355,6 +356,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(NOVATEL, V740, 0), U3G_DEV(NOVATEL, X950D, 0), U3G_DEV(NOVATEL, XU870, 0), + U3G_DEV(MOTOROLA2, MB886, U3GINIT_SCSIEJECT), U3G_DEV(OPTION, E6500, 0), U3G_DEV(OPTION, E6501, 0), U3G_DEV(OPTION, E6601, 0), Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevs Mon Jan 21 07:03:13 2013 (r245726) +++ stable/9/sys/dev/usb/usbdevs Mon Jan 21 07:10:27 2013 (r245727) @@ -2936,6 +2936,7 @@ product MOTOROLA2 A41XV32X 0x2a22 A41x/V product MOTOROLA2 E3980x4810 E398 Mobile Phone product MOTOROLA2 USBLAN 0x600c USBLAN product MOTOROLA2 USBLAN2 0x6027 USBLAN +product MOTOROLA2 MB886 0x710f MB886 Mobile Phone (Atria HD) product MOTOROLA4 RT2770 0x9031 RT2770 product MOTOROLA4 RT3070 0x9032 RT3070 @@ -3055,6 +3056,7 @@ product NOVATEL U727 0x4100 Merlin U727 product NOVATEL MC950D0x4400 Novatel MC950D HSUPA product NOVATEL ZEROCD0x5010 Novatel ZeroCD product NOVATEL ZEROCD2 0x5030 Novatel ZeroCD +product NOVATEL MIFI2200 0x5041 Novatel MiFi 2200 CDMA product NOVATEL U727_20x5100 Merlin U727 CDMA product NOVATEL U760 0x6000 Novatel U760 product NOVATEL MC760 0x6002 Novatel MC760 ___ 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/174814: commit references a PR
The following reply was made to PR usb/174814; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/174814: commit references a PR Date: Sat, 29 Dec 2012 21:22:46 + (UTC) Author: hselasky Date: Sat Dec 29 21:22:38 2012 New Revision: 244837 URL: http://svnweb.freebsd.org/changeset/base/244837 Log: Add new USB ID. PR: usb/174814 Submitted by:Andy Balholm MFC after: 1 week Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c == --- head/sys/dev/usb/serial/u3g.c Sat Dec 29 21:01:41 2012 (r244836) +++ head/sys/dev/usb/serial/u3g.c Sat Dec 29 21:22:38 2012 (r244837) @@ -342,6 +342,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(NOVATEL, MC760, 0), U3G_DEV(NOVATEL, MC547, 0), U3G_DEV(NOVATEL, MC950D, 0), + U3G_DEV(NOVATEL, MIFI2200, U3GINIT_SCSIEJECT), U3G_DEV(NOVATEL, U720, 0), U3G_DEV(NOVATEL, U727, 0), U3G_DEV(NOVATEL, U727_2, 0), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Sat Dec 29 21:01:41 2012(r244836) +++ head/sys/dev/usb/usbdevs Sat Dec 29 21:22:38 2012(r244837) @@ -3058,6 +3058,7 @@ product NOVATEL U727 0x4100 Merlin U727 product NOVATEL MC950D0x4400 Novatel MC950D HSUPA product NOVATEL ZEROCD0x5010 Novatel ZeroCD product NOVATEL ZEROCD2 0x5030 Novatel ZeroCD +product NOVATEL MIFI2200 0x5041 Novatel MiFi 2200 CDMA product NOVATEL U727_20x5100 Merlin U727 CDMA product NOVATEL U760 0x6000 Novatel U760 product NOVATEL MC760 0x6002 Novatel MC760 ___ 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/171810: commit references a PR
The following reply was made to PR usb/171810; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/171810: commit references a PR
Date: Thu, 20 Sep 2012 18:56:39 + (UTC)
Author: mav
Date: Thu Sep 20 18:56:27 2012
New Revision: 240762
URL: http://svn.freebsd.org/changeset/base/240762
Log:
Restore handling of the third argument (id) of hid_start_parse(), same as
it is done in NetBSD/OpenBSD, and as it was here before r205728.
I personally think this API or its implementation is incorrect, as it is not
correct to filter collections based on report ID, as they are orthogonal
in general case, but I see no harm from supporting this feature.
PR: usb/171810
Submitted by:Vitaly Magerya vmage...@gmail.com
MFC after: 1 month
Modified:
head/lib/libusbhid/descr.c
head/lib/libusbhid/parse.c
head/lib/libusbhid/usbhid.3
Modified: head/lib/libusbhid/descr.c
==
--- head/lib/libusbhid/descr.c Thu Sep 20 18:42:00 2012(r240761)
+++ head/lib/libusbhid/descr.c Thu Sep 20 18:56:27 2012(r240762)
@@ -68,7 +68,7 @@ hid_get_report_id(int fd)
if ((rep = hid_get_report_desc(fd)) == NULL)
goto use_ioctl;
kindset = 1 hid_input | 1 hid_output | 1 hid_feature;
- for (d = hid_start_parse(rep, kindset, 0); hid_get_item(d, h); ) {
+ for (d = hid_start_parse(rep, kindset, -1); hid_get_item(d, h); ) {
/* Return the first report ID we met. */
if (h.report_ID != 0) {
temp = h.report_ID;
Modified: head/lib/libusbhid/parse.c
==
--- head/lib/libusbhid/parse.c Thu Sep 20 18:42:00 2012(r240761)
+++ head/lib/libusbhid/parse.c Thu Sep 20 18:56:27 2012(r240762)
@@ -70,6 +70,7 @@ struct hid_data {
uint8_t iusage; /* current usages_min/max index */
uint8_t ousage; /* current usages_min/max offset */
uint8_t susage; /* usage set flags */
+ int32_t reportid; /* requested report ID */
};
/**
@@ -149,7 +150,7 @@ hid_switch_rid(struct hid_data *s, struc
*hid_start_parse
**/
hid_data_t
-hid_start_parse(report_desc_t d, int kindset, int id __unused)
+hid_start_parse(report_desc_t d, int kindset, int id)
{
struct hid_data *s;
@@ -158,6 +159,7 @@ hid_start_parse(report_desc_t d, int kin
s-start = s-p = d-data;
s-end = d-data + d-size;
s-kindset = kindset;
+ s-reportid = id;
return (s);
}
@@ -207,8 +209,8 @@ hid_get_byte(struct hid_data *s, const u
/**
*hid_get_item
**/
-int
-hid_get_item(hid_data_t s, hid_item_t *h)
+static int
+hid_get_item_raw(hid_data_t s, hid_item_t *h)
{
hid_item_t *c;
unsigned int bTag, bType, bSize;
@@ -509,6 +511,19 @@ hid_get_item(hid_data_t s, hid_item_t *h
}
int
+hid_get_item(hid_data_t s, hid_item_t *h)
+{
+ int r;
+
+ for (;;) {
+ r = hid_get_item_raw(s, h);
+ if (r = 0 || s-reportid == -1 || h-report_ID == s-reportid)
+ break;
+ }
+ return (r);
+}
+
+int
hid_report_size(report_desc_t r, enum hid_kind k, int id)
{
struct hid_data *d;
@@ -523,7 +538,7 @@ hid_report_size(report_desc_t r, enum hi
memset(h, 0, sizeof h);
for (d = hid_start_parse(r, 1 k, id); hid_get_item(d, h); ) {
- if ((h.report_ID == id || id 0) h.kind == k) {
+ if (h.kind == k) {
/* compute minimum */
if (lpos h.pos)
lpos = h.pos;
Modified: head/lib/libusbhid/usbhid.3
==
--- head/lib/libusbhid/usbhid.3Thu Sep 20 18:42:00 2012
(r240761)
+++ head/lib/libusbhid/usbhid.3Thu Sep 20 18:56:27 2012
(r240762)
@@ -144,16 +144,15 @@ fails it will return
.Ss Descriptor Parsing Functions
To parse the report descriptor the
.Fn hid_start_parse
-function should be called with a report descriptor and a set that
-describes which items that are interesting.
+function should be called with a report descriptor, a set that
+describes which items that are interesting, and the desired report
+ID (or -1 to obtain items of all report IDs).
The set is obtained by OR-ing together values
.Fa (1 k)
where
.Fa k
is an item of type
.Vt
Re: usb/169789: commit references a PR
The following reply was made to PR usb/169789; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/169789: commit references a PR Date: Tue, 18 Sep 2012 17:23:11 + (UTC) Author: hselasky Date: Tue Sep 18 17:23:00 2012 New Revision: 240669 URL: http://svn.freebsd.org/changeset/base/240669 Log: MFC r238079, r238493, r238526, r238529 and r238717: Add new USB ID's. PR: usb/169789 Modified: stable/9/sys/dev/usb/serial/u3g.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/serial/u3g.c == --- stable/9/sys/dev/usb/serial/u3g.c Tue Sep 18 17:17:04 2012 (r240668) +++ stable/9/sys/dev/usb/serial/u3g.c Tue Sep 18 17:23:00 2012 (r240669) @@ -285,14 +285,18 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(HUAWEI, E143F, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E173, 0), U3G_DEV(HUAWEI, E173_INIT, U3GINIT_HUAWEISCSI), + U3G_DEV(HUAWEI, E3131, 0), + U3G_DEV(HUAWEI, E3131_INIT, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, E180V, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), + U3G_DEV(HUAWEI, E392, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, E1820, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI), + U3G_DEV(HUAWEI, ETS2055, U3GINIT_HUAWEI), U3G_DEV(KYOCERA2, CDMA_MSM_K, 0), U3G_DEV(KYOCERA2, KPC680, 0), U3G_DEV(LONGCHEER, WM66, U3GINIT_HUAWEI), @@ -359,6 +363,8 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(QUALCOMM2, MF330, 0), U3G_DEV(QUALCOMM2, SIM5218, 0), U3G_DEV(QUALCOMM2, VW110L, U3GINIT_SCSIEJECT), + U3G_DEV(QUALCOMM2, GOBI2000_QDL, 0), + U3G_DEV(QUALCOMM2, GOBI2000, 0), U3G_DEV(QUALCOMMINC, AC2726, 0), U3G_DEV(QUALCOMMINC, AC8700, 0), U3G_DEV(QUALCOMMINC, AC8710, 0), Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevs Tue Sep 18 17:17:04 2012 (r240668) +++ stable/9/sys/dev/usb/usbdevs Tue Sep 18 17:23:00 2012 (r240669) @@ -2184,7 +2184,11 @@ product HUAWEI E143F0x143f 3G modem product HUAWEI E1752 0x1446 3G modem product HUAWEI K3765 0x1465 3G modem product HUAWEI E1820 0x14ac E1820 HSPA+ USB Slider +product HUAWEI E3131_INIT 0x14fe 3G modem initial +product HUAWEI E392 0x1505 LTE modem +product HUAWEI E3131 0x1506 3G modem product HUAWEI K3765_INIT 0x1520 K3765 Initial +product HUAWEI ETS20550x1803 CDMA modem product HUAWEI E173 0x1c05 3G modem product HUAWEI E173_INIT 0x1c0b 3G modem initial @@ -3328,6 +3332,8 @@ product QUALCOMM2 CDMA_MSM 0x3196 CDMA T product QUALCOMM2 AC8700 0x6000 AC8700 product QUALCOMM2 VW110L 0x1000 Vertex Wireless 110L modem product QUALCOMM2 SIM5218 0x9000 SIM5218 +product QUALCOMM2 GOBI2000_QDL0x9204 Qualcomm Gobi 2000 QDL +product QUALCOMM2 GOBI20000x9205 Qualcomm Gobi 2000 modem product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem product QUALCOMMINC E0002 0x0002 3G modem product QUALCOMMINC E0003 0x0003 3G modem ___ 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/171721: commit references a PR
The following reply was made to PR usb/171721; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/171721: commit references a PR
Date: Mon, 17 Sep 2012 19:06:47 + (UTC)
Author: hselasky
Date: Mon Sep 17 19:06:35 2012
New Revision: 240615
URL: http://svn.freebsd.org/changeset/base/240615
Log:
Add UQ_UMS_IGNORE quirk.
Wrap two long lines.
Some minor spelling correction.
PR: usb/171721
Modified:
head/share/man/man4/usb_quirk.4
head/sys/dev/usb/input/ums.c
head/sys/dev/usb/quirk/usb_quirk.c
head/sys/dev/usb/quirk/usb_quirk.h
Modified: head/share/man/man4/usb_quirk.4
==
--- head/share/man/man4/usb_quirk.4Mon Sep 17 16:39:32 2012
(r240614)
+++ head/share/man/man4/usb_quirk.4Mon Sep 17 19:06:35 2012
(r240615)
@@ -66,6 +66,8 @@ device should be ignored by hid class
device should be ignored by kbd class
.It UQ_KBD_BOOTPROTO
device should set the boot protocol
+.It UQ_UMS_IGNORE
+device should be ignored by ums class
.It UQ_MS_BAD_CLASS
doesn't identify properly
.It UQ_MS_LEADING_BYTE
Modified: head/sys/dev/usb/input/ums.c
==
--- head/sys/dev/usb/input/ums.c Mon Sep 17 16:39:32 2012
(r240614)
+++ head/sys/dev/usb/input/ums.c Mon Sep 17 19:06:35 2012
(r240615)
@@ -381,6 +381,9 @@ ums_probe(device_t dev)
if (uaa-info.bInterfaceClass != UICLASS_HID)
return (ENXIO);
+ if (usb_test_quirk(uaa, UQ_UMS_IGNORE))
+ return (ENXIO);
+
if ((uaa-info.bInterfaceSubClass == UISUBCLASS_BOOT)
(uaa-info.bInterfaceProtocol == UIPROTO_MOUSE))
return (BUS_PROBE_DEFAULT);
Modified: head/sys/dev/usb/quirk/usb_quirk.c
==
--- head/sys/dev/usb/quirk/usb_quirk.c Mon Sep 17 16:39:32 2012
(r240614)
+++ head/sys/dev/usb/quirk/usb_quirk.c Mon Sep 17 19:06:35 2012
(r240615)
@@ -494,6 +494,7 @@ static const char *usb_quirk_str[USB_QUI
[UQ_HID_IGNORE] = UQ_HID_IGNORE,
[UQ_KBD_IGNORE] = UQ_KBD_IGNORE,
[UQ_KBD_BOOTPROTO] = UQ_KBD_BOOTPROTO,
+ [UQ_UMS_IGNORE] = UQ_UMS_IGNORE,
[UQ_MS_BAD_CLASS] = UQ_MS_BAD_CLASS,
[UQ_MS_LEADING_BYTE]= UQ_MS_LEADING_BYTE,
[UQ_MS_REVZ]= UQ_MS_REVZ,
Modified: head/sys/dev/usb/quirk/usb_quirk.h
==
--- head/sys/dev/usb/quirk/usb_quirk.h Mon Sep 17 16:39:32 2012
(r240614)
+++ head/sys/dev/usb/quirk/usb_quirk.h Mon Sep 17 19:06:35 2012
(r240615)
@@ -29,7 +29,7 @@
enum {
/*
- * Keep in sync with theusb_quirk_str usb_quirk.c, and with the
+ * Keep in sync with usb_quirk_str in usb_quirk.c, and with
* share/man/man4/usb_quirk.4
*/
UQ_NONE,/* not a valid quirk */
@@ -49,6 +49,7 @@ enum {
UQ_HID_IGNORE, /* device should be ignored by hid class */
UQ_KBD_IGNORE, /* device should be ignored by kbd class */
UQ_KBD_BOOTPROTO, /* device should set the boot protocol */
+ UQ_UMS_IGNORE, /* device should be ignored by ums class */
UQ_MS_BAD_CLASS,/* doesn't identify properly */
UQ_MS_LEADING_BYTE, /* mouse sends an unknown leading byte */
UQ_MS_REVZ, /* mouse has Z-axis reversed */
@@ -64,7 +65,10 @@ enum {
UQ_CFG_INDEX_0, /* select configuration index 0 by default */
UQ_ASSUME_CM_OVER_DATA, /* assume cm over data feature */
- /* USB Mass Storage Quirks. See storage/umass.c for a detailed
description. */
+ /*
+ * USB Mass Storage Quirks. See storage/umass.c for a
+ * detailed description.
+ */
UQ_MSC_NO_TEST_UNIT_READY, /* send start/stop instead of TUR */
UQ_MSC_NO_RS_CLEAR_UA, /* does not reset Unit Att. */
UQ_MSC_NO_START_STOP, /* does not support start/stop */
___
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/170688: commit references a PR
The following reply was made to PR usb/170688; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/170688: commit references a PR Date: Fri, 17 Aug 2012 16:27:31 + (UTC) Author: hselasky Date: Fri Aug 17 16:27:11 2012 New Revision: 239358 URL: http://svn.freebsd.org/changeset/base/239358 Log: Add new USB device ID. PR: usb/170688 MFC after: 1 week Modified: head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Fri Aug 17 16:01:24 2012(r239357) +++ head/sys/dev/usb/usbdevs Fri Aug 17 16:27:11 2012(r239358) @@ -1118,6 +1118,7 @@ product ASUS A730W 0x4202 ASUS MyPal A7 product ASUS P535 0x420f ASUS P535 PDA product ASUS GMSC 0x422f ASUS Generic Mass Storage product ASUS RT2570 0x1706 RT2500USB Wireless Adapter +product ASUS USB_N53 0x179d ASUS Black Diamond Dual Band USB-N53 /* ATen products */ product ATEN UC1284 0x2001 Parallel printer Modified: head/sys/dev/usb/wlan/if_run.c == --- head/sys/dev/usb/wlan/if_run.c Fri Aug 17 16:01:24 2012 (r239357) +++ head/sys/dev/usb/wlan/if_run.c Fri Aug 17 16:27:11 2012 (r239358) @@ -136,6 +136,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(ASUS, RT2870_5), RUN_DEV(ASUS, USBN13), RUN_DEV(ASUS, RT3070_1), +RUN_DEV(ASUS, USB_N53), RUN_DEV(ASUS2,USBN11), RUN_DEV(AZUREWAVE,RT2870_1), RUN_DEV(AZUREWAVE,RT2870_2), ___ 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/170606: commit references a PR
The following reply was made to PR usb/170606; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/170606: commit references a PR
Date: Mon, 13 Aug 2012 18:34:16 + (UTC)
Author: hselasky
Date: Mon Aug 13 18:34:04 2012
New Revision: 239240
URL: http://svn.freebsd.org/changeset/base/239240
Log:
Fix for missing locks due to recent change.
PR: usb/170606
MFC after: 2 weeks
Modified:
head/sys/dev/usb/usb_device.c
Modified: head/sys/dev/usb/usb_device.c
==
--- head/sys/dev/usb/usb_device.c Mon Aug 13 18:10:52 2012
(r239239)
+++ head/sys/dev/usb/usb_device.c Mon Aug 13 18:34:04 2012
(r239240)
@@ -2777,8 +2777,15 @@ usbd_set_endpoint_mode(struct usb_device
uint8_t ep_mode)
{
usb_error_t error;
+ uint8_t do_unlock;
- sx_assert(udev-enum_sx, SA_LOCKED);
+ /* automatic locking */
+ if (usbd_enum_is_locked(udev)) {
+ do_unlock = 0;
+ } else {
+ do_unlock = 1;
+ usbd_enum_lock(udev);
+ }
if (udev-bus-methods-set_endpoint_mode != NULL) {
error = (udev-bus-methods-set_endpoint_mode) (
@@ -2792,6 +2799,9 @@ usbd_set_endpoint_mode(struct usb_device
/* only set new mode regardless of error */
ep-ep_mode = ep_mode;
+ if (do_unlock)
+ usbd_enum_unlock(udev);
+
return (error);
}
___
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/169789: commit references a PR
The following reply was made to PR usb/169789; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/169789: commit references a PR Date: Mon, 16 Jul 2012 09:36:03 + (UTC) Author: hselasky Date: Mon Jul 16 09:35:47 2012 New Revision: 238526 URL: http://svn.freebsd.org/changeset/base/238526 Log: Add new USB device ID. PR: usb/169789 MFC after: 1 week Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c == --- head/sys/dev/usb/serial/u3g.c Mon Jul 16 09:02:43 2012 (r238525) +++ head/sys/dev/usb/serial/u3g.c Mon Jul 16 09:35:47 2012 (r238526) @@ -359,6 +359,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(QUALCOMM2, MF330, 0), U3G_DEV(QUALCOMM2, SIM5218, 0), U3G_DEV(QUALCOMM2, VW110L, U3GINIT_SCSIEJECT), + U3G_DEV(QUALCOMM2, GOBI2000, 0), U3G_DEV(QUALCOMMINC, AC2726, 0), U3G_DEV(QUALCOMMINC, AC8700, 0), U3G_DEV(QUALCOMMINC, AC8710, 0), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Mon Jul 16 09:02:43 2012(r238525) +++ head/sys/dev/usb/usbdevs Mon Jul 16 09:35:47 2012(r238526) @@ -2705,6 +2705,7 @@ product QUALCOMM2 CDMA_MSM 0x3196 CDMA T product QUALCOMM2 AC8700 0x6000 AC8700 product QUALCOMM2 VW110L 0x1000 Vertex Wireless 110L modem product QUALCOMM2 SIM5218 0x9000 SIM5218 +product QUALCOMM2 GOBI20000x9204 Qualcomm Gobi 2000 product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem product QUALCOMMINC E0002 0x0002 3G modem product QUALCOMMINC E0003 0x0003 3G modem ___ 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/169789: commit references a PR
The following reply was made to PR usb/169789; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/169789: commit references a PR Date: Sun, 15 Jul 2012 18:12:21 + (UTC) Author: hselasky Date: Sun Jul 15 18:12:09 2012 New Revision: 238493 URL: http://svn.freebsd.org/changeset/base/238493 Log: Add new USB device ID. PR: usb/169789 MFC after: 1 week Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c == --- head/sys/dev/usb/serial/u3g.c Sun Jul 15 17:44:27 2012 (r238492) +++ head/sys/dev/usb/serial/u3g.c Sun Jul 15 18:12:09 2012 (r238493) @@ -282,6 +282,8 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(HUAWEI, E143F, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E173, 0), U3G_DEV(HUAWEI, E173_INIT, U3GINIT_HUAWEISCSI), + U3G_DEV(HUAWEI, E3131, 0), + U3G_DEV(HUAWEI, E3131_INIT, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, E180V, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Sun Jul 15 17:44:27 2012(r238492) +++ head/sys/dev/usb/usbdevs Sun Jul 15 18:12:09 2012(r238493) @@ -1894,6 +1894,8 @@ product HUAWEI E143F 0x143f 3G modem product HUAWEI E1752 0x1446 3G modem product HUAWEI K3765 0x1465 3G modem product HUAWEI E1820 0x14ac E1820 HSPA+ USB Slider +product HUAWEI E3131_INIT 0x14fe 3G modem initial +product HUAWEI E3131 0x1506 3G modem product HUAWEI K3765_INIT 0x1520 K3765 Initial product HUAWEI ETS20550x1803 CDMA modem product HUAWEI E173 0x1c05 3G modem ___ 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/168743: commit references a PR
The following reply was made to PR usb/168743; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/168743: commit references a PR
Date: Wed, 27 Jun 2012 11:02:49 + (UTC)
Author: mav
Date: Wed Jun 27 11:02:35 2012
New Revision: 237637
URL: http://svn.freebsd.org/changeset/base/237637
Log:
MFC r237398:
In camisr() clear CAM_SIM_ON_DONEQ flag after camisr_runqueue() purged SIM
done queue. Clearing it before caused extra SIM queueing in some cases.
It was invisible during normal operation, but during USB device unplug and
respective SIM destruction it could keep pointer on SIM without having
counted reference and as result crash the system by use afer free.
PR: usb/168743
Modified:
stable/9/sys/cam/cam_xpt.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/cam/cam_xpt.c
==
--- stable/9/sys/cam/cam_xpt.c Wed Jun 27 10:07:29 2012(r237636)
+++ stable/9/sys/cam/cam_xpt.c Wed Jun 27 11:02:35 2012(r237637)
@@ -4990,8 +4990,8 @@ camisr(void *dummy)
while ((sim = TAILQ_FIRST(queue)) != NULL) {
TAILQ_REMOVE(queue, sim, links);
CAM_SIM_LOCK(sim);
- sim-flags = ~CAM_SIM_ON_DONEQ;
camisr_runqueue(sim-sim_doneq);
+ sim-flags = ~CAM_SIM_ON_DONEQ;
CAM_SIM_UNLOCK(sim);
}
mtx_lock(cam_simq_lock);
___
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/168743: commit references a PR
The following reply was made to PR usb/168743; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/168743: commit references a PR
Date: Wed, 27 Jun 2012 11:04:18 + (UTC)
Author: mav
Date: Wed Jun 27 11:04:04 2012
New Revision: 237638
URL: http://svn.freebsd.org/changeset/base/237638
Log:
MFC r237398:
In camisr() clear CAM_SIM_ON_DONEQ flag after camisr_runqueue() purged SIM
done queue. Clearing it before caused extra SIM queueing in some cases.
It was invisible during normal operation, but during USB device unplug and
respective SIM destruction it could keep pointer on SIM without having
counted reference and as result crash the system by use afer free.
PR: usb/168743
Modified:
stable/8/sys/cam/cam_xpt.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/cam/cam_xpt.c
==
--- stable/8/sys/cam/cam_xpt.c Wed Jun 27 11:02:35 2012(r237637)
+++ stable/8/sys/cam/cam_xpt.c Wed Jun 27 11:04:04 2012(r237638)
@@ -4944,8 +4944,8 @@ camisr(void *dummy)
while ((sim = TAILQ_FIRST(queue)) != NULL) {
TAILQ_REMOVE(queue, sim, links);
CAM_SIM_LOCK(sim);
- sim-flags = ~CAM_SIM_ON_DONEQ;
camisr_runqueue(sim-sim_doneq);
+ sim-flags = ~CAM_SIM_ON_DONEQ;
CAM_SIM_UNLOCK(sim);
}
mtx_lock(cam_simq_lock);
___
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/165815: commit references a PR
The following reply was made to PR usb/165815; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/165815: commit references a PR
Date: Thu, 8 Mar 2012 07:22:55 + (UTC)
Author: hselasky
Date: Thu Mar 8 07:22:41 2012
New Revision: 232684
URL: http://svn.freebsd.org/changeset/base/232684
Log:
Add new USB device IDs.
PR: usb/165815
MFC after: 1 week
Modified:
head/share/man/man4/u3g.4
head/sys/dev/usb/serial/u3g.c
head/sys/dev/usb/usbdevs
Modified: head/share/man/man4/u3g.4
==
--- head/share/man/man4/u3g.4 Thu Mar 8 03:02:48 2012(r232683)
+++ head/share/man/man4/u3g.4 Thu Mar 8 07:22:41 2012(r232684)
@@ -63,6 +63,8 @@ Option GT 3G, GT 3G Quad, etc.
.It
Vodafone Mobile Connect Card 3G
.It
+Vodafone Mobile Broadband K3772-Z
+.It
Qualcomm Inc. CDMA MSM
.It
Huawei B190, E180v, E220 ('Huawei Mobile')
Modified: head/sys/dev/usb/serial/u3g.c
==
--- head/sys/dev/usb/serial/u3g.c Thu Mar 8 03:02:48 2012
(r232683)
+++ head/sys/dev/usb/serial/u3g.c Thu Mar 8 07:22:41 2012
(r232684)
@@ -423,6 +423,7 @@ static const STRUCT_USB_HOST_ID u3g_devs
U3G_DEV(QUALCOMMINC, SURFSTICK, 0),
U3G_DEV(QUALCOMMINC, E2002, 0),
U3G_DEV(QUALCOMMINC, E2003, 0),
+ U3G_DEV(QUALCOMMINC, K3772_Z, U3GINIT_SCSIEJECT),
U3G_DEV(QUALCOMMINC, MF626, 0),
U3G_DEV(QUALCOMMINC, MF628, 0),
U3G_DEV(QUALCOMMINC, MF633R, 0),
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevs Thu Mar 8 03:02:48 2012(r232683)
+++ head/sys/dev/usb/usbdevs Thu Mar 8 07:22:41 2012(r232684)
@@ -2750,6 +2750,7 @@ product QUALCOMMINC E00780x0078 3G mode
product QUALCOMMINC E0082 0x0082 3G modem
product QUALCOMMINC E0086 0x0086 3G modem
product QUALCOMMINC SURFSTICK 0x0117 11 Surf Stick
+product QUALCOMMINC K3772_Z 0x1179 3G modem
product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage
product QUALCOMMINC E2002 0x2002 3G modem
product QUALCOMMINC E2003 0x2003 3G modem
___
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/165154: commit references a PR
The following reply was made to PR usb/165154; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/165154: commit references a PR Date: Fri, 2 Mar 2012 09:30:27 + (UTC) Author: remko Date: Fri Mar 2 09:30:16 2012 New Revision: 232381 URL: http://svn.freebsd.org/changeset/base/232381 Log: MFC r231713 Add additional Sierra 3G device. Original commit message: Add new USB device ID. MFC after: 3 days PR:usb/165154 PR: usb/165154 Approved by: re(kib), hselasky Modified: stable/8/sys/dev/usb/serial/u3g.c stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/dev/usb/serial/u3g.c == --- stable/8/sys/dev/usb/serial/u3g.c Fri Mar 2 08:49:07 2012 (r232380) +++ stable/8/sys/dev/usb/serial/u3g.c Fri Mar 2 09:30:16 2012 (r232381) @@ -432,6 +432,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(QUANTA, Q111, 0), U3G_DEV(SIERRA, AC402, 0), U3G_DEV(SIERRA, AC595U, 0), + U3G_DEV(SIERRA, AC313U, 0), U3G_DEV(SIERRA, AC597E, 0), U3G_DEV(SIERRA, AC875E, 0), U3G_DEV(SIERRA, AC875U, 0), Modified: stable/8/sys/dev/usb/usbdevs == --- stable/8/sys/dev/usb/usbdevs Fri Mar 2 08:49:07 2012 (r232380) +++ stable/8/sys/dev/usb/usbdevs Fri Mar 2 09:30:16 2012 (r232381) @@ -2989,6 +2989,7 @@ product SIERRA E6892 0x6892 E6892 product SIERRA E6893 0x6893 E6893 product SIERRA MC8700 0x68A3 MC8700 product SIERRA AIRCARD875 0x6820 Aircard 875 HSDPA +product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer /* Sigmatel products */ ___ 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/165154: commit references a PR
The following reply was made to PR usb/165154; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/165154: commit references a PR Date: Fri, 2 Mar 2012 09:30:27 + (UTC) Author: remko Date: Fri Mar 2 09:30:16 2012 New Revision: 232381 URL: http://svn.freebsd.org/changeset/base/232381 Log: MFC r231713 Add additional Sierra 3G device. Original commit message: Add new USB device ID. MFC after: 3 days PR:usb/165154 PR: usb/165154 Approved by: re(kib), hselasky Modified: stable/8/sys/dev/usb/serial/u3g.c stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/dev/usb/serial/u3g.c == --- stable/8/sys/dev/usb/serial/u3g.c Fri Mar 2 08:49:07 2012 (r232380) +++ stable/8/sys/dev/usb/serial/u3g.c Fri Mar 2 09:30:16 2012 (r232381) @@ -432,6 +432,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(QUANTA, Q111, 0), U3G_DEV(SIERRA, AC402, 0), U3G_DEV(SIERRA, AC595U, 0), + U3G_DEV(SIERRA, AC313U, 0), U3G_DEV(SIERRA, AC597E, 0), U3G_DEV(SIERRA, AC875E, 0), U3G_DEV(SIERRA, AC875U, 0), Modified: stable/8/sys/dev/usb/usbdevs == --- stable/8/sys/dev/usb/usbdevs Fri Mar 2 08:49:07 2012 (r232380) +++ stable/8/sys/dev/usb/usbdevs Fri Mar 2 09:30:16 2012 (r232381) @@ -2989,6 +2989,7 @@ product SIERRA E6892 0x6892 E6892 product SIERRA E6893 0x6893 E6893 product SIERRA MC8700 0x68A3 MC8700 product SIERRA AIRCARD875 0x6820 Aircard 875 HSDPA +product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer /* Sigmatel products */ ___ 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/165154: commit references a PR
The following reply was made to PR usb/165154; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/165154: commit references a PR Date: Thu, 23 Feb 2012 07:27:13 + (UTC) Author: hselasky Date: Thu Feb 23 07:26:58 2012 New Revision: 232036 URL: http://svn.freebsd.org/changeset/base/232036 Log: MFC r231713: Add new USB device ID. PR: usb/165154 Modified: stable/9/sys/dev/usb/serial/u3g.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/dev/usb/serial/u3g.c == --- stable/9/sys/dev/usb/serial/u3g.c Thu Feb 23 07:23:33 2012 (r232035) +++ stable/9/sys/dev/usb/serial/u3g.c Thu Feb 23 07:26:58 2012 (r232036) @@ -432,6 +432,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(QUANTA, Q111, 0), U3G_DEV(SIERRA, AC402, 0), U3G_DEV(SIERRA, AC595U, 0), + U3G_DEV(SIERRA, AC313U, 0), U3G_DEV(SIERRA, AC597E, 0), U3G_DEV(SIERRA, AC875E, 0), U3G_DEV(SIERRA, AC875U, 0), Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevs Thu Feb 23 07:23:33 2012 (r232035) +++ stable/9/sys/dev/usb/usbdevs Thu Feb 23 07:26:58 2012 (r232036) @@ -3000,6 +3000,7 @@ product SIERRA E6892 0x6892 E6892 product SIERRA E6893 0x6893 E6893 product SIERRA MC8700 0x68A3 MC8700 product SIERRA AIRCARD875 0x6820 Aircard 875 HSDPA +product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer /* Sigmatel products */ ___ 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/164090: commit references a PR
The following reply was made to PR usb/164090; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/164090: commit references a PR
Date: Thu, 23 Feb 2012 07:35:17 + (UTC)
Author: hselasky
Date: Thu Feb 23 07:34:53 2012
New Revision: 232038
URL: http://svn.freebsd.org/changeset/base/232038
Log:
MFC r230204 and r230209:
Export information about USB serial port unit and port numbers
directly via the sysctl interface.
PR: usb/164090
Modified:
stable/9/sys/dev/usb/serial/usb_serial.c
stable/9/sys/dev/usb/serial/usb_serial.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/dev/usb/serial/usb_serial.c
==
--- stable/9/sys/dev/usb/serial/usb_serial.c Thu Feb 23 07:27:20 2012
(r232037)
+++ stable/9/sys/dev/usb/serial/usb_serial.c Thu Feb 23 07:34:53 2012
(r232038)
@@ -248,10 +248,16 @@ ucom_attach(struct ucom_super_softc *ssc
return (EINVAL);
}
+ /* allocate a uniq unit number */
ssc-sc_unit = ucom_unit_alloc();
if (ssc-sc_unit == -1)
return (ENOMEM);
+ /* generate TTY name string */
+ snprintf(ssc-sc_ttyname, sizeof(ssc-sc_ttyname),
+ UCOM_TTY_PREFIX %d, ssc-sc_unit);
+
+ /* create USB request handling process */
error = usb_proc_create(ssc-sc_tq, mtx, ucom, USB_PRI_MED);
if (error) {
ucom_unit_free(ssc-sc_unit);
@@ -292,6 +298,16 @@ ucom_detach(struct ucom_super_softc *ssc
if (ssc-sc_subunits == 0)
return; /* not initialized */
+ if (ssc-sc_sysctl_ttyname != NULL) {
+ sysctl_remove_oid(ssc-sc_sysctl_ttyname, 1, 0);
+ ssc-sc_sysctl_ttyname = NULL;
+ }
+
+ if (ssc-sc_sysctl_ttyports != NULL) {
+ sysctl_remove_oid(ssc-sc_sysctl_ttyports, 1, 0);
+ ssc-sc_sysctl_ttyports = NULL;
+ }
+
usb_proc_drain(ssc-sc_tq);
for (subunit = 0; subunit ssc-sc_subunits; subunit++) {
@@ -420,19 +436,36 @@ ucom_detach_tty(struct ucom_softc *sc)
void
ucom_set_pnpinfo_usb(struct ucom_super_softc *ssc, device_t dev)
{
-char buf[64];
-uint8_t iface_index;
-struct usb_attach_arg *uaa;
-
-snprintf(buf, sizeof(buf), ttyname=%s%d ttyports=%d,
- UCOM_TTY_PREFIX, ssc-sc_unit, ssc-sc_subunits);
-
-/* Store the PNP info in the first interface for the dev */
-uaa = device_get_ivars(dev);
-iface_index = uaa-info.bIfaceIndex;
+ char buf[64];
+ uint8_t iface_index;
+ struct usb_attach_arg *uaa;
+
+ snprintf(buf, sizeof(buf), ttyname= UCOM_TTY_PREFIX
+ %d ttyports=%d, ssc-sc_unit, ssc-sc_subunits);
+
+ /* Store the PNP info in the first interface for the device */
+ uaa = device_get_ivars(dev);
+ iface_index = uaa-info.bIfaceIndex;
-if (usbd_set_pnpinfo(uaa-device, iface_index, buf) != 0)
- device_printf(dev, Could not set PNP info\n);
+ if (usbd_set_pnpinfo(uaa-device, iface_index, buf) != 0)
+ device_printf(dev, Could not set PNP info\n);
+
+ /*
+ * The following information is also replicated in the PNP-info
+ * string which is registered above:
+ */
+ if (ssc-sc_sysctl_ttyname == NULL) {
+ ssc-sc_sysctl_ttyname = SYSCTL_ADD_STRING(NULL,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ OID_AUTO, ttyname, CTLFLAG_RD, ssc-sc_ttyname, 0,
+ TTY device basename);
+ }
+ if (ssc-sc_sysctl_ttyports == NULL) {
+ ssc-sc_sysctl_ttyports = SYSCTL_ADD_INT(NULL,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ OID_AUTO, ttyports, CTLFLAG_RD,
+ NULL, ssc-sc_subunits, Number of ports);
+ }
}
static void
Modified: stable/9/sys/dev/usb/serial/usb_serial.h
==
--- stable/9/sys/dev/usb/serial/usb_serial.h Thu Feb 23 07:27:20 2012
(r232037)
+++ stable/9/sys/dev/usb/serial/usb_serial.h Thu Feb 23 07:34:53 2012
(r232038)
@@ -70,6 +70,7 @@
#include sys/tty.h
#include sys/serial.h
#include sys/fcntl.h
+#include sys/sysctl.h
/* Module interface related macros */
#define UCOM_MODVER 1
@@ -132,8 +133,11 @@ struct ucom_param_task {
struct ucom_super_softc {
struct usb_process sc_tq;
- uint32_t sc_unit;
- uint32_t sc_subunits;
+ int sc_unit;
+ int sc_subunits;
+ struct sysctl_oid *sc_sysctl_ttyname;
+ struct sysctl_oid *sc_sysctl_ttyports;
+ char sc_ttyname[16];
};
struct ucom_softc {
___
svn-src
Re: usb/164275: commit references a PR
The following reply was made to PR usb/164275; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/164275: commit references a PR Date: Thu, 19 Jan 2012 18:04:02 + (UTC) Author: hselasky Date: Thu Jan 19 18:03:52 2012 New Revision: 230333 URL: http://svn.freebsd.org/changeset/base/230333 Log: Add support for new USB device. PR: usb/164275 MFC after: 3 days Modified: head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Thu Jan 19 17:29:54 2012(r230332) +++ head/sys/dev/usb/usbdevs Thu Jan 19 18:03:52 2012(r230333) @@ -2091,7 +2091,6 @@ product LINKSYS4 RT3070 0x0078 RT3070 product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2 /* Logitech products */ -product LOGITECH LANW300NU2 0x0166 LAN-W300N/U2 product LOGITECH M24520x0203 M2452 keyboard product LOGITECH M48480x0301 M4848 mouse product LOGITECH PAGESCAN 0x040f PageScan @@ -2124,6 +2123,7 @@ product LOGITEC LAN_GTJU2A 0x0160 LAN-GT product LOGITEC RT2870_1 0x0162 RT2870 product LOGITEC RT2870_2 0x0163 RT2870 product LOGITEC RT2870_3 0x0164 RT2870 +product LOGITEC LANW300NU20x0166 LAN-W300N/U2 /* Longcheer Holdings, Ltd. products */ product LONGCHEER WM660x6061 Longcheer WM66 HSDPA Modified: head/sys/dev/usb/wlan/if_run.c == --- head/sys/dev/usb/wlan/if_run.c Thu Jan 19 17:29:54 2012 (r230332) +++ head/sys/dev/usb/wlan/if_run.c Thu Jan 19 18:03:52 2012 (r230333) @@ -208,7 +208,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(LOGITEC, RT2870_1), RUN_DEV(LOGITEC, RT2870_2), RUN_DEV(LOGITEC, RT2870_3), -RUN_DEV(LOGITECH, LANW300NU2), +RUN_DEV(LOGITEC, LANW300NU2), RUN_DEV(MELCO,RT2870_1), RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), ___ 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/164090: commit references a PR
The following reply was made to PR usb/164090; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/164090: commit references a PR
Date: Mon, 16 Jan 2012 08:13:39 + (UTC)
Author: hselasky
Date: Mon Jan 16 08:13:25 2012
New Revision: 230204
URL: http://svn.freebsd.org/changeset/base/230204
Log:
Export information about USB serial port unit and port numbers
directly via the sysctl interface.
Submitted by:Mykhaylo Yehorov
PR: usb/164090
MFC after: 1 week
Modified:
head/sys/dev/usb/serial/usb_serial.c
head/sys/dev/usb/serial/usb_serial.h
Modified: head/sys/dev/usb/serial/usb_serial.c
==
--- head/sys/dev/usb/serial/usb_serial.c Mon Jan 16 07:02:59 2012
(r230203)
+++ head/sys/dev/usb/serial/usb_serial.c Mon Jan 16 08:13:25 2012
(r230204)
@@ -292,6 +292,16 @@ ucom_detach(struct ucom_super_softc *ssc
if (ssc-sc_subunits == 0)
return; /* not initialized */
+ if (ssc-sc_sysctl_ttyunit != NULL) {
+ sysctl_remove_oid(ssc-sc_sysctl_ttyunit, 1, 0);
+ ssc-sc_sysctl_ttyunit = NULL;
+ }
+
+ if (ssc-sc_sysctl_ttyports != NULL) {
+ sysctl_remove_oid(ssc-sc_sysctl_ttyports, 1, 0);
+ ssc-sc_sysctl_ttyports = NULL;
+ }
+
usb_proc_drain(ssc-sc_tq);
for (subunit = 0; subunit ssc-sc_subunits; subunit++) {
@@ -420,19 +430,36 @@ ucom_detach_tty(struct ucom_softc *sc)
void
ucom_set_pnpinfo_usb(struct ucom_super_softc *ssc, device_t dev)
{
-char buf[64];
-uint8_t iface_index;
-struct usb_attach_arg *uaa;
-
-snprintf(buf, sizeof(buf), ttyname=%s%d ttyports=%d,
- UCOM_TTY_PREFIX, ssc-sc_unit, ssc-sc_subunits);
-
-/* Store the PNP info in the first interface for the dev */
-uaa = device_get_ivars(dev);
-iface_index = uaa-info.bIfaceIndex;
+ char buf[64];
+ uint8_t iface_index;
+ struct usb_attach_arg *uaa;
+
+ snprintf(buf, sizeof(buf), ttyname=%s%d ttyports=%d,
+ UCOM_TTY_PREFIX, ssc-sc_unit, ssc-sc_subunits);
+
+ /* Store the PNP info in the first interface for the device */
+ uaa = device_get_ivars(dev);
+ iface_index = uaa-info.bIfaceIndex;
-if (usbd_set_pnpinfo(uaa-device, iface_index, buf) != 0)
- device_printf(dev, Could not set PNP info\n);
+ if (usbd_set_pnpinfo(uaa-device, iface_index, buf) != 0)
+ device_printf(dev, Could not set PNP info\n);
+
+ /*
+ * The following information is also replicated in the pnp-info
+ * string which is registered above:
+ */
+ if (ssc-sc_sysctl_ttyunit == NULL) {
+ ssc-sc_sysctl_ttyunit = SYSCTL_ADD_INT(NULL,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ OID_AUTO, ttyunit, CTLFLAG_RD,
+ NULL, ssc-sc_unit, TTY unit number);
+ }
+ if (ssc-sc_sysctl_ttyports == NULL) {
+ ssc-sc_sysctl_ttyports = SYSCTL_ADD_INT(NULL,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ OID_AUTO, ttyports, CTLFLAG_RD,
+ NULL, ssc-sc_subunits, Number of ports);
+ }
}
static void
Modified: head/sys/dev/usb/serial/usb_serial.h
==
--- head/sys/dev/usb/serial/usb_serial.h Mon Jan 16 07:02:59 2012
(r230203)
+++ head/sys/dev/usb/serial/usb_serial.h Mon Jan 16 08:13:25 2012
(r230204)
@@ -70,6 +70,7 @@
#include sys/tty.h
#include sys/serial.h
#include sys/fcntl.h
+#include sys/sysctl.h
/* Module interface related macros */
#define UCOM_MODVER 1
@@ -132,8 +133,10 @@ struct ucom_param_task {
struct ucom_super_softc {
struct usb_process sc_tq;
- uint32_t sc_unit;
- uint32_t sc_subunits;
+ int sc_unit;
+ int sc_subunits;
+ struct sysctl_oid *sc_sysctl_ttyunit;
+ struct sysctl_oid *sc_sysctl_ttyports;
};
struct ucom_softc {
___
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/164090: commit references a PR
The following reply was made to PR usb/164090; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/164090: commit references a PR
Date: Mon, 16 Jan 2012 10:43:00 + (UTC)
Author: hselasky
Date: Mon Jan 16 10:42:43 2012
New Revision: 230209
URL: http://svn.freebsd.org/changeset/base/230209
Log:
Export ttyname instead of ttyunit via the sysctl interface.
Submitted by:Mykhaylo Yehorov
PR: usb/164090
MFC after: 1 week
Modified:
head/sys/dev/usb/serial/usb_serial.c
head/sys/dev/usb/serial/usb_serial.h
Modified: head/sys/dev/usb/serial/usb_serial.c
==
--- head/sys/dev/usb/serial/usb_serial.c Mon Jan 16 10:25:22 2012
(r230208)
+++ head/sys/dev/usb/serial/usb_serial.c Mon Jan 16 10:42:43 2012
(r230209)
@@ -248,10 +248,16 @@ ucom_attach(struct ucom_super_softc *ssc
return (EINVAL);
}
+ /* allocate a uniq unit number */
ssc-sc_unit = ucom_unit_alloc();
if (ssc-sc_unit == -1)
return (ENOMEM);
+ /* generate TTY name string */
+ snprintf(ssc-sc_ttyname, sizeof(ssc-sc_ttyname),
+ UCOM_TTY_PREFIX %d, ssc-sc_unit);
+
+ /* create USB request handling process */
error = usb_proc_create(ssc-sc_tq, mtx, ucom, USB_PRI_MED);
if (error) {
ucom_unit_free(ssc-sc_unit);
@@ -292,9 +298,9 @@ ucom_detach(struct ucom_super_softc *ssc
if (ssc-sc_subunits == 0)
return; /* not initialized */
- if (ssc-sc_sysctl_ttyunit != NULL) {
- sysctl_remove_oid(ssc-sc_sysctl_ttyunit, 1, 0);
- ssc-sc_sysctl_ttyunit = NULL;
+ if (ssc-sc_sysctl_ttyname != NULL) {
+ sysctl_remove_oid(ssc-sc_sysctl_ttyname, 1, 0);
+ ssc-sc_sysctl_ttyname = NULL;
}
if (ssc-sc_sysctl_ttyports != NULL) {
@@ -434,8 +440,8 @@ ucom_set_pnpinfo_usb(struct ucom_super_s
uint8_t iface_index;
struct usb_attach_arg *uaa;
- snprintf(buf, sizeof(buf), ttyname=%s%d ttyports=%d,
- UCOM_TTY_PREFIX, ssc-sc_unit, ssc-sc_subunits);
+ snprintf(buf, sizeof(buf), ttyname= UCOM_TTY_PREFIX
+ %d ttyports=%d, ssc-sc_unit, ssc-sc_subunits);
/* Store the PNP info in the first interface for the device */
uaa = device_get_ivars(dev);
@@ -445,14 +451,14 @@ ucom_set_pnpinfo_usb(struct ucom_super_s
device_printf(dev, Could not set PNP info\n);
/*
- * The following information is also replicated in the pnp-info
+ * The following information is also replicated in the PNP-info
* string which is registered above:
*/
- if (ssc-sc_sysctl_ttyunit == NULL) {
- ssc-sc_sysctl_ttyunit = SYSCTL_ADD_INT(NULL,
+ if (ssc-sc_sysctl_ttyname == NULL) {
+ ssc-sc_sysctl_ttyname = SYSCTL_ADD_STRING(NULL,
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- OID_AUTO, ttyunit, CTLFLAG_RD,
- NULL, ssc-sc_unit, TTY unit number);
+ OID_AUTO, ttyname, CTLFLAG_RD, ssc-sc_ttyname, 0,
+ TTY device basename);
}
if (ssc-sc_sysctl_ttyports == NULL) {
ssc-sc_sysctl_ttyports = SYSCTL_ADD_INT(NULL,
Modified: head/sys/dev/usb/serial/usb_serial.h
==
--- head/sys/dev/usb/serial/usb_serial.h Mon Jan 16 10:25:22 2012
(r230208)
+++ head/sys/dev/usb/serial/usb_serial.h Mon Jan 16 10:42:43 2012
(r230209)
@@ -135,8 +135,9 @@ struct ucom_super_softc {
struct usb_process sc_tq;
int sc_unit;
int sc_subunits;
- struct sysctl_oid *sc_sysctl_ttyunit;
+ struct sysctl_oid *sc_sysctl_ttyname;
struct sysctl_oid *sc_sysctl_ttyports;
+ char sc_ttyname[16];
};
struct ucom_softc {
___
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: kern/163091: commit references a PR
The following reply was made to PR kern/163091; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/163091: commit references a PR
Date: Tue, 3 Jan 2012 09:18:00 + (UTC)
Author: hselasky
Date: Tue Jan 3 09:17:50 2012
New Revision: 229371
URL: http://svn.freebsd.org/changeset/base/229371
Log:
MFC r228758:
- Fix for race against user-space applications trying to change the
configuration on USB HUBs.
PR: kern/163091
Modified:
stable/8/sys/dev/usb/usb_hub.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/usb/usb_hub.c
==
--- stable/8/sys/dev/usb/usb_hub.c Tue Jan 3 09:15:54 2012
(r229370)
+++ stable/8/sys/dev/usb/usb_hub.c Tue Jan 3 09:17:50 2012
(r229371)
@@ -707,6 +707,13 @@ uhub_explore(struct usb_device *udev)
DPRINTF(Device is suspended!\n);
return (0);
}
+
+ /*
+ * Make sure we don't race against user-space applications
+ * like LibUSB:
+ */
+ usbd_enum_lock(udev);
+
for (x = 0; x != hub-nports; x++) {
up = hub-ports + x;
portno = x + 1;
@@ -784,6 +791,8 @@ uhub_explore(struct usb_device *udev)
up-restartcnt = 0;
}
+ usbd_enum_unlock(udev);
+
/* initial status checked */
sc-sc_flags |= UHUB_FLAG_DID_EXPLORE;
___
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: kern/163091: commit references a PR
The following reply was made to PR kern/163091; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/163091: commit references a PR
Date: Sat, 31 Dec 2011 14:24:41 + (UTC)
Author: hselasky
Date: Sat Dec 31 14:24:22 2011
New Revision: 229097
URL: http://svn.freebsd.org/changeset/base/229097
Log:
MFC r228758:
Fix for race against user-space applications trying to change the
configuration on USB HUBs.
PR: kern/163091
Modified:
stable/9/sys/dev/usb/usb_hub.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/usb/usb_hub.c
==
--- stable/9/sys/dev/usb/usb_hub.c Sat Dec 31 14:22:02 2011
(r229096)
+++ stable/9/sys/dev/usb/usb_hub.c Sat Dec 31 14:24:22 2011
(r229097)
@@ -707,6 +707,13 @@ uhub_explore(struct usb_device *udev)
DPRINTF(Device is suspended!\n);
return (0);
}
+
+ /*
+ * Make sure we don't race against user-space applications
+ * like LibUSB:
+ */
+ usbd_enum_lock(udev);
+
for (x = 0; x != hub-nports; x++) {
up = hub-ports + x;
portno = x + 1;
@@ -784,6 +791,8 @@ uhub_explore(struct usb_device *udev)
up-restartcnt = 0;
}
+ usbd_enum_unlock(udev);
+
/* initial status checked */
sc-sc_flags |= UHUB_FLAG_DID_EXPLORE;
___
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/163732: commit references a PR
The following reply was made to PR usb/163732; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/163732: commit references a PR Date: Sat, 31 Dec 2011 15:14:19 + (UTC) Author: hselasky Date: Sat Dec 31 15:14:07 2011 New Revision: 229115 URL: http://svn.freebsd.org/changeset/base/229115 Log: MFC r227781: Add new USB IDs. PR: usb/162712, usb/163732 Modified: stable/9/sys/dev/usb/usbdevs stable/9/sys/dev/usb/wlan/if_run.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevs Sat Dec 31 15:11:47 2011 (r229114) +++ stable/9/sys/dev/usb/usbdevs Sat Dec 31 15:14:07 2011 (r229115) @@ -2084,6 +2084,7 @@ product LINKSYS4 RT3070 0x0078 RT3070 product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2 /* Logitech products */ +product LOGITECH LANW300NU2 0x0166 LAN-W300N/U2 product LOGITECH M24520x0203 M2452 keyboard product LOGITECH M48480x0301 M4848 mouse product LOGITECH PAGESCAN 0x040f PageScan @@ -2179,6 +2180,7 @@ product MELCO RT2870_1 0x0148 RT2870 product MELCO RT2870_20x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN product MELCO WLIUCG301N 0x016f WLI-UC-G301N +product MELCO WLIUCGNM0x01a2 WLI-UC-GNM /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 Modified: stable/9/sys/dev/usb/wlan/if_run.c == --- stable/9/sys/dev/usb/wlan/if_run.c Sat Dec 31 15:11:47 2011 (r229114) +++ stable/9/sys/dev/usb/wlan/if_run.c Sat Dec 31 15:14:07 2011 (r229115) @@ -208,12 +208,14 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(LOGITEC, RT2870_1), RUN_DEV(LOGITEC, RT2870_2), RUN_DEV(LOGITEC, RT2870_3), +RUN_DEV(LOGITECH, LANW300NU2), RUN_DEV(MELCO,RT2870_1), RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), RUN_DEV(MELCO,WLIUCG300N), RUN_DEV(MELCO,WLIUCG301N), RUN_DEV(MELCO,WLIUCGN), +RUN_DEV(MELCO,WLIUCGNM), RUN_DEV(MOTOROLA4,RT2770), RUN_DEV(MOTOROLA4,RT3070), RUN_DEV(MSI, RT3070_1), ___ 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: kern/163091: commit references a PR
The following reply was made to PR kern/163091; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/163091: commit references a PR
Date: Wed, 21 Dec 2011 08:46:17 + (UTC)
Author: hselasky
Date: Wed Dec 21 08:46:08 2011
New Revision: 228758
URL: http://svn.freebsd.org/changeset/base/228758
Log:
Fix for race against user-space applications trying to change the
configuration on USB HUBs.
PR: kern/163091
MFC after: 1 week
Modified:
head/sys/dev/usb/usb_hub.c
Modified: head/sys/dev/usb/usb_hub.c
==
--- head/sys/dev/usb/usb_hub.c Wed Dec 21 02:45:51 2011(r228757)
+++ head/sys/dev/usb/usb_hub.c Wed Dec 21 08:46:08 2011(r228758)
@@ -707,6 +707,13 @@ uhub_explore(struct usb_device *udev)
DPRINTF(Device is suspended!\n);
return (0);
}
+
+ /*
+ * Make sure we don't race against user-space applications
+ * like LibUSB:
+ */
+ usbd_enum_lock(udev);
+
for (x = 0; x != hub-nports; x++) {
up = hub-ports + x;
portno = x + 1;
@@ -784,6 +791,8 @@ uhub_explore(struct usb_device *udev)
up-restartcnt = 0;
}
+ usbd_enum_unlock(udev);
+
/* initial status checked */
sc-sc_flags |= UHUB_FLAG_DID_EXPLORE;
___
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/162712: commit references a PR
The following reply was made to PR usb/162712; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/162712: commit references a PR Date: Sat, 3 Dec 2011 14:02:35 + (UTC) Author: hselasky Date: Sat Dec 3 14:02:25 2011 New Revision: 228224 URL: http://svn.freebsd.org/changeset/base/228224 Log: MFC r227610 and r227781: Add new USB IDs. PR: usb/162712 Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c stable/8/sys/dev/usb/usbdevs stable/8/sys/dev/usb/wlan/if_run.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c == --- stable/8/sys/dev/usb/quirk/usb_quirk.c Sat Dec 3 13:54:54 2011 (r228223) +++ stable/8/sys/dev/usb/quirk/usb_quirk.c Sat Dec 3 14:02:25 2011 (r228224) @@ -148,10 +148,6 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(AIPTEK, POCKETCAM3M, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), - USB_QUIRK(ALCOR, SDCR_6335, 0x, 0x, UQ_MSC_NO_TEST_UNIT_READY, - UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(ALCOR, SDCR_6362, 0x, 0x, UQ_MSC_NO_TEST_UNIT_READY, - UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, UMCR_9361, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(ALCOR, TRANSCEND, 0x, 0x, UQ_MSC_NO_GETMAXLUN, @@ -462,6 +458,7 @@ static struct usb_quirk_entry usb_quirks * Quirks for manufacturers which USB devices does not respond * after issuing non-supported commands: */ + USB_QUIRK(ALCOR, DUMMY, 0x, 0x, UQ_MSC_NO_SYNC_CACHE, UQ_MSC_NO_TEST_UNIT_READY, UQ_MATCH_VENDOR_ONLY), USB_QUIRK(FEIYA, DUMMY, 0x, 0x, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY), USB_QUIRK(REALTEK, DUMMY, 0x, 0x, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY), USB_QUIRK(INITIO, DUMMY, 0x, 0x, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY), Modified: stable/8/sys/dev/usb/usbdevs == --- stable/8/sys/dev/usb/usbdevs Sat Dec 3 13:54:54 2011 (r228223) +++ stable/8/sys/dev/usb/usbdevs Sat Dec 3 14:02:25 2011 (r228224) @@ -913,8 +913,10 @@ product ALCATEL OT535 0x02df One Touch /* Alcor Micro, Inc. products */ product ALCOR2 KBD_HUB0x2802 Kbd Hub +product ALCOR DUMMY 0x Dummy product product ALCOR SDCR_6335 0x6335 SD/MMC Card Reader product ALCOR SDCR_6362 0x6362 SD/MMC Card Reader +product ALCOR SDCR_6366 0x6366 SD/MMC Card Reader product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive product ALCOR MA_KBD_HUB 0x9213 MacAlly Kbd Hub product ALCOR AU9814 0x9215 AU9814 Hub @@ -2082,6 +2084,7 @@ product LINKSYS4 RT3070 0x0078 RT3070 product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2 /* Logitech products */ +product LOGITECH LANW300NU2 0x0166 LAN-W300N/U2 product LOGITECH M24520x0203 M2452 keyboard product LOGITECH M48480x0301 M4848 mouse product LOGITECH PAGESCAN 0x040f PageScan @@ -2177,6 +2180,7 @@ product MELCO RT2870_1 0x0148 RT2870 product MELCO RT2870_20x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN product MELCO WLIUCG301N 0x016f WLI-UC-G301N +product MELCO WLIUCGNM0x01a2 WLI-UC-GNM /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 Modified: stable/8/sys/dev/usb/wlan/if_run.c == --- stable/8/sys/dev/usb/wlan/if_run.c Sat Dec 3 13:54:54 2011 (r228223) +++ stable/8/sys/dev/usb/wlan/if_run.c Sat Dec 3 14:02:25 2011 (r228224) @@ -208,12 +208,14 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(LOGITEC, RT2870_1), RUN_DEV(LOGITEC, RT2870_2), RUN_DEV(LOGITEC, RT2870_3), +RUN_DEV(LOGITECH, LANW300NU2), RUN_DEV(MELCO,RT2870_1), RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), RUN_DEV(MELCO,WLIUCG300N), RUN_DEV(MELCO,WLIUCG301N), RUN_DEV(MELCO,WLIUCGN), +RUN_DEV(MELCO,WLIUCGNM), RUN_DEV(MOTOROLA4,RT2770), RUN_DEV(MOTOROLA4,RT3070
Re: usb/162307: commit references a PR
The following reply was made to PR usb/162307; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/162307: commit references a PR
Date: Sat, 3 Dec 2011 14:11:56 + (UTC)
Author: hselasky
Date: Sat Dec 3 14:11:47 2011
New Revision: 228226
URL: http://svn.freebsd.org/changeset/base/228226
Log:
MFC r227108, r227383 and r227463:
Add support for modem control lines and GPIO pins to USLCOM driver.
PR: usb/162307
Modified:
stable/8/sys/dev/usb/serial/uslcom.c
stable/8/sys/dev/usb/usb_ioctl.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/usb/serial/uslcom.c
==
--- stable/8/sys/dev/usb/serial/uslcom.c Sat Dec 3 14:03:53 2011
(r228225)
+++ stable/8/sys/dev/usb/serial/uslcom.c Sat Dec 3 14:11:47 2011
(r228226)
@@ -41,6 +41,7 @@ __FBSDID($FreeBSD$);
#include dev/usb/usb.h
#include dev/usb/usbdi.h
#include dev/usb/usbdi_util.h
+#include dev/usb/usb_ioctl.h
#include usbdevs.h
#define USB_DEBUG_VAR uslcom_debug
@@ -63,49 +64,72 @@ SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, deb
#define USLCOM_SET_DATA_BITS(x) ((x) 8)
+/* Request types */
#define USLCOM_WRITE0x41
#define USLCOM_READ 0xc1
+/* Request codes */
#define USLCOM_UART 0x00
#define USLCOM_BAUD_RATE0x01
#define USLCOM_DATA 0x03
#define USLCOM_BREAK0x05
#define USLCOM_CTRL 0x07
+#define USLCOM_RCTRL0x08
+#define USLCOM_SET_FLOWCTRL 0x13
+#define USLCOM_VENDOR_SPECIFIC 0xff
+/* USLCOM_UART values */
#define USLCOM_UART_DISABLE 0x00
#define USLCOM_UART_ENABLE 0x01
+/* USLCOM_CTRL/USLCOM_RCTRL values */
#define USLCOM_CTRL_DTR_ON 0x0001
#define USLCOM_CTRL_DTR_SET 0x0100
#define USLCOM_CTRL_RTS_ON 0x0002
#define USLCOM_CTRL_RTS_SET 0x0200
#define USLCOM_CTRL_CTS 0x0010
#define USLCOM_CTRL_DSR 0x0020
+#define USLCOM_CTRL_RI 0x0040
#define USLCOM_CTRL_DCD 0x0080
+/* USLCOM_BAUD_RATE values */
#define USLCOM_BAUD_REF 0x384000
+/* USLCOM_DATA values */
#define USLCOM_STOP_BITS_1 0x00
#define USLCOM_STOP_BITS_2 0x02
-
#define USLCOM_PARITY_NONE 0x00
#define USLCOM_PARITY_ODD 0x10
#define USLCOM_PARITY_EVEN 0x20
-#define USLCOM_PORT_NO 0x /* XXX think this should be 0
--hps */
+#define USLCOM_PORT_NO 0x
+/* USLCOM_BREAK values */
#define USLCOM_BREAK_OFF0x00
#define USLCOM_BREAK_ON 0x01
+/* USLCOM_SET_FLOWCTRL values - 1st word */
+#define USLCOM_FLOW_DTR_ON 0x0001 /* DTR static active */
+#define USLCOM_FLOW_CTS_HS 0x0008 /* CTS handshake */
+/* USLCOM_SET_FLOWCTRL values - 2nd word */
+#define USLCOM_FLOW_RTS_ON 0x0040 /* RTS static active */
+#define USLCOM_FLOW_RTS_HS 0x0080 /* RTS handshake */
+
+/* USLCOM_VENDOR_SPECIFIC values */
+#define USLCOM_WRITE_LATCH 0x37E1
+#define USLCOM_READ_LATCH 0x00C2
+
enum {
USLCOM_BULK_DT_WR,
USLCOM_BULK_DT_RD,
+ USLCOM_CTRL_DT_RD,
USLCOM_N_TRANSFER,
};
struct uslcom_softc {
struct ucom_super_softc sc_super_ucom;
struct ucom_softc sc_ucom;
+ struct usb_callout sc_watchdog;
struct usb_xfer *sc_xfer[USLCOM_N_TRANSFER];
struct usb_device *sc_udev;
@@ -121,12 +145,15 @@ static device_detach_t uslcom_detach;
static usb_callback_t uslcom_write_callback;
static usb_callback_t uslcom_read_callback;
+static usb_callback_t uslcom_control_callback;
static void uslcom_open(struct ucom_softc *);
static void uslcom_close(struct ucom_softc *);
static void uslcom_set_dtr(struct ucom_softc *, uint8_t);
static void uslcom_set_rts(struct ucom_softc *, uint8_t);
static void uslcom_set_break(struct ucom_softc *, uint8_t);
+static int uslcom_ioctl(struct ucom_softc *, uint32_t, caddr_t, int,
+ struct thread *);
static int uslcom_pre_param(struct ucom_softc *, struct termios *);
static void uslcom_param(struct ucom_softc *, struct termios *);
static void uslcom_get_status(struct ucom_softc *, uint8_t *, uint8_t *);
@@ -143,7 +170,7 @@ static const struct usb_config uslcom_co
.endpoint = UE_ADDR_ANY,
.direction
Re: usb/162712: commit references a PR
The following reply was made to PR usb/162712; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/162712: commit references a PR Date: Mon, 21 Nov 2011 07:50:44 + (UTC) Author: hselasky Date: Mon Nov 21 07:50:29 2011 New Revision: 227781 URL: http://svn.freebsd.org/changeset/base/227781 Log: Add new USB IDs to RUN driver. PR: usb/162712 MFC after: 1 week Modified: head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Mon Nov 21 06:45:12 2011(r227780) +++ head/sys/dev/usb/usbdevs Mon Nov 21 07:50:29 2011(r227781) @@ -2086,6 +2086,7 @@ product LINKSYS4 RT3070 0x0078 RT3070 product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2 /* Logitech products */ +product LOGITECH LANW300NU2 0x0166 LAN-W300N/U2 product LOGITECH M24520x0203 M2452 keyboard product LOGITECH M48480x0301 M4848 mouse product LOGITECH PAGESCAN 0x040f PageScan @@ -2182,6 +2183,7 @@ product MELCO RT2870_1 0x0148 RT2870 product MELCO RT2870_20x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN product MELCO WLIUCG301N 0x016f WLI-UC-G301N +product MELCO WLIUCGNM0x01a2 WLI-UC-GNM /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 Modified: head/sys/dev/usb/wlan/if_run.c == --- head/sys/dev/usb/wlan/if_run.c Mon Nov 21 06:45:12 2011 (r227780) +++ head/sys/dev/usb/wlan/if_run.c Mon Nov 21 07:50:29 2011 (r227781) @@ -208,12 +208,14 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(LOGITEC, RT2870_1), RUN_DEV(LOGITEC, RT2870_2), RUN_DEV(LOGITEC, RT2870_3), +RUN_DEV(LOGITECH, LANW300NU2), RUN_DEV(MELCO,RT2870_1), RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), RUN_DEV(MELCO,WLIUCG300N), RUN_DEV(MELCO,WLIUCG301N), RUN_DEV(MELCO,WLIUCGN), +RUN_DEV(MELCO,WLIUCGNM), RUN_DEV(MOTOROLA4,RT2770), RUN_DEV(MOTOROLA4,RT3070), RUN_DEV(MSI, RT3070_1), ___ 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/162307: commit references a PR
The following reply was made to PR usb/162307; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/162307: commit references a PR
Date: Wed, 9 Nov 2011 09:16:11 + (UTC)
Author: hselasky
Date: Wed Nov 9 09:15:57 2011
New Revision: 227383
URL: http://svn.freebsd.org/changeset/base/227383
Log:
Some minor corrections to a modem driver.
PR: usb/162307
MFC after: 3 days
Modified:
head/sys/dev/usb/serial/uslcom.c
Modified: head/sys/dev/usb/serial/uslcom.c
==
--- head/sys/dev/usb/serial/uslcom.c Wed Nov 9 07:48:48 2011
(r227382)
+++ head/sys/dev/usb/serial/uslcom.c Wed Nov 9 09:15:57 2011
(r227383)
@@ -100,18 +100,17 @@ SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, deb
#define USLCOM_PARITY_ODD 0x10
#define USLCOM_PARITY_EVEN 0x20
-#define USLCOM_PORT_NO 0x /* XXX think this should be 0
--hps */
+#define USLCOM_PORT_NO 0x
/* USLCOM_BREAK values */
#define USLCOM_BREAK_OFF0x00
#define USLCOM_BREAK_ON 0x01
/* USLCOM_SET_FLOWCTRL values - 1st word */
-#define USLCOM_FLOW_DTR_ON 0x0001
+#define USLCOM_FLOW_DTR_ON 0x0001 /* DTR static active */
#define USLCOM_FLOW_CTS_HS 0x0008 /* CTS handshake */
-#define USLCOM_FLOW_RESERVED0xFF80
/* USLCOM_SET_FLOWCTRL values - 2nd word */
-#define USLCOM_FLOW_RTS_ON 0x0040
+#define USLCOM_FLOW_RTS_ON 0x0040 /* RTS static active */
#define USLCOM_FLOW_RTS_HS 0x0080 /* RTS handshake */
enum {
@@ -540,14 +539,12 @@ uslcom_param(struct ucom_softc *ucom, st
}
if (t-c_cflag CRTSCTS) {
- flowctrl[0] = htole32(USLCOM_FLOW_RESERVED |
- USLCOM_FLOW_DTR_ON | USLCOM_FLOW_CTS_HS);
+ flowctrl[0] = htole32(USLCOM_FLOW_DTR_ON | USLCOM_FLOW_CTS_HS);
flowctrl[1] = htole32(USLCOM_FLOW_RTS_HS);
flowctrl[2] = 0;
flowctrl[3] = 0;
} else {
- flowctrl[0] = htole32(USLCOM_FLOW_RESERVED |
- USLCOM_FLOW_DTR_ON);
+ flowctrl[0] = htole32(USLCOM_FLOW_DTR_ON);
flowctrl[1] = htole32(USLCOM_FLOW_RTS_ON);
flowctrl[2] = 0;
flowctrl[3] = 0;
@@ -692,7 +689,7 @@ tr_setup:
req.bmRequestType = USLCOM_READ;
req.bRequest = USLCOM_RCTRL;
USETW(req.wValue, 0);
- USETW(req.wIndex, 0);
+ USETW(req.wIndex, USLCOM_PORT_NO);
USETW(req.wLength, sizeof(buf));
usbd_xfer_set_frames(xfer, 2);
___
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/162307: commit references a PR
The following reply was made to PR usb/162307; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/162307: commit references a PR
Date: Sat, 5 Nov 2011 12:02:09 + (UTC)
Author: hselasky
Date: Sat Nov 5 12:01:51 2011
New Revision: 227108
URL: http://svn.freebsd.org/changeset/base/227108
Log:
Implement support for modem control lines.
Don't short terminate transmitted BULK data.
Assume that the chip reads one USB packet at a time.
PR: usb/162307
MFC after: 3 days
Modified:
head/sys/dev/usb/serial/uslcom.c
Modified: head/sys/dev/usb/serial/uslcom.c
==
--- head/sys/dev/usb/serial/uslcom.c Sat Nov 5 11:18:46 2011
(r227107)
+++ head/sys/dev/usb/serial/uslcom.c Sat Nov 5 12:01:51 2011
(r227108)
@@ -63,43 +63,61 @@ SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, deb
#define USLCOM_SET_DATA_BITS(x) ((x) 8)
+/* Request types */
#define USLCOM_WRITE0x41
#define USLCOM_READ 0xc1
+/* Request codes */
#define USLCOM_UART 0x00
#define USLCOM_BAUD_RATE0x01
#define USLCOM_DATA 0x03
#define USLCOM_BREAK0x05
#define USLCOM_CTRL 0x07
+#define USLCOM_RCTRL0x08
+#define USLCOM_SET_FLOWCTRL 0x13
+/* USLCOM_UART values */
#define USLCOM_UART_DISABLE 0x00
#define USLCOM_UART_ENABLE 0x01
+/* USLCOM_CTRL/USLCOM_RCTRL values */
#define USLCOM_CTRL_DTR_ON 0x0001
#define USLCOM_CTRL_DTR_SET 0x0100
#define USLCOM_CTRL_RTS_ON 0x0002
#define USLCOM_CTRL_RTS_SET 0x0200
#define USLCOM_CTRL_CTS 0x0010
#define USLCOM_CTRL_DSR 0x0020
+#define USLCOM_CTRL_RI 0x0040
#define USLCOM_CTRL_DCD 0x0080
+/* USLCOM_BAUD_RATE values */
#define USLCOM_BAUD_REF 0x384000
+/* USLCOM_DATA values */
#define USLCOM_STOP_BITS_1 0x00
#define USLCOM_STOP_BITS_2 0x02
-
#define USLCOM_PARITY_NONE 0x00
#define USLCOM_PARITY_ODD 0x10
#define USLCOM_PARITY_EVEN 0x20
#define USLCOM_PORT_NO 0x /* XXX think this should be 0
--hps */
+/* USLCOM_BREAK values */
#define USLCOM_BREAK_OFF0x00
#define USLCOM_BREAK_ON 0x01
+/* USLCOM_SET_FLOWCTRL values - 1st word */
+#define USLCOM_FLOW_DTR_ON 0x0001
+#define USLCOM_FLOW_CTS_HS 0x0008 /* CTS handshake */
+#define USLCOM_FLOW_RESERVED0xFF80
+/* USLCOM_SET_FLOWCTRL values - 2nd word */
+#define USLCOM_FLOW_RTS_ON 0x0040
+#define USLCOM_FLOW_RTS_HS 0x0080 /* RTS handshake */
+
enum {
USLCOM_BULK_DT_WR,
USLCOM_BULK_DT_RD,
+ USLCOM_CTRL_DT_RD,
USLCOM_N_TRANSFER,
};
@@ -121,6 +139,7 @@ static device_detach_t uslcom_detach;
static usb_callback_t uslcom_write_callback;
static usb_callback_t uslcom_read_callback;
+static usb_callback_t uslcom_control_callback;
static void uslcom_open(struct ucom_softc *);
static void uslcom_close(struct ucom_softc *);
@@ -143,7 +162,7 @@ static const struct usb_config uslcom_co
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = USLCOM_BULK_BUF_SIZE,
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .flags = {.pipe_bof = 1,},
.callback = uslcom_write_callback,
},
@@ -155,6 +174,16 @@ static const struct usb_config uslcom_co
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.callback = uslcom_read_callback,
},
+ [USLCOM_CTRL_DT_RD] = {
+ .type = UE_CONTROL,
+ .endpoint = 0x00,
+ .direction = UE_DIR_ANY,
+ .interval = 150,/* poll status every 150 ms */
+ .bufsize = sizeof(struct usb_device_request) + 8,
+ .flags = {.pipe_bof = 1,},
+ .callback = uslcom_control_callback,
+ .timeout = 1000,/* 1 second timeout */
+ },
};
static struct ucom_callback uslcom_callback = {
@@ -371,6 +400,8 @@ uslcom_open(struct ucom_softc *ucom)
req, NULL, 0, 1000)) {
DPRINTF(UART enable failed (ignored)\n);
}
+ /* Start polling status */
+ usbd_transfer_start(sc-sc_xfer[USLCOM_CTRL_DT_RD]);
}
static void
@@ -379,13 +410,16 @@ uslcom_close(struct ucom_softc *ucom)
struct uslcom_softc *sc = ucom-sc_parent;
struct usb_device_request req;
+ /* Stop polling status */
+ usbd_transfer_stop(sc-sc_xfer[USLCOM_CTRL_DT_RD
Re: usb/161798: commit references a PR
The following reply was made to PR usb/161798; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/161798: commit references a PR
Date: Tue, 1 Nov 2011 08:24:22 + (UTC)
Author: hselasky
Date: Tue Nov 1 08:24:01 2011
New Revision: 226984
URL: http://svn.freebsd.org/changeset/base/226984
Log:
MFC r226903, r225777, r226221 and r226534:
Add some new USB device IDs and some USB device quirks.
Improve the USB mass storage auto quirk detection.
PR: usb/161798, usb/160911
Modified:
stable/8/etc/devd/usb.conf
stable/8/sys/dev/usb/quirk/usb_quirk.c
stable/8/sys/dev/usb/usb_device.c
stable/8/sys/dev/usb/usb_msctest.c
stable/8/sys/dev/usb/usbdevs
stable/8/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/8/etc/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/etc/devd/usb.conf
==
--- stable/8/etc/devd/usb.conf Tue Nov 1 04:21:57 2011(r226983)
+++ stable/8/etc/devd/usb.conf Tue Nov 1 08:24:01 2011(r226984)
@@ -565,6 +565,14 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x04e8;
+ match product 0x2018;
+ action kldload if_run;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x04e8;
match product (0x5f00|0x5f01|0x5f02|0x5f03|0x5f04);
action kldload uipaq;
};
@@ -741,7 +749,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x050d;
- match product (0x8053|0x805c|0x815c|0x825a);
+ match product (0x8053|0x805c|0x815c|0x825a|0x825b);
action kldload if_run;
};
@@ -1877,7 +1885,23 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0af0;
- match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701|0x6721|0x6741|0x6761|0x6800|0x6901);
+ match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product 0x6711;
+ action kldload uhso;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product (0x6721|0x6741|0x6761|0x6800|0x6901);
action kldload u3g;
};
@@ -2069,7 +2093,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0b95;
- match product (0x1720|0x1780|0x7720|0x772a);
+ match product (0x1720|0x1780|0x7720|0x772a|0x772b);
action kldload if_axe;
};
@@ -2500,6 +2524,14 @@ nomatch 32 {
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x0f3d;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x0f4e;
match product 0x0200;
action kldload uipaq;
@@ -2789,13 +2821,37 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x1199;
- match product
(0x0220|0x0224|0x0fff|0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
+ match product (0x0220|0x0224|0x0fff);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product 0x0fff;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product
(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
action kldload u3g;
};
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x1199;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x11ad;
match product 0x0701;
action kldload uplcom;
@@ -2869,7 +2925,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host
Re: usb/160911: commit references a PR
The following reply was made to PR usb/160911; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/160911: commit references a PR
Date: Tue, 1 Nov 2011 08:24:23 + (UTC)
Author: hselasky
Date: Tue Nov 1 08:24:01 2011
New Revision: 226984
URL: http://svn.freebsd.org/changeset/base/226984
Log:
MFC r226903, r225777, r226221 and r226534:
Add some new USB device IDs and some USB device quirks.
Improve the USB mass storage auto quirk detection.
PR: usb/161798, usb/160911
Modified:
stable/8/etc/devd/usb.conf
stable/8/sys/dev/usb/quirk/usb_quirk.c
stable/8/sys/dev/usb/usb_device.c
stable/8/sys/dev/usb/usb_msctest.c
stable/8/sys/dev/usb/usbdevs
stable/8/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/8/etc/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/etc/devd/usb.conf
==
--- stable/8/etc/devd/usb.conf Tue Nov 1 04:21:57 2011(r226983)
+++ stable/8/etc/devd/usb.conf Tue Nov 1 08:24:01 2011(r226984)
@@ -565,6 +565,14 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x04e8;
+ match product 0x2018;
+ action kldload if_run;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x04e8;
match product (0x5f00|0x5f01|0x5f02|0x5f03|0x5f04);
action kldload uipaq;
};
@@ -741,7 +749,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x050d;
- match product (0x8053|0x805c|0x815c|0x825a);
+ match product (0x8053|0x805c|0x815c|0x825a|0x825b);
action kldload if_run;
};
@@ -1877,7 +1885,23 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0af0;
- match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701|0x6721|0x6741|0x6761|0x6800|0x6901);
+ match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product 0x6711;
+ action kldload uhso;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product (0x6721|0x6741|0x6761|0x6800|0x6901);
action kldload u3g;
};
@@ -2069,7 +2093,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0b95;
- match product (0x1720|0x1780|0x7720|0x772a);
+ match product (0x1720|0x1780|0x7720|0x772a|0x772b);
action kldload if_axe;
};
@@ -2500,6 +2524,14 @@ nomatch 32 {
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x0f3d;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x0f4e;
match product 0x0200;
action kldload uipaq;
@@ -2789,13 +2821,37 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x1199;
- match product
(0x0220|0x0224|0x0fff|0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
+ match product (0x0220|0x0224|0x0fff);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product 0x0fff;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product
(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
action kldload u3g;
};
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x1199;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x11ad;
match product 0x0701;
action kldload uplcom;
@@ -2869,7 +2925,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host
Re: usb/161798: commit references a PR
The following reply was made to PR usb/161798; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/161798: commit references a PR
Date: Tue, 1 Nov 2011 22:01:04 + (UTC)
Author: hselasky
Date: Tue Nov 1 22:00:49 2011
New Revision: 227007
URL: http://svn.freebsd.org/changeset/base/227007
Log:
MFC r226903, r225777, r226221 and r226534:
Add some new USB device IDs and some USB device quirks.
Improve the USB mass storage auto quirk detection.
PR: usb/161798, usb/160911
Approved by: re (kib)
Modified:
stable/9/etc/devd/usb.conf
stable/9/sys/dev/usb/quirk/usb_quirk.c
stable/9/sys/dev/usb/usb_device.c
stable/9/sys/dev/usb/usb_msctest.c
stable/9/sys/dev/usb/usbdevs
stable/9/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/9/etc/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/etc/devd/usb.conf
==
--- stable/9/etc/devd/usb.conf Tue Nov 1 21:26:57 2011(r227006)
+++ stable/9/etc/devd/usb.conf Tue Nov 1 22:00:49 2011(r227007)
@@ -565,6 +565,14 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x04e8;
+ match product 0x2018;
+ action kldload if_run;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x04e8;
match product (0x5f00|0x5f01|0x5f02|0x5f03|0x5f04);
action kldload uipaq;
};
@@ -741,7 +749,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x050d;
- match product (0x8053|0x805c|0x815c|0x825a);
+ match product (0x8053|0x805c|0x815c|0x825a|0x825b);
action kldload if_run;
};
@@ -1877,7 +1885,23 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0af0;
- match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701|0x6721|0x6741|0x6761|0x6800|0x6901);
+ match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product 0x6711;
+ action kldload uhso;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product (0x6721|0x6741|0x6761|0x6800|0x6901);
action kldload u3g;
};
@@ -2069,7 +2093,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0b95;
- match product (0x1720|0x1780|0x7720|0x772a);
+ match product (0x1720|0x1780|0x7720|0x772a|0x772b);
action kldload if_axe;
};
@@ -2500,6 +2524,14 @@ nomatch 32 {
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x0f3d;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x0f4e;
match product 0x0200;
action kldload uipaq;
@@ -2789,13 +2821,37 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x1199;
- match product
(0x0220|0x0224|0x0fff|0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
+ match product (0x0220|0x0224|0x0fff);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product 0x0fff;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product
(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892
Re: usb/160911: commit references a PR
The following reply was made to PR usb/160911; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/160911: commit references a PR
Date: Tue, 1 Nov 2011 22:01:05 + (UTC)
Author: hselasky
Date: Tue Nov 1 22:00:49 2011
New Revision: 227007
URL: http://svn.freebsd.org/changeset/base/227007
Log:
MFC r226903, r225777, r226221 and r226534:
Add some new USB device IDs and some USB device quirks.
Improve the USB mass storage auto quirk detection.
PR: usb/161798, usb/160911
Approved by: re (kib)
Modified:
stable/9/etc/devd/usb.conf
stable/9/sys/dev/usb/quirk/usb_quirk.c
stable/9/sys/dev/usb/usb_device.c
stable/9/sys/dev/usb/usb_msctest.c
stable/9/sys/dev/usb/usbdevs
stable/9/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/9/etc/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/etc/devd/usb.conf
==
--- stable/9/etc/devd/usb.conf Tue Nov 1 21:26:57 2011(r227006)
+++ stable/9/etc/devd/usb.conf Tue Nov 1 22:00:49 2011(r227007)
@@ -565,6 +565,14 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x04e8;
+ match product 0x2018;
+ action kldload if_run;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x04e8;
match product (0x5f00|0x5f01|0x5f02|0x5f03|0x5f04);
action kldload uipaq;
};
@@ -741,7 +749,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x050d;
- match product (0x8053|0x805c|0x815c|0x825a);
+ match product (0x8053|0x805c|0x815c|0x825a|0x825b);
action kldload if_run;
};
@@ -1877,7 +1885,23 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0af0;
- match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701|0x6721|0x6741|0x6761|0x6800|0x6901);
+ match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product 0x6711;
+ action kldload uhso;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product (0x6721|0x6741|0x6761|0x6800|0x6901);
action kldload u3g;
};
@@ -2069,7 +2093,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0b95;
- match product (0x1720|0x1780|0x7720|0x772a);
+ match product (0x1720|0x1780|0x7720|0x772a|0x772b);
action kldload if_axe;
};
@@ -2500,6 +2524,14 @@ nomatch 32 {
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x0f3d;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x0f4e;
match product 0x0200;
action kldload uipaq;
@@ -2789,13 +2821,37 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x1199;
- match product
(0x0220|0x0224|0x0fff|0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
+ match product (0x0220|0x0224|0x0fff);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product 0x0fff;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product
(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892
Re: usb/161798: commit references a PR
The following reply was made to PR usb/161798; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/161798: commit references a PR
Date: Wed, 19 Oct 2011 10:09:18 + (UTC)
Author: hselasky
Date: Wed Oct 19 10:09:01 2011
New Revision: 226534
URL: http://svn.freebsd.org/changeset/base/226534
Log:
Add new USB IDs to RUN driver. Update usb.conf.
PR: usb/161798
MFC after: 3 days
Modified:
head/etc/devd/usb.conf
head/sys/dev/usb/usbdevs
head/sys/dev/usb/wlan/if_run.c
Modified: head/etc/devd/usb.conf
==
--- head/etc/devd/usb.conf Wed Oct 19 10:08:58 2011(r226533)
+++ head/etc/devd/usb.conf Wed Oct 19 10:09:01 2011(r226534)
@@ -565,6 +565,14 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x04e8;
+ match product 0x2018;
+ action kldload if_run;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x04e8;
match product (0x5f00|0x5f01|0x5f02|0x5f03|0x5f04);
action kldload uipaq;
};
@@ -741,7 +749,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x050d;
- match product (0x8053|0x805c|0x815c|0x825a);
+ match product (0x8053|0x805c|0x815c|0x825a|0x825b);
action kldload if_run;
};
@@ -1877,7 +1885,23 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0af0;
- match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701|0x6721|0x6741|0x6761|0x6800|0x6901);
+ match product
(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product 0x6711;
+ action kldload uhso;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x0af0;
+ match product (0x6721|0x6741|0x6761|0x6800|0x6901);
action kldload u3g;
};
@@ -2069,7 +2093,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0b95;
- match product (0x1720|0x1780|0x7720|0x772a);
+ match product (0x1720|0x1780|0x7720|0x772a|0x772b);
action kldload if_axe;
};
@@ -2500,6 +2524,14 @@ nomatch 32 {
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x0f3d;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x0f4e;
match product 0x0200;
action kldload uipaq;
@@ -2789,13 +2821,37 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x1199;
- match product
(0x0220|0x0224|0x0fff|0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
+ match product (0x0220|0x0224|0x0fff);
+ action kldload u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product 0x0fff;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x1199;
+ match product
(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3);
action kldload u3g;
};
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x1199;
+ match product 0x68a3;
+ action kldload usie;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x11ad;
match product 0x0701;
action kldload uplcom;
@@ -2869,7 +2925,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x12d1;
- match product
(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1465|0x14ac
Re: usb/160911: commit references a PR
The following reply was made to PR usb/160911; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/160911: commit references a PR Date: Tue, 27 Sep 2011 07:06:17 + (UTC) Author: hselasky Date: Tue Sep 27 07:06:02 2011 New Revision: 225777 URL: http://svn.freebsd.org/changeset/base/225777 Log: Add quirks for some USB mass storage devices which doesn't respond after trying to query the synchronize cache support. Submitted by:Keith White PR: usb/160911 Approved by: re (kensmith) MFC after: 1 week Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Tue Sep 27 07:05:41 2011 (r225776) +++ head/sys/dev/usb/quirk/usb_quirk.c Tue Sep 27 07:06:02 2011 (r225777) @@ -457,6 +457,13 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(ROLAND, SD80, 0x, 0x, UQ_AU_VENDOR_CLASS), USB_QUIRK(ROLAND, UA700, 0x, 0x, UQ_AU_VENDOR_CLASS), USB_QUIRK(MEDELI, DD305, 0x, 0x, UQ_SINGLE_CMD_MIDI, UQ_MATCH_VENDOR_ONLY), + + /* + * Quirks for manufacturers which USB devices does not respond + * after issuing non-supported commands: + */ + USB_QUIRK(FEIYA, DUMMY, 0x, 0x, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY), + USB_QUIRK(REALTEK, DUMMY, 0x, 0x, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY), }; #undef USB_QUIRK_VP #undef USB_QUIRK Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Tue Sep 27 07:05:41 2011(r225776) +++ head/sys/dev/usb/usbdevs Tue Sep 27 07:06:02 2011(r225777) @@ -1569,6 +1569,7 @@ product EXTENDED XTNDACCESS 0x0100 XTNDA product FALCOM TWIST 0x0001 USB GSM/GPRS Modem /* FEIYA products */ +product FEIYA DUMMY 0x Dummy product product FEIYA 5IN10x1132 5-in-1 Card Reader product FEIYA AC110 0x6300 AC-110 Card Reader @@ -2780,6 +2781,7 @@ product RATOC REXUSB60F 0xb020 USB seri /* ReakTek products */ /* Green House and CompUSA OEM this part */ +product REALTEK DUMMY 0x Dummy product product REALTEK USB20CRW 0x0158 USB20CRW Card Reader product REALTEK USBKR100 0x8150 USBKR100 USB Ethernet product REALTEK RTL8187 0x8187 RTL8187 Wireless Adapter ___ 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/160299: commit references a PR
The following reply was made to PR usb/160299; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/160299: commit references a PR
Date: Sat, 10 Sep 2011 15:55:46 + (UTC)
Author: hselasky
Date: Sat Sep 10 15:55:36 2011
New Revision: 225469
URL: http://svn.freebsd.org/changeset/base/225469
Log:
Refactor auto-quirk solution so that we break as few external
drivers as possible.
PR: usb/160299
Approved by: re (kib)
Suggested by:rwatson
MFC after: 0 days
Modified:
head/sys/dev/usb/quirk/usb_quirk.c
head/sys/dev/usb/usb_device.c
head/sys/dev/usb/usb_dynamic.c
head/sys/dev/usb/usb_dynamic.h
head/sys/dev/usb/usbdi.h
head/sys/sys/param.h
Modified: head/sys/dev/usb/quirk/usb_quirk.c
==
--- head/sys/dev/usb/quirk/usb_quirk.c Sat Sep 10 12:36:11 2011
(r225468)
+++ head/sys/dev/usb/quirk/usb_quirk.c Sat Sep 10 15:55:36 2011
(r225469)
@@ -588,7 +588,7 @@ usb_test_quirk_by_info(const struct usbd
}
mtx_unlock(usb_quirk_mtx);
done:
- return (usb_test_quirk_w(info, quirk));
+ return (0); /* no quirk match */
}
static struct usb_quirk_entry *
Modified: head/sys/dev/usb/usb_device.c
==
--- head/sys/dev/usb/usb_device.c Sat Sep 10 12:36:11 2011
(r225468)
+++ head/sys/dev/usb/usb_device.c Sat Sep 10 15:55:36 2011
(r225469)
@@ -1239,8 +1239,6 @@ static void
usb_init_attach_arg(struct usb_device *udev,
struct usb_attach_arg *uaa)
{
- uint8_t x;
-
memset(uaa, 0, sizeof(*uaa));
uaa-device = udev;
@@ -1256,9 +1254,6 @@ usb_init_attach_arg(struct usb_device *u
uaa-info.bDeviceProtocol = udev-ddesc.bDeviceProtocol;
uaa-info.bConfigIndex = udev-curr_config_index;
uaa-info.bConfigNum = udev-curr_config_no;
-
- for (x = 0; x != USB_MAX_AUTO_QUIRK; x++)
- uaa-info.autoQuirk[x] = udev-autoQuirk[x];
}
/**
@@ -2389,8 +2384,22 @@ uint8_t
usb_test_quirk(const struct usb_attach_arg *uaa, uint16_t quirk)
{
uint8_t found;
+ uint8_t x;
+
+ if (quirk == UQ_NONE)
+ return (0);
+
+ /* search the automatic per device quirks first */
+
+ for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) {
+ if (uaa-device-autoQuirk[x] == quirk)
+ return (1);
+ }
+
+ /* search global quirk table, if any */
found = (usb_test_quirk_p) (uaa-info, quirk);
+
return (found);
}
@@ -2723,7 +2732,8 @@ usbd_add_dynamic_quirk(struct usb_device
uint8_t x;
for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) {
- if (udev-autoQuirk[x] == 0) {
+ if (udev-autoQuirk[x] == 0 ||
+ udev-autoQuirk[x] == quirk) {
udev-autoQuirk[x] = quirk;
return (0); /* success */
}
Modified: head/sys/dev/usb/usb_dynamic.c
==
--- head/sys/dev/usb/usb_dynamic.c Sat Sep 10 12:36:11 2011
(r225468)
+++ head/sys/dev/usb/usb_dynamic.c Sat Sep 10 15:55:36 2011
(r225469)
@@ -50,12 +50,12 @@
#include dev/usb/usb_process.h
#include dev/usb/usb_device.h
#include dev/usb/usb_dynamic.h
-#include dev/usb/quirk/usb_quirk.h
/* function prototypes */
static usb_handle_req_t usb_temp_get_desc_w;
static usb_temp_setup_by_index_t usb_temp_setup_by_index_w;
static usb_temp_unsetup_t usb_temp_unsetup_w;
+static usb_test_quirk_t usb_test_quirk_w;
static usb_quirk_ioctl_t usb_quirk_ioctl_w;
/* global variables */
@@ -72,19 +72,9 @@ usb_temp_setup_by_index_w(struct usb_dev
return (USB_ERR_INVAL);
}
-uint8_t
+static uint8_t
usb_test_quirk_w(const struct usbd_lookup_info *info, uint16_t quirk)
{
- uint8_t x;
-
- if (quirk == UQ_NONE)
- return (0); /* no match */
-
- for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) {
- if (info-autoQuirk[x] == quirk)
- return (1); /* match */
- }
-
return (0); /* no match */
}
Modified: head/sys/dev/usb/usb_dynamic.h
==
--- head/sys/dev/usb/usb_dynamic.h Sat Sep 10 12:36:11 2011
(r225468)
+++ head/sys/dev/usb/usb_dynamic.h Sat Sep 10 15:55:36 2011
(r225469)
@@ -57,6 +57,5 @@ extern devclass_t usb_devclass_ptr;
void usb_temp_unload(void *);
void usb_quirk_unload(void *);
void usb_bus_unload(void *);
-usb_test_quirk_t
Re: usb/160299: commit references a PR
The following reply was made to PR usb/160299; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/160299: commit references a PR
Date: Sat, 10 Sep 2011 16:52:30 + (UTC)
Author: hselasky
Date: Sat Sep 10 16:52:15 2011
New Revision: 225470
URL: http://svn.freebsd.org/changeset/base/225470
Log:
MFC r225469:
Refactor auto-quirk solution so that we break as few external
drivers as possible.
PR: usb/160299
Suggested by:rwatson
Modified:
stable/8/sys/dev/usb/quirk/usb_quirk.c
stable/8/sys/dev/usb/usb_device.c
stable/8/sys/dev/usb/usb_device.h
stable/8/sys/dev/usb/usb_dynamic.c
stable/8/sys/dev/usb/usb_dynamic.h
stable/8/sys/dev/usb/usbdi.h
stable/8/sys/sys/param.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c
==
--- stable/8/sys/dev/usb/quirk/usb_quirk.c Sat Sep 10 15:55:36 2011
(r225469)
+++ stable/8/sys/dev/usb/quirk/usb_quirk.c Sat Sep 10 16:52:15 2011
(r225470)
@@ -588,7 +588,7 @@ usb_test_quirk_by_info(const struct usbd
}
mtx_unlock(usb_quirk_mtx);
done:
- return (usb_test_quirk_w(info, quirk));
+ return (0); /* no quirk match */
}
static struct usb_quirk_entry *
Modified: stable/8/sys/dev/usb/usb_device.c
==
--- stable/8/sys/dev/usb/usb_device.c Sat Sep 10 15:55:36 2011
(r225469)
+++ stable/8/sys/dev/usb/usb_device.c Sat Sep 10 16:52:15 2011
(r225470)
@@ -1239,8 +1239,6 @@ static void
usb_init_attach_arg(struct usb_device *udev,
struct usb_attach_arg *uaa)
{
- uint8_t x;
-
memset(uaa, 0, sizeof(*uaa));
uaa-device = udev;
@@ -1256,9 +1254,6 @@ usb_init_attach_arg(struct usb_device *u
uaa-info.bDeviceProtocol = udev-ddesc.bDeviceProtocol;
uaa-info.bConfigIndex = udev-curr_config_index;
uaa-info.bConfigNum = udev-curr_config_no;
-
- for (x = 0; x != USB_MAX_AUTO_QUIRK; x++)
- uaa-info.autoQuirk[x] = udev-autoQuirk[x];
}
/**
@@ -2389,8 +2384,22 @@ uint8_t
usb_test_quirk(const struct usb_attach_arg *uaa, uint16_t quirk)
{
uint8_t found;
+ uint8_t x;
+
+ if (quirk == UQ_NONE)
+ return (0);
+
+ /* search the automatic per device quirks first */
+
+ for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) {
+ if (uaa-device-autoQuirk[x] == quirk)
+ return (1);
+ }
+
+ /* search global quirk table, if any */
found = (usb_test_quirk_p) (uaa-info, quirk);
+
return (found);
}
@@ -2798,7 +2807,8 @@ usbd_add_dynamic_quirk(struct usb_device
uint8_t x;
for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) {
- if (udev-autoQuirk[x] == 0) {
+ if (udev-autoQuirk[x] == 0 ||
+ udev-autoQuirk[x] == quirk) {
udev-autoQuirk[x] = quirk;
return (0); /* success */
}
Modified: stable/8/sys/dev/usb/usb_device.h
==
--- stable/8/sys/dev/usb/usb_device.h Sat Sep 10 15:55:36 2011
(r225469)
+++ stable/8/sys/dev/usb/usb_device.h Sat Sep 10 16:52:15 2011
(r225470)
@@ -149,7 +149,6 @@ struct usb_device {
uint16_t power; /* mA the device uses */
uint16_t langid;/* language for strings */
- uint16_t autoQuirk[USB_MAX_AUTO_QUIRK]; /* dynamic quirks */
uint8_t address;/* device addess */
uint8_t device_index; /* device index in bus-devices */
@@ -191,6 +190,8 @@ struct usb_device {
#endif
uint32_t clear_stall_errors;/* number of clear-stall failures */
+
+ uint16_t autoQuirk[USB_MAX_AUTO_QUIRK]; /* dynamic quirks */
};
/* globals */
Modified: stable/8/sys/dev/usb/usb_dynamic.c
==
--- stable/8/sys/dev/usb/usb_dynamic.c Sat Sep 10 15:55:36 2011
(r225469)
+++ stable/8/sys/dev/usb/usb_dynamic.c Sat Sep 10 16:52:15 2011
(r225470)
@@ -50,12 +50,12 @@
#include dev/usb/usb_process.h
#include dev/usb/usb_device.h
#include dev/usb/usb_dynamic.h
-#include dev/usb/quirk/usb_quirk.h
/* function prototypes */
static usb_handle_req_t
Re: usb/160299: commit references a PR
The following reply was made to PR usb/160299; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/160299: commit references a PR Date: Fri, 9 Sep 2011 07:44:24 + (UTC) Author: hselasky Date: Fri Sep 9 07:44:14 2011 New Revision: 225458 URL: http://svn.freebsd.org/changeset/base/225458 Log: MFC r225350 and r225400: This patch adds automatic detection of USB mass storage devices which does not support the no synchronize cache SCSI command. The __FreeBSD_version version macro has been bumped and external kernel modules needs to be recompiled after this patch. PR: usb/160299 Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c stable/8/sys/dev/usb/storage/umass.c stable/8/sys/dev/usb/usb_device.c stable/8/sys/dev/usb/usb_device.h stable/8/sys/dev/usb/usb_dynamic.c stable/8/sys/dev/usb/usb_dynamic.h stable/8/sys/dev/usb/usb_freebsd.h stable/8/sys/dev/usb/usb_msctest.c stable/8/sys/dev/usb/usb_msctest.h stable/8/sys/dev/usb/usbdi.h stable/8/sys/sys/param.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c == --- stable/8/sys/dev/usb/quirk/usb_quirk.c Fri Sep 9 04:42:11 2011 (r225457) +++ stable/8/sys/dev/usb/quirk/usb_quirk.c Fri Sep 9 07:44:14 2011 (r225458) @@ -148,12 +148,10 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(AIPTEK, POCKETCAM3M, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), - USB_QUIRK(AIPTEK2, SUNPLUS_TECH, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, SDCR_6335, 0x, 0x, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, SDCR_6362, 0x, 0x, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(ALCOR, AU6390, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, UMCR_9361, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(ALCOR, TRANSCEND, 0x, 0x, UQ_MSC_NO_GETMAXLUN, @@ -173,14 +171,12 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(CENTURY, EX35QUAT, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE), - USB_QUIRK(CENTURY, EX35SW4_SB4, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(CYPRESS, XX6830XX, 0x, 0x, UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(DESKNOTE, UCR_61S2B, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(DMI, CFSM_RW, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), - USB_QUIRK(DMI, DISK, 0x000, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(EPSON, STYLUS_875DC, 0x, 0x, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(EPSON, STYLUS_895, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -188,7 +184,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(FEIYA, 5IN1, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(FREECOM, DVD, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI), - USB_QUIRK(FREECOM, HDD, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(FUJIPHOTO, MASS0100, 0x, 0x, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(GENESYS, GL641USB2IDE, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -232,7 +227,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(IOMEGA, ZIP100, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_TEST_UNIT_READY), /* XXX ZIP drives can also use ATAPI */ - USB_QUIRK(JMICRON, JM20336, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(JMICRON, JM20337, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), @@ -279,8 +273,6 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_ATAPI), USB_QUIRK(MYSON, HEDEN, 0x, 0x, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(MYSON, HEDEN_8813, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(MYSON, STARREADER, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(NEODIO, ND3260, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ
Re: usb/160299: commit references a PR
The following reply was made to PR usb/160299; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/160299: commit references a PR
Date: Mon, 5 Sep 2011 14:38:12 + (UTC)
Author: hselasky
Date: Mon Sep 5 14:37:59 2011
New Revision: 225400
URL: http://svn.freebsd.org/changeset/base/225400
Log:
Some USB mass storage devices requires that the sense information
is retrieved after a failed SCSI command to continue normal
operation. Else this sense information is retrived at the next
SCSI command.
Approved by: re (kib)
Reported by: Alex Kozlov
MFC after: 1 week
PR: usb/160299
Modified:
head/sys/dev/usb/usb_msctest.c
Modified: head/sys/dev/usb/usb_msctest.c
==
--- head/sys/dev/usb/usb_msctest.c Mon Sep 5 12:39:15 2011
(r225399)
+++ head/sys/dev/usb/usb_msctest.c Mon Sep 5 14:37:59 2011
(r225400)
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+ * Copyright (c) 2008,2011 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -83,7 +83,10 @@ enum {
DIR_NONE,
};
+#define SCSI_MAX_LEN0x100
#define SCSI_INQ_LEN0x24
+#define SCSI_SENSE_LEN 0xFF
+
static uint8_t scsi_test_unit_ready[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static uint8_t scsi_inquiry[] = { 0x12, 0x00, 0x00, 0x00, SCSI_INQ_LEN, 0x00
};
static uint8_t scsi_rezero_init[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
};
@@ -98,6 +101,8 @@ static uint8_t scsi_huawei_eject[] ={ 0
static uint8_t scsi_tct_eject[] = { 0x06, 0xf5, 0x04, 0x02, 0x52, 0x70 };
static uint8_t scsi_sync_cache[] ={ 0x35, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00 };
+static uint8_t scsi_request_sense[] = { 0x03, 0x00, 0x00, 0x00, 0x12, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#define BULK_SIZE 64 /* dummy */
#define ERR_CSW_FAILED -1
@@ -151,7 +156,7 @@ struct bbb_transfer {
uint8_t status_try;
int error;
- uint8_t buffer[256];
+ uint8_t buffer[SCSI_MAX_LEN] __aligned(4);
};
static usb_callback_t bbb_command_callback;
@@ -661,6 +666,32 @@ usb_msc_auto_quirk(struct usb_device *ud
usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE);
}
+ /* clear sense status of any failed commands on the device */
+
+ err = bbb_command_start(sc, DIR_IN, 0, sc-buffer,
+ SCSI_INQ_LEN, scsi_inquiry, sizeof(scsi_inquiry),
+ USB_MS_HZ);
+
+ DPRINTF(Inquiry = %d\n, err);
+
+ if (err != 0) {
+
+ if (err != ERR_CSW_FAILED)
+ goto error;
+ }
+
+ err = bbb_command_start(sc, DIR_IN, 0, sc-buffer,
+ SCSI_SENSE_LEN, scsi_request_sense,
+ sizeof(scsi_request_sense), USB_MS_HZ);
+
+ DPRINTF(Request sense = %d\n, err);
+
+ if (err != 0) {
+
+ if (err != ERR_CSW_FAILED)
+ goto error;
+ }
+
done:
bbb_detach(sc);
return (0);
___
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/160299: commit references a PR
The following reply was made to PR usb/160299; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/160299: commit references a PR Date: Fri, 2 Sep 2011 18:50:59 + (UTC) Author: hselasky Date: Fri Sep 2 18:50:44 2011 New Revision: 225350 URL: http://svn.freebsd.org/changeset/base/225350 Log: This patch adds automatic detection of USB mass storage devices which does not support the no synchronize cache SCSI command. The __FreeBSD_version version macro has been bumped and external kernel modules needs to be recompiled after this patch. Approved by:re (kib) MFC after: 1 week PR: usb/160299 Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/storage/umass.c head/sys/dev/usb/usb_device.c head/sys/dev/usb/usb_device.h head/sys/dev/usb/usb_dynamic.c head/sys/dev/usb/usb_dynamic.h head/sys/dev/usb/usb_freebsd.h head/sys/dev/usb/usb_msctest.c head/sys/dev/usb/usb_msctest.h head/sys/dev/usb/usbdi.h head/sys/sys/param.h Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/quirk/usb_quirk.c Fri Sep 2 18:50:44 2011 (r225350) @@ -148,12 +148,10 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(AIPTEK, POCKETCAM3M, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), - USB_QUIRK(AIPTEK2, SUNPLUS_TECH, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, SDCR_6335, 0x, 0x, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, SDCR_6362, 0x, 0x, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(ALCOR, AU6390, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, UMCR_9361, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(ALCOR, TRANSCEND, 0x, 0x, UQ_MSC_NO_GETMAXLUN, @@ -173,14 +171,12 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(CENTURY, EX35QUAT, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE), - USB_QUIRK(CENTURY, EX35SW4_SB4, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(CYPRESS, XX6830XX, 0x, 0x, UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(DESKNOTE, UCR_61S2B, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(DMI, CFSM_RW, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), - USB_QUIRK(DMI, DISK, 0x000, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(EPSON, STYLUS_875DC, 0x, 0x, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(EPSON, STYLUS_895, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -188,7 +184,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(FEIYA, 5IN1, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(FREECOM, DVD, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI), - USB_QUIRK(FREECOM, HDD, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(FUJIPHOTO, MASS0100, 0x, 0x, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(GENESYS, GL641USB2IDE, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -232,7 +227,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(IOMEGA, ZIP100, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_TEST_UNIT_READY), /* XXX ZIP drives can also use ATAPI */ - USB_QUIRK(JMICRON, JM20336, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(JMICRON, JM20337, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), @@ -279,8 +273,6 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_ATAPI), USB_QUIRK(MYSON, HEDEN, 0x, 0x, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(MYSON, HEDEN_8813, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(MYSON, STARREADER, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(NEODIO, ND3260, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ), USB_QUIRK(NETAC, CF_CARD, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -317,7 +309,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(PANASONIC, KXLCB35AN, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(PANASONIC, LS120CAM, 0x, 0x
Re: usb/159836: commit references a PR
The following reply was made to PR usb/159836; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/159836: commit references a PR
Date: Sat, 20 Aug 2011 14:21:53 + (UTC)
Author: hselasky
Date: Sat Aug 20 14:21:32 2011
New Revision: 225037
URL: http://svn.freebsd.org/changeset/base/225037
Log:
Add new USB ID.
Approved by:re (kib)
MFC after: 1 week
PR: usb/159836
Modified:
head/share/man/man4/uhso.4
head/sys/dev/usb/net/uhso.c
head/sys/dev/usb/usbdevs
Modified: head/share/man/man4/uhso.4
==
--- head/share/man/man4/uhso.4 Sat Aug 20 14:20:36 2011(r225036)
+++ head/share/man/man4/uhso.4 Sat Aug 20 14:21:32 2011(r225037)
@@ -79,6 +79,8 @@ The following devices have been verified
.It
Option GlobeSurfer iCON 7.2 (new firmware)
.It
+Option GlobeTrotter Max 7.2 (new firmware)
+.It
Option iCON 225
.It
Option iCON 452
Modified: head/sys/dev/usb/net/uhso.c
==
--- head/sys/dev/usb/net/uhso.cSat Aug 20 14:20:36 2011
(r225036)
+++ head/sys/dev/usb/net/uhso.cSat Aug 20 14:21:32 2011
(r225037)
@@ -249,6 +249,8 @@ static struct unrhdr *uhso_ifnet_unit =
static const STRUCT_USB_HOST_ID uhso_devs[] = {
#define UHSO_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v,
USB_PRODUCT_##v##_##p, i) }
+ /* Option GlobeTrotter MAX 7.2 with upgraded firmware */
+ UHSO_DEV(OPTION, GTMAX72, UHSO_STATIC_IFACE),
/* Option GlobeSurfer iCON 7.2 */
UHSO_DEV(OPTION, GSICON72, UHSO_STATIC_IFACE),
/* Option iCON 225 */
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevs Sat Aug 20 14:20:36 2011(r225036)
+++ head/sys/dev/usb/usbdevs Sat Aug 20 14:21:32 2011(r225037)
@@ -2448,6 +2448,7 @@ product OPTION GT3GQUAD 0x6300 GlobeTro
product OPTION GT3GPLUS 0x6600 GlobeTrotter 3G+ datacard
product OPTION GTICON322 0xd033 GlobeTrotter Icon322 storage
product OPTION GTMAX360x6701 GlobeTrotter Max 3.6 Modem
+product OPTION GTMAX720x6711 GlobeTrotter Max 7.2 HSDPA
product OPTION GTHSDPA0x6971 GlobeTrotter HSDPA
product OPTION GTMAXHSUPA 0x7001 GlobeTrotter HSUPA
product OPTION GTMAXHSUPAE0x6901 GlobeTrotter HSUPA PCIe
___
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/159919: commit references a PR
The following reply was made to PR usb/159919; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/159919: commit references a PR Date: Sat, 20 Aug 2011 16:21:55 + (UTC) Author: hselasky Date: Sat Aug 20 16:21:40 2011 New Revision: 225041 URL: http://svn.freebsd.org/changeset/base/225041 Log: Add new USB ID to u3g driver. Approved by:re (kib) MFC after: 1 week PR: usb/159919 Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c == --- head/sys/dev/usb/serial/u3g.c Sat Aug 20 16:12:29 2011 (r225040) +++ head/sys/dev/usb/serial/u3g.c Sat Aug 20 16:21:40 2011 (r225041) @@ -280,6 +280,8 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(HUAWEI, E143D, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E143E, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E143F, U3GINIT_HUAWEI), + U3G_DEV(HUAWEI, E173, 0), + U3G_DEV(HUAWEI, E173_INIT, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, E180V, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Sat Aug 20 16:12:29 2011(r225040) +++ head/sys/dev/usb/usbdevs Sat Aug 20 16:21:40 2011(r225041) @@ -1874,6 +1874,8 @@ product HUAWEI E1752 0x1446 3G modem product HUAWEI K3765 0x1465 3G modem product HUAWEI E1820 0x14ac E1820 HSPA+ USB Slider product HUAWEI K3765_INIT 0x1520 K3765 Initial +product HUAWEI E173 0x1c05 3G modem +product HUAWEI E173_INIT 0x1c0b 3G modem initial /* HUAWEI 3com products */ product HUAWEI3COM WUB320G0x0009 Aolynk WUB320g ___ 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/155229: commit references a PR
The following reply was made to PR usb/155229; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/155229: commit references a PR Date: Mon, 27 Jun 2011 21:30:18 + (UTC) Author: hselasky Date: Mon Jun 27 21:30:04 2011 New Revision: 223609 URL: http://svn.freebsd.org/changeset/base/223609 Log: MFC r219257: Add new USB ID. PR: usb/155229 Modified: stable/8/sys/dev/usb/usbdevs stable/8/sys/dev/usb/wlan/if_run.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/usb/usbdevs == --- stable/8/sys/dev/usb/usbdevs Mon Jun 27 21:27:12 2011 (r223608) +++ stable/8/sys/dev/usb/usbdevs Mon Jun 27 21:30:04 2011 (r223609) @@ -2160,6 +2160,7 @@ product MELCO WLIUCG 0x0137 WLI-UC-G product MELCO RT2870_10x0148 RT2870 product MELCO RT2870_20x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN +product MELCO WLIUCG301N 0x016f WLI-UC-G301N /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 Modified: stable/8/sys/dev/usb/wlan/if_run.c == --- stable/8/sys/dev/usb/wlan/if_run.c Mon Jun 27 21:27:12 2011 (r223608) +++ stable/8/sys/dev/usb/wlan/if_run.c Mon Jun 27 21:30:04 2011 (r223609) @@ -210,6 +210,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), RUN_DEV(MELCO,WLIUCG300N), +RUN_DEV(MELCO,WLIUCG301N), RUN_DEV(MELCO,WLIUCGN), RUN_DEV(MOTOROLA4,RT2770), RUN_DEV(MOTOROLA4,RT3070), ___ 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/150401: commit references a PR
The following reply was made to PR usb/150401; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/150401: commit references a PR
Date: Mon, 18 Apr 2011 11:25:28 + (UTC)
Author: mav
Date: Mon Apr 18 11:25:13 2011
New Revision: 220771
URL: http://svn.freebsd.org/changeset/base/220771
Log:
Rework change made at r203146. Instead of reporting all wire errors as
SCSI status errors to CAM (that was wrong, as it too often turned retriable
wire errors into non-retriable REQUEST SENSE errors), do it only for STALL
errors on control pipe of the CBI devices. STALL on control pipe is just
a one of the ways to report error for CBI devices.
PR: usb/150401, usb/154593.
Reviewed by: hselasky
Modified:
stable/8/sys/dev/usb/storage/umass.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/usb/storage/umass.c
==
--- stable/8/sys/dev/usb/storage/umass.c Mon Apr 18 10:25:54 2011
(r220770)
+++ stable/8/sys/dev/usb/storage/umass.c Mon Apr 18 11:25:13 2011
(r220771)
@@ -1850,9 +1850,23 @@ umass_t_cbi_command_callback(struct usb_
break;
default:/* Error */
- umass_tr_error(xfer, error);
- /* skip reset */
- sc-sc_last_xfer_index = UMASS_T_CBI_COMMAND;
+ /*
+ * STALL on the control pipe can be result of the command error.
+ * Attempt to clear this STALL same as for bulk pipe also
+ * results in command completion interrupt, but ASC/ASCQ there
+ * look like not always valid, so don't bother about it.
+ */
+ if ((error == USB_ERR_STALLED) ||
+ (sc-sc_transfer.callback == umass_cam_cb)) {
+ sc-sc_transfer.ccb = NULL;
+ (sc-sc_transfer.callback)
+ (sc, ccb, sc-sc_transfer.data_len,
+ STATUS_CMD_UNKNOWN);
+ } else {
+ umass_tr_error(xfer, error);
+ /* skip reset */
+ sc-sc_last_xfer_index = UMASS_T_CBI_COMMAND;
+ }
break;
}
}
@@ -2606,17 +2620,9 @@ umass_cam_cb(struct umass_softc *sc, uni
/*
* The wire protocol failed and will hopefully have
* recovered. We return an error to CAM and let CAM
- * retry the command if necessary. In case of SCSI IO
- * commands we ask the CAM layer to check the
- * condition first. This is a quick hack to make
- * certain devices work.
+ * retry the command if necessary.
*/
- if (ccb-ccb_h.func_code == XPT_SCSI_IO) {
- ccb-ccb_h.status = CAM_SCSI_STATUS_ERROR;
- ccb-csio.scsi_status = SCSI_STATUS_CHECK_COND;
- } else {
- ccb-ccb_h.status = CAM_REQ_CMP_ERR;
- }
+ ccb-ccb_h.status = CAM_REQ_CMP_ERR;
xpt_done(ccb);
break;
}
___
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/155229: commit references a PR
The following reply was made to PR usb/155229; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/155229: commit references a PR Date: Fri, 4 Mar 2011 07:01:59 + (UTC) Author: daichi Date: Fri Mar 4 07:01:45 2011 New Revision: 219257 URL: http://svn.freebsd.org/changeset/base/219257 Log: Add the Buffalo (Melco Inc.) WLI-UC-G301N PR: usb/155229 Submitted by:Yoshiaki UCHIKAWA MFC after: 1 week Modified: head/share/man/man4/run.4 head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_run.c Modified: head/share/man/man4/run.4 == --- head/share/man/man4/run.4 Thu Mar 3 22:34:13 2011(r219256) +++ head/share/man/man4/run.4 Fri Mar 4 07:01:45 2011(r219257) @@ -120,6 +120,7 @@ driver supports the following wireless a .It Belkin F6D4050 ver 1 .It Buffalo WLI-UC-AG300N .It Buffalo WLI-UC-G300N +.It Buffalo WLI-UC-G301N .It Buffalo WLI-UC-GN .It Corega CG-WLUSB2GNL .It Corega CG-WLUSB2GNR Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Thu Mar 3 22:34:13 2011(r219256) +++ head/sys/dev/usb/usbdevs Fri Mar 4 07:01:45 2011(r219257) @@ -2157,6 +2157,7 @@ product MELCO WLIUCG 0x0137 WLI-UC-G product MELCO RT2870_10x0148 RT2870 product MELCO RT2870_20x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN +product MELCO WLIUCG301N 0x016f WLI-UC-G301N /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 Modified: head/sys/dev/usb/wlan/if_run.c == --- head/sys/dev/usb/wlan/if_run.c Thu Mar 3 22:34:13 2011 (r219256) +++ head/sys/dev/usb/wlan/if_run.c Fri Mar 4 07:01:45 2011 (r219257) @@ -210,6 +210,7 @@ static const struct usb_device_id run_de RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), RUN_DEV(MELCO,WLIUCG300N), +RUN_DEV(MELCO,WLIUCG301N), RUN_DEV(MELCO,WLIUCGN), RUN_DEV(MOTOROLA4,RT2770), RUN_DEV(MOTOROLA4,RT3070), ___ 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/153929: commit references a PR
The following reply was made to PR usb/153929; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/153929: commit references a PR
Date: Thu, 3 Feb 2011 18:26:00 + (UTC)
Author: hselasky
Date: Thu Feb 3 18:25:55 2011
New Revision: 218229
URL: http://svn.freebsd.org/changeset/base/218229
Log:
Fix for detection of MTK 3329 GPS USB devices.
Submitted by:Mykhaylo Yehorov
PR: usb/153929
Approved by: thompsa (mentor)
Modified:
head/sys/dev/usb/serial/umodem.c
head/sys/dev/usb/usbdevs
Modified: head/sys/dev/usb/serial/umodem.c
==
--- head/sys/dev/usb/serial/umodem.c Thu Feb 3 18:07:05 2011
(r218228)
+++ head/sys/dev/usb/serial/umodem.c Thu Feb 3 18:25:55 2011
(r218229)
@@ -197,6 +197,8 @@ static void*umodem_get_desc(struct usb_
static usb_error_t umodem_set_comm_feature(struct usb_device *, uint8_t,
uint16_t, uint16_t);
static void umodem_poll(struct ucom_softc *ucom);
+static void umodem_find_data_iface(struct usb_attach_arg *uaa,
+ uint8_t, uint8_t *, uint8_t *);
static const struct usb_config umodem_config[UMODEM_N_TRANSFER] = {
@@ -311,13 +313,30 @@ umodem_attach(device_t dev)
0 - 1, UDESCSUB_CDC_UNION, 0 - 1);
if ((cud == NULL) || (cud-bLength sizeof(*cud))) {
- device_printf(dev, Missing descriptor.
+ DPRINTF(Missing descriptor.
Assuming data interface is next.\n);
- if (sc-sc_ctrl_iface_no == 0xFF)
+ if (sc-sc_ctrl_iface_no == 0xFF) {
goto detach;
- else
- sc-sc_data_iface_no =
- sc-sc_ctrl_iface_no + 1;
+ } else {
+ uint8_t class_match = 0;
+
+ /* set default interface number */
+ sc-sc_data_iface_no = 0xFF;
+
+ /* try to find the data interface backwards */
+ umodem_find_data_iface(uaa,
+ uaa-info.bIfaceIndex - 1,
+ sc-sc_data_iface_no, class_match);
+
+ /* try to find the data interface forwards */
+ umodem_find_data_iface(uaa,
+ uaa-info.bIfaceIndex + 1,
+ sc-sc_data_iface_no, class_match);
+
+ /* check if nothing was found */
+ if (sc-sc_data_iface_no == 0xFF)
+ goto detach;
+ }
} else {
sc-sc_data_iface_no = cud-bSlaveInterface[0];
}
@@ -398,6 +417,36 @@ detach:
}
static void
+umodem_find_data_iface(struct usb_attach_arg *uaa,
+uint8_t iface_index, uint8_t *p_data_no, uint8_t *p_match_class)
+{
+ struct usb_interface_descriptor *id;
+ struct usb_interface *iface;
+
+ iface = usbd_get_iface(uaa-device, iface_index);
+
+ /* check for end of interfaces */
+ if (iface == NULL)
+ return;
+
+ id = usbd_get_interface_descriptor(iface);
+
+ /* check for non-matching interface class */
+ if (id-bInterfaceClass != UICLASS_CDC_DATA ||
+ id-bInterfaceSubClass != UISUBCLASS_DATA) {
+ /* if we got a class match then return */
+ if (*p_match_class)
+ return;
+ } else {
+ *p_match_class = 1;
+ }
+
+ DPRINTFN(11, Match at index %u\n, iface_index);
+
+ *p_data_no = id-bInterfaceNumber;
+}
+
+static void
umodem_start_read(struct ucom_softc *ucom)
{
struct umodem_softc *sc = ucom-sc_parent;
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevs Thu Feb 3 18:07:05 2011(r218228)
+++ head/sys/dev/usb/usbdevs Thu Feb 3 18:25:55 2011(r218229)
@@ -536,6 +536,7 @@ vendor SPEEDDRAGON 0x0e55 Speed Dragon M
vendor HAWKING0x0e66 Hawking
vendor FOSSIL 0x0e67 Fossil, Inc
vendor GMATE 0x0e7e G.Mate, Inc
+vendor MEDIATEK 0x0e8d MediaTek, Inc.
vendor OTI0x0ea0 Ours Technology
vendor YISO 0x0eab Yiso Wireless Co.
vendor PILOTECH 0x0eaf Pilotech
@@ -2120,6 +2121,9 @@ product MCT DU_H3SP_USB232 0x0200 D-Link
product MCT USB2320x0210 USB-232 Interface
product MCT SITECOM_USB2320x0230 Sitecom
Re: usb/154127: commit references a PR
The following reply was made to PR usb/154127; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/154127: commit references a PR Date: Tue, 1 Feb 2011 22:26:15 + (UTC) Author: n_hibma Date: Tue Feb 1 22:26:06 2011 New Revision: 218178 URL: http://svn.freebsd.org/changeset/base/218178 Log: New ID for the Novatel MC547 PR: 154127 Submitted by:Mike Tancsa MFC after: 1 day Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c == --- head/sys/dev/usb/serial/u3g.c Tue Feb 1 21:15:35 2011 (r218177) +++ head/sys/dev/usb/serial/u3g.c Tue Feb 1 22:26:06 2011 (r218178) @@ -302,6 +302,7 @@ static const struct usb_device_id u3g_de U3G_DEV(NOVATEL, EU740, 0), U3G_DEV(NOVATEL, EU870D, 0), U3G_DEV(NOVATEL, MC760, 0), + U3G_DEV(NOVATEL, MC547, 0), U3G_DEV(NOVATEL, MC950D, 0), U3G_DEV(NOVATEL, U720, 0), U3G_DEV(NOVATEL, U727, 0), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Tue Feb 1 21:15:35 2011(r218177) +++ head/sys/dev/usb/usbdevs Tue Feb 1 22:26:06 2011(r218178) @@ -2387,6 +2387,7 @@ product NOVATEL ZEROCD2 0x5030 Novatel product NOVATEL U727_20x5100 Merlin U727 CDMA product NOVATEL U760 0x6000 Novatel U760 product NOVATEL MC760 0x6002 Novatel MC760 +product NOVATEL MC547 0x7042 Novatel MC547 product NOVATEL2 FLEXPACKGPS 0x0100 NovAtel FlexPack GPS receiver /* Merlin products */ ___ 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/141777: commit references a PR
The following reply was made to PR usb/141777; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/141777: commit references a PR Date: Mon, 29 Nov 2010 15:08:24 + (UTC) Author: sanpei Date: Mon Nov 29 15:08:18 2010 New Revision: 216057 URL: http://svn.freebsd.org/changeset/base/216057 Log: Add new device ids. Buffalo (Melco Inc.) WLI-UC-G PR: 141777 Modified: head/share/man/man4/rum.4 head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_rum.c Modified: head/share/man/man4/rum.4 == --- head/share/man/man4/rum.4 Mon Nov 29 14:47:59 2010(r216056) +++ head/share/man/man4/rum.4 Mon Nov 29 15:08:18 2010(r216057) @@ -93,6 +93,7 @@ including: .It Buffalo WLI-U2-SG54HP Ta USB .It Buffalo WLI-U2-SG54HG Ta USB .It Buffalo WLI-U2-G54HP Ta USB +.It Buffalo WLI-UC-G Ta USB .It CNet CWD-854 ver F Ta USB .It Conceptronic C54RU ver 2 Ta USB .It Corega CG-WLUSB2GO Ta USB Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Mon Nov 29 14:47:59 2010(r216056) +++ head/sys/dev/usb/usbdevs Mon Nov 29 15:08:18 2010(r216057) @@ -2140,6 +2140,7 @@ product MELCO SG54HG 0x00f4 WLI-U2-SG54 product MELCO WLRUCG 0x0116 WLR-UC-G product MELCO WLRUCGAOSS 0x0119 WLR-UC-G-AOSS product MELCO WLIUCAG300N 0x012e WLI-UC-AG300N +product MELCO WLIUCG 0x0137 WLI-UC-G product MELCO RT2870_10x0148 RT2870 product MELCO RT2870_20x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN Modified: head/sys/dev/usb/wlan/if_rum.c == --- head/sys/dev/usb/wlan/if_rum.c Mon Nov 29 14:47:59 2010 (r216056) +++ head/sys/dev/usb/wlan/if_rum.c Mon Nov 29 15:08:18 2010 (r216057) @@ -118,6 +118,7 @@ static const struct usb_device_id rum_de RUM_DEV(HUAWEI3COM, WUB320G), RUM_DEV(MELCO, G54HP), RUM_DEV(MELCO, SG54HP), +RUM_DEV(MELCO, WLIUCG), RUM_DEV(MELCO, WLRUCG), RUM_DEV(MELCO, WLRUCGAOSS), RUM_DEV(MSI, RT2573_1), ___ 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/149039: commit references a PR
The following reply was made to PR usb/149039; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/149039: commit references a PR Date: Sat, 27 Nov 2010 19:39:35 + (UTC) Author: thompsa Date: Sat Nov 27 19:39:29 2010 New Revision: 215947 URL: http://svn.freebsd.org/changeset/base/215947 Log: MFC r213803 USB network (UHSO): - Correct network interface flags. PR: usb/149039 Submitted by:Fredrik Lindberg Modified: stable/8/sys/dev/usb/net/uhso.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/mips/alchemy/ (props changed) stable/8/sys/mips/atheros/ (props changed) stable/8/sys/mips/cavium/ (props changed) stable/8/sys/mips/cavium/dev/ (props changed) stable/8/sys/mips/rmi/ (props changed) stable/8/sys/mips/rmi/dev/ (props changed) stable/8/sys/mips/sibyte/ (props changed) Modified: stable/8/sys/dev/usb/net/uhso.c == --- stable/8/sys/dev/usb/net/uhso.cSat Nov 27 19:38:40 2010 (r215946) +++ stable/8/sys/dev/usb/net/uhso.cSat Nov 27 19:39:29 2010 (r215947) @@ -1560,7 +1560,7 @@ uhso_attach_ifnet(struct uhso_softc *sc, ifp-if_init = uhso_if_init; ifp-if_start = uhso_if_start; ifp-if_output = uhso_if_output; - ifp-if_flags = 0; + ifp-if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_NOARP; ifp-if_softc = sc; IFQ_SET_MAXLEN(ifp-if_snd, ifqmaxlen); ifp-if_snd.ifq_drv_maxlen = ifqmaxlen; ___ 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/149675: commit references a PR
The following reply was made to PR usb/149675; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/149675: commit references a PR
Date: Sun, 28 Nov 2010 07:28:18 + (UTC)
Author: thompsa
Date: Sun Nov 28 07:28:10 2010
New Revision: 215986
URL: http://svn.freebsd.org/changeset/base/215986
Log:
MFC r213872
Fix forwarding of Line Register Status changes to TTY layer.
PR: usb/149675
Modified:
stable/8/sys/dev/usb/serial/usb_serial.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/usb/serial/usb_serial.c
==
--- stable/8/sys/dev/usb/serial/usb_serial.c Sun Nov 28 07:23:05 2010
(r215985)
+++ stable/8/sys/dev/usb/serial/usb_serial.c Sun Nov 28 07:28:10 2010
(r215986)
@@ -942,6 +942,7 @@ ucom_cfg_status_change(struct usb_proc_m
uint8_t new_msr;
uint8_t new_lsr;
uint8_t onoff;
+ uint8_t lsr_delta;
tp = sc-sc_tty;
@@ -965,6 +966,7 @@ ucom_cfg_status_change(struct usb_proc_m
return;
}
onoff = ((sc-sc_msr ^ new_msr) SER_DCD);
+ lsr_delta = (sc-sc_lsr ^ new_lsr);
sc-sc_msr = new_msr;
sc-sc_lsr = new_lsr;
@@ -977,6 +979,30 @@ ucom_cfg_status_change(struct usb_proc_m
ttydisc_modem(tp, onoff);
}
+
+ if ((lsr_delta ULSR_BI) (sc-sc_lsr ULSR_BI)) {
+
+ DPRINTF(BREAK detected\n);
+
+ ttydisc_rint(tp, 0, TRE_BREAK);
+ ttydisc_rint_done(tp);
+ }
+
+ if ((lsr_delta ULSR_FE) (sc-sc_lsr ULSR_FE)) {
+
+ DPRINTF(Frame error detected\n);
+
+ ttydisc_rint(tp, 0, TRE_FRAMING);
+ ttydisc_rint_done(tp);
+ }
+
+ if ((lsr_delta ULSR_PE) (sc-sc_lsr ULSR_PE)) {
+
+ DPRINTF(Parity error detected\n);
+
+ ttydisc_rint(tp, 0, TRE_PARITY);
+ ttydisc_rint_done(tp);
+ }
}
void
___
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/150546: commit references a PR
The following reply was made to PR usb/150546; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/150546: commit references a PR
Date: Fri, 19 Nov 2010 21:04:24 + (UTC)
Author: thompsa
Date: Fri Nov 19 21:04:18 2010
New Revision: 215546
URL: http://svn.freebsd.org/changeset/base/215546
Log:
MFC r213853
- Add missing LibUSB API functions:
* libusb_strerror()
* libusb_get_driver[_np]()
* libusb_detach_kernel_driver[_np]()
- Factor out setting of non-blocking flag inside libusb.
- Add missing NULL check after libusb_get_device() call.
- Correct some wrong error codes due to copy and paste error.
PR: usb/150546
Submitted by: Robert Jenssen, Alexander Leidinger
Modified:
stable/8/lib/libusb/libusb.3
stable/8/lib/libusb/libusb.h
stable/8/lib/libusb/libusb10.c
stable/8/lib/libusb/libusb20.3
Directory Properties:
stable/8/lib/libusb/ (props changed)
stable/8/lib/libusb/usb.h (props changed)
Modified: stable/8/lib/libusb/libusb.3
==
--- stable/8/lib/libusb/libusb.3 Fri Nov 19 20:23:01 2010
(r215545)
+++ stable/8/lib/libusb/libusb.3 Fri Nov 19 21:04:18 2010
(r215546)
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD$
.\
-.Dd June 22, 2009
+.Dd October 14, 2010
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -72,6 +72,15 @@ Deinitialise libusb. Must be called at t
.
.Pp
.
+.Ft const char *
+.Fn libusb_strerror int code
+Get ASCII representation of the error given by the
+.Fa code
+argument.
+.
+.
+.Pp
+.
.Ft void
.Fn libusb_set_debug libusb_context *ctx int level
Set debug to the
@@ -239,12 +248,37 @@ if the device has been disconnected and
.Pp
.
.Ft int
+.Fn libusb_get_driver libusb_device_handle *devh int interface char
*name int namelen
+or
+.Ft int
+.Fn libusb_get_driver_np libusb_device_handle *devh int interface char
*name int namelen
+Gets the name of the driver attached to the given
+.Fa device
+and
+.Fa interface
+into the buffer given by
+.Fa name
+and
+.Fa namelen .
+Returns 0 on success, LIBUSB_ERROR_NOT_FOUND if no kernel driver is attached
+to the given interface and LIBUSB_ERROR_INVALID_PARAM if the interface does
+not exist.
+This function is non-portable.
+The buffer pointed to by
+.Fa name
+is only zero terminated on success.
+.
+.Pp
+.
+.Ft int
.Fn libusb_detach_kernel_driver libusb_device_handle *devh int interface
-Detach a kernel driver from an interface. This is needed to claim an interface
-required by a kernel driver. Returns 0 on success, LIBUSB_ERROR_NOT_FOUND if
-no kernel driver was active, LIBUSB_ERROR_INVALID_PARAM if the interface does
not
-exist, LIBUSB_ERROR_NO_DEVICE if the device has been disconnected and a
-LIBUSB_ERROR code on failure.
+or
+.Ft int
+.Fn libusb_detach_kernel_driver_np libusb_device_handle *devh int
interface
+Detach a kernel driver from an interface.
+This is needed to claim an interface required by a kernel driver.
+Returns 0 on success, LIBUSB_ERROR_NOT_FOUND if no kernel driver was active,
+LIBUSB_ERROR_INVALID_PARAM if the interface does not exist,
LIBUSB_ERROR_NO_DEVICE if the device has been disconnected and a LIBUSB_ERROR
code on failure. This function is non-portable.
.
.Pp
.
@@ -271,7 +305,7 @@ failure.
.
.Pp
.Ft int
-.Fn libsub_get_active_config_descriptor libusb_device *dev
libusb_device_descriptor **config
+.Fn libsub_get_active_config_descriptor libusb_device *dev struct
libusb_config_descriptor **config
Get the USB configuration descriptor for the active configuration. Returns 0
on
success, returns LIBUSB_ERROR_NOT_FOUND if the device is in unconfigured
state
and return another LIBUSB_ERROR code on error.
@@ -337,7 +371,7 @@ LIBUSB_ERROR code on failure.
.
.Pp
.Ft int
-.Fn libusb_control_transfer libusb_device_handle *devh uint8_t
bmRequestType uint16_t wIndex unsigned char *data uint16_t wLength
unsigned int timeout
+.Fn libusb_control_transfer libusb_device_handle *devh uint8_t
bmRequestType uint8_t bRequest uint16_t wValue uint16_t wIndex unsigned
char *data uint16_t wLength unsigned int timeout
Perform a USB control transfer. Returns 0 on success, LIBUSB_ERROR_TIMEOUT
if the transfer timeout, LIBUSB_ERROR_PIPE if the control request was not
supported, LIBUSB_ERROR_NO_DEVICE if the device has been disconnected and
Modified: stable/8/lib/libusb/libusb.h
==
--- stable/8/lib/libusb/libusb.h Fri Nov 19 20:23:01 2010
(r215545)
+++ stable/8/lib/libusb/libusb.h Fri Nov 19 21:04:18 2010
(r215546)
@@ -294,6 +294,7 @@ typedef struct libusb_transfer {
/* Library initialisation */
void libusb_set_debug(libusb_context * ctx, int level);
+const char
Re: usb/119981: commit references a PR
The following reply was made to PR usb/119981; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/119981: commit references a PR Date: Fri, 19 Nov 2010 01:24:41 + (UTC) Author: thompsa Date: Fri Nov 19 01:24:36 2010 New Revision: 215479 URL: http://svn.freebsd.org/changeset/base/215479 Log: MFC r212980 Add new device ids. Buffalo (Melco Inc.) LUA3-U2-AGT Logitec LAN-GTJ/U2A(usb/119981) PR: usb/119981 Modified: Directory Properties: stable/8/share/man/man4/ (props changed) stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) ___ 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/135575: commit references a PR
The following reply was made to PR usb/135575; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/135575: commit references a PR
Date: Fri, 19 Nov 2010 01:36:06 + (UTC)
Author: thompsa
Date: Fri Nov 19 01:35:57 2010
New Revision: 215488
URL: http://svn.freebsd.org/changeset/base/215488
Log:
MFC r210469
Give a name to the HTC Wizard Smartphone
PR: usb/135575
Modified:
stable/8/sys/dev/usb/serial/uipaq.c
stable/8/sys/dev/usb/usbdevs
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/serial/uipaq.c
==
--- stable/8/sys/dev/usb/serial/uipaq.cFri Nov 19 01:35:14 2010
(r215487)
+++ stable/8/sys/dev/usb/serial/uipaq.cFri Nov 19 01:35:57 2010
(r215488)
@@ -690,14 +690,14 @@ static const struct usb_device_id uipaq_
{USB_VPI(USB_VENDOR_HTC, 0x0a9e, 0)},
/* SmartPhone USB Sync */
{USB_VPI(USB_VENDOR_HTC, 0x0a9f, 0)},
- /* High Tech Computer Corp */
- {USB_VPI(USB_VENDOR_HTC, 0x0bce, 0)},
/**/
{USB_VPI(USB_VENDOR_HTC, USB_PRODUCT_HTC_PPC6700MODEM, 0)},
/**/
{USB_VPI(USB_VENDOR_HTC, USB_PRODUCT_HTC_SMARTPHONE, 0)},
/**/
{USB_VPI(USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE, 0)},
+ /* High Tech Computer Wizard Smartphone */
+ {USB_VPI(USB_VENDOR_HTC, USB_PRODUCT_HTC_WIZARD, 0)},
/* JVC USB Sync */
{USB_VPI(USB_VENDOR_JVC, 0x3011, 0)},
/* JVC USB Sync */
Modified: stable/8/sys/dev/usb/usbdevs
==
--- stable/8/sys/dev/usb/usbdevs Fri Nov 19 01:35:14 2010
(r215487)
+++ stable/8/sys/dev/usb/usbdevs Fri Nov 19 01:35:57 2010
(r215488)
@@ -1761,6 +1761,7 @@ product HP HS23000x1e1d hs2300 HSDPA
product HTC WINMOBILE 0x00ce HTC USB Sync
product HTC PPC6700MODEM 0x00cf PPC6700 Modem
product HTC SMARTPHONE0x0a51 SmartPhone USB Sync
+product HTC WIZARD0x0bce HTC Wizard USB Sync
/* HUAWEI products */
product HUAWEI MOBILE 0x1001 Huawei Mobile
___
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/141212: commit references a PR
The following reply was made to PR usb/141212; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/141212: commit references a PR Date: Fri, 19 Nov 2010 01:43:14 + (UTC) Author: thompsa Date: Fri Nov 19 01:43:08 2010 New Revision: 215494 URL: http://svn.freebsd.org/changeset/base/215494 Log: MFC r212128 Silence debug error by default. PR: usb/141212 Modified: stable/8/sys/dev/usb/input/ukbd.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/usb/input/ukbd.c == --- stable/8/sys/dev/usb/input/ukbd.c Fri Nov 19 01:42:13 2010 (r215493) +++ stable/8/sys/dev/usb/input/ukbd.c Fri Nov 19 01:43:08 2010 (r215494) @@ -727,7 +727,7 @@ ukbd_set_leds_callback(struct usb_xfer * break; default:/* Error */ - DPRINTFN(0, error=%s\n, usbd_errstr(error)); + DPRINTFN(1, error=%s\n, usbd_errstr(error)); break; } } ___ 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/150546: commit references a PR
The following reply was made to PR usb/150546; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/150546: commit references a PR
Date: Thu, 14 Oct 2010 20:50:41 + (UTC)
Author: hselasky
Date: Thu Oct 14 20:50:33 2010
New Revision: 213853
URL: http://svn.freebsd.org/changeset/base/213853
Log:
- Add missing LibUSB API functions:
* libusb_strerror()
* libusb_get_driver[_np]()
* libusb_detach_kernel_driver[_np]()
- Factor out setting of non-blocking flag inside libusb.
- Add missing NULL check after libusb_get_device() call.
- Correct some wrong error codes due to copy and paste error.
PR: usb/150546
Submitted by:Robert Jenssen, Alexander Leidinger
Approved by:thompsa (mentor)
Modified:
head/lib/libusb/libusb.3
head/lib/libusb/libusb.h
head/lib/libusb/libusb10.c
head/lib/libusb/libusb20.3
Modified: head/lib/libusb/libusb.3
==
--- head/lib/libusb/libusb.3 Thu Oct 14 20:38:18 2010(r213852)
+++ head/lib/libusb/libusb.3 Thu Oct 14 20:50:33 2010(r213853)
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD$
.\
-.Dd June 22, 2009
+.Dd October 14, 2010
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -72,6 +72,15 @@ Deinitialise libusb. Must be called at t
.
.Pp
.
+.Ft const char *
+.Fn libusb_strerror int code
+Get ASCII representation of the error given by the
+.Fa code
+argument.
+.
+.
+.Pp
+.
.Ft void
.Fn libusb_set_debug libusb_context *ctx int level
Set debug to the
@@ -247,12 +256,37 @@ if the device has been disconnected and
.Pp
.
.Ft int
+.Fn libusb_get_driver libusb_device_handle *devh int interface char
*name int namelen
+or
+.Ft int
+.Fn libusb_get_driver_np libusb_device_handle *devh int interface char
*name int namelen
+Gets the name of the driver attached to the given
+.Fa device
+and
+.Fa interface
+into the buffer given by
+.Fa name
+and
+.Fa namelen .
+Returns 0 on success, LIBUSB_ERROR_NOT_FOUND if no kernel driver is attached
+to the given interface and LIBUSB_ERROR_INVALID_PARAM if the interface does
+not exist.
+This function is non-portable.
+The buffer pointed to by
+.Fa name
+is only zero terminated on success.
+.
+.Pp
+.
+.Ft int
.Fn libusb_detach_kernel_driver libusb_device_handle *devh int interface
-Detach a kernel driver from an interface. This is needed to claim an interface
-required by a kernel driver. Returns 0 on success, LIBUSB_ERROR_NOT_FOUND if
-no kernel driver was active, LIBUSB_ERROR_INVALID_PARAM if the interface does
not
-exist, LIBUSB_ERROR_NO_DEVICE if the device has been disconnected and a
-LIBUSB_ERROR code on failure.
+or
+.Ft int
+.Fn libusb_detach_kernel_driver_np libusb_device_handle *devh int
interface
+Detach a kernel driver from an interface.
+This is needed to claim an interface required by a kernel driver.
+Returns 0 on success, LIBUSB_ERROR_NOT_FOUND if no kernel driver was active,
+LIBUSB_ERROR_INVALID_PARAM if the interface does not exist,
LIBUSB_ERROR_NO_DEVICE if the device has been disconnected and a LIBUSB_ERROR
code on failure. This function is non-portable.
.
.Pp
.
@@ -279,7 +313,7 @@ failure.
.
.Pp
.Ft int
-.Fn libsub_get_active_config_descriptor libusb_device *dev
libusb_device_descriptor **config
+.Fn libsub_get_active_config_descriptor libusb_device *dev struct
libusb_config_descriptor **config
Get the USB configuration descriptor for the active configuration. Returns 0
on
success, returns LIBUSB_ERROR_NOT_FOUND if the device is in unconfigured
state
and return another LIBUSB_ERROR code on error.
@@ -345,7 +379,7 @@ LIBUSB_ERROR code on failure.
.
.Pp
.Ft int
-.Fn libusb_control_transfer libusb_device_handle *devh uint8_t
bmRequestType uint16_t wIndex unsigned char *data uint16_t wLength
unsigned int timeout
+.Fn libusb_control_transfer libusb_device_handle *devh uint8_t
bmRequestType uint8_t bRequest uint16_t wValue uint16_t wIndex unsigned
char *data uint16_t wLength unsigned int timeout
Perform a USB control transfer. Returns 0 on success, LIBUSB_ERROR_TIMEOUT
if the transfer timeout, LIBUSB_ERROR_PIPE if the control request was not
supported, LIBUSB_ERROR_NO_DEVICE if the device has been disconnected and
Modified: head/lib/libusb/libusb.h
==
--- head/lib/libusb/libusb.h Thu Oct 14 20:38:18 2010(r213852)
+++ head/lib/libusb/libusb.h Thu Oct 14 20:50:33 2010(r213853)
@@ -294,6 +294,7 @@ typedef struct libusb_transfer {
/* Library initialisation */
void libusb_set_debug(libusb_context * ctx, int level);
+const char *libusb_strerror(int code);
int libusb_init(libusb_context ** context);
void libusb_exit(struct libusb_context *ctx);
@@ -318,6 +319,9 @@ int
Re: usb/149934: commit references a PR
The following reply was made to PR usb/149934; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/149934: commit references a PR Date: Thu, 14 Oct 2010 21:09:43 + (UTC) Author: hselasky Date: Thu Oct 14 21:09:37 2010 New Revision: 213856 URL: http://svn.freebsd.org/changeset/base/213856 Log: - Add more USB devices to usbdevs and rename some previously unknown ones. - Add more USB mass storage quirks. Submitted by: Dmitry Luhtionov PR: usb/149934, usb/143045 Approved by:thompsa (mentor) Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Thu Oct 14 21:09:04 2010 (r213855) +++ head/sys/dev/usb/quirk/usb_quirk.c Thu Oct 14 21:09:37 2010 (r213856) @@ -159,10 +159,8 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(ALCOR, AU6390, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, UMCR_9361, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), - USB_QUIRK(ALCOR, TRANSCEND, 0x0142, 0x0142, UQ_MSC_FORCE_WIRE_BBB, - UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(ALCOR, TRANSCEND, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, - UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), + USB_QUIRK(ALCOR, TRANSCEND, 0x, 0x, UQ_MSC_NO_GETMAXLUN, + UQ_MSC_NO_SYNC_CACHE, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(APACER, HT202, 0x, 0x, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ASAHIOPTICAL, OPTIO230, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, @@ -195,7 +193,7 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(FREECOM, DVD, 0x, 0x, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(FREECOM, HDD, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(FUJIPHOTO, MASS0100, 0x, 0x, UQ_MSC_FORCE_WIRE_CBI_I, - UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA), + UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(GENESYS, GL641USB2IDE, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE), @@ -456,8 +454,9 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(ACTIONS, MP4, 0x, 0x, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ASUS, GMSC, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(UNKNOWN4, USBMEMSTICK, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(UNKNOWN5, USB2IDEBRIDGE, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(CHIPSBANK, USBMEMSTICK, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(CHIPSBANK, USBMEMSTICK1, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(NEWLINK, USB2IDEBRIDGE, 0x, 0x, UQ_MSC_NO_SYNC_CACHE), }; #undef USB_QUIRK_VP #undef USB_QUIRK Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevs Thu Oct 14 21:09:04 2010(r213855) +++ head/sys/dev/usb/usbdevs Thu Oct 14 21:09:37 2010(r213856) @@ -58,7 +58,7 @@ $FreeBSD$ vendor UNKNOWN1 0x0053 Unknown vendor vendor UNKNOWN2 0x0105 Unknown vendor vendor EGALAX20x0123 eGalax, Inc. -vendor UNKNOWN4 0x0204 Unknown vendor +vendor CHIPSBANK 0x0204 Chipsbank Microelectronics Co. vendor HUMAX 0x02ad HUMAX vendor LTS0x0386 LTS vendor BWCT 0x03da Bernd Walter Computer Technology @@ -403,7 +403,7 @@ vendor ARASAN 0x07da Arasan Chip System vendor ALLIEDCABLE0x07e6 Allied Cable vendor STSN 0x07ef STSN vendor CENTURY0x07f7 Century Corp -vendor UNKNOWN5 0x07ff Unknown +vendor NEWLINK0x07ff NEWlink vendor ZOOM 0x0803 Zoom Telephonics vendor PCS0x0810 Personal Communication Systems vendor ALPHASMART 0x081e AlphaSmart, Inc. @@ -651,18 +651,21 @@ vendor METAGEEK 0x1781 MetaGeek vendor WAVESENSE 0x17f4 WaveSense vendor VAISALA0x1843 Vaisala vendor AMIT 0x18c5 AMIT +vendor GOOGLE 0x18d1 Google vendor QCOM 0x18e8 Qcom vendor ELV0x18ef ELV vendor LINKSYS3 0x1915 Linksys vendor QUALCOMMINC0x19d2 Qualcomm, Incorporated vendor WCH2 0x1a86 QinHeng Electronics vendor STELERA0x1a8d Stelera Wireless +vendor MATRIXORBITAL 0x1b3d Matrix Orbital vendor OVISLINK
