Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop using the compatibility macros USB_ATTACH(), USB_DETACH(), 

USB_MATCH(), et cetera.  These files produce the same assembly
(according to objdump -d) before and after the change, except for
if_cue.c where two adjacent instructions inexplicably change order.

Straggler from last: commit corresponding header files.
This commit is contained in:
dyoung 2010-11-03 22:30:50 +00:00
parent 68c8418c63
commit e74917f4cf
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/usb/if_kuereg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_kuereg.h,v 1.15 2010/08/16 11:21:43 tsutsui Exp $ */
/* $NetBSD: if_kuereg.h,v 1.16 2010/11/03 22:30:50 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@ -159,7 +159,7 @@ struct kue_cdata {
};
struct kue_softc {
USBBASEDEVICE kue_dev;
device_t kue_dev;
struct ethercom kue_ec;
#if NRND > 0

8
sys/dev/usb/if_rumvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_rumvar.h,v 1.7 2010/01/19 22:07:44 pooka Exp $ */
/* $NetBSD: if_rumvar.h,v 1.8 2010/11/03 22:30:50 dyoung Exp $ */
/* $OpenBSD: if_rumvar.h,v 1.7 2006/11/13 20:06:38 damien Exp $ */
/*-
@ -71,7 +71,7 @@ struct rum_rx_data {
};
struct rum_softc {
USBBASEDEVICE sc_dev;
device_t sc_dev;
struct ethercom sc_ec;
#define sc_if sc_ec.ec_if
struct ieee80211com sc_ic;
@ -109,8 +109,8 @@ struct rum_softc {
struct ieee80211_beacon_offsets sc_bo;
usb_callout_t sc_scan_ch;
usb_callout_t sc_amrr_ch;
struct callout sc_scan_ch;
struct callout sc_amrr_ch;
int sc_tx_timer;

6
sys/dev/usb/if_udavreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_udavreg.h,v 1.5 2009/09/04 18:10:08 dyoung Exp $ */
/* $NetBSD: if_udavreg.h,v 1.6 2010/11/03 22:30:50 dyoung Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
@ -166,7 +166,7 @@ struct udav_cdata {
};
struct udav_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev;
/* USB */
@ -178,7 +178,7 @@ struct udav_softc {
usbd_pipe_handle sc_pipe_rx;
usbd_pipe_handle sc_pipe_tx;
usbd_pipe_handle sc_pipe_intr;
usb_callout_t sc_stat_ch;
struct callout sc_stat_ch;
u_int sc_rx_errs;
/* u_int sc_intr_errs; */
struct timeval sc_rx_notice;

8
sys/dev/usb/if_uralvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_uralvar.h,v 1.10 2010/01/19 22:07:44 pooka Exp $ */
/* $NetBSD: if_uralvar.h,v 1.11 2010/11/03 22:30:50 dyoung Exp $ */
/* $OpenBSD: if_ralvar.h,v 1.2 2005/05/13 18:42:50 damien Exp $ */
/*-
@ -71,7 +71,7 @@ struct ural_rx_data {
};
struct ural_softc {
USBBASEDEVICE sc_dev;
device_t sc_dev;
struct ethercom sc_ec;
#define sc_if sc_ec.ec_if
struct ieee80211com sc_ic;
@ -104,8 +104,8 @@ struct ural_softc {
struct ieee80211_beacon_offsets sc_bo;
usb_callout_t sc_scan_ch;
usb_callout_t sc_amrr_ch;
struct callout sc_scan_ch;
struct callout sc_amrr_ch;
int sc_tx_timer;

6
sys/dev/usb/if_urlreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_urlreg.h,v 1.5 2009/09/04 18:10:08 dyoung Exp $ */
/* $NetBSD: if_urlreg.h,v 1.6 2010/11/03 22:30:50 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
@ -152,7 +152,7 @@ struct url_cdata {
};
struct url_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev;
/* USB */
@ -164,7 +164,7 @@ struct url_softc {
usbd_pipe_handle sc_pipe_rx;
usbd_pipe_handle sc_pipe_tx;
usbd_pipe_handle sc_pipe_intr;
usb_callout_t sc_stat_ch;
struct callout sc_stat_ch;
u_int sc_rx_errs;
/* u_int sc_intr_errs; */
struct timeval sc_rx_notice;

8
sys/dev/usb/if_zydreg.h
View File

@ -1,5 +1,5 @@
/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
/* $NetBSD: if_zydreg.h,v 1.4 2010/01/19 22:07:44 pooka Exp $ */
/* $NetBSD: if_zydreg.h,v 1.5 2010/11/03 22:30:50 dyoung Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@ -1166,7 +1166,7 @@ struct rq {
};
struct zyd_softc {
USBBASEDEVICE sc_dev;
device_t sc_dev;
struct ethercom sc_ec;
#define sc_if sc_ec.ec_if
struct ieee80211com sc_ic;
@ -1185,8 +1185,8 @@ struct zyd_softc {
int sc_arg;
int attached;
usb_callout_t sc_scan_ch;
usb_callout_t sc_amrr_ch;
struct callout sc_scan_ch;
struct callout sc_amrr_ch;
struct ieee80211_amrr amrr;