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 attach_arg structure member names. ...
details: https://anonhg.NetBSD.org/src/rev/27bbc7132e98
branches: nick-nhusb
changeset: 334165:27bbc7132e98
user: skrll <skrll%NetBSD.org@localhost>
date: Sat Mar 21 11:33:37 2015 +0000
description:
Add prefixes to attach_arg structure member names. No functional change.
diffstat:
sys/arch/evbmips/loongson/gdium_machdep.c | 2 +-
sys/dev/usb/aubtfwl.c | 14 +-
sys/dev/usb/auvitek.c | 16 +-
sys/dev/usb/auvitek_audio.c | 54 ++++++------
sys/dev/usb/emdtv.c | 12 +-
sys/dev/usb/if_athn_usb.c | 10 +-
sys/dev/usb/if_atu.c | 14 +-
sys/dev/usb/if_aue.c | 22 ++--
sys/dev/usb/if_axe.c | 14 +-
sys/dev/usb/if_axen.c | 14 +-
sys/dev/usb/if_cdce.c | 30 +++---
sys/dev/usb/if_cue.c | 12 +-
sys/dev/usb/if_kue.c | 12 +-
sys/dev/usb/if_otus.c | 12 +-
sys/dev/usb/if_rum.c | 8 +-
sys/dev/usb/if_run.c | 8 +-
sys/dev/usb/if_smsc.c | 6 +-
sys/dev/usb/if_udav.c | 10 +-
sys/dev/usb/if_upgt.c | 12 +-
sys/dev/usb/if_upl.c | 12 +-
sys/dev/usb/if_ural.c | 8 +-
sys/dev/usb/if_url.c | 10 +-
sys/dev/usb/if_urndis.c | 34 +++----
sys/dev/usb/if_urtw.c | 10 +-
sys/dev/usb/if_urtwn.c | 10 +-
sys/dev/usb/if_zyd.c | 12 +-
sys/dev/usb/irmce.c | 14 +-
sys/dev/usb/moscom.c | 10 +-
sys/dev/usb/pseye.c | 20 ++--
sys/dev/usb/slurm.c | 16 +-
sys/dev/usb/stuirda.c | 8 +-
sys/dev/usb/u3g.c | 64 +++++++-------
sys/dev/usb/uark.c | 6 +-
sys/dev/usb/uatp.c | 23 ++--
sys/dev/usb/uaudio.c | 30 +++---
sys/dev/usb/uberry.c | 10 +-
sys/dev/usb/ubsa.c | 12 +-
sys/dev/usb/ubt.c | 14 +-
sys/dev/usb/uchcom.c | 10 +-
sys/dev/usb/ucycom.c | 6 +-
sys/dev/usb/udl.c | 8 +-
sys/dev/usb/udsbr.c | 10 +-
sys/dev/usb/udsir.c | 16 +-
sys/dev/usb/uep.c | 16 +-
sys/dev/usb/uftdi.c | 14 +-
sys/dev/usb/ugen.c | 10 +-
sys/dev/usb/ugensa.c | 12 +-
sys/dev/usb/uhidev.c | 46 +++++-----
sys/dev/usb/uhidev.h | 4 +-
sys/dev/usb/uhmodem.c | 20 ++--
sys/dev/usb/uhso.c | 20 ++--
sys/dev/usb/uhub.c | 10 +-
sys/dev/usb/uipad.c | 8 +-
sys/dev/usb/uipaq.c | 12 +-
sys/dev/usb/uirda.c | 20 ++--
sys/dev/usb/ukbd.c | 8 +-
sys/dev/usb/ukyopon.c | 22 ++--
sys/dev/usb/ulpt.c | 22 ++--
sys/dev/usb/umass.c | 36 ++++----
sys/dev/usb/umcs.c | 12 +-
sys/dev/usb/umct.c | 10 +-
sys/dev/usb/umidi.c | 26 +++--
sys/dev/usb/umodem.c | 22 ++--
sys/dev/usb/umodem_common.c | 22 ++--
sys/dev/usb/ums.c | 14 +-
sys/dev/usb/uplcom.c | 8 +-
sys/dev/usb/urio.c | 8 +-
sys/dev/usb/usb_subr.c | 129 +++++++++++++++--------------
sys/dev/usb/usbdi.h | 42 +++++----
sys/dev/usb/uscanner.c | 14 +-
sys/dev/usb/uslsa.c | 17 +--
sys/dev/usb/usscanner.c | 16 +-
sys/dev/usb/ustir.c | 10 +-
sys/dev/usb/uthum.c | 6 +-
sys/dev/usb/utoppy.c | 10 +-
sys/dev/usb/uvideo.c | 20 ++--
sys/dev/usb/uvisor.c | 12 +-
sys/dev/usb/uvscom.c | 8 +-
sys/dev/usb/uyap.c | 10 +-
sys/dev/usb/uyurex.c | 6 +-
sys/dev/usb/xinput_rdesc.h | 10 +-
81 files changed, 686 insertions(+), 681 deletions(-)
diffs (truncated from 4351 to 300 lines):
diff -r f47de4fa9e47 -r 27bbc7132e98 sys/arch/evbmips/loongson/gdium_machdep.c
--- a/sys/arch/evbmips/loongson/gdium_machdep.c Sat Mar 21 10:14:45 2015 +0000
+++ b/sys/arch/evbmips/loongson/gdium_machdep.c Sat Mar 21 11:33:37 2015 +0000
@@ -284,7 +284,7 @@
case 5: /* umass at uhub port 3 */
if (device_is_a(dev, "umass")) {
struct usb_attach_arg *uaa = aux;
- if (uaa->port == 3)
+ if (uaa->uaa_port == 3)
goto advance;
}
break;
diff -r f47de4fa9e47 -r 27bbc7132e98 sys/dev/usb/aubtfwl.c
--- a/sys/dev/usb/aubtfwl.c Sat Mar 21 10:14:45 2015 +0000
+++ b/sys/dev/usb/aubtfwl.c Sat Mar 21 11:33:37 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aubtfwl.c,v 1.5.10.4 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: aubtfwl.c,v 1.5.10.5 2015/03/21 11:33:37 skrll Exp $ */
/*
* Copyright (c) 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5.10.4 2015/03/19 17:26:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5.10.5 2015/03/21 11:33:37 skrll Exp $");
#include <sys/param.h>
#include <dev/usb/usb.h>
@@ -67,11 +67,11 @@
{
const struct usb_attach_arg * const uaa = aux;
- if (usb_lookup(ar3k_devs, uaa->vendor, uaa->product))
+ if (usb_lookup(ar3k_devs, uaa->uaa_vendor, uaa->uaa_product))
return UMATCH_VENDOR_PRODUCT;
- if (usb_lookup(ar3k12_devs, uaa->vendor, uaa->product)) {
- return (UGETW(uaa->device->ud_ddesc.bcdDevice) > 1)?
+ if (usb_lookup(ar3k12_devs, uaa->uaa_vendor, uaa->uaa_product)) {
+ return (UGETW(uaa->uaa_device->ud_ddesc.bcdDevice) > 1)?
UMATCH_NONE : UMATCH_VENDOR_PRODUCT;
}
@@ -85,10 +85,10 @@
struct aubtfwl_softc * const sc = device_private(self);
aprint_naive("\n");
aprint_normal("\n");
- sc->sc_udev = uaa->device;
+ sc->sc_udev = uaa->uaa_device;
sc->sc_flags = 0;
- if (usb_lookup(ar3k12_devs, uaa->vendor, uaa->product))
+ if (usb_lookup(ar3k12_devs, uaa->uaa_vendor, uaa->uaa_product))
sc->sc_flags |= AUBT_IS_AR3012;
config_mountroot(self, aubtfwl_attach_hook);
diff -r f47de4fa9e47 -r 27bbc7132e98 sys/dev/usb/auvitek.c
--- a/sys/dev/usb/auvitek.c Sat Mar 21 10:14:45 2015 +0000
+++ b/sys/dev/usb/auvitek.c Sat Mar 21 11:33:37 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek.c,v 1.9.4.1 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: auvitek.c,v 1.9.4.2 2015/03/21 11:33:37 skrll Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.9.4.1 2015/03/19 17:26:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.9.4.2 2015/03/21 11:33:37 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -79,8 +79,8 @@
unsigned int i;
for (i = 0; i < __arraycount(auvitek_devices); i++) {
- if (auvitek_devices[i].vendor == uaa->vendor &&
- auvitek_devices[i].product == uaa->product)
+ if (auvitek_devices[i].vendor == uaa->uaa_vendor &&
+ auvitek_devices[i].product == uaa->uaa_product)
return UMATCH_VENDOR_PRODUCT;
}
@@ -92,7 +92,7 @@
{
struct auvitek_softc *sc = device_private(self);
struct usb_attach_arg *uaa = opaque;
- struct usbd_device *dev = uaa->device;
+ struct usbd_device *dev = uaa->uaa_device;
usb_endpoint_descriptor_t *ed;
usbd_status err;
unsigned int i;
@@ -103,11 +103,11 @@
sc->sc_dev = self;
sc->sc_udev = dev;
- sc->sc_uport = uaa->port;
+ sc->sc_uport = uaa->uaa_port;
for (i = 0; i < __arraycount(auvitek_devices); i++) {
- if (auvitek_devices[i].vendor == uaa->vendor &&
- auvitek_devices[i].product == uaa->product)
+ if (auvitek_devices[i].vendor == uaa->uaa_vendor &&
+ auvitek_devices[i].product == uaa->uaa_product)
break;
}
KASSERT(i != __arraycount(auvitek_devices));
diff -r f47de4fa9e47 -r 27bbc7132e98 sys/dev/usb/auvitek_audio.c
--- a/sys/dev/usb/auvitek_audio.c Sat Mar 21 10:14:45 2015 +0000
+++ b/sys/dev/usb/auvitek_audio.c Sat Mar 21 11:33:37 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_audio.c,v 1.1.40.2 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: auvitek_audio.c,v 1.1.40.3 2015/03/21 11:33:37 skrll Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_audio.c,v 1.1.40.2 2015/03/19 17:26:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_audio.c,v 1.1.40.3 2015/03/21 11:33:37 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,33 +72,33 @@
ifaces[i] = &udev->ud_ifaces[i];
}
- uiaa.device = udev;
- uiaa.port = sc->sc_uport;
- uiaa.vendor = UGETW(dd->idVendor);
- uiaa.product = UGETW(dd->idProduct);
- uiaa.release = UGETW(dd->bcdDevice);
- uiaa.configno = udev->ud_cdesc->bConfigurationValue;
- uiaa.ifaces = ifaces;
- uiaa.nifaces = nifaces;
- ilocs[USBIFIFCF_PORT] = uiaa.port;
- ilocs[USBIFIFCF_VENDOR] = uiaa.vendor;
- ilocs[USBIFIFCF_PRODUCT] = uiaa.product;
- ilocs[USBIFIFCF_RELEASE] = uiaa.release;
- ilocs[USBIFIFCF_CONFIGURATION] = uiaa.configno;
+ uiaa.uiaa_device = udev;
+ uiaa.uiaa_port = sc->sc_uport;
+ uiaa.uiaa_vendor = UGETW(dd->idVendor);
+ uiaa.uiaa_product = UGETW(dd->idProduct);
+ uiaa.uiaa_release = UGETW(dd->bcdDevice);
+ uiaa.uiaa_configno = udev->ud_cdesc->bConfigurationValue;
+ uiaa.uiaa_ifaces = ifaces;
+ uiaa.uiaa_nifaces = nifaces;
+ ilocs[USBIFIFCF_PORT] = uiaa.uiaa_port;
+ ilocs[USBIFIFCF_VENDOR] = uiaa.uiaa_vendor;
+ ilocs[USBIFIFCF_PRODUCT] = uiaa.uiaa_product;
+ ilocs[USBIFIFCF_RELEASE] = uiaa.uiaa_release;
+ ilocs[USBIFIFCF_CONFIGURATION] = uiaa.uiaa_configno;
for (i = 0; i < nifaces; i++) {
if (!ifaces[i])
continue;
- uiaa.class = ifaces[i]->ui_idesc->bInterfaceClass;
- uiaa.subclass = ifaces[i]->ui_idesc->bInterfaceSubClass;
- if (uiaa.class != UICLASS_AUDIO)
+ uiaa.uiaa_class = ifaces[i]->ui_idesc->bInterfaceClass;
+ uiaa.uiaa_subclass = ifaces[i]->ui_idesc->bInterfaceSubClass;
+ if (uiaa.uiaa_class != UICLASS_AUDIO)
continue;
- if (uiaa.subclass != UISUBCLASS_AUDIOCONTROL)
+ if (uiaa.uiaa_subclass != UISUBCLASS_AUDIOCONTROL)
continue;
- uiaa.iface = ifaces[i];
- uiaa.proto = ifaces[i]->ui_idesc->bInterfaceProtocol;
- uiaa.ifaceno = ifaces[i]->ui_idesc->bInterfaceNumber;
- ilocs[USBIFIFCF_INTERFACE] = uiaa.ifaceno;
+ uiaa.uiaa_iface = ifaces[i];
+ uiaa.uiaa_proto = ifaces[i]->ui_idesc->bInterfaceProtocol;
+ uiaa.uiaa_ifaceno = ifaces[i]->ui_idesc->bInterfaceNumber;
+ ilocs[USBIFIFCF_INTERFACE] = uiaa.uiaa_ifaceno;
sc->sc_audiodev = config_found_sm_loc(sc->sc_dev, "usbifif",
ilocs, &uiaa, auvitek_ifprint, config_stdsubmatch);
if (sc->sc_audiodev)
@@ -131,14 +131,14 @@
static int
auvitek_ifprint(void *opaque, const char *pnp)
{
- struct usbif_attach_arg *uaa = opaque;
+ struct usbif_attach_arg *uiaa = opaque;
if (pnp)
return QUIET;
- aprint_normal(" port %d", uaa->port);
- aprint_normal(" configuration %d", uaa->configno);
- aprint_normal(" interface %d", uaa->ifaceno);
+ aprint_normal(" port %d", uiaa->uiaa_port);
+ aprint_normal(" configuration %d", uiaa->uiaa_configno);
+ aprint_normal(" interface %d", uiaa->uiaa_ifaceno);
return UNCONF;
}
diff -r f47de4fa9e47 -r 27bbc7132e98 sys/dev/usb/emdtv.c
--- a/sys/dev/usb/emdtv.c Sat Mar 21 10:14:45 2015 +0000
+++ b/sys/dev/usb/emdtv.c Sat Mar 21 11:33:37 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.9.14.1 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: emdtv.c,v 1.9.14.2 2015/03/21 11:33:37 skrll Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.9.14.1 2015/03/19 17:26:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.9.14.2 2015/03/21 11:33:37 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@
{
struct usb_attach_arg *uaa = opaque;
- return usb_lookup(emdtv_devices, uaa->vendor, uaa->product) != NULL ?
+ return usb_lookup(emdtv_devices, uaa->uaa_vendor, uaa->uaa_product) != NULL ?
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
@@ -81,7 +81,7 @@
{
struct emdtv_softc *sc = device_private(self);
struct usb_attach_arg *uaa = opaque;
- struct usbd_device * dev = uaa->device;
+ struct usbd_device * dev = uaa->uaa_device;
usbd_status status;
char *devinfo;
@@ -93,8 +93,8 @@
sc->sc_dev = self;
sc->sc_udev = dev;
- sc->sc_vendor = uaa->vendor;
- sc->sc_product = uaa->product;
+ sc->sc_vendor = uaa->uaa_vendor;
+ sc->sc_product = uaa->uaa_product;
emdtv_i2c_attach(sc);
diff -r f47de4fa9e47 -r 27bbc7132e98 sys/dev/usb/if_athn_usb.c
--- a/sys/dev/usb/if_athn_usb.c Sat Mar 21 10:14:45 2015 +0000
+++ b/sys/dev/usb/if_athn_usb.c Sat Mar 21 11:33:37 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.6.8.3 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.6.8.4 2015/03/21 11:33:37 skrll Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.6.8.3 2015/03/19 17:26:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.6.8.4 2015/03/21 11:33:37 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -231,7 +231,7 @@
{
struct usb_attach_arg *uaa = aux;
- return athn_usb_lookup(uaa->vendor, uaa->product) != NULL ?
+ return athn_usb_lookup(uaa->uaa_vendor, uaa->uaa_product) != NULL ?
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
@@ -247,7 +247,7 @@
sc = &usc->usc_sc;
uaa = aux;
sc->sc_dev = self;
- usc->usc_udev = uaa->device;
+ usc->usc_udev = uaa->uaa_device;
aprint_naive("\n");
aprint_normal("\n");
@@ -255,7 +255,7 @@
DPRINTFN(DBG_FN, sc, "\n");
usc->usc_athn_attached = 0;
- usc->usc_flags = athn_usb_lookup(uaa->vendor, uaa->product)->flags;
+ usc->usc_flags = athn_usb_lookup(uaa->uaa_vendor, uaa->uaa_product)->flags;
sc->sc_flags |= ATHN_FLAG_USB;
#ifdef notyet
/* Check if it is a combo WiFi+Bluetooth (WB193) device. */
diff -r f47de4fa9e47 -r 27bbc7132e98 sys/dev/usb/if_atu.c
--- a/sys/dev/usb/if_atu.c Sat Mar 21 10:14:45 2015 +0000
+++ b/sys/dev/usb/if_atu.c Sat Mar 21 11:33:37 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.50.2.7 2015/03/19 17:26:42 skrll Exp $ */
Home |
Main Index |
Thread Index |
Old Index