PERFORCE change 166147 for review
Sylvestre Gallon
syl at FreeBSD.org
Wed Jul 15 19:14:34 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166147
Change 166147 by syl at syl_atuin on 2009/07/15 19:14:09
Fix compilation errors.
Affected files ...
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.c#11 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#7 edit
Differences ...
==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.c#11 (text+ko) ====
@@ -73,6 +73,7 @@
#endif
static void s3c24dci_device_done(struct usb_xfer *, usb_error_t);
+static void s3c24dci_start_standard_chain(struct usb_xfer *xfer);
/*
* This driver dont support DMA for the mement. DMA seems to not be
@@ -165,7 +166,7 @@
{
struct usb_xfer *xfer = arg;
- DPRINTFN("xfer=%p\n", xfer);
+ DPRINTF("xfer=%p\n", xfer);
USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
@@ -238,7 +239,6 @@
}
static void
-static void
s3c24dci_standard_done(struct usb_xfer *xfer)
{
usb_error_t err = 0;
@@ -268,7 +268,7 @@
}
}
- if (xfer->flags_int.control_xfer &&
+ if (xfer->flags_int.control_xfr &&
!xfer->flags_int.control_act) {
err = s3c24dci_standard_done_sub(xfer);
}
@@ -279,7 +279,6 @@
static uint8_t
s3c24dci_xfer_do_fifo(struct usb_xfer *xfer)
{
- struct s3c24dci_softc *sc;
struct s3c24dci_td *td;
DPRINTFN(9, "\n");
@@ -292,6 +291,9 @@
}
if (((void *)td) == xfer->td_transfer_last) {
goto done;
+ }
+ if (td->error) {
+ goto done;
} else if (td->remainder > 0) {
/*
* We had a short transfer. If there is no alternate
@@ -300,16 +302,18 @@
if (!td->alt_next) {
goto done;
}
- /*
- * Fetch the next transfer descriptor and transfer
- * some flags to the next transfer descriptor.
- */
- td = td->obj_next;
- xfer->td_transfer_cache = td;
}
- return (1);
+ /*
+ * Fetch the next transfer descriptor and transfer
+ * some flags to the next transfer descriptor.
+ */
+ td = td->obj_next;
+ xfer->td_transfer_cache = td;
+ }
+ return (1);
done:
- s3c24dci_standard_done(xfer);
+ s3c24dci_standard_done(xfer);
+ return (0);
}
static void
@@ -319,7 +323,7 @@
/* poll one time */
if (s3c24dci_xfer_do_fifo(xfer)) {
- struct at91dci_softc *sc = S3C24_DCI_BUS2SC(xfer->xroot->bus);
+ struct s3c24dci_softc *sc = S3C24_DCI_BUS2SC(xfer->xroot->bus);
uint8_t ep_no = xfer->endpointno & UE_ADDR;
uint32_t ittmp;
==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#7 (text+ko) ====
@@ -177,7 +177,7 @@
struct s3c24dci_td;
-typedef uint8_t (*s3c24dci_cmd_t)(struct s3c24dci_td *td);
+typedef uint8_t (s3c24dci_cmd_t)(struct s3c24dci_td *td);
struct s3c24dci_td {
bus_space_tag_t io_tag;
More information about the p4-projects
mailing list