Module Name: src
Committed By: skrll
Date: Mon Dec 1 12:38:39 UTC 2014
Modified Files:
src/sys/arch/mips/adm5120/dev [nick-nhusb]: ahci.c
src/sys/dev/ic [nick-nhusb]: sl811hs.c
src/sys/dev/usb [nick-nhusb]: ehci.c motg.c ohci.c uhci.c usb.c
usb_subr.c usbdi.c usbdivar.h xhci.c
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c
src/sys/rump/dev/lib/libugenhc [nick-nhusb]: ugenhc.c
Log Message:
Add prefixes to method structures member names. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.12.6.2 -r1.12.6.3 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.47.6.1 -r1.47.6.2 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.234.2.5 -r1.234.2.6 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.12.2.3 -r1.12.2.4 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.254.2.4 -r1.254.2.5 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.264.4.4 -r1.264.4.5 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.156 -r1.156.2.1 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.198 -r1.198.2.1 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.162.2.3 -r1.162.2.4 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.109.2.2 -r1.109.2.3 src/sys/dev/usb/usbdivar.h
cvs rdiff -u -r1.28.2.2 -r1.28.2.3 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 src/sys/external/bsd/dwc2/dwc2.c
cvs rdiff -u -r1.22.4.1 -r1.22.4.2 src/sys/rump/dev/lib/libugenhc/ugenhc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.2 src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.3
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.2 Sun Nov 30 13:14:11 2014
+++ src/sys/arch/mips/adm5120/dev/ahci.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.12.6.2 2014/11/30 13:14:11 skrll Exp $ */
+/* $NetBSD: ahci.c,v 1.12.6.3 2014/12/01 12:38:39 skrll Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.2 2014/11/30 13:14:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.3 2014/12/01 12:38:39 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -173,68 +173,68 @@ void print_xfer(usbd_xfer_handle);
struct usbd_bus_methods ahci_bus_methods = {
- .open_pipe = ahci_open,
- .soft_intr = ahci_softintr,
- .do_poll = ahci_poll,
- .allocm = ahci_allocm,
- .freem = ahci_freem,
- .allocx = ahci_allocx,
- .freex = ahci_freex,
- .get_lock = ahci_get_lock,
+ .ubm_open = ahci_open,
+ .ubm_softint = ahci_softintr,
+ .ubm_dopoll = ahci_poll,
+ .ubm_allocm = ahci_allocm,
+ .ubm_freem = ahci_freem,
+ .ubm_allocx = ahci_allocx,
+ .ubm_freex = ahci_freex,
+ .ubm_getlock = ahci_get_lock,
};
struct usbd_pipe_methods ahci_root_ctrl_methods = {
- .transfer = ahci_root_ctrl_transfer,
- .start = ahci_root_ctrl_start,
- .abort = ahci_root_ctrl_abort,
- .close = ahci_root_ctrl_close,
- .cleartoggle = ahci_noop,
- .done = ahci_root_ctrl_done,
+ .upm_transfer = ahci_root_ctrl_transfer,
+ .upm_start = ahci_root_ctrl_start,
+ .upm_abort = ahci_root_ctrl_abort,
+ .upm_close = ahci_root_ctrl_close,
+ .upm_cleartoggle = ahci_noop,
+ .upm_done = ahci_root_ctrl_done,
};
struct usbd_pipe_methods ahci_root_intr_methods = {
- .transfer = ahci_root_intr_transfer,
- .start = ahci_root_intr_start,
- .abort = ahci_root_intr_abort,
- .close = ahci_root_intr_close,
- .cleartoggle = ahci_noop,
- .done = ahci_root_intr_done,
+ .upm_transfer = ahci_root_intr_transfer,
+ .upm_start = ahci_root_intr_start,
+ .upm_abort = ahci_root_intr_abort,
+ .upm_close = ahci_root_intr_close,
+ .upm_cleartoggle = ahci_noop,
+ .upm_done = ahci_root_intr_done,
};
struct usbd_pipe_methods ahci_device_ctrl_methods = {
- .transfer = ahci_device_ctrl_transfer,
- .start = ahci_device_ctrl_start,
- .abort = ahci_device_ctrl_abort,
- .close = ahci_device_ctrl_close,
- .cleartoggle = ahci_noop,
- .done = ahci_device_ctrl_done,
+ .upm_transfer = ahci_device_ctrl_transfer,
+ .upm_start = ahci_device_ctrl_start,
+ .upm_abort = ahci_device_ctrl_abort,
+ .upm_close = ahci_device_ctrl_close,
+ .upm_cleartoggle = ahci_noop,
+ .upm_done = ahci_device_ctrl_done,
};
struct usbd_pipe_methods ahci_device_intr_methods = {
- .transfer = ahci_device_intr_transfer,
- .start = ahci_device_intr_start,
- .abort = ahci_device_intr_abort,
- .close = ahci_device_intr_close,
- .cleartoggle = ahci_device_clear_toggle,
- .done = ahci_device_intr_done,
+ .upm_transfer = ahci_device_intr_transfer,
+ .upm_start = ahci_device_intr_start,
+ .upm_abort = ahci_device_intr_abort,
+ .upm_close = ahci_device_intr_close,
+ .upm_cleartoggle = ahci_device_clear_toggle,
+ .upm_done = ahci_device_intr_done,
};
struct usbd_pipe_methods ahci_device_isoc_methods = {
- .transfer = ahci_device_isoc_transfer,
- .start = ahci_device_isoc_start,
- .abort = ahci_device_isoc_abort,
- .close = ahci_device_isoc_close,
- .cleartoggle = ahci_noop,
- .done = ahci_device_isoc_done,
+ .upm_transfer = ahci_device_isoc_transfer,
+ .upm_start = ahci_device_isoc_start,
+ .upm_abort = ahci_device_isoc_abort,
+ .upm_close = ahci_device_isoc_close,
+ .upm_cleartoggle = ahci_noop,
+ .upm_done = ahci_device_isoc_done,
};
struct usbd_pipe_methods ahci_device_bulk_methods = {
- .transfer = ahci_device_bulk_transfer,
- .start = ahci_device_bulk_start,
- .abort = ahci_device_bulk_abort,
- .close = ahci_device_bulk_close,
- .cleartoggle = ahci_device_clear_toggle,
- .done = ahci_device_bulk_done,
+ .upm_transfer = ahci_device_bulk_transfer,
+ .upm_start = ahci_device_bulk_start,
+ .upm_abort = ahci_device_bulk_abort,
+ .upm_close = ahci_device_bulk_close,
+ .upm_cleartoggle = ahci_device_clear_toggle,
+ .upm_done = ahci_device_bulk_done,
};
struct ahci_pipe {
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.47.6.1 src/sys/dev/ic/sl811hs.c:1.47.6.2
--- src/sys/dev/ic/sl811hs.c:1.47.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/ic/sl811hs.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.47.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.47.6.2 2014/12/01 12:38:39 skrll Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.2 2014/12/01 12:38:39 skrll Exp $");
#include "opt_slhci.h"
@@ -680,33 +680,32 @@ DDOLOGBUF(uint8_t *buf, unsigned int len
#endif
const struct usbd_bus_methods slhci_bus_methods = {
- .open_pipe = slhci_open,
- .soft_intr = slhci_void,
- .do_poll = slhci_poll,
- .allocm = slhci_allocm,
- .freem = slhci_freem,
- .allocx = slhci_allocx,
- .freex = slhci_freex,
- .get_lock = slhci_get_lock,
- NULL, /* new_device */
+ .ubm_open = slhci_open,
+ .ubm_softint= slhci_void,
+ .ubm_dopoll = slhci_poll,
+ .ubm_allocm = slhci_allocm,
+ .ubm_freem = slhci_freem,
+ .ubm_allocx = slhci_allocx,
+ .ubm_freex = slhci_freex,
+ .ubm_getlock = slhci_get_lock,
};
const struct usbd_pipe_methods slhci_pipe_methods = {
- .transfer = slhci_transfer,
- .start = slhci_start,
- .abort = slhci_abort,
- .close = slhci_close,
- .cleartoggle = slhci_clear_toggle,
- .done = slhci_done,
+ .upm_transfer = slhci_transfer,
+ .upm_start = slhci_start,
+ .upm_abort = slhci_abort,
+ .upm_close = slhci_close,
+ .upm_cleartoggle = slhci_clear_toggle,
+ .upm_done = slhci_done,
};
const struct usbd_pipe_methods slhci_root_methods = {
- .transfer = slhci_transfer,
- .start = slhci_root_start,
- .abort = slhci_abort,
- .close = (void (*)(struct usbd_pipe *))slhci_void, /* XXX safe? */
- .cleartoggle = slhci_clear_toggle,
- .done = slhci_done,
+ .upm_transfer = slhci_transfer,
+ .upm_start = slhci_root_start,
+ .upm_abort = slhci_abort,
+ .upm_close = (void (*)(struct usbd_pipe *))slhci_void, /* XXX safe? */
+ .upm_cleartoggle = slhci_clear_toggle,
+ .upm_done = slhci_done,
};
/* Queue inlines */
@@ -889,7 +888,7 @@ slhci_transfer(struct usbd_xfer *xfer)
/*
* Start will take the lock.
*/
- error = xfer->pipe->methods->start(SIMPLEQ_FIRST(&xfer->pipe->queue));
+ error = xfer->pipe->methods->upm_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
return error;
}
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.5 src/sys/dev/usb/ehci.c:1.234.2.6
--- src/sys/dev/usb/ehci.c:1.234.2.5 Mon Dec 1 08:12:09 2014
+++ src/sys/dev/usb/ehci.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.5 2014/12/01 08:12:09 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.6 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.5 2014/12/01 08:12:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.6 2014/12/01 12:38:39 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -291,78 +291,78 @@ Static void ehci_dump_exfer(struct ehci
#define ehci_active_intr_list(ex) ((ex)->inext.tqe_prev != NULL)
Static const struct usbd_bus_methods ehci_bus_methods = {
- .open_pipe = ehci_open,
- .soft_intr = ehci_softintr,
- .do_poll = ehci_poll,
- .allocm = ehci_allocm,
- .freem = ehci_freem,
- .allocx = ehci_allocx,
- .freex = ehci_freex,
- .get_lock = ehci_get_lock,
- .new_device = NULL,
+ .ubm_open = ehci_open,
+ .ubm_softint = ehci_softintr,
+ .ubm_dopoll = ehci_poll,
+ .ubm_allocm = ehci_allocm,
+ .ubm_freem = ehci_freem,
+ .ubm_allocx = ehci_allocx,
+ .ubm_freex = ehci_freex,
+ .ubm_getlock = ehci_get_lock,
+ .ubm_newdev = NULL,
};
Static const struct usbd_pipe_methods ehci_root_ctrl_methods = {
- .transfer = ehci_root_ctrl_transfer,
- .start = ehci_root_ctrl_start,
- .abort = ehci_root_ctrl_abort,
- .close = ehci_root_ctrl_close,
- .cleartoggle = ehci_noop,
- .done = ehci_root_ctrl_done,
+ .upm_transfer = ehci_root_ctrl_transfer,
+ .upm_start = ehci_root_ctrl_start,
+ .upm_abort = ehci_root_ctrl_abort,
+ .upm_close = ehci_root_ctrl_close,
+ .upm_cleartoggle = ehci_noop,
+ .upm_done = ehci_root_ctrl_done,
};
Static const struct usbd_pipe_methods ehci_root_intr_methods = {
- .transfer = ehci_root_intr_transfer,
- .start = ehci_root_intr_start,
- .abort = ehci_root_intr_abort,
- .close = ehci_root_intr_close,
- .cleartoggle = ehci_noop,
- .done = ehci_root_intr_done,
+ .upm_transfer = ehci_root_intr_transfer,
+ .upm_start = ehci_root_intr_start,
+ .upm_abort = ehci_root_intr_abort,
+ .upm_close = ehci_root_intr_close,
+ .upm_cleartoggle = ehci_noop,
+ .upm_done = ehci_root_intr_done,
};
Static const struct usbd_pipe_methods ehci_device_ctrl_methods = {
- .transfer = ehci_device_ctrl_transfer,
- .start = ehci_device_ctrl_start,
- .abort = ehci_device_ctrl_abort,
- .close = ehci_device_ctrl_close,
- .cleartoggle = ehci_noop,
- .done = ehci_device_ctrl_done,
+ .upm_transfer = ehci_device_ctrl_transfer,
+ .upm_start = ehci_device_ctrl_start,
+ .upm_abort = ehci_device_ctrl_abort,
+ .upm_close = ehci_device_ctrl_close,
+ .upm_cleartoggle = ehci_noop,
+ .upm_done = ehci_device_ctrl_done,
};
Static const struct usbd_pipe_methods ehci_device_intr_methods = {
- .transfer = ehci_device_intr_transfer,
- .start = ehci_device_intr_start,
- .abort = ehci_device_intr_abort,
- .close = ehci_device_intr_close,
- .cleartoggle = ehci_device_clear_toggle,
- .done = ehci_device_intr_done,
+ .upm_transfer = ehci_device_intr_transfer,
+ .upm_start = ehci_device_intr_start,
+ .upm_abort = ehci_device_intr_abort,
+ .upm_close = ehci_device_intr_close,
+ .upm_cleartoggle = ehci_device_clear_toggle,
+ .upm_done = ehci_device_intr_done,
};
Static const struct usbd_pipe_methods ehci_device_bulk_methods = {
- .transfer = ehci_device_bulk_transfer,
- .start = ehci_device_bulk_start,
- .abort = ehci_device_bulk_abort,
- .close = ehci_device_bulk_close,
- .cleartoggle = ehci_device_clear_toggle,
- .done = ehci_device_bulk_done,
+ .upm_transfer = ehci_device_bulk_transfer,
+ .upm_start = ehci_device_bulk_start,
+ .upm_abort = ehci_device_bulk_abort,
+ .upm_close = ehci_device_bulk_close,
+ .upm_cleartoggle = ehci_device_clear_toggle,
+ .upm_done = ehci_device_bulk_done,
};
Static const struct usbd_pipe_methods ehci_device_isoc_methods = {
- .transfer = ehci_device_isoc_transfer,
- .start = ehci_device_isoc_start,
- .abort = ehci_device_isoc_abort,
- .close = ehci_device_isoc_close,
- .cleartoggle = ehci_noop,
- .done = ehci_device_isoc_done,
+ .upm_transfer = ehci_device_isoc_transfer,
+ .upm_start = ehci_device_isoc_start,
+ .upm_abort = ehci_device_isoc_abort,
+ .upm_close = ehci_device_isoc_close,
+ .upm_cleartoggle = ehci_noop,
+ .upm_done = ehci_device_isoc_done,
};
Static const struct usbd_pipe_methods ehci_device_fs_isoc_methods = {
- ehci_device_fs_isoc_transfer,
- ehci_device_fs_isoc_start,
- ehci_device_fs_isoc_abort,
- ehci_device_fs_isoc_close,
- ehci_noop,
- ehci_device_fs_isoc_done,
+ .upm_transfer = ehci_device_fs_isoc_transfer,
+ .upm_start = ehci_device_fs_isoc_start,
+ .upm_abort = ehci_device_fs_isoc_abort,
+ .upm_close = ehci_device_fs_isoc_close,
+ .upm_cleartoggle = ehci_noop,
+ .upm_done = ehci_device_fs_isoc_done,
};
static const uint8_t revbits[EHCI_MAX_POLLRATE] = {
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.12.2.3 src/sys/dev/usb/motg.c:1.12.2.4
--- src/sys/dev/usb/motg.c:1.12.2.3 Mon Dec 1 08:12:09 2014
+++ src/sys/dev/usb/motg.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.12.2.3 2014/12/01 08:12:09 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.12.2.4 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include "opt_motg.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.3 2014/12/01 08:12:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.4 2014/12/01 12:38:39 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,51 +203,51 @@ musbotg_pull_common(struct motg_softc *s
}
const struct usbd_bus_methods motg_bus_methods = {
- .open_pipe = motg_open,
- .soft_intr = motg_softintr,
- .do_poll = motg_poll,
- .allocm = motg_allocm,
- .freem = motg_freem,
- .allocx = motg_allocx,
- .freex = motg_freex,
- .get_lock = motg_get_lock,
- .new_device = NULL,
+ .ubm_open = motg_open,
+ .ubm_softint = motg_softintr,
+ .ubm_dopoll = motg_poll,
+ .ubm_allocm = motg_allocm,
+ .ubm_freem = motg_freem,
+ .ubm_allocx = motg_allocx,
+ .ubm_freex = motg_freex,
+ .ubm_getlock = motg_get_lock,
+ .ubm_newdev = NULL,
};
const struct usbd_pipe_methods motg_root_ctrl_methods = {
- .transfer = motg_root_ctrl_transfer,
- .start = motg_root_ctrl_start,
- .abort = motg_root_ctrl_abort,
- .close = motg_root_ctrl_close,
- .cleartoggle = motg_noop,
- .done = motg_root_ctrl_done,
+ .upm_transfer = motg_root_ctrl_transfer,
+ .upm_start = motg_root_ctrl_start,
+ .upm_abort = motg_root_ctrl_abort,
+ .upm_close = motg_root_ctrl_close,
+ .upm_cleartoggle = motg_noop,
+ .upm_done = motg_root_ctrl_done,
};
const struct usbd_pipe_methods motg_root_intr_methods = {
- .transfer = motg_root_intr_transfer,
- .start = motg_root_intr_start,
- .abort = motg_root_intr_abort,
- .close = motg_root_intr_close,
- .cleartoggle = motg_noop,
- .done = motg_root_intr_done,
+ .upm_transfer = motg_root_intr_transfer,
+ .upm_start = motg_root_intr_start,
+ .upm_abort = motg_root_intr_abort,
+ .upm_close = motg_root_intr_close,
+ .upm_cleartoggle = motg_noop,
+ .upm_done = motg_root_intr_done,
};
const struct usbd_pipe_methods motg_device_ctrl_methods = {
- .transfer = motg_device_ctrl_transfer,
- .start = motg_device_ctrl_start,
- .abort = motg_device_ctrl_abort,
- .close = motg_device_ctrl_close,
- .cleartoggle = motg_noop,
- .done = motg_device_ctrl_done,
+ .upm_transfer = motg_device_ctrl_transfer,
+ .upm_start = motg_device_ctrl_start,
+ .upm_abort = motg_device_ctrl_abort,
+ .upm_close = motg_device_ctrl_close,
+ .upm_cleartoggle = motg_noop,
+ .upm_done = motg_device_ctrl_done,
};
const struct usbd_pipe_methods motg_device_data_methods = {
- .transfer = motg_device_data_transfer,
- .start = motg_device_data_start,
- .abort = motg_device_data_abort,
- .close = motg_device_data_close,
- .cleartoggle = motg_device_clear_toggle,
- .done = motg_device_data_done,
+ .upm_transfer = motg_device_data_transfer,
+ .upm_start = motg_device_data_start,
+ .upm_abort = motg_device_data_abort,
+ .upm_close = motg_device_data_close,
+ .upm_cleartoggle = motg_device_clear_toggle,
+ .upm_done = motg_device_data_done,
};
usbd_status
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.4 src/sys/dev/usb/ohci.c:1.254.2.5
--- src/sys/dev/usb/ohci.c:1.254.2.4 Mon Dec 1 08:12:09 2014
+++ src/sys/dev/usb/ohci.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.4 2014/12/01 08:12:09 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.5 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.4 2014/12/01 08:12:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.5 2014/12/01 12:38:39 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -251,69 +251,69 @@ struct ohci_pipe {
#define OHCI_INTR_ENDPT 1
Static const struct usbd_bus_methods ohci_bus_methods = {
- .open_pipe = ohci_open,
- .soft_intr = ohci_softintr,
- .do_poll = ohci_poll,
- .allocm = ohci_allocm,
- .freem = ohci_freem,
- .allocx = ohci_allocx,
- .freex = ohci_freex,
- .get_lock = ohci_get_lock,
- .new_device = NULL,
+ .ubm_open = ohci_open,
+ .ubm_softint = ohci_softintr,
+ .ubm_dopoll = ohci_poll,
+ .ubm_allocm = ohci_allocm,
+ .ubm_freem = ohci_freem,
+ .ubm_allocx = ohci_allocx,
+ .ubm_freex = ohci_freex,
+ .ubm_getlock = ohci_get_lock,
+ .ubm_newdev = NULL,
};
Static const struct usbd_pipe_methods ohci_root_ctrl_methods = {
- .transfer = ohci_root_ctrl_transfer,
- .start = ohci_root_ctrl_start,
- .abort = ohci_root_ctrl_abort,
- .close = ohci_root_ctrl_close,
- .cleartoggle = ohci_noop,
- .done = ohci_root_ctrl_done,
+ .upm_transfer = ohci_root_ctrl_transfer,
+ .upm_start = ohci_root_ctrl_start,
+ .upm_abort = ohci_root_ctrl_abort,
+ .upm_close = ohci_root_ctrl_close,
+ .upm_cleartoggle = ohci_noop,
+ .upm_done = ohci_root_ctrl_done,
};
Static const struct usbd_pipe_methods ohci_root_intr_methods = {
- .transfer = ohci_root_intr_transfer,
- .start = ohci_root_intr_start,
- .abort = ohci_root_intr_abort,
- .close = ohci_root_intr_close,
- .cleartoggle = ohci_noop,
- .done = ohci_root_intr_done,
+ .upm_transfer = ohci_root_intr_transfer,
+ .upm_start = ohci_root_intr_start,
+ .upm_abort = ohci_root_intr_abort,
+ .upm_close = ohci_root_intr_close,
+ .upm_cleartoggle = ohci_noop,
+ .upm_done = ohci_root_intr_done,
};
Static const struct usbd_pipe_methods ohci_device_ctrl_methods = {
- .transfer = ohci_device_ctrl_transfer,
- .start = ohci_device_ctrl_start,
- .abort = ohci_device_ctrl_abort,
- .close = ohci_device_ctrl_close,
- .cleartoggle = ohci_noop,
- .done = ohci_device_ctrl_done,
+ .upm_transfer = ohci_device_ctrl_transfer,
+ .upm_start = ohci_device_ctrl_start,
+ .upm_abort = ohci_device_ctrl_abort,
+ .upm_close = ohci_device_ctrl_close,
+ .upm_cleartoggle = ohci_noop,
+ .upm_done = ohci_device_ctrl_done,
};
Static const struct usbd_pipe_methods ohci_device_intr_methods = {
- .transfer = ohci_device_intr_transfer,
- .start = ohci_device_intr_start,
- .abort = ohci_device_intr_abort,
- .close = ohci_device_intr_close,
- .cleartoggle = ohci_device_clear_toggle,
- .done = ohci_device_intr_done,
+ .upm_transfer = ohci_device_intr_transfer,
+ .upm_start = ohci_device_intr_start,
+ .upm_abort = ohci_device_intr_abort,
+ .upm_close = ohci_device_intr_close,
+ .upm_cleartoggle = ohci_device_clear_toggle,
+ .upm_done = ohci_device_intr_done,
};
Static const struct usbd_pipe_methods ohci_device_bulk_methods = {
- .transfer = ohci_device_bulk_transfer,
- .start = ohci_device_bulk_start,
- .abort = ohci_device_bulk_abort,
- .close = ohci_device_bulk_close,
- .cleartoggle = ohci_device_clear_toggle,
- .done = ohci_device_bulk_done,
+ .upm_transfer = ohci_device_bulk_transfer,
+ .upm_start = ohci_device_bulk_start,
+ .upm_abort = ohci_device_bulk_abort,
+ .upm_close = ohci_device_bulk_close,
+ .upm_cleartoggle = ohci_device_clear_toggle,
+ .upm_done = ohci_device_bulk_done,
};
Static const struct usbd_pipe_methods ohci_device_isoc_methods = {
- .transfer = ohci_device_isoc_transfer,
- .start = ohci_device_isoc_start,
- .abort = ohci_device_isoc_abort,
- .close = ohci_device_isoc_close,
- .cleartoggle = ohci_noop,
- .done = ohci_device_isoc_done,
+ .upm_transfer = ohci_device_isoc_transfer,
+ .upm_start = ohci_device_isoc_start,
+ .upm_abort = ohci_device_isoc_abort,
+ .upm_close = ohci_device_isoc_close,
+ .upm_cleartoggle = ohci_noop,
+ .upm_done = ohci_device_isoc_done,
};
int
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.4.4 src/sys/dev/usb/uhci.c:1.264.4.5
--- src/sys/dev/usb/uhci.c:1.264.4.4 Mon Dec 1 08:12:09 2014
+++ src/sys/dev/usb/uhci.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.264.4.4 2014/12/01 08:12:09 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.264.4.5 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.4 2014/12/01 08:12:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.5 2014/12/01 12:38:39 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -283,69 +283,69 @@ UREAD4(uhci_softc_t *sc, bus_size_t r)
#define UHCI_INTR_ENDPT 1
const struct usbd_bus_methods uhci_bus_methods = {
- .open_pipe = uhci_open,
- .soft_intr = uhci_softintr,
- .do_poll = uhci_poll,
- .allocm = uhci_allocm,
- .freem = uhci_freem,
- .allocx = uhci_allocx,
- .freex = uhci_freex,
- .get_lock = uhci_get_lock,
- .new_device = NULL,
+ .ubm_open = uhci_open,
+ .ubm_softint = uhci_softintr,
+ .ubm_dopoll = uhci_poll,
+ .ubm_allocm = uhci_allocm,
+ .ubm_freem = uhci_freem,
+ .ubm_allocx = uhci_allocx,
+ .ubm_freex = uhci_freex,
+ .ubm_getlock = uhci_get_lock,
+ .ubm_newdev = NULL,
};
const struct usbd_pipe_methods uhci_root_ctrl_methods = {
- .transfer = uhci_root_ctrl_transfer,
- .start = uhci_root_ctrl_start,
- .abort = uhci_root_ctrl_abort,
- .close = uhci_root_ctrl_close,
- .cleartoggle = uhci_noop,
- .done = uhci_root_ctrl_done,
+ .upm_transfer = uhci_root_ctrl_transfer,
+ .upm_start = uhci_root_ctrl_start,
+ .upm_abort = uhci_root_ctrl_abort,
+ .upm_close = uhci_root_ctrl_close,
+ .upm_cleartoggle = uhci_noop,
+ .upm_done = uhci_root_ctrl_done,
};
const struct usbd_pipe_methods uhci_root_intr_methods = {
- .transfer = uhci_root_intr_transfer,
- .start = uhci_root_intr_start,
- .abort = uhci_root_intr_abort,
- .close = uhci_root_intr_close,
- .cleartoggle = uhci_noop,
- .done = uhci_root_intr_done,
+ .upm_transfer = uhci_root_intr_transfer,
+ .upm_start = uhci_root_intr_start,
+ .upm_abort = uhci_root_intr_abort,
+ .upm_close = uhci_root_intr_close,
+ .upm_cleartoggle = uhci_noop,
+ .upm_done = uhci_root_intr_done,
};
const struct usbd_pipe_methods uhci_device_ctrl_methods = {
- .transfer = uhci_device_ctrl_transfer,
- .start = uhci_device_ctrl_start,
- .abort = uhci_device_ctrl_abort,
- .close = uhci_device_ctrl_close,
- .cleartoggle = uhci_noop,
- .done = uhci_device_ctrl_done,
+ .upm_transfer = uhci_device_ctrl_transfer,
+ .upm_start = uhci_device_ctrl_start,
+ .upm_abort = uhci_device_ctrl_abort,
+ .upm_close = uhci_device_ctrl_close,
+ .upm_cleartoggle = uhci_noop,
+ .upm_done = uhci_device_ctrl_done,
};
const struct usbd_pipe_methods uhci_device_intr_methods = {
- .transfer = uhci_device_intr_transfer,
- .start = uhci_device_intr_start,
- .abort = uhci_device_intr_abort,
- .close = uhci_device_intr_close,
- .cleartoggle = uhci_device_clear_toggle,
- .done = uhci_device_intr_done,
+ .upm_transfer = uhci_device_intr_transfer,
+ .upm_start = uhci_device_intr_start,
+ .upm_abort = uhci_device_intr_abort,
+ .upm_close = uhci_device_intr_close,
+ .upm_cleartoggle = uhci_device_clear_toggle,
+ .upm_done = uhci_device_intr_done,
};
const struct usbd_pipe_methods uhci_device_bulk_methods = {
- .transfer = uhci_device_bulk_transfer,
- .start = uhci_device_bulk_start,
- .abort = uhci_device_bulk_abort,
- .close = uhci_device_bulk_close,
- .cleartoggle = uhci_device_clear_toggle,
- .done = uhci_device_bulk_done,
+ .upm_transfer = uhci_device_bulk_transfer,
+ .upm_start = uhci_device_bulk_start,
+ .upm_abort = uhci_device_bulk_abort,
+ .upm_close = uhci_device_bulk_close,
+ .upm_cleartoggle = uhci_device_clear_toggle,
+ .upm_done = uhci_device_bulk_done,
};
const struct usbd_pipe_methods uhci_device_isoc_methods = {
- .transfer = uhci_device_isoc_transfer,
- .start = uhci_device_isoc_start,
- .abort = uhci_device_isoc_abort,
- .close = uhci_device_isoc_close,
- .cleartoggle = uhci_noop,
- .done = uhci_device_isoc_done,
+ .upm_transfer = uhci_device_isoc_transfer,
+ .upm_start = uhci_device_isoc_start,
+ .upm_abort = uhci_device_isoc_abort,
+ .upm_close = uhci_device_isoc_close,
+ .upm_cleartoggle = uhci_noop,
+ .upm_done = uhci_device_isoc_done,
};
#define uhci_add_intr_info(sc, ii) \
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.156 src/sys/dev/usb/usb.c:1.156.2.1
--- src/sys/dev/usb/usb.c:1.156 Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/usb.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.156 2014/09/12 16:40:38 skrll Exp $ */
+/* $NetBSD: usb.c,v 1.156.2.1 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156 2014/09/12 16:40:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156.2.1 2014/12/01 12:38:39 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -262,7 +262,7 @@ usb_attach(device_t parent, device_t sel
return;
}
- sc->sc_bus->methods->get_lock(sc->sc_bus, &sc->sc_bus->lock);
+ sc->sc_bus->methods->ubm_getlock(sc->sc_bus, &sc->sc_bus->lock);
KASSERT(sc->sc_bus->lock != NULL);
RUN_ONCE(&init_control, usb_once_init);
@@ -1020,7 +1020,7 @@ usb_soft_intr(void *arg)
usbd_bus_handle bus = arg;
mutex_enter(bus->lock);
- (*bus->methods->soft_intr)(bus);
+ bus->methods->ubm_softint(bus);
mutex_exit(bus->lock);
}
@@ -1031,7 +1031,7 @@ usb_schedsoftintr(usbd_bus_handle bus)
DPRINTFN(10,("usb_schedsoftintr: polling=%d\n", bus->use_polling));
if (bus->use_polling) {
- bus->methods->soft_intr(bus);
+ bus->methods->ubm_softint(bus);
} else {
kpreempt_disable();
softint_schedule(bus->soft);
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.198 src/sys/dev/usb/usb_subr.c:1.198.2.1
--- src/sys/dev/usb/usb_subr.c:1.198 Sun Sep 21 14:30:22 2014
+++ src/sys/dev/usb/usb_subr.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.198 2014/09/21 14:30:22 christos Exp $ */
+/* $NetBSD: usb_subr.c,v 1.198.2.1 2014/12/01 12:38:39 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198 2014/09/21 14:30:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.1 2014/12/01 12:38:39 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -725,7 +725,7 @@ usbd_setup_pipe_flags(usbd_device_handle
p->interval = ival;
p->flags = flags;
SIMPLEQ_INIT(&p->queue);
- err = dev->bus->methods->open_pipe(p);
+ err = dev->bus->methods->ubm_open(p);
if (err) {
DPRINTFN(-1,("usbd_setup_pipe: endpoint=0x%x failed, error="
"%s\n",
@@ -745,7 +745,7 @@ usbd_kill_pipe(usbd_pipe_handle pipe)
{
usbd_abort_pipe(pipe);
usbd_lock_pipe(pipe);
- pipe->methods->close(pipe);
+ pipe->methods->upm_close(pipe);
usbd_unlock_pipe(pipe);
usb_rem_task(pipe->device, &pipe->async_task);
pipe->endpoint->refcnt--;
@@ -1065,8 +1065,8 @@ usbd_new_device(device_t parent, usbd_bu
DPRINTF(("usbd_new_device bus=%p port=%d depth=%d speed=%d\n",
bus, port, depth, speed));
- if (bus->methods->new_device != NULL)
- return (bus->methods->new_device)(parent, bus, depth, speed,
+ if (bus->methods->ubm_newdev != NULL)
+ return (bus->methods->ubm_newdev)(parent, bus, depth, speed,
port, up);
addr = usbd_getnewaddr(bus);
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.162.2.3 src/sys/dev/usb/usbdi.c:1.162.2.4
--- src/sys/dev/usb/usbdi.c:1.162.2.3 Sun Nov 30 16:38:45 2014
+++ src/sys/dev/usb/usbdi.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.162.2.3 2014/11/30 16:38:45 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.162.2.4 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.3 2014/11/30 16:38:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.4 2014/12/01 12:38:39 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -263,7 +263,7 @@ usbd_close_pipe(usbd_pipe_handle pipe)
}
LIST_REMOVE(pipe, next);
pipe->endpoint->refcnt--;
- pipe->methods->close(pipe);
+ pipe->methods->upm_close(pipe);
usbd_unlock_pipe(pipe);
if (pipe->intrxfer != NULL)
usbd_free_xfer(pipe->intrxfer);
@@ -306,7 +306,7 @@ usbd_transfer(usbd_xfer_handle xfer)
if (xfer->rqflags & URQ_AUTO_DMABUF)
printf("usbd_transfer: has old buffer!\n");
#endif
- err = bus->methods->allocm(bus, dmap, size);
+ err = bus->methods->ubm_allocm(bus, dmap, size);
if (err) {
USBHIST_LOG(usbdebug,
"<- done xfer %p, no mem", xfer, 0, 0, 0);
@@ -322,7 +322,7 @@ usbd_transfer(usbd_xfer_handle xfer)
memcpy(KERNADDR(dmap, 0), xfer->buffer, size);
/* xfer is not valid after the transfer method unless synchronous */
- err = pipe->methods->transfer(xfer);
+ err = pipe->methods->upm_transfer(xfer);
USBHIST_LOG(usbdebug, "<- done transfer %p, err = %d", xfer, err, 0, 0);
if (err != USBD_IN_PROGRESS && err) {
@@ -330,7 +330,7 @@ usbd_transfer(usbd_xfer_handle xfer)
if (xfer->rqflags & URQ_AUTO_DMABUF) {
struct usbd_bus *bus = pipe->device->bus;
- bus->methods->freem(bus, &xfer->dmabuf);
+ bus->methods->ubm_freem(bus, &xfer->dmabuf);
xfer->rqflags &= ~URQ_AUTO_DMABUF;
}
}
@@ -361,7 +361,7 @@ usbd_transfer(usbd_xfer_handle xfer)
}
if (err) {
if (!xfer->done)
- pipe->methods->abort(xfer);
+ pipe->methods->upm_abort(xfer);
break;
}
}
@@ -395,7 +395,7 @@ usbd_alloc_buffer(usbd_xfer_handle xfer,
if (xfer->rqflags & (URQ_DEV_DMABUF | URQ_AUTO_DMABUF))
printf("usbd_alloc_buffer: xfer already has a buffer\n");
#endif
- err = bus->methods->allocm(bus, &xfer->dmabuf, size);
+ err = bus->methods->ubm_allocm(bus, &xfer->dmabuf, size);
if (err)
return (NULL);
xfer->rqflags |= URQ_DEV_DMABUF;
@@ -412,7 +412,7 @@ usbd_free_buffer(usbd_xfer_handle xfer)
}
#endif
xfer->rqflags &= ~(URQ_DEV_DMABUF | URQ_AUTO_DMABUF);
- xfer->device->bus->methods->freem(xfer->device->bus, &xfer->dmabuf);
+ xfer->device->bus->methods->ubm_freem(xfer->device->bus, &xfer->dmabuf);
}
void *
@@ -432,7 +432,7 @@ usbd_alloc_xfer(usbd_device_handle dev)
ASSERT_SLEEPABLE();
- xfer = dev->bus->methods->allocx(dev->bus);
+ xfer = dev->bus->methods->ubm_allocx(dev->bus);
if (xfer == NULL)
return (NULL);
xfer->device = dev;
@@ -461,7 +461,7 @@ usbd_free_xfer(usbd_xfer_handle xfer)
#endif
cv_destroy(&xfer->cv);
cv_destroy(&xfer->hccv);
- xfer->device->bus->methods->freex(xfer->device->bus, xfer);
+ xfer->device->bus->methods->ubm_freex(xfer->device->bus, xfer);
return (USBD_NORMAL_COMPLETION);
}
@@ -615,7 +615,7 @@ usbd_clear_endpoint_stall(usbd_pipe_hand
* Clearing en endpoint stall resets the endpoint toggle, so
* do the same to the HC toggle.
*/
- pipe->methods->cleartoggle(pipe);
+ pipe->methods->upm_cleartoggle(pipe);
req.bmRequestType = UT_WRITE_ENDPOINT;
req.bRequest = UR_CLEAR_FEATURE;
@@ -640,7 +640,7 @@ usbd_clear_endpoint_stall_task(void *arg
usbd_device_handle dev = pipe->device;
usb_device_request_t req;
- pipe->methods->cleartoggle(pipe);
+ pipe->methods->upm_cleartoggle(pipe);
req.bmRequestType = UT_WRITE_ENDPOINT;
req.bRequest = UR_CLEAR_FEATURE;
@@ -660,7 +660,7 @@ usbd_clear_endpoint_stall_async(usbd_pip
void
usbd_clear_endpoint_toggle(usbd_pipe_handle pipe)
{
- pipe->methods->cleartoggle(pipe);
+ pipe->methods->upm_cleartoggle(pipe);
}
usbd_status
@@ -805,7 +805,7 @@ usbd_ar_pipe(usbd_pipe_handle pipe)
USBHIST_LOG(usbdebug, "pipe = %p xfer = %p (methods = %p)",
pipe, xfer, pipe->methods, 0);
/* Make the HC abort it (and invoke the callback). */
- pipe->methods->abort(xfer);
+ pipe->methods->upm_abort(xfer);
/* XXX only for non-0 usbd_clear_endpoint_stall(pipe); */
}
pipe->aborting = 0;
@@ -865,7 +865,7 @@ usb_transfer_complete(usbd_xfer_handle x
if (xfer->rqflags & URQ_AUTO_DMABUF) {
if (!repeat) {
struct usbd_bus *bus = pipe->device->bus;
- bus->methods->freem(bus, dmap);
+ bus->methods->ubm_freem(bus, dmap);
xfer->rqflags &= ~URQ_AUTO_DMABUF;
}
}
@@ -910,18 +910,18 @@ usb_transfer_complete(usbd_xfer_handle x
KERNEL_LOCK(1, curlwp);
xfer->callback(xfer, xfer->priv, xfer->status);
USBHIST_LOG(usbdebug, "xfer %p doing done %p", xfer,
- pipe->methods->done, 0, 0);
+ pipe->methods->upm_done, 0, 0);
if (!(pipe->flags & USBD_MPSAFE))
KERNEL_UNLOCK_ONE(curlwp);
if (!polling)
mutex_enter(pipe->device->bus->lock);
}
- pipe->methods->done(xfer);
+ pipe->methods->upm_done(xfer);
} else {
USBHIST_LOG(usbdebug, "xfer %p doing done %p", xfer,
- pipe->methods->done, 0, 0);
- pipe->methods->done(xfer);
+ pipe->methods->upm_done, 0, 0);
+ pipe->methods->upm_done(xfer);
USBHIST_LOG(usbdebug, "xfer %p doing callback %p status %x",
xfer, xfer->callback, xfer->status, 0);
if (xfer->callback) {
@@ -1002,7 +1002,7 @@ usbd_start_next(usbd_pipe_handle pipe)
printf("usbd_start_next: pipe == NULL\n");
return;
}
- if (pipe->methods == NULL || pipe->methods->start == NULL) {
+ if (pipe->methods == NULL || pipe->methods->upm_start == NULL) {
printf("usbd_start_next: pipe=%p no start method\n", pipe);
return;
}
@@ -1017,7 +1017,7 @@ usbd_start_next(usbd_pipe_handle pipe)
pipe->running = 0;
} else {
mutex_exit(pipe->device->bus->lock);
- err = pipe->methods->start(xfer);
+ err = pipe->methods->upm_start(xfer);
mutex_enter(pipe->device->bus->lock);
if (err != USBD_IN_PROGRESS) {
@@ -1145,7 +1145,7 @@ usbd_get_quirks(usbd_device_handle dev)
void
usbd_dopoll(usbd_interface_handle iface)
{
- iface->device->bus->methods->do_poll(iface->device->bus);
+ iface->device->bus->methods->ubm_dopoll(iface->device->bus);
}
/*
@@ -1161,7 +1161,7 @@ usbd_set_polling(usbd_device_handle dev,
/* Kick the host controller when switching modes */
mutex_enter(dev->bus->lock);
- (*dev->bus->methods->soft_intr)(dev->bus);
+ dev->bus->methods->ubm_softint(dev->bus);
mutex_exit(dev->bus->lock);
}
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.109.2.2 src/sys/dev/usb/usbdivar.h:1.109.2.3
--- src/sys/dev/usb/usbdivar.h:1.109.2.2 Mon Dec 1 08:12:09 2014
+++ src/sys/dev/usb/usbdivar.h Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.109.2.2 2014/12/01 08:12:09 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.109.2.3 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -92,26 +92,26 @@ struct usbd_endpoint {
};
struct usbd_bus_methods {
- usbd_status (*open_pipe)(struct usbd_pipe *pipe);
- void (*soft_intr)(void *);
- void (*do_poll)(struct usbd_bus *);
- usbd_status (*allocm)(struct usbd_bus *, usb_dma_t *,
- uint32_t bufsize);
- void (*freem)(struct usbd_bus *, usb_dma_t *);
- struct usbd_xfer * (*allocx)(struct usbd_bus *);
- void (*freex)(struct usbd_bus *, struct usbd_xfer *);
- void (*get_lock)(struct usbd_bus *, kmutex_t **);
- usbd_status (*new_device)(device_t, usbd_bus_handle, int,
+ usbd_status (*ubm_open)(struct usbd_pipe *pipe);
+ void (*ubm_softint)(void *);
+ void (*ubm_dopoll)(struct usbd_bus *);
+ usbd_status (*ubm_allocm)(struct usbd_bus *, usb_dma_t *,
+ uint32_t);
+ void (*ubm_freem)(struct usbd_bus *, usb_dma_t *);
+ struct usbd_xfer * (*ubm_allocx)(struct usbd_bus *);
+ void (*ubm_freex)(struct usbd_bus *, struct usbd_xfer *);
+ void (*ubm_getlock)(struct usbd_bus *, kmutex_t **);
+ usbd_status (*ubm_newdev)(device_t, usbd_bus_handle, int,
int, int, struct usbd_port *);
};
struct usbd_pipe_methods {
- usbd_status (*transfer)(usbd_xfer_handle xfer);
- usbd_status (*start)(usbd_xfer_handle xfer);
- void (*abort)(usbd_xfer_handle xfer);
- void (*close)(usbd_pipe_handle pipe);
- void (*cleartoggle)(usbd_pipe_handle pipe);
- void (*done)(usbd_xfer_handle xfer);
+ usbd_status (*upm_transfer)(usbd_xfer_handle);
+ usbd_status (*upm_start)(usbd_xfer_handle);
+ void (*upm_abort)(usbd_xfer_handle);
+ void (*upm_close)(usbd_pipe_handle);
+ void (*upm_cleartoggle)(usbd_pipe_handle);
+ void (*upm_done)(usbd_xfer_handle);
};
#if 0 /* notyet */
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.2 src/sys/dev/usb/xhci.c:1.28.2.3
--- src/sys/dev/usb/xhci.c:1.28.2.2 Mon Dec 1 08:12:09 2014
+++ src/sys/dev/usb/xhci.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.2 2014/12/01 08:12:09 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.3 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.2 2014/12/01 08:12:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.3 2014/12/01 12:38:39 skrll Exp $");
#include "opt_usb.h"
@@ -184,65 +184,65 @@ static void xhci_timeout(void *);
static void xhci_timeout_task(void *);
static const struct usbd_bus_methods xhci_bus_methods = {
- .open_pipe = xhci_open,
- .soft_intr = xhci_softintr,
- .do_poll = xhci_poll,
- .allocm = xhci_allocm,
- .freem = xhci_freem,
- .allocx = xhci_allocx,
- .freex = xhci_freex,
- .get_lock = xhci_get_lock,
- .new_device = xhci_new_device,
+ .ubm_open = xhci_open,
+ .ubm_softint = xhci_softintr,
+ .ubm_dopoll = xhci_poll,
+ .ubm_allocm = xhci_allocm,
+ .ubm_freem = xhci_freem,
+ .ubm_allocx = xhci_allocx,
+ .ubm_freex = xhci_freex,
+ .ubm_getlock = xhci_get_lock,
+ .ubm_newdev = xhci_new_device,
};
static const struct usbd_pipe_methods xhci_root_ctrl_methods = {
- .transfer = xhci_root_ctrl_transfer,
- .start = xhci_root_ctrl_start,
- .abort = xhci_root_ctrl_abort,
- .close = xhci_root_ctrl_close,
- .cleartoggle = xhci_noop,
- .done = xhci_root_ctrl_done,
+ .upm_transfer = xhci_root_ctrl_transfer,
+ .upm_start = xhci_root_ctrl_start,
+ .upm_abort = xhci_root_ctrl_abort,
+ .upm_close = xhci_root_ctrl_close,
+ .upm_cleartoggle = xhci_noop,
+ .upm_done = xhci_root_ctrl_done,
};
static const struct usbd_pipe_methods xhci_root_intr_methods = {
- .transfer = xhci_root_intr_transfer,
- .start = xhci_root_intr_start,
- .abort = xhci_root_intr_abort,
- .close = xhci_root_intr_close,
- .cleartoggle = xhci_noop,
- .done = xhci_root_intr_done,
+ .upm_transfer = xhci_root_intr_transfer,
+ .upm_start = xhci_root_intr_start,
+ .upm_abort = xhci_root_intr_abort,
+ .upm_close = xhci_root_intr_close,
+ .upm_cleartoggle = xhci_noop,
+ .upm_done = xhci_root_intr_done,
};
static const struct usbd_pipe_methods xhci_device_ctrl_methods = {
- .transfer = xhci_device_ctrl_transfer,
- .start = xhci_device_ctrl_start,
- .abort = xhci_device_ctrl_abort,
- .close = xhci_device_ctrl_close,
- .cleartoggle = xhci_noop,
- .done = xhci_device_ctrl_done,
+ .upm_transfer = xhci_device_ctrl_transfer,
+ .upm_start = xhci_device_ctrl_start,
+ .upm_abort = xhci_device_ctrl_abort,
+ .upm_close = xhci_device_ctrl_close,
+ .upm_cleartoggle = xhci_noop,
+ .upm_done = xhci_device_ctrl_done,
};
static const struct usbd_pipe_methods xhci_device_isoc_methods = {
- .cleartoggle = xhci_noop,
+ .upm_cleartoggle = xhci_noop,
};
static const struct usbd_pipe_methods xhci_device_bulk_methods = {
- .transfer = xhci_device_bulk_transfer,
- .start = xhci_device_bulk_start,
- .abort = xhci_device_bulk_abort,
- .close = xhci_device_bulk_close,
- .cleartoggle = xhci_noop,
- .done = xhci_device_bulk_done,
+ .upm_transfer = xhci_device_bulk_transfer,
+ .upm_start = xhci_device_bulk_start,
+ .upm_abort = xhci_device_bulk_abort,
+ .upm_close = xhci_device_bulk_close,
+ .upm_cleartoggle = xhci_noop,
+ .upm_done = xhci_device_bulk_done,
};
static const struct usbd_pipe_methods xhci_device_intr_methods = {
- .transfer = xhci_device_intr_transfer,
- .start = xhci_device_intr_start,
- .abort = xhci_device_intr_abort,
- .close = xhci_device_intr_close,
- .cleartoggle = xhci_noop,
- .done = xhci_device_intr_done,
+ .upm_transfer = xhci_device_intr_transfer,
+ .upm_start = xhci_device_intr_start,
+ .upm_abort = xhci_device_intr_abort,
+ .upm_close = xhci_device_intr_close,
+ .upm_cleartoggle = xhci_noop,
+ .upm_done = xhci_device_intr_done,
};
static inline uint32_t
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.32.2.1 src/sys/external/bsd/dwc2/dwc2.c:1.32.2.2
--- src/sys/external/bsd/dwc2/dwc2.c:1.32.2.1 Sun Nov 30 13:14:11 2014
+++ src/sys/external/bsd/dwc2/dwc2.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.32.2.1 2014/11/30 13:14:11 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.32.2.2 2014/12/01 12:38:39 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.1 2014/11/30 13:14:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.2 2014/12/01 12:38:39 skrll Exp $");
#include "opt_usb.h"
@@ -159,68 +159,68 @@ dwc2_free_bus_bandwidth(struct dwc2_hsot
#define DWC2_INTR_ENDPT 1
Static const struct usbd_bus_methods dwc2_bus_methods = {
- .open_pipe = dwc2_open,
- .soft_intr = dwc2_softintr,
- .do_poll = dwc2_poll,
- .allocm = dwc2_allocm,
- .freem = dwc2_freem,
- .allocx = dwc2_allocx,
- .freex = dwc2_freex,
- .get_lock = dwc2_get_lock,
+ .ubm_open = dwc2_open,
+ .ubm_softint = dwc2_softintr,
+ .ubm_dopoll = dwc2_poll,
+ .ubm_allocm = dwc2_allocm,
+ .ubm_freem = dwc2_freem,
+ .ubm_allocx = dwc2_allocx,
+ .ubm_freex = dwc2_freex,
+ .ubm_getlock = dwc2_get_lock,
};
Static const struct usbd_pipe_methods dwc2_root_ctrl_methods = {
- .transfer = dwc2_root_ctrl_transfer,
- .start = dwc2_root_ctrl_start,
- .abort = dwc2_root_ctrl_abort,
- .close = dwc2_root_ctrl_close,
- .cleartoggle = dwc2_noop,
- .done = dwc2_root_ctrl_done,
+ .upm_transfer = dwc2_root_ctrl_transfer,
+ .upm_start = dwc2_root_ctrl_start,
+ .upm_abort = dwc2_root_ctrl_abort,
+ .upm_close = dwc2_root_ctrl_close,
+ .upm_cleartoggle = dwc2_noop,
+ .upm_done = dwc2_root_ctrl_done,
};
Static const struct usbd_pipe_methods dwc2_root_intr_methods = {
- .transfer = dwc2_root_intr_transfer,
- .start = dwc2_root_intr_start,
- .abort = dwc2_root_intr_abort,
- .close = dwc2_root_intr_close,
- .cleartoggle = dwc2_noop,
- .done = dwc2_root_intr_done,
+ .upm_transfer = dwc2_root_intr_transfer,
+ .upm_start = dwc2_root_intr_start,
+ .upm_abort = dwc2_root_intr_abort,
+ .upm_close = dwc2_root_intr_close,
+ .upm_cleartoggle = dwc2_noop,
+ .upm_done = dwc2_root_intr_done,
};
Static const struct usbd_pipe_methods dwc2_device_ctrl_methods = {
- .transfer = dwc2_device_ctrl_transfer,
- .start = dwc2_device_ctrl_start,
- .abort = dwc2_device_ctrl_abort,
- .close = dwc2_device_ctrl_close,
- .cleartoggle = dwc2_noop,
- .done = dwc2_device_ctrl_done,
+ .upm_transfer = dwc2_device_ctrl_transfer,
+ .upm_start = dwc2_device_ctrl_start,
+ .upm_abort = dwc2_device_ctrl_abort,
+ .upm_close = dwc2_device_ctrl_close,
+ .upm_cleartoggle = dwc2_noop,
+ .upm_done = dwc2_device_ctrl_done,
};
Static const struct usbd_pipe_methods dwc2_device_intr_methods = {
- .transfer = dwc2_device_intr_transfer,
- .start = dwc2_device_intr_start,
- .abort = dwc2_device_intr_abort,
- .close = dwc2_device_intr_close,
- .cleartoggle = dwc2_device_clear_toggle,
- .done = dwc2_device_intr_done,
+ .upm_transfer = dwc2_device_intr_transfer,
+ .upm_start = dwc2_device_intr_start,
+ .upm_abort = dwc2_device_intr_abort,
+ .upm_close = dwc2_device_intr_close,
+ .upm_cleartoggle = dwc2_device_clear_toggle,
+ .upm_done = dwc2_device_intr_done,
};
Static const struct usbd_pipe_methods dwc2_device_bulk_methods = {
- .transfer = dwc2_device_bulk_transfer,
- .start = dwc2_device_bulk_start,
- .abort = dwc2_device_bulk_abort,
- .close = dwc2_device_bulk_close,
- .cleartoggle = dwc2_device_clear_toggle,
- .done = dwc2_device_bulk_done,
+ .upm_transfer = dwc2_device_bulk_transfer,
+ .upm_start = dwc2_device_bulk_start,
+ .upm_abort = dwc2_device_bulk_abort,
+ .upm_close = dwc2_device_bulk_close,
+ .upm_cleartoggle = dwc2_device_clear_toggle,
+ .upm_done = dwc2_device_bulk_done,
};
Static const struct usbd_pipe_methods dwc2_device_isoc_methods = {
- .transfer = dwc2_device_isoc_transfer,
- .start = dwc2_device_isoc_start,
- .abort = dwc2_device_isoc_abort,
- .close = dwc2_device_isoc_close,
- .cleartoggle = dwc2_noop,
- .done = dwc2_device_isoc_done,
+ .upm_transfer = dwc2_device_isoc_transfer,
+ .upm_start = dwc2_device_isoc_start,
+ .upm_abort = dwc2_device_isoc_abort,
+ .upm_close = dwc2_device_isoc_close,
+ .upm_cleartoggle = dwc2_noop,
+ .upm_done = dwc2_device_isoc_done,
};
Static usbd_status
Index: src/sys/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.4.1 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.4.2
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Mon Dec 1 12:38:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.22.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ugenhc.c,v 1.22.4.2 2014/12/01 12:38:39 skrll Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.2 2014/12/01 12:38:39 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -363,12 +363,12 @@ rumpusb_root_ctrl_done(usbd_xfer_handle
}
static const struct usbd_pipe_methods rumpusb_root_ctrl_methods = {
- .transfer = rumpusb_root_ctrl_transfer,
- .start = rumpusb_root_ctrl_start,
- .abort = rumpusb_root_ctrl_abort,
- .close = rumpusb_root_ctrl_close,
- .cleartoggle = rumpusb_root_ctrl_cleartoggle,
- .done = rumpusb_root_ctrl_done,
+ .upm_transfer = rumpusb_root_ctrl_transfer,
+ .upm_start = rumpusb_root_ctrl_start,
+ .upm_abort = rumpusb_root_ctrl_abort,
+ .upm_close = rumpusb_root_ctrl_close,
+ .upm_cleartoggle = rumpusb_root_ctrl_cleartoggle,
+ .upm_done = rumpusb_root_ctrl_done,
};
static usbd_status
@@ -593,12 +593,12 @@ rumpusb_device_ctrl_done(usbd_xfer_handl
}
static const struct usbd_pipe_methods rumpusb_device_ctrl_methods = {
- .transfer = rumpusb_device_ctrl_transfer,
- .start = rumpusb_device_ctrl_start,
- .abort = rumpusb_device_ctrl_abort,
- .close = rumpusb_device_ctrl_close,
- .cleartoggle = rumpusb_device_ctrl_cleartoggle,
- .done = rumpusb_device_ctrl_done,
+ .upm_transfer = rumpusb_device_ctrl_transfer,
+ .upm_start = rumpusb_device_ctrl_start,
+ .upm_abort = rumpusb_device_ctrl_abort,
+ .upm_close = rumpusb_device_ctrl_close,
+ .upm_cleartoggle = rumpusb_device_ctrl_cleartoggle,
+ .upm_done = rumpusb_device_ctrl_done,
};
static void
@@ -732,12 +732,12 @@ rumpusb_root_intr_done(usbd_xfer_handle
}
static const struct usbd_pipe_methods rumpusb_root_intr_methods = {
- .transfer = rumpusb_root_intr_transfer,
- .start = rumpusb_root_intr_start,
- .abort = rumpusb_root_intr_abort,
- .close = rumpusb_root_intr_close,
- .cleartoggle = rumpusb_root_intr_cleartoggle,
- .done = rumpusb_root_intr_done,
+ .upm_transfer = rumpusb_root_intr_transfer,
+ .upm_start = rumpusb_root_intr_start,
+ .upm_abort = rumpusb_root_intr_abort,
+ .upm_close = rumpusb_root_intr_close,
+ .upm_cleartoggle = rumpusb_root_intr_cleartoggle,
+ .upm_done = rumpusb_root_intr_done,
};
static usbd_status
@@ -940,12 +940,12 @@ rumpusb_device_bulk_done(usbd_xfer_handl
}
static const struct usbd_pipe_methods rumpusb_device_bulk_methods = {
- .transfer = rumpusb_device_bulk_transfer,
- .start = rumpusb_device_bulk_start,
- .abort = rumpusb_device_bulk_abort,
- .close = rumpusb_device_bulk_close,
- .cleartoggle = rumpusb_device_bulk_cleartoggle,
- .done = rumpusb_device_bulk_done,
+ .upm_transfer = rumpusb_device_bulk_transfer,
+ .upm_start = rumpusb_device_bulk_start,
+ .upm_abort = rumpusb_device_bulk_abort,
+ .upm_close = rumpusb_device_bulk_close,
+ .upm_cleartoggle = rumpusb_device_bulk_cleartoggle,
+ .upm_done = rumpusb_device_bulk_done,
};
static usbd_status
@@ -1087,14 +1087,14 @@ struct ugenhc_pipe {
};
static const struct usbd_bus_methods ugenhc_bus_methods = {
- .open_pipe = ugenhc_open,
- .soft_intr = ugenhc_softint,
- .do_poll = ugenhc_poll,
- .allocm = ugenhc_allocm,
- .freem = ugenhc_freem,
- .allocx = ugenhc_allocx,
- .freex = ugenhc_freex,
- .get_lock = ugenhc_getlock
+ .ubm_open = ugenhc_open,
+ .ubm_softint = ugenhc_softint,
+ .ubm_dopoll = ugenhc_poll,
+ .ubm_allocm = ugenhc_allocm,
+ .ubm_freem = ugenhc_freem,
+ .ubm_allocx = ugenhc_allocx,
+ .ubm_freex = ugenhc_freex,
+ .ubm_getlock = ugenhc_getlock
};
static int
