Re: CVS commit: [netbsd-5] src/sys/dev/usb
On 11/21/10 2:11 AM, Martin Husemann wrote: Module Name:src Committed By: martin Date: Sun Nov 21 10:11:59 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: usbdevs.h usbdevs_data.h Log Message: Regen (accidently mssing form [pullup-5 #1407]) To generate a diff of this commit: cvs rdiff -u -r1.515.4.6 -r1.515.4.7 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.516.4.6 -r1.516.4.7 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Thanks for taking care of this. I knew I was forgetting something! +j
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: snj
Date: Tue Mar 9 03:45:43 UTC 2010
Modified Files:
src/sys/dev/usb [netbsd-5]: umass.c usbdevs
Log Message:
Pull up following revision(s) (requested by is/martin):
sys/dev/usb/usbdevs: revision 1.535
sys/dev/usb/umass.c: revision 1.137
Add SuperTop and SuperTop IDE Bridge to usbdevs.
--
Max out the expected response size at the actual transfer length.
Fixes PR kern/42225.
To generate a diff of this commit:
cvs rdiff -u -r1.129.4.1 -r1.129.4.2 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.519.4.4 -r1.519.4.5 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.129.4.1 src/sys/dev/usb/umass.c:1.129.4.2
--- src/sys/dev/usb/umass.c:1.129.4.1 Sat Dec 13 21:44:42 2008
+++ src/sys/dev/usb/umass.c Tue Mar 9 03:45:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.129.4.1 2008/12/13 21:44:42 bouyer Exp $ */
+/* $NetBSD: umass.c,v 1.129.4.2 2010/03/09 03:45:43 snj Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.129.4.1 2008/12/13 21:44:42 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.129.4.2 2010/03/09 03:45:43 snj Exp $);
#include atapibus.h
#include scsibus.h
@@ -996,6 +996,7 @@
{
struct umass_softc *sc = (struct umass_softc *) priv;
usbd_xfer_handle next_xfer;
+ int residue;
KASSERT(sc-sc_wire UMASS_WPROTO_BBB,
(sc-sc_wire == 0x%02x wrong for umass_bbb_state\n,
@@ -1168,6 +1169,10 @@
DIF(UDMASS_BBB, umass_bbb_dump_csw(sc, sc-csw));
+ residue = UGETDW(sc-csw.dCSWDataResidue);
+ if (residue sc-transfer_datalen - sc-transfer_actlen)
+ residue = sc-transfer_datalen - sc-transfer_actlen;
+
/* Translate weird command-status signatures. */
if ((sc-sc_quirks UMASS_QUIRK_WRONG_CSWSIG)
UGETDW(sc-csw.dCSWSignature) == CSWSIGNATURE_OLYMPUS_C1)
@@ -1210,8 +1215,7 @@
return;
} else if (sc-csw.bCSWStatus == CSWSTATUS_PHASE) {
printf(%s: Phase Error, residue = %d\n,
-USBDEVNAME(sc-sc_dev),
-UGETDW(sc-csw.dCSWDataResidue));
+USBDEVNAME(sc-sc_dev), residue);
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
return;
@@ -1223,32 +1227,29 @@
sc-transfer_actlen, sc-transfer_datalen);
#if 0
} else if (sc-transfer_datalen - sc-transfer_actlen
- != UGETDW(sc-csw.dCSWDataResidue)) {
+ != residue) {
DPRINTF(UDMASS_BBB, (%s: actlen=%d != residue=%d\n,
USBDEVNAME(sc-sc_dev),
sc-transfer_datalen - sc-transfer_actlen,
-UGETDW(sc-csw.dCSWDataResidue)));
+residue));
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
return;
#endif
} else if (sc-csw.bCSWStatus == CSWSTATUS_FAILED) {
DPRINTF(UDMASS_BBB, (%s: Command Failed, res = %d\n,
-USBDEVNAME(sc-sc_dev),
-UGETDW(sc-csw.dCSWDataResidue)));
+USBDEVNAME(sc-sc_dev), residue));
/* SCSI command failed but transfer was succesful */
sc-transfer_state = TSTATE_IDLE;
- sc-transfer_cb(sc, sc-transfer_priv,
- UGETDW(sc-csw.dCSWDataResidue),
+ sc-transfer_cb(sc, sc-transfer_priv, residue,
STATUS_CMD_FAILED);
return;
} else { /* success */
sc-transfer_state = TSTATE_IDLE;
- sc-transfer_cb(sc, sc-transfer_priv,
- UGETDW(sc-csw.dCSWDataResidue),
+ sc-transfer_cb(sc, sc-transfer_priv, residue,
STATUS_CMD_OK);
return;
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.519.4.4 src/sys/dev/usb/usbdevs:1.519.4.5
--- src/sys/dev/usb/usbdevs:1.519.4.4 Sat Jan 16 17:47:12 2010
+++ src/sys/dev/usb/usbdevs Tue Mar 9 03:45:43 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.519.4.4 2010/01/16 17:47:12 bouyer Exp $
+$NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -454,6 +454,7 @@
vendor RALINK 0x1485 Ralink Technology
vendor RALINK_2 0x148f Ralink Technology
vendor CONCEPTRONIC 0x14b2 Conceptronic
+vendor SUPERTOP 0x14cd SuperTop
vendor PLANEX3 0x14ea Planex Communications
vendor SILICONPORTALS 0x1527 Silicon Portals
vendor OQO 0x1557 OQO
@@ -2194,6 +2195,9 @@
/* XXX The above is a North American PC style keyboard possibly */
product SUN MOUSE 0x0100 Type 6 USB mouse
+/* SuperTop products */
+product SUPERTOP IDEBRIDGE 0x6600 SuperTop IDE Bridge
+
/* Supra products */
product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem
product DIAMOND2 SUPRA2890 0x0b4a SupraMax 2890 56K Modem
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: snj Date: Tue Mar 9 03:45:43 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: umass.c usbdevs Log Message: Pull up following revision(s) (requested by is/martin): sys/dev/usb/usbdevs: revision 1.535 sys/dev/usb/umass.c: revision 1.137 Add SuperTop and SuperTop IDE Bridge to usbdevs. -- Max out the expected response size at the actual transfer length. Fixes PR kern/42225. To generate a diff of this commit: cvs rdiff -u -r1.129.4.1 -r1.129.4.2 src/sys/dev/usb/umass.c cvs rdiff -u -r1.519.4.4 -r1.519.4.5 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: snj
Date: Tue Mar 9 03:46:24 UTC 2010
Modified Files:
src/sys/dev/usb [netbsd-5]: usbdevs.h usbdevs_data.h
Log Message:
Regen for ticket 1123.
To generate a diff of this commit:
cvs rdiff -u -r1.515.4.4 -r1.515.4.5 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.516.4.4 -r1.516.4.5 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.515.4.4 src/sys/dev/usb/usbdevs.h:1.515.4.5
--- src/sys/dev/usb/usbdevs.h:1.515.4.4 Sat Jan 16 17:50:13 2010
+++ src/sys/dev/usb/usbdevs.h Tue Mar 9 03:46:24 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.515.4.4 2010/01/16 17:50:13 bouyer Exp $ */
+/* $NetBSD: usbdevs.h,v 1.515.4.5 2010/03/09 03:46:24 snj Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp
*/
/*
@@ -461,6 +461,7 @@
#define USB_VENDOR_RALINK 0x1485 /* Ralink Technology */
#define USB_VENDOR_RALINK_2 0x148f /* Ralink Technology */
#define USB_VENDOR_CONCEPTRONIC 0x14b2 /* Conceptronic */
+#define USB_VENDOR_SUPERTOP 0x14cd /* SuperTop */
#define USB_VENDOR_PLANEX3 0x14ea /* Planex Communications */
#define USB_VENDOR_SILICONPORTALS 0x1527 /* Silicon Portals */
#define USB_VENDOR_OQO 0x1557 /* OQO */
@@ -2201,6 +2202,9 @@
/* XXX The above is a North American PC style keyboard possibly */
#define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 USB mouse */
+/* SuperTop products */
+#define USB_PRODUCT_SUPERTOP_IDEBRIDGE 0x6600 /* SuperTop IDE Bridge */
+
/* Supra products */
#define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */
#define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.516.4.4 src/sys/dev/usb/usbdevs_data.h:1.516.4.5
--- src/sys/dev/usb/usbdevs_data.h:1.516.4.4 Sat Jan 16 17:50:13 2010
+++ src/sys/dev/usb/usbdevs_data.h Tue Mar 9 03:46:24 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.516.4.4 2010/01/16 17:50:13 bouyer Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.516.4.5 2010/03/09 03:46:24 snj Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp
*/
/*
@@ -1639,6 +1639,10 @@
Conceptronic,
},
{
+ USB_VENDOR_SUPERTOP,
+ SuperTop,
+ },
+ {
USB_VENDOR_PLANEX3,
Planex Communications,
},
@@ -1855,7 +1859,7 @@
GNU Radio USRP,
},
};
-const int usb_nvendors = 454;
+const int usb_nvendors = 455;
const struct usb_product usb_products[] = {
{
@@ -6359,6 +6363,10 @@
Type 6 USB mouse,
},
{
+ USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDEBRIDGE,
+ SuperTop IDE Bridge,
+ },
+ {
USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
Supra Express 56K modem,
},
@@ -6835,4 +6843,4 @@
Prestige,
},
};
-const int usb_nproducts = 1244;
+const int usb_nproducts = 1245;
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: bouyer Date: Sun Feb 14 13:58:32 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: ukbd.c Log Message: Pull up following revision(s) (requested by sborrill in ticket #1303): sys/dev/usb/ukbd.c: revision 1.104 sys/dev/usb/ukbd.c: revision 1.107 Fix WSKBD_RAW mode ukbd - pckbd translation for Pause/Break and Print Screen/Sys Req keys so xf86-input-keyboard can figure out what we want. Additionally, fix dead URL, and add a note that this emulation is not completely identical to a real pckbd. Tweak comment about keyboard mapping. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.101.4.1 src/sys/dev/usb/ukbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: sborrill Date: Wed Jan 27 20:56:45 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: usbdi.c Log Message: Pull up the following revisions(s) (requested by bouyer in ticket #1247): sys/dev/usb/usbdi.c:revision 1.127 Fix leak of a usbd_xfer_handle when a interrupt pipe is aborted then closed. Confirmed to fix the memory leak on close() with umodem(4) and uplcom(4). To generate a diff of this commit: cvs rdiff -u -r1.124.4.1 -r1.124.4.2 src/sys/dev/usb/usbdi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: bouyer Date: Sat Jan 16 17:47:13 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: ums.c usbdevs Log Message: Pull up following revision(s) (requested by matthias in ticket #1243): sys/dev/usb/usbdevs.h: regen sys/dev/usb/usbdevs_data.h: regen sys/dev/usb/usbdevs: revision 1.540 sys/dev/usb/ums.c: revision 1.80 Make ums.c work with a Microsoft Natural Ergonomic Desktop 7000 mouse. XXX The tilt function still doesn't work for me. To generate a diff of this commit: cvs rdiff -u -r1.73.8.2 -r1.73.8.3 src/sys/dev/usb/ums.c cvs rdiff -u -r1.519.4.3 -r1.519.4.4 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: bouyer Date: Sat Jan 16 17:50:13 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: usbdevs.h usbdevs_data.h Log Message: Regen for ticket 1243 To generate a diff of this commit: cvs rdiff -u -r1.515.4.3 -r1.515.4.4 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.516.4.3 -r1.516.4.4 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: snj Date: Sat Jan 9 01:37:04 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: uhidev.c Log Message: Pull up following revision(s) (requested by jakllsch in ticket #1219): sys/dev/usb/uhidev.c: revision 1.46 The Dell DRAC5 gives us a zero-length report immediately following a normal report. Thus, ignore zero-length reports. Move some related report size insanity checking into the UHIDEV_DEBUG case. Should fix PR/39911. To generate a diff of this commit: cvs rdiff -u -r1.42.8.1 -r1.42.8.2 src/sys/dev/usb/uhidev.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
