USB developer utilities:

    usbctl
	Dump information about devices on a USB bus.
    usbgen
	Dump descriptors of a generic device.
	usbgen -f ugenN -v -D
    usbstats
	Gives statistics for a USB host contrller.

6 files changed, 159 insertions, 0 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index acbff3eafee0..21ce49a22494 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -672,6 +672,7 @@
     SUBDIR += uptimec
     SUBDIR += uptimed
     SUBDIR += usbhotkey
+    SUBDIR += usbutil
     SUBDIR += usbutils
     SUBDIR += uschedule
     SUBDIR += userinfo
diff --git a/sysutils/usbutil/Makefile b/sysutils/usbutil/Makefile
new file mode 100644
index 000000000000..6bca9ed868eb
--- /dev/null
+++ b/sysutils/usbutil/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	usbutils
+# Date created:		2003-03-27
+# Whom:			Bernd Walter <ticso@freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	usbutil
+PORTVERSION=	0.5
+CATEGORIES=	sysutils
+MASTER_SITES=	ftp://ftp.augustsson.net/pub/netbsd/ \
+		http://www.mavetju.org/download/adopted/
+
+MAINTAINER=	ticso@FreeBSD.org
+COMMENT=	USB developer utilities
+
+PLIST_FILES=	sbin/usbctl sbin/usbgen sbin/usbstats
+MAN8=		usbgen.8
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/usbgen.8 ${PREFIX}/man/man8
+
+.include <bsd.port.mk>
diff --git a/sysutils/usbutil/distinfo b/sysutils/usbutil/distinfo
new file mode 100644
index 000000000000..7233b22ce1f5
--- /dev/null
+++ b/sysutils/usbutil/distinfo
@@ -0,0 +1,3 @@
+MD5 (usbutil-0.5.tar.gz) = 3ca61f11056567846e403787b7ea20d0
+SHA256 (usbutil-0.5.tar.gz) = e0e930a737fd7834241b1edd3ff4a13362ba97d071f539f1055fe3528b717db8
+SIZE (usbutil-0.5.tar.gz) = 11508
diff --git a/sysutils/usbutil/files/patch-aa b/sysutils/usbutil/files/patch-aa
new file mode 100644
index 000000000000..99939ebe267f
--- /dev/null
+++ b/sysutils/usbutil/files/patch-aa
@@ -0,0 +1,96 @@
+diff -ur usbctl.c usbctl.c
+--- usbctl.c	Mon Feb 25 01:50:55 2002
++++ usbctl.c	Thu Mar 27 14:47:09 2003
+@@ -26,6 +26,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -33,15 +34,6 @@
+ #include <errno.h>
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
+-
+-#ifndef USB_STACK_VERSION
+-#define ucr_addr addr
+-#define ucr_request request
+-#define ucr_data data
+-#define ucr_flags flags
+-#define udi_addr addr
+-#define udi_class class
+-#endif
+ 
+ #ifndef UICLASS_HID
+ #define UICLASS_HID UCLASS_HID
+diff -ur usbdebug.c usbdebug.c
+--- usbdebug.c	Wed May 19 01:47:45 1999
++++ usbdebug.c	Sun Mar 23 15:29:31 2003
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+diff -ur usbgen.c usbgen.c
+--- usbgen.c	Mon Feb 25 01:55:12 2002
++++ usbgen.c	Thu Mar 27 14:47:40 2003
+@@ -26,6 +26,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -38,25 +39,6 @@
+ #define UE_GET_DIR(a)	((a) & 0x80)
+ #define UE_DIR_IN	0x80
+ #define UE_DIR_OUT	0x00
+-#endif
+-
+-#ifndef USB_STACK_VERSION
+-#define uid_config_index config_index
+-#define uid_interface_index interface_index
+-#define uid_alt_index alt_index
+-#define uid_desc desc
+-#define ued_config_index config_index
+-#define ued_interface_index interface_index
+-#define ued_alt_index alt_index
+-#define ued_endpoint_index endpoint_index
+-#define ued_desc desc
+-#define ucd_config_index config_index
+-#define ucd_desc desc
+-#define uai_config_index config_index
+-#define uai_interface_index interface_index
+-#define udi_product product
+-#define udi_vendor vendor
+-#define udi_addr addr
+ #endif
+ 
+ int verbose;
+diff -ur usbstats.c usbstats.c
+--- usbstats.c	Mon Feb 25 01:55:56 2002
++++ usbstats.c	Thu Mar 27 14:47:44 2003
+@@ -25,15 +25,13 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <err.h>
+ #include <dev/usb/usb.h>
+-
+-#ifndef USB_STACK_VERSION
+-#define uds_requests requests
+-#endif
+ 
+ #define USBDEV "/dev/usb"
+ 
diff --git a/sysutils/usbutil/files/patch-ab b/sysutils/usbutil/files/patch-ab
new file mode 100644
index 000000000000..ceb8c306d2f3
--- /dev/null
+++ b/sysutils/usbutil/files/patch-ab
@@ -0,0 +1,28 @@
+--- Makefile	Wed May 19 23:05:31 1999
++++ Makefile	Thu Mar 27 19:21:15 2003
+@@ -1,5 +1,4 @@
+-PROGS = usbctl usbdebug usbstats usbgen 
+-CFLAGS = -Wall -s
++PROGS = usbctl usbstats usbgen 
+ 
+ all:	$(PROGS)
+ 
+@@ -9,9 +8,6 @@
+ usbctl:		usbctl.c
+ 	cc $(CFLAGS) usbctl.c -o usbctl
+ 
+-usbdebug:	usbdebug.c
+-	cc $(CFLAGS) usbdebug.c -o usbdebug
+-
+ usbstats:	usbstats.c
+ 	cc $(CFLAGS) usbstats.c -o usbstats
+ 
+@@ -19,7 +15,7 @@
+ 	cc $(CFLAGS) usbgen.c -o usbgen
+ 
+ install: $(PROGS)
+-	install usbctl usbdebug usbstats usbgen $(PREFIX)/sbin
++	install usbctl usbstats usbgen $(PREFIX)/sbin
+ 
+ clean:
+ 	rm -f $(PROGS)
diff --git a/sysutils/usbutil/pkg-descr b/sysutils/usbutil/pkg-descr
new file mode 100644
index 000000000000..95ec91bfae04
--- /dev/null
+++ b/sysutils/usbutil/pkg-descr
@@ -0,0 +1,8 @@
+USB developer utilities:
+usbctl
+	Dump information about devices on a USB bus.
+usbgen
+	Dump descriptors of a generic device.
+	usbgen -f ugenN -v -D
+usbstats
+	Gives statistics for a USB host contrller.