Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nick-nhusb]: src/sys Add prefixes to method structures member names. No ...
details: https://anonhg.NetBSD.org/src/rev/0e98c51fff35
branches: nick-nhusb
changeset: 334057:0e98c51fff35
user: skrll <skrll%NetBSD.org@localhost>
date: Mon Dec 01 12:38:39 2014 +0000
description:
Add prefixes to method structures member names. No functional change.
diffstat:
sys/arch/mips/adm5120/dev/ahci.c | 92 +++++++++++++++---------------
sys/dev/ic/sl811hs.c | 47 +++++++--------
sys/dev/usb/ehci.c | 106 ++++++++++++++++++------------------
sys/dev/usb/motg.c | 70 +++++++++++-----------
sys/dev/usb/ohci.c | 94 +++++++++++++++---------------
sys/dev/usb/uhci.c | 94 +++++++++++++++---------------
sys/dev/usb/usb.c | 10 +-
sys/dev/usb/usb_subr.c | 12 ++--
sys/dev/usb/usbdi.c | 48 ++++++++--------
sys/dev/usb/usbdivar.h | 34 +++++-----
sys/dev/usb/xhci.c | 84 ++++++++++++++--------------
sys/external/bsd/dwc2/dwc2.c | 92 +++++++++++++++---------------
sys/rump/dev/lib/libugenhc/ugenhc.c | 68 +++++++++++-----------
13 files changed, 425 insertions(+), 426 deletions(-)
diffs (truncated from 1448 to 300 lines):
diff -r 402bdbcb15fd -r 0e98c51fff35 sys/arch/mips/adm5120/dev/ahci.c
--- a/sys/arch/mips/adm5120/dev/ahci.c Mon Dec 01 08:12:09 2014 +0000
+++ b/sys/arch/mips/adm5120/dev/ahci.c Mon Dec 01 12:38:39 2014 +0000
@@ -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 @@
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 {
diff -r 402bdbcb15fd -r 0e98c51fff35 sys/dev/ic/sl811hs.c
--- a/sys/dev/ic/sl811hs.c Mon Dec 01 08:12:09 2014 +0000
+++ b/sys/dev/ic/sl811hs.c Mon Dec 01 12:38:39 2014 +0000
@@ -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 @@
#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 @@
/*
* 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;
}
diff -r 402bdbcb15fd -r 0e98c51fff35 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c Mon Dec 01 08:12:09 2014 +0000
+++ b/sys/dev/usb/ehci.c Mon Dec 01 12:38:39 2014 +0000
@@ -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 @@
#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 = {
Home |
Main Index |
Thread Index |
Old Index