PERFORCE change 182198 for review

[Hans Petter Selasky]

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

Change 182198 by hselasky at hselasky_laptop001 on 2010/08/10 16:31:35

	
	IFC
		- integrate octusb driver in new location

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#8 delete
.. //depot/projects/usb/src/sys/dev/usb/controller/octusb.h#3 delete
.. //depot/projects/usb/src/sys/mips/cavium/usb/octusb.c#2 edit
.. //depot/projects/usb/src/sys/modules/usb/octusb/Makefile#3 edit

Differences ...

==== //depot/projects/usb/src/sys/mips/cavium/usb/octusb.c#2 (text+ko) ====

@@ -1361,7 +1361,7 @@
 	.bcdUSB = {0x00, 0x02},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_FSHUB,
+	.bDeviceProtocol = UDPROTO_HSHUBSTT,
 	.bMaxPacketSize = 64,
 	.idVendor = {0},
 	.idProduct = {0},
@@ -1403,7 +1403,7 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_FSHUB,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),
@@ -1444,9 +1444,6 @@
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
-	/* XXX disable power save mode, hence it is not supported */
-	udev->power_mode = USB_POWER_MODE_ON;
-
 	/* buffer reset */
 	ptr = (const void *)&sc->sc_hub_desc.temp;
 	len = 0;
@@ -1885,7 +1882,7 @@
 }
 
 static void
-octusb_get_dma_delay(struct usb_bus *bus, uint32_t *pus)
+octusb_get_dma_delay(struct usb_device *udev, uint32_t *pus)
 {
 	/* DMA delay - wait until any use of memory is finished */
 	*pus = (2125);			/* microseconds */
@@ -1909,6 +1906,13 @@
 	DPRINTF("Nothing to do.\n");
 }
 
+static void
+octusb_get_power_mode(struct usb_device *udev, int8_t *pmode)
+{
+	/* power save is not supported */
+	*pmode = USB_POWER_MODE_ON;
+}
+
 struct usb_bus_methods octusb_bus_methods = {
 	.endpoint_init = octusb_ep_init,
 	.xfer_setup = octusb_xfer_setup,
@@ -1919,4 +1923,5 @@
 	.set_hw_power = octusb_set_hw_power,
 	.roothub_exec = octusb_roothub_exec,
 	.xfer_poll = octusb_do_poll,
+	.get_power_mode = octusb_get_power_mode,
 };

==== //depot/projects/usb/src/sys/modules/usb/octusb/Makefile#3 (text+ko) ====

@@ -27,11 +27,11 @@
 
 S=	${.CURDIR}/../../..
 
-.PATH: $S/dev/usb/controller
+.PATH: $S/mips/cavium/usb
 
 KMOD=	octusb
 SRCS=	bus_if.h device_if.h usb_if.h \
-	opt_bus.h opt_usb.h \
-	octusb.c octusb.h
+	opt_bus.h opt_usb.h opt_cvmx.h \
+	octusb.c
 
 .include <bsd.kmod.mk>