PERFORCE change 180040 for review

[Hans Petter Selasky]

http://p4web.freebsd.org/@@180040?ac=10

Change 180040 by hselasky at hselasky_laptop001 on 2010/06/21 15:58:03

	
	USB controller:
		- integrate some fixes
		- remove unused file
		http://svn.freebsd.org/viewvc/base/user/jmallett/octeon/sys/mips/cavium/usb/octusb.c

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/octusb_mips.c#3 delete

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#3 (text+ko) ====

@@ -334,7 +334,7 @@
 
 	if (td->remainder > rem) {
 		td->error_any = 1;
-		DPRINTF(1, "Excess setup transmit data\n");
+		DPRINTFN(1, "Excess setup transmit data\n");
 		return (0);		/* done */
 	}
 	usbd_copy_out(td->pc, td->offset, td->qh->fixup_buf + td->qh->fixup_off, td->remainder);
@@ -371,7 +371,7 @@
 	td->remainder -= rem;
 	td->qh->fixup_off += rem;
 
-	return (1);			/* done */
+	return (0);			/* done */
 }
 
 static uint8_t
@@ -459,7 +459,7 @@
 
 		if (rem == 0) {
 			/* should not happen */
-			DPRINTF(1, "Fixup buffer is too small\n");
+			DPRINTFN(1, "Fixup buffer is too small\n");
 			td->error_any = 1;
 			return (0);	/* done */
 		}
@@ -587,7 +587,7 @@
 
 		if (rem == 0) {
 			/* should not happen */
-			DPRINTF(1, "Fixup buffer is too small\n");
+			DPRINTFN(1, "Fixup buffer is too small\n");
 			td->error_any = 1;
 			return (0);	/* done */
 		}
@@ -864,6 +864,9 @@
 	if (sc->sc_noport > OCTUSB_MAX_PORTS)
 		sc->sc_noport = OCTUSB_MAX_PORTS;
 
+	/* set USB revision */
+	sc->sc_bus.usbrev = USB_REV_2_0;
+
 	USB_BUS_LOCK(&sc->sc_bus);
 
 	/* setup all ports */