Module Name: src
Committed By: skrll
Date: Thu Oct 22 11:15:42 UTC 2015
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]: ehcivar.h motgvar.h ohcivar.h uhcivar.h
xhcivar.h
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2var.h
src/sys/rump/dev/lib/libugenhc [nick-nhusb]: ugenhc.c
Log Message:
Simplify *_XFER2SC using ux_bus
To generate a diff of this commit:
cvs rdiff -u -r1.12.6.14 -r1.12.6.15 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.47.6.14 -r1.47.6.15 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.42.14.18 -r1.42.14.19 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.4.2.7 -r1.4.2.8 src/sys/dev/usb/motgvar.h
cvs rdiff -u -r1.55.6.7 -r1.55.6.8 src/sys/dev/usb/ohcivar.h
cvs rdiff -u -r1.52.14.8 -r1.52.14.9 src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.4.12.6 -r1.4.12.7 src/sys/dev/usb/xhcivar.h
cvs rdiff -u -r1.3.12.6 -r1.3.12.7 src/sys/external/bsd/dwc2/dwc2var.h
cvs rdiff -u -r1.22.4.11 -r1.22.4.12 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.14 src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.15
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.14 Tue Oct 20 15:31:21 2015
+++ src/sys/arch/mips/adm5120/dev/ahci.c Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.12.6.14 2015/10/20 15:31:21 skrll Exp $ */
+/* $NetBSD: ahci.c,v 1.12.6.15 2015/10/22 11:15:42 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.14 2015/10/20 15:31:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.15 2015/10/22 11:15:42 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -411,7 +411,7 @@ ahci_poll(struct usbd_bus *bus)
#define AHCI_BUS2SC(bus) ((bus)->ub_hcpriv)
#define AHCI_PIPE2SC(pipe) AHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define AHCI_XFER2SC(xfer) AHCI_PIPE2SC((xfer)->ux_pipe)
+#define AHCI_XFER2SC(xfer) AHCI_BUS2SC((xfer)->ux_bus)
#define AHCI_APIPE2SC(ap) AHCI_BUS2SC((d)->pipe.up_dev->ud_bus)
/*
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.47.6.14 src/sys/dev/ic/sl811hs.c:1.47.6.15
--- src/sys/dev/ic/sl811hs.c:1.47.6.14 Tue Oct 20 15:31:21 2015
+++ src/sys/dev/ic/sl811hs.c Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.47.6.14 2015/10/20 15:31:21 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.47.6.15 2015/10/22 11:15:42 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.14 2015/10/20 15:31:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.15 2015/10/22 11:15:42 skrll Exp $");
#include "opt_slhci.h"
@@ -294,7 +294,7 @@ struct slhci_pipe {
#define SLHCI_BUS2SC(bus) ((bus)->ub_hcpriv)
#define SLHCI_PIPE2SC(pipe) SLHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define SLHCI_XFER2SC(xfer) SLHCI_PIPE2SC((xfer)->ux_pipe)
+#define SLHCI_XFER2SC(xfer) SLHCI_BUS2SC((xfer)->ux_bus)
#define SLHCI_PIPE2SPIPE(pipe) ((struct slhci_pipe *)(pipe))
Index: src/sys/dev/usb/ehcivar.h
diff -u src/sys/dev/usb/ehcivar.h:1.42.14.18 src/sys/dev/usb/ehcivar.h:1.42.14.19
--- src/sys/dev/usb/ehcivar.h:1.42.14.18 Tue Oct 20 08:33:17 2015
+++ src/sys/dev/usb/ehcivar.h Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcivar.h,v 1.42.14.18 2015/10/20 08:33:17 skrll Exp $ */
+/* $NetBSD: ehcivar.h,v 1.42.14.19 2015/10/22 11:15:42 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@ struct ehci_xfer {
#define EHCI_BUS2SC(bus) ((bus)->ub_hcpriv)
#define EHCI_PIPE2SC(pipe) EHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define EHCI_XFER2SC(xfer) EHCI_PIPE2SC((xfer)->ux_pipe)
+#define EHCI_XFER2SC(xfer) EHCI_BUS2SC((xfer)->ux_bus)
#define EHCI_EPIPE2SC(epipe) EHCI_BUS2SC((epipe)->pipe.up_dev->ud_bus)
#define EHCI_XFER2EXFER(xfer) ((struct ehci_xfer *)(xfer))
Index: src/sys/dev/usb/motgvar.h
diff -u src/sys/dev/usb/motgvar.h:1.4.2.7 src/sys/dev/usb/motgvar.h:1.4.2.8
--- src/sys/dev/usb/motgvar.h:1.4.2.7 Tue Oct 20 15:31:21 2015
+++ src/sys/dev/usb/motgvar.h Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: motgvar.h,v 1.4.2.7 2015/10/20 15:31:21 skrll Exp $ */
+/* $NetBSD: motgvar.h,v 1.4.2.8 2015/10/22 11:15:42 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@ struct motg_xfer {
#define MOTG_BUS2SC(bus) ((bus)->ub_hcpriv)
#define MOTG_PIPE2SC(pipe) MOTG_BUS2SC((pipe)->up_dev->ud_bus)
-#define MOTG_XFER2SC(xfer) MOTG_PIPE2SC((xfer)->ux_pipe)
+#define MOTG_XFER2SC(xfer) MOTG_BUS2SC((xfer)->ux_bus)
#define MOTG_OTGPIPE2SC(mpipe) MOTG_BUS2SC((mpipe)->pipe.up_dev->ud_bus)
#define MOTG_XFER2MXFER(xfer) ((struct motg_xfer *)(xfer))
Index: src/sys/dev/usb/ohcivar.h
diff -u src/sys/dev/usb/ohcivar.h:1.55.6.7 src/sys/dev/usb/ohcivar.h:1.55.6.8
--- src/sys/dev/usb/ohcivar.h:1.55.6.7 Tue Oct 20 15:31:21 2015
+++ src/sys/dev/usb/ohcivar.h Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcivar.h,v 1.55.6.7 2015/10/20 15:31:21 skrll Exp $ */
+/* $NetBSD: ohcivar.h,v 1.55.6.8 2015/10/22 11:15:42 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@ struct ohci_xfer {
#define OHCI_BUS2SC(bus) ((bus)->ub_hcpriv)
#define OHCI_PIPE2SC(pipe) OHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define OHCI_XFER2SC(xfer) OHCI_PIPE2SC((xfer)->ux_pipe)
+#define OHCI_XFER2SC(xfer) OHCI_BUS2SC((xfer)->ux_bus)
#define OHCI_XFER2OXFER(xfer) ((struct ohci_xfer *)(xfer))
#define OHCI_PIPE2OPIPE(pipe) ((struct ohci_pipe *)(pipe))
Index: src/sys/dev/usb/uhcivar.h
diff -u src/sys/dev/usb/uhcivar.h:1.52.14.8 src/sys/dev/usb/uhcivar.h:1.52.14.9
--- src/sys/dev/usb/uhcivar.h:1.52.14.8 Tue Oct 20 15:31:21 2015
+++ src/sys/dev/usb/uhcivar.h Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.52.14.8 2015/10/20 15:31:21 skrll Exp $ */
+/* $NetBSD: uhcivar.h,v 1.52.14.9 2015/10/22 11:15:42 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@ struct uhci_xfer {
#define UHCI_BUS2SC(bus) ((bus)->ub_hcpriv)
#define UHCI_PIPE2SC(pipe) UHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define UHCI_XFER2SC(xfer) UHCI_PIPE2SC((xfer)->ux_pipe)
+#define UHCI_XFER2SC(xfer) UHCI_BUS2SC((xfer)->ux_bus)
#define UHCI_UPIPE2SC(d) UHCI_BUS2SC((d)->pipe.up_dev->ud_bus)
#define UHCI_XFER2UXFER(xfer) ((struct uhci_xfer *)(xfer))
Index: src/sys/dev/usb/xhcivar.h
diff -u src/sys/dev/usb/xhcivar.h:1.4.12.6 src/sys/dev/usb/xhcivar.h:1.4.12.7
--- src/sys/dev/usb/xhcivar.h:1.4.12.6 Tue Oct 20 15:31:21 2015
+++ src/sys/dev/usb/xhcivar.h Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xhcivar.h,v 1.4.12.6 2015/10/20 15:31:21 skrll Exp $ */
+/* $NetBSD: xhcivar.h,v 1.4.12.7 2015/10/22 11:15:42 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -41,7 +41,7 @@ struct xhci_xfer {
#define XHCI_BUS2SC(bus) ((bus)->ub_hcpriv)
#define XHCI_PIPE2SC(pipe) XHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define XHCI_XFER2SC(xfer) XHCI_PIPE2SC((xfer)->ux_pipe)
+#define XHCI_XFER2SC(xfer) XHCI_BUS2SC((xfer)->ux_bus)
#define XHCI_XPIPE2SC(d) XHCI_BUS2SC((d)->pipe.up_dev->ud_bus)
#define XHCI_XFER2XXFER(xfer) ((struct xhci_xfer *)(xfer))
Index: src/sys/external/bsd/dwc2/dwc2var.h
diff -u src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.6 src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.7
--- src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.6 Sun Oct 11 09:17:51 2015
+++ src/sys/external/bsd/dwc2/dwc2var.h Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2var.h,v 1.3.12.6 2015/10/11 09:17:51 skrll Exp $ */
+/* $NetBSD: dwc2var.h,v 1.3.12.7 2015/10/22 11:15:42 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@ struct dwc2_pipe {
#define DWC2_BUS2SC(bus) ((bus)->ub_hcpriv)
#define DWC2_PIPE2SC(pipe) DWC2_BUS2SC((pipe)->up_dev->ud_bus)
-#define DWC2_XFER2SC(xfer) DWC2_PIPE2SC((xfer)->ux_pipe)
+#define DWC2_XFER2SC(xfer) DWC2_BUS2SC((xfer)->ux_bus)
#define DWC2_DPIPE2SC(d) DWC2_BUS2SC((d)->pipe.up_dev->ud_bus)
#define DWC2_XFER2DXFER(x) (struct dwc2_xfer *)(x)
Index: src/sys/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.4.11 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.4.12
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.4.11 Tue Oct 20 15:31:21 2015
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Thu Oct 22 11:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.22.4.11 2015/10/20 15:31:21 skrll Exp $ */
+/* $NetBSD: ugenhc.c,v 1.22.4.12 2015/10/22 11:15:42 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.11 2015/10/20 15:31:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.12 2015/10/22 11:15:42 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -120,7 +120,7 @@ struct rusb_xfer {
#define UGENHC_BUS2SC(bus) ((bus)->ub_hcpriv)
#define UGENHC_PIPE2SC(pipe) UGENHC_BUS2SC((pipe)->up_dev->ud_bus)
-#define UGENHC_XFER2SC(pipe) UGENHC_PIPE2SC((xfer)->ux_pipe)
+#define UGENHC_XFER2SC(pipe) UGENHC_BUS2SC((xfer)->ux_bus)
#define UGENDEV_BASESTR "/dev/ugen"
#define UGENDEV_BUFSIZE 32
