Index: sys/dev/pci/uhci_pci.c
===================================================================
RCS file: /home/cvs/newconfig/sys/dev/pci/uhci_pci.c,v
retrieving revision 1.3
diff -u -u -r1.3 uhci_pci.c
--- uhci_pci.c	1999/03/30 00:04:24	1.3
+++ uhci_pci.c	1999/04/07 17:44:32
@@ -1,4 +1,4 @@
-/*	FreeBSD $Id: uhci_pci.c,v 1.3 1999/03/27 23:08:43 n_hibma Exp $ */
+/*	FreeBSD $Id: uhci_pci.c,v 1.4 1999/04/06 23:09:58 n_hibma Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -261,7 +261,7 @@
 #if ! (defined(USBVERBOSE) || defined(USB_DEBUG))
 		if (bootverbose)
 #endif
-			printf("uhcis%d: PIRQD enable not set\n", unit);
+			printf("uhci%d: PIRQD enable not set\n", unit);
 		legsup |= PCI_LEGSUP_USBPIRQDEN;
 		pci_conf_write(config_id, PCI_LEGSUP, legsup);
 	}
Index: sys/dev/usb/usb.h
===================================================================
RCS file: /home/cvs/newconfig/sys/dev/usb/usb.h,v
retrieving revision 1.2
diff -u -u -r1.2 usb.h
--- usb.h	1999/03/30 00:04:25	1.2
+++ usb.h	1999/04/07 17:44:32
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.h,v 1.17 1999/01/03 01:09:18 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.8 1999/01/22 00:51:12 n_hibma Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.9 1999/04/05 17:23:54 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -217,8 +217,9 @@
 	uByte		bLength;
 	uByte		bDescriptorType;
 	uByte		bEndpointAddress;
-#define UE_IN		0x80
-#define UE_OUT		0x00
+#define UE_DIR		0x80	/* mask */
+#define  UE_IN		0x80
+#define  UE_OUT		0x00
 #define UE_ADDR		0x0f
 #define UE_GET_ADDR(a)	((a) & UE_ADDR)
 #define UE_GET_IN(a)	(((a) >> 7) & 1)
@@ -329,20 +330,32 @@
 
 #define UDESC_HUB		0x29
 
-#define UCLASS_UNSPEC		0
-#define UCLASS_AUDIO		1
+#define UCLASS_UNSPEC		0	/* Unspecified */
+#define UCLASS_AUDIO		1	/* Audio */
 #define  USUBCLASS_AUDIOCONTROL	1
 #define  USUBCLASS_AUDIOSTREAM	2
-#define UCLASS_CDC		2 /* communication */
+#define UCLASS_CDC		2	/* Communication */
 #define  USUBCLASS_ABSTRACT_CONTROL_MODEL	2
 #define   UPROTO_CDC_AT		1
-#define UCLASS_HID		3
+#define UCLASS_HID		3	/* Human Interface Device */
 #define  USUBCLASS_BOOT	 	1
-#define UCLASS_PRINTER		7
+#define UCLASS_PRINTER		7	/* Printer/Parallel Port */
 #define  USUBCLASS_PRINTER	1
-#define  UPROTO_PRINTER_UNI	1
-#define  UPROTO_PRINTER_BI	2
-#define UCLASS_HUB		9
+#define  UPROTO_PRINTER_UNI	1	/* Unidirectional */
+#define  UPROTO_PRINTER_BI	2	/* Bidirectional */
+#define UCLASS_MASS		8	/* Mass Storage */
+#define  USUBCLASS_RBC		1	/* Reduced Block comm. (e.g. Flash ) */
+#define  USUBCLASS_SFF8020I	2	/* (e.g. CD ROM) */
+#define  USUBCLASS_QIC157	3	/* (e.g. tape drives) */
+#define  USUBCLASS_UFI		4	/* (e.g. floppy drives) */
+#define  USUBCLASS_SFF8070I	5	/* (e.g. floppy drives) */
+#define  USUBCLASS_SCSI		6	/* SCSI transparent comman set */
+#define  UPROTO_MASS_CBI_I	0	/* CBI protocol with comm. compl. int */
+#define  UPROTO_MASS_CBI	1	/* CBI protocol */
+/* unknown yet 1999-04-05
+#define  UPROTO_MASS_BULK	??	/ * Bulk only transport * /
+*/
+#define UCLASS_HUB		9	/* Hub */
 #define  USUBCLASS_HUB		0
 #define UCLASS_DATA		10
 
Index: sys/dev/usb/usb_port.h
===================================================================
RCS file: /home/cvs/newconfig/sys/dev/usb/usb_port.h,v
retrieving revision 1.3
diff -u -u -r1.3 usb_port.h
--- usb_port.h	1999/03/30 00:04:25	1.3
+++ usb_port.h	1999/04/07 18:15:52
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_port.h,v 1.5 1999/01/08 11:58:25 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.11 1999/01/22 00:44:31 n_hibma Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.12 1999/04/07 17:07:07 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -111,6 +111,7 @@
 #define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
 	((dev)->softc = config_found_sm(parent, args, print, sub))
 
+#define logprintf	printf
 
 
 
@@ -260,6 +261,9 @@
 #define SIMPLEQ_INIT		STAILQ_INIT
 #define SIMPLEQ_ENTRY		STAILQ_ENTRY
 #endif /* NEW_CONFIG */
+
+#include <sys/syslog.h>
+#define logprintf(args...)	log(LOG_DEBUG, args);
 
 #endif /* __FreeBSD__ */
 
Index: sys/dev/usb/usbdevs.h
===================================================================
RCS file: /home/cvs/newconfig/sys/dev/usb/usbdevs.h,v
retrieving revision 1.2
diff -u -u -r1.2 usbdevs.h
--- usbdevs.h	1999/03/30 00:04:25	1.2
+++ usbdevs.h	1999/04/09 14:32:47
@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.8 1999/03/24 07:46:53 n_hibma Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.13 1999/04/08 23:26:49 n_hibma Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -62,16 +62,21 @@
 #define	USB_VENDOR_BTC	0x046e		/* BTC */
 #define	USB_VENDOR_PHILIPS	0x0471		/* Philips */
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix */
+#define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_ACER	0x04a5		/* Acer Peripherals */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
+#define	USB_VENDOR_EPSON	0x04b8		/* Epson */
 #define	USB_VENDOR_3COM	0x04c1		/* 3Com */
 #define	USB_VENDOR_KONICA	0x04c8		/* Konica Corporation */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_JAZZ	0x04fa		/* Jazz */
+#define	USB_VENDOR_VISION	0x0553		/* Vision */
+#define	USB_VENDOR_AKS	0x0529		/* Aladdin Knowledge Systems */
 #define	USB_VENDOR_ATEN	0x0557		/* ATen */
 #define	USB_VENDOR_PERACOM	0x0565		/* Peracom */
 #define	USB_VENDOR_EIZO	0x056d		/* EIZO */
 #define	USB_VENDOR_AGILER	0x056e		/* Agiler */
+#define	USB_VENDOR_IOMEGA	0x059b		/* Iomega */
 #define	USB_VENDOR_BELKIN	0x05ab		/* Belkin */
 #define	USB_VENDOR_LOGITECH	0x05ac		/* Logitech */
 #define	USB_VENDOR_EIZONANAO	0x05e7		/* EIZO Nanao */
@@ -125,12 +130,18 @@
 /* Connectix products */
 #define	USB_PRODUCT_CONNECTIX_QUICKCAM	0x0001		/* QuickCam */
 
+/* Lucent products */
+#define	USB_PRODUCT_LUCENT_EVALKIT	0x1001		/* USS-720 evaluation kit */
+
 /* Acer products */
 #define	USB_PRODUCT_ACER_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
 
 /* Cypress Semiconduuctor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 
+/* Epson products */
+#define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD USB Smart Cable */
+
 /* 3Com products */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice USB Modem */
 
@@ -143,6 +154,12 @@
 /* Jazz products */
 #define	USB_PRODUCT_JAZZ_J6502	0x4201		/* J-6502 speakers */
 
+/* Vision products */
+#define	USB_PRODUCT_VISION_CAMERA	0x0002		/* VC6452V002 Camera */
+
+/* AKS products */
+#define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
+
 /* ATen products */
 #define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
 
@@ -156,6 +173,9 @@
 /* Agiler products */
 #define	USB_PRODUCT_AGILER_MOUSE29UO	0x0002		/* mouse 29UO */
 
+/* Iomega products */
+#define	USB_PRODUCT_IOMEGA_ZIP100	0x0001		/* Zip 100 */
+
 /* Belkin products */
 #define	USB_PRODUCT_BELKIN_F5U002	0x0002		/* Parallel printer adapter */
 
@@ -172,11 +192,12 @@
 /* ADS products */
 #define	USB_PRODUCT_ADS_ENET	0x0008		/* Ethernet adapter */
 
-/* PLX products */
-#define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
-
+/* Entrega products */
 #define	USB_PRODUCT_ENTREGA_CENTRONICS	0x0006		/* Centronics connector */
 #define	USB_PRODUCT_ENTREGA_SERIAL	0x8001		/* DB25 Serial connector */
+
+/* PLX products */
+#define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
 
 /* Inside Out Networks products */
 #define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 serial ports */
Index: sys/dev/usb/usbdevs_data.h
===================================================================
RCS file: /home/cvs/newconfig/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.2
diff -u -u -r1.2 usbdevs_data.h
--- usbdevs_data.h	1999/03/30 00:04:25	1.2
+++ usbdevs_data.h	1999/04/09 14:32:47
@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.8 1999/03/24 07:46:53 n_hibma Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.13 1999/04/08 23:26:50 n_hibma Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -142,6 +142,12 @@
 	    "QuickCam",
 	},
 	{
+	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT,
+	    0,
+	    "Lucent",
+	    "USS-720 evaluation kit",
+	},
+	{
 	    USB_VENDOR_ACER, USB_PRODUCT_ACER_ACERSCAN_C310U,
 	    0,
 	    "Acer Peripherals",
@@ -154,6 +160,12 @@
 	    "mouse",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
+	    0,
+	    "Epson",
+	    "ISD USB Smart Cable",
+	},
+	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
 	    "3Com",
@@ -178,6 +190,18 @@
 	    "J-6502 speakers",
 	},
 	{
+	    USB_VENDOR_VISION, USB_PRODUCT_VISION_CAMERA,
+	    0,
+	    "Vision",
+	    "VC6452V002 Camera",
+	},
+	{
+	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
+	    0,
+	    "Aladdin Knowledge Systems",
+	    "USB-HASP 0.06",
+	},
+	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    0,
 	    "ATen",
@@ -208,6 +232,12 @@
 	    "mouse 29UO",
 	},
 	{
+	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
+	    0,
+	    "Iomega",
+	    "Zip 100",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U002,
 	    0,
 	    "Belkin",
@@ -244,12 +274,6 @@
 	    "Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
-	    0,
-	    "PLX",
-	    "test board",
-	},
-	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS,
 	    0,
 	    "Entrega",
@@ -262,6 +286,12 @@
 	    "DB25 Serial connector",
 	},
 	{
+	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
+	    0,
+	    "PLX",
+	    "test board",
+	},
+	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
 	    0,
 	    "Inside Out Networks",
@@ -346,6 +376,12 @@
 	    NULL,
 	},
 	{
+	    USB_VENDOR_LUCENT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Lucent",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACER, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Acer Peripherals",
@@ -358,6 +394,12 @@
 	    NULL,
 	},
 	{
+	    USB_VENDOR_EPSON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Epson",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_3COM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "3Com",
@@ -382,6 +424,18 @@
 	    NULL,
 	},
 	{
+	    USB_VENDOR_VISION, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Vision",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AKS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aladdin Knowledge Systems",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ATEN, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "ATen",
@@ -403,6 +457,12 @@
 	    USB_VENDOR_AGILER, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Agiler",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_IOMEGA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Iomega",
 	    NULL,
 	},
 	{
Index: sys/dev/usb/usbdi.c
===================================================================
RCS file: /home/cvs/newconfig/sys/dev/usb/usbdi.c,v
retrieving revision 1.3
diff -u -u -r1.3 usbdi.c
--- usbdi.c	1999/03/30 00:04:25	1.3
+++ usbdi.c	1999/04/07 17:44:32
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.c,v 1.20 1999/01/08 11:58:26 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.12 1999/03/22 19:58:59 n_hibma Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.13 1999/04/05 17:01:52 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -273,15 +273,16 @@
 			      usbd_status));
 {
 	reqh->pipe = pipe;
-	reqh->isreq = 0;
 	reqh->priv = priv;
 	reqh->buffer = buffer;
 	reqh->length = length;
 	reqh->actlen = 0;
 	reqh->flags = flags;
-	reqh->callback = callback;
+	reqh->timeout = timeout;
 	reqh->status = USBD_NOT_STARTED;
+	reqh->callback = callback;
 	reqh->retries = 1;
+	reqh->isreq = 0;
 	return (USBD_NORMAL_COMPLETION);
 }
 
@@ -320,8 +321,8 @@
 	reqh->status = USBD_NOT_STARTED;
 	reqh->callback = callback;
 	reqh->request = *req;
-	reqh->isreq = 1;
 	reqh->retries = 1;
+	reqh->isreq = 1;
 	return (USBD_NORMAL_COMPLETION);
 }
 
Index: sys/dev/usb/usbdi.h
===================================================================
RCS file: /home/cvs/newconfig/sys/dev/usb/usbdi.h,v
retrieving revision 1.3
diff -u -u -r1.3 usbdi.h
--- usbdi.h	1999/03/30 00:04:25	1.3
+++ usbdi.h	1999/04/07 17:44:32
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.16 1999/01/08 11:58:26 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.7 1999/03/22 19:58:59 n_hibma Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.8 1999/04/05 17:19:48 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -217,11 +217,11 @@
 	     usbd_private_handle priv, u_int32_t bufsize, u_int32_t nbuf,
 	     usbd_callback));
 usbd_status usbd_do_request 
-	__P((usbd_device_handle pipe, usb_device_request_t *req, void *data));
+	__P((usbd_device_handle dev, usb_device_request_t *req, void *data));
 usbd_status usbd_do_request_async
-	__P((usbd_device_handle pipe, usb_device_request_t *req, void *data));
+	__P((usbd_device_handle dev, usb_device_request_t *req, void *data));
 usbd_status usbd_do_request_flags
-	__P((usbd_device_handle pipe, usb_device_request_t *req, 
+	__P((usbd_device_handle dev, usb_device_request_t *req, 
 	     void *data, u_int16_t flags, int *));
 usb_interface_descriptor_t *usbd_get_interface_descriptor
 	__P((usbd_interface_handle iface));