PERFORCE change 130011 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=130011

Change 130011 by hselasky at hselasky_laptop001 on 2007/12/02 13:29:09

	
	Compile fixes for ARM.

Affected files ...

.. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#14 edit

Differences ...

==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#11 (text) ====

@@ -73,7 +73,7 @@
 	}
 	/* store parent DMA tag */
 
-	sc->sc_ohci.sc_bus.dma_tag_parent = device_get_dma_tag(self);
+	sc->sc_ohci.sc_bus.dma_tag_parent = device_get_dma_tag(dev);
 
 	/* get all DMA memory */
 
@@ -197,9 +197,9 @@
 		    sc->sc_ohci.sc_io_res);
 		sc->sc_ohci.sc_io_res = NULL;
 	}
-	usbd_config_td_unsetup(&(sc->sc_config_td));
+	usbd_config_td_unsetup(&(sc->sc_ohci.sc_config_td));
 
-	usbd_bus_mem_free_all(&(sc->sc_bus), &ohci_iterate_hw_softc);
+	usbd_bus_mem_free_all(&(sc->sc_ohci.sc_bus), &ohci_iterate_hw_softc);
 
 	return (0);
 }

==== //depot/projects/usb/src/sys/dev/usb/ucom.c#23 (text+ko) ====

@@ -1164,7 +1164,6 @@
 		}
 	}
 
-done:
 	if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) &&
 	    (!(sc->sc_mcr & SER_RTS)) &&
 	    (!(tp->t_state & TS_TBLOCK))) {

==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#14 (text+ko) ====

@@ -116,7 +116,7 @@
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UIPAQ_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer_ok = 1,},
+		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
 		.callback = &uipaq_write_callback,
 	},
 
@@ -310,8 +310,7 @@
 	if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
 		goto error;
 	}
-	err = usbd_do_request_flags_mtx(sc->sc_udev, &Giant, req,
-	    data, 0, NULL, 1000);
+	err = usbd_do_request(sc->sc_udev, &Giant, req, data);
 
 	if (err) {