summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2002-01-21 04:15:39 +0000
committerjoe <joe@FreeBSD.org>2002-01-21 04:15:39 +0000
commitac16f826307f3faf58e1b1b7b5bd43fd267e1ec8 (patch)
treed56f20c1ae13bdf2bcc6bbce3b90c840b9cd60a1
parent49bfeafa097bf84c2fff8ec4d1ae3665457ccf38 (diff)
downloadFreeBSD-src-ac16f826307f3faf58e1b1b7b5bd43fd267e1ec8.zip
FreeBSD-src-ac16f826307f3faf58e1b1b7b5bd43fd267e1ec8.tar.gz
Merge from NetBSD:
revision 1.65 date: 2000/01/25 12:06:21; author: augustss; state: Exp; lines: +10 -2 Add done method for root control transfers.
-rw-r--r--sys/dev/usb/ohci.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index debe3a0..a54f21b 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.64 2000/01/19 00:23:58 augustss Exp $ */
+/* $NetBSD: ohci.c,v 1.65 2000/01/25 12:06:21 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -165,6 +165,7 @@ Static usbd_status ohci_root_ctrl_transfer(usbd_xfer_handle);
Static usbd_status ohci_root_ctrl_start(usbd_xfer_handle);
Static void ohci_root_ctrl_abort(usbd_xfer_handle);
Static void ohci_root_ctrl_close(usbd_pipe_handle);
+Static void ohci_root_ctrl_done (usbd_xfer_handle);
Static usbd_status ohci_root_intr_transfer(usbd_xfer_handle);
Static usbd_status ohci_root_intr_start(usbd_xfer_handle);
@@ -280,7 +281,7 @@ Static struct usbd_pipe_methods ohci_root_ctrl_methods = {
ohci_root_ctrl_abort,
ohci_root_ctrl_close,
ohci_noop,
- 0,
+ ohci_root_ctrl_done,
};
Static struct usbd_pipe_methods ohci_root_intr_methods = {
@@ -1364,6 +1365,13 @@ ohci_root_intr_done(xfer)
xfer->hcpriv = NULL;
}
+void
+ohci_root_ctrl_done(xfer)
+ usbd_xfer_handle xfer;
+{
+ xfer->hcpriv = NULL;
+}
+
/*
* Wait here until controller claims to have an interrupt.
* Then call ohci_intr and return. Use timeout to avoid waiting
OpenPOWER on IntegriCloud