Cosmetical changes.

7 files changed, 14 insertions, 13 deletions

diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index a384590..08983b2 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -102,7 +102,7 @@
 #define UHCI_PORTSC_OCIC	0x0800
 #define UHCI_PORTSC_SUSP	0x1000
 
-#define UHCI_LEGSUP		0xC0
+#define UHCI_LEGSUP		0xc0
 
 #define UHCI_FRAMELIST_COUNT	1024
 #define UHCI_FRAMELIST_ALIGN	4096
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 5749f77..7913976 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -340,9 +340,9 @@ uhub_explore(dev)
 		up = &dev->hub->ports[port-1];
 		r = usbd_get_port_status(dev, port, &up->status);
 		if (r != USBD_NORMAL_COMPLETION) {
-			DPRINTF(("uhub_explore: get port status failed, "
+			DPRINTF(("uhub_explore: get port status failed, on port %d "
 				 "error=%d(%s)\n",
-				 r, usbd_error_strs[r]));
+				 port, r, usbd_error_strs[r]));
 			continue;
 		}
 		status = UGETW(up->status.wPortStatus);
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index ed7b2f3..e62fc92 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -300,11 +300,11 @@ ulptopen(dev, flag, mode, p)
 	sc->sc_flags = flags;
 	DPRINTF(("ulptopen: flags=0x%x\n", (unsigned)flags));
 
-#if USB_DEBUG && defined(__FreeBSD__)
+#if defined(USB_DEBUG) && defined(__FreeBSD__)
 	/* Ignoring these flags might not be a good idea */
-	if ((flags ^ ULPT_NOPRIME) != 0)
-		DPRINTF(("flags ignored: %b\n", flags,
-			"\20\3POS_INIT\4POS_ACK\6PRIME_OPEN\7AUTOLF\10BYPASS"));
+	if ((flags & ~ULPT_NOPRIME) != 0)
+		printf("ulptopen: flags ignored: %b\n", flags,
+			"\20\3POS_INIT\4POS_ACK\6PRIME_OPEN\7AUTOLF\10BYPASS");
 #endif
 	if ((flags & ULPT_NOPRIME) == 0)
 		ulpt_reset(sc);
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index fa5649c..2c5e521 100644
--- a/sys/dev/usb/usb_if.m
+++ b/sys/dev/usb/usb_if.m
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id$
+# $Id: usb_if.m,v 1.3 1999/01/07 23:31:37 n_hibma Exp $
 #
 
 # USB interface description
@@ -33,9 +33,8 @@
 
 INTERFACE usb;
 
-# The device should start probing for new children again
+# The device should start probing for new drivers again
 #
 METHOD int reconfigure {
 	device_t dev;
 };
-
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index b02be19..11f2e03 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -794,6 +794,8 @@ usbd_probe_and_attach(parent, dev, port, addr)
 				found++;
 				ifaces[i] = 0; /* consumed */
 #elif defined(__FreeBSD__)
+				/* XXX FreeBSD can't handle multiple intfaces
+				 *     on 1 device yet */
 				return (USBD_NORMAL_COMPLETION);
 #endif
 			}
@@ -972,7 +974,7 @@ usbd_new_device(parent, bus, depth, lowspeed, port, up)
 		usbd_remove_device(dev, up);
 		return (r);
   	}
-  
+ 
   	return (USBD_NORMAL_COMPLETION);
 }
 
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index e051c8b..0e63635 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -672,7 +672,6 @@ usbd_get_bus_handle(index, bus)
 {
 	return (usb_get_bus_handle(index, bus));
 }
-#endif
 
 usbd_status 
 usbd_get_root_hub(bus, dev)
@@ -706,6 +705,7 @@ usbd_hub2device_handle(dev, port, devp)
 	*devp = dev->hub->ports[port].device;
 	return (USBD_NORMAL_COMPLETION);
 }
+#endif
 
 usbd_status 
 usbd_request2pipe_handle(reqh, pipe)
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index a1bb232..51d5c2f 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -178,12 +178,12 @@ usbd_status usbd_interface_count
 #if 0
 u_int8_t usbd_bus_count __P((void));
 usbd_status usbd_get_bus_handle __P((u_int8_t index, usbd_bus_handle *bus));
-#endif
 usbd_status usbd_get_root_hub 
 	__P((usbd_bus_handle bus, usbd_device_handle *dev));
 usbd_status usbd_port_count __P((usbd_device_handle hub, u_int8_t *nports));
 usbd_status usbd_hub2device_handle
 	__P((usbd_device_handle hub, u_int8_t port, usbd_device_handle *dev));
+#endif
 usbd_status usbd_request2pipe_handle
 	__P((usbd_request_handle reqh, usbd_pipe_handle *pipe));
 usbd_status usbd_pipe2interface_handle