Module Name: src
Committed By: dyoung
Date: Wed Nov 3 22:30:51 UTC 2010
Modified Files:
src/sys/dev/usb: if_kuereg.h if_rumvar.h if_udavreg.h if_uralvar.h
if_urlreg.h if_zydreg.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/if_kuereg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_rumvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_udavreg.h \
src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_uralvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_zydreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_kuereg.h
diff -u src/sys/dev/usb/if_kuereg.h:1.15 src/sys/dev/usb/if_kuereg.h:1.16
--- src/sys/dev/usb/if_kuereg.h:1.15 Mon Aug 16 11:21:43 2010
+++ src/sys/dev/usb/if_kuereg.h Wed Nov 3 22:30:50 2010
@@ -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 <wp...@ee.columbia.edu>. All rights reserved.
@@ -159,7 +159,7 @@
};
struct kue_softc {
- USBBASEDEVICE kue_dev;
+ device_t kue_dev;
struct ethercom kue_ec;
#if NRND > 0
Index: src/sys/dev/usb/if_rumvar.h
diff -u src/sys/dev/usb/if_rumvar.h:1.7 src/sys/dev/usb/if_rumvar.h:1.8
--- src/sys/dev/usb/if_rumvar.h:1.7 Tue Jan 19 22:07:44 2010
+++ src/sys/dev/usb/if_rumvar.h Wed Nov 3 22:30:50 2010
@@ -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_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 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;
Index: src/sys/dev/usb/if_udavreg.h
diff -u src/sys/dev/usb/if_udavreg.h:1.5 src/sys/dev/usb/if_udavreg.h:1.6
--- src/sys/dev/usb/if_udavreg.h:1.5 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_udavreg.h Wed Nov 3 22:30:50 2010
@@ -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_softc {
- USBBASEDEVICE sc_dev; /* base device */
+ device_t sc_dev; /* base device */
usbd_device_handle sc_udev;
/* USB */
@@ -178,7 +178,7 @@
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;
Index: src/sys/dev/usb/if_urlreg.h
diff -u src/sys/dev/usb/if_urlreg.h:1.5 src/sys/dev/usb/if_urlreg.h:1.6
--- src/sys/dev/usb/if_urlreg.h:1.5 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_urlreg.h Wed Nov 3 22:30:50 2010
@@ -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 <n...@nabechan.org>. All rights reserved.
@@ -152,7 +152,7 @@
};
struct url_softc {
- USBBASEDEVICE sc_dev; /* base device */
+ device_t sc_dev; /* base device */
usbd_device_handle sc_udev;
/* USB */
@@ -164,7 +164,7 @@
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;
Index: src/sys/dev/usb/if_uralvar.h
diff -u src/sys/dev/usb/if_uralvar.h:1.10 src/sys/dev/usb/if_uralvar.h:1.11
--- src/sys/dev/usb/if_uralvar.h:1.10 Tue Jan 19 22:07:44 2010
+++ src/sys/dev/usb/if_uralvar.h Wed Nov 3 22:30:50 2010
@@ -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_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 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;
Index: src/sys/dev/usb/if_zydreg.h
diff -u src/sys/dev/usb/if_zydreg.h:1.4 src/sys/dev/usb/if_zydreg.h:1.5
--- src/sys/dev/usb/if_zydreg.h:1.4 Tue Jan 19 22:07:44 2010
+++ src/sys/dev/usb/if_zydreg.h Wed Nov 3 22:30:50 2010
@@ -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.bergam...@free.fr>
@@ -1166,7 +1166,7 @@
};
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 @@
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;
