diff options
| author | drochner <drochner> | 2007-01-23 17:02:06 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2007-01-23 17:02:06 +0000 |
| commit | 9a490911eb2c45c5aff29a2b325adebce46cc0db (patch) | |
| tree | e1417b4efc46476f3638b48b5dca1fabae925918 /sysutils/usbutil | |
| parent | 3b92fed58df0e1bdc4038c0c447206ec7b58fc5e (diff) | |
| download | pkgsrc-9a490911eb2c45c5aff29a2b325adebce46cc0db.tar.gz | |
-make fetch of hub descriptors in usbctl work (by setting the correct
request value)
-ifdef out the USB_DISCOVER ioctl on NetBSD, this doesn't exist
-bump PKGREVISION
Diffstat (limited to 'sysutils/usbutil')
| -rw-r--r-- | sysutils/usbutil/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/usbutil/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/usbutil/patches/patch-ab | 29 |
3 files changed, 31 insertions, 5 deletions
diff --git a/sysutils/usbutil/Makefile b/sysutils/usbutil/Makefile index 116c0025da6..233b583fc7e 100644 --- a/sysutils/usbutil/Makefile +++ b/sysutils/usbutil/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2002/02/25 01:00:49 augustss Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/23 17:02:06 drochner Exp $ # DISTNAME= usbutil-0.5 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/ diff --git a/sysutils/usbutil/distinfo b/sysutils/usbutil/distinfo index 72018108810..e8d7fd1bdb9 100644 --- a/sysutils/usbutil/distinfo +++ b/sysutils/usbutil/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2005/12/18 17:31:22 joerg Exp $ +$NetBSD: distinfo,v 1.7 2007/01/23 17:02:06 drochner Exp $ SHA1 (usbutil-0.5.tar.gz) = 4c9abc6f370ab561bd2748b1792802d1e959c599 RMD160 (usbutil-0.5.tar.gz) = 48c6bedeed8daf50a760feedef3575db021066f8 Size (usbutil-0.5.tar.gz) = 11508 bytes SHA1 (patch-aa) = 8db548f99befd76839b8b31caa2de0861c6d708b -SHA1 (patch-ab) = f3bf1820290e966065b185b3b55ce7ec4f127d59 +SHA1 (patch-ab) = 264ca3c572be06b2be720ecce5e77da1725fa894 SHA1 (patch-ac) = 0c1c7e67c84c1a6db1ad0144803977bee7c61ceb SHA1 (patch-ad) = bf7ba74ab56b2ae8560c3da73cbd53134a2bf2b8 diff --git a/sysutils/usbutil/patches/patch-ab b/sysutils/usbutil/patches/patch-ab index 95937c5ebea..ce6add0062d 100644 --- a/sysutils/usbutil/patches/patch-ab +++ b/sysutils/usbutil/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2005/12/18 17:31:22 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2007/01/23 17:02:07 drochner Exp $ ---- usbctl.c.orig 2002-02-25 00:50:55.000000000 +0000 +--- usbctl.c.orig 2002-02-25 01:50:55.000000000 +0100 +++ usbctl.c @@ -27,12 +27,18 @@ #include <stdio.h> @@ -21,3 +21,28 @@ $NetBSD: patch-ab,v 1.1 2005/12/18 17:31:22 joerg Exp $ #ifndef USB_STACK_VERSION #define ucr_addr addr +@@ -630,7 +636,7 @@ gethubdesc(int f, usb_hub_descriptor_t * + req.ucr_addr = addr; + req.ucr_request.bmRequestType = UT_READ_CLASS_DEVICE; + req.ucr_request.bRequest = UR_GET_DESCRIPTOR; +- USETW(req.ucr_request.wValue, 0); ++ USETW2(req.ucr_request.wValue, UDESC_HUB, 0); + USETW(req.ucr_request.wIndex, 0); + USETW(req.ucr_request.wLength, USB_HUB_DESCRIPTOR_SIZE); + req.ucr_data = d; +@@ -1321,6 +1327,7 @@ main(int argc, char **argv) + + if (!doaddr) + prunits(f); ++#ifndef __NetBSD__ + if (!nodisc) { + r = ioctl(f, USB_DISCOVER); + if (r < 0) +@@ -1329,6 +1336,7 @@ main(int argc, char **argv) + if (disconly) + exit(0); + } ++#endif + + for(addr = 0; addr < USB_MAX_DEVICES; addr++) { + if (doaddr != -1 && addr != doaddr) |