summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2002-01-21 03:44:00 +0000
committerjoe <joe@FreeBSD.org>2002-01-21 03:44:00 +0000
commit49bfeafa097bf84c2fff8ec4d1ae3665457ccf38 (patch)
treeb128c506856d654d04560289a71d5bb8ef8891c2
parent2a5c822c6c779312f6d91e906acd3ae54e556416 (diff)
downloadFreeBSD-src-49bfeafa097bf84c2fff8ec4d1ae3665457ccf38.zip
FreeBSD-src-49bfeafa097bf84c2fff8ec4d1ae3665457ccf38.tar.gz
Merge from NetBSD:
revision 1.84 date: 2000/01/28 00:44:27; author: augustss; state: Exp; lines: +9 -2 Add uhci_root_ctrl_done() method.
-rw-r--r--sys/dev/usb/uhci.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 33c2b76..df19aac 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.82 2000/01/26 10:04:38 augustss Exp $ */
+/* $NetBSD: uhci.c,v 1.84 2000/01/28 00:44:27 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -233,6 +233,7 @@ Static usbd_status uhci_root_ctrl_transfer(usbd_xfer_handle);
Static usbd_status uhci_root_ctrl_start(usbd_xfer_handle);
Static void uhci_root_ctrl_abort(usbd_xfer_handle);
Static void uhci_root_ctrl_close(usbd_pipe_handle);
+Static void uhci_root_ctrl_done(usbd_xfer_handle);
Static usbd_status uhci_root_intr_transfer(usbd_xfer_handle);
Static usbd_status uhci_root_intr_start(usbd_xfer_handle);
@@ -299,7 +300,7 @@ struct usbd_pipe_methods uhci_root_ctrl_methods = {
uhci_root_ctrl_abort,
uhci_root_ctrl_close,
uhci_noop,
- 0,
+ uhci_root_ctrl_done,
};
struct usbd_pipe_methods uhci_root_intr_methods = {
@@ -848,6 +849,11 @@ uhci_root_intr_done(usbd_xfer_handle xfer)
}
void
+uhci_root_ctrl_done(usbd_xfer_handle xfer)
+{
+}
+
+void
uhci_lock_frames(uhci_softc_t *sc)
{
int s = splusb();
OpenPOWER on IntegriCloud