PERFORCE change 128944 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sun Nov 11 12:26:25 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=128944
Change 128944 by hselasky at hselasky_laptop001 on 2007/11/11 20:26:09
Substitute "__callout" by "usb_callout" hence
double underscore function names are reserved
for the system domain.
Suggested by Alfred Perlstein.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#47 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.h#20 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#14 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#17 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#13 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#13 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rumvar.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#20 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#8 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.h#16 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_port.h#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#50 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#40 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ehci.c#47 (text+ko) ====
@@ -149,7 +149,7 @@
LIST_INIT(&sc->sc_interrupt_list_head);
- __callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.mtx,
+ usb_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.mtx,
CALLOUT_RETURNUNLOCKED);
#ifdef USB_DEBUG
@@ -388,7 +388,7 @@
{
mtx_lock(&sc->sc_bus.mtx);
- __callout_stop(&sc->sc_tmo_pcd);
+ usb_callout_stop(&sc->sc_tmo_pcd);
EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
EOWRITE4(sc, EHCI_USBCMD, 0);
@@ -398,7 +398,7 @@
DELAY(1000 * 300); /* XXX let stray task complete */
- __callout_drain(&(sc->sc_tmo_pcd));
+ usb_callout_drain(&(sc->sc_tmo_pcd));
return;
}
@@ -1411,7 +1411,7 @@
mtx_lock(&(sc->sc_bus.mtx));
}
/* do not allow RHSC interrupts > 1 per second */
- __callout_reset(&sc->sc_tmo_pcd, hz,
+ usb_callout_reset(&sc->sc_tmo_pcd, hz,
(void *)(void *)ehci_pcd_enable, sc);
}
status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA);
@@ -2156,7 +2156,7 @@
xfer->td_transfer_last = NULL;
}
/* stop timeout */
- __callout_stop(&xfer->timeout_handle);
+ usb_callout_stop(&xfer->timeout_handle);
/* remove interrupt info (if any) */
ehci_remove_interrupt_info(xfer);
@@ -2260,7 +2260,7 @@
ehci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!xfer->flags.use_polling)) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ehci_timeout, xfer);
}
return;
@@ -2310,7 +2310,7 @@
ehci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!xfer->flags.use_polling)) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ehci_timeout, xfer);
}
return;
@@ -2416,7 +2416,7 @@
ehci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!xfer->flags.use_polling)) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ehci_timeout, xfer);
}
return;
@@ -2686,7 +2686,7 @@
{
/* start timeout, if any (should not be done by the enter routine) */
if (xfer->timeout && (!xfer->flags.use_polling)) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ehci_timeout, xfer);
}
return;
@@ -2967,7 +2967,7 @@
{
/* start timeout, if any (should not be done by the enter routine) */
if (xfer->timeout && (!xfer->flags.use_polling)) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ehci_timeout, xfer);
}
return;
==== //depot/projects/usb/src/sys/dev/usb/ehci.h#20 (text+ko) ====
@@ -437,7 +437,7 @@
struct usbd_page sc_hw_page;
struct usbd_bus sc_bus; /* base device */
struct usbd_config_td sc_config_td;
- struct __callout sc_tmo_pcd;
+ struct usb_callout sc_tmo_pcd;
LIST_HEAD(, usbd_xfer) sc_interrupt_list_head;
union ehci_hub_desc sc_hub_desc;
struct usbd_std_root_transfer sc_root_ctrl;
==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#34 (text+ko) ====
@@ -799,7 +799,7 @@
mtx_init(&(sc->sc_mtx), "aue lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, AUE_CONFIG_NO, 0);
@@ -946,7 +946,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&(sc->sc_watchdog));
+ usb_callout_stop(&(sc->sc_watchdog));
aue_cfg_pre_stop(sc, NULL, 0);
@@ -966,7 +966,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
@@ -1544,7 +1544,7 @@
usbd_config_td_queue_command
(&(sc->sc_config_td), NULL, &aue_cfg_tick, 0, 0);
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &aue_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_auereg.h#14 (text+ko) ====
@@ -201,7 +201,7 @@
void *sc_evilhack; /* XXX this pointer must be first */
struct usbd_config_td sc_config_td;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
struct aue_rxpkt sc_rxpkt;
==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#35 (text+ko) ====
@@ -653,7 +653,7 @@
mtx_init(&(sc->sc_mtx), "axe lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, AXE_CONFIG_NO, 1);
@@ -916,7 +916,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&sc->sc_watchdog);
+ usb_callout_stop(&sc->sc_watchdog);
axe_cfg_pre_stop(sc, NULL, 0);
@@ -936,7 +936,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
@@ -1502,7 +1502,7 @@
usbd_config_td_queue_command
(&(sc->sc_config_td), NULL, &axe_cfg_tick, 0, 0);
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &axe_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#17 (text+ko) ====
@@ -166,7 +166,7 @@
void *sc_evilhack; /* XXX this pointer must be first */
struct usbd_config_td sc_config_td;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
struct ifnet *sc_ifp;
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#30 (text+ko) ====
@@ -484,7 +484,7 @@
mtx_init(&(sc->sc_mtx), "cue lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, CUE_CONFIG_NO, 0);
@@ -591,7 +591,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&(sc->sc_watchdog));
+ usb_callout_stop(&(sc->sc_watchdog));
cue_cfg_pre_stop(sc, NULL, 0);
@@ -611,7 +611,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
@@ -973,7 +973,7 @@
usbd_config_td_queue_command
(&(sc->sc_config_td), NULL, &cue_cfg_tick, 0, 0);
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &cue_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#13 (text+ko) ====
@@ -124,7 +124,7 @@
void *sc_evilhack; /* XXX this pointer must be first */
struct usbd_config_td sc_config_td;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
struct ifnet *sc_ifp;
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#32 (text+ko) ====
@@ -513,7 +513,7 @@
mtx_init(&(sc->sc_mtx), "kue lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, KUE_CONFIG_NO, 0);
@@ -625,7 +625,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&(sc->sc_watchdog));
+ usb_callout_stop(&(sc->sc_watchdog));
kue_cfg_pre_stop(sc, NULL, 0);
@@ -645,7 +645,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
@@ -996,7 +996,7 @@
usbd_config_td_queue_command
(&(sc->sc_config_td), NULL, &kue_cfg_tick, 0, 0);
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &kue_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#12 (text+ko) ====
@@ -129,7 +129,7 @@
void *sc_evilhack; /* XXX this pointer must be first */
struct usbd_config_td sc_config_td;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
struct kue_ether_desc sc_desc;
==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#30 (text+ko) ====
@@ -709,7 +709,7 @@
mtx_init(&(sc->sc_mtx), "rue lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, RUE_CONFIG_NO, 0);
@@ -842,7 +842,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&sc->sc_watchdog);
+ usb_callout_stop(&sc->sc_watchdog);
rue_cfg_pre_stop(sc, NULL, 0);
@@ -862,7 +862,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
@@ -1379,7 +1379,7 @@
usbd_config_td_queue_command
(&(sc->sc_config_td), NULL, &rue_cfg_tick, 0, 0);
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &rue_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#13 (text+ko) ====
@@ -169,7 +169,7 @@
void *sc_evilhack; /* XXX this pointer must be first */
struct usbd_config_td sc_config_td;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
struct ifnet *sc_ifp;
==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#14 (text+ko) ====
@@ -465,7 +465,7 @@
sc->sc_udev = uaa->device;
sc->sc_unit = device_get_unit(dev);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, RT2573_CONFIG_NO, 0);
@@ -520,7 +520,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&sc->sc_watchdog);
+ usb_callout_stop(&sc->sc_watchdog);
rum_cfg_pre_stop(sc, NULL, 0);
@@ -542,7 +542,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&sc->sc_mtx);
@@ -1576,7 +1576,7 @@
(&(sc->sc_config_td), NULL,
&rum_cfg_amrr_timeout, 0, 0);
}
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &rum_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_rumvar.h#5 (text+ko) ====
@@ -107,7 +107,7 @@
struct ieee80211_amrr_node sc_amn;
struct ieee80211_beacon_offsets sc_bo;
struct mtx sc_mtx;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct rum_bbp_prom sc_bbp_prom[16];
union rum_rxtap sc_rxtap;
union rum_txtap sc_txtap;
==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#31 (text+ko) ====
@@ -324,7 +324,7 @@
mtx_init(&(sc->sc_mtx), "udav lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, UDAV_CONFIG_NO, 1);
@@ -457,7 +457,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&sc->sc_watchdog);
+ usb_callout_stop(&sc->sc_watchdog);
udav_cfg_pre_stop(sc, NULL, 0);
@@ -477,7 +477,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
@@ -1170,7 +1170,7 @@
usbd_config_td_queue_command
(&(sc->sc_config_td), NULL, &udav_cfg_tick, 0, 0);
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &udav_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#11 (text+ko) ====
@@ -140,7 +140,7 @@
void *sc_evilhack; /* XXX this pointer must be first */
struct usbd_config_td sc_config_td;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
struct ifnet *sc_ifp;
==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#38 (text+ko) ====
@@ -524,7 +524,7 @@
sc->sc_udev = uaa->device;
sc->sc_unit = device_get_unit(dev);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, RAL_CONFIG_NO, 0);
@@ -579,7 +579,7 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&sc->sc_watchdog);
+ usb_callout_stop(&sc->sc_watchdog);
ural_cfg_pre_stop(sc, NULL, 0);
@@ -601,7 +601,7 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&sc->sc_mtx);
@@ -1680,7 +1680,7 @@
(&(sc->sc_config_td), NULL,
&ural_cfg_amrr_timeout, 0, 0);
}
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &ural_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#20 (text+ko) ====
@@ -106,7 +106,7 @@
struct ieee80211_amrr_node sc_amn;
struct ieee80211_beacon_offsets sc_bo;
struct mtx sc_mtx;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct ural_bbp_prom sc_bbp_prom[16];
union ural_rxtap sc_rxtap;
union ural_txtap sc_txtap;
==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#20 (text+ko) ====
@@ -1265,10 +1265,10 @@
mtx_init(&sc->sc_mtx, "zyd lock", MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
- __callout_init_mtx(&(sc->sc_scan_callout),
+ usb_callout_init_mtx(&(sc->sc_scan_callout),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
error = usbd_set_config_no(uaa->device, ZYD_CONFIG_NO, 1);
@@ -2126,8 +2126,8 @@
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&(sc->sc_watchdog));
- __callout_stop(&(sc->sc_scan_callout));
+ usb_callout_stop(&(sc->sc_watchdog));
+ usb_callout_stop(&(sc->sc_scan_callout));
zyd_cfg_pre_stop(sc, NULL, 0);
@@ -2149,8 +2149,8 @@
}
usbd_config_td_unsetup(&(sc->sc_config_td));
- __callout_drain(&(sc->sc_watchdog));
- __callout_drain(&(sc->sc_scan_callout));
+ usb_callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_scan_callout));
mtx_destroy(&sc->sc_mtx);
@@ -2195,7 +2195,7 @@
/* stop timers */
- __callout_stop(&(sc->sc_scan_callout));
+ usb_callout_stop(&(sc->sc_scan_callout));
if (nstate != IEEE80211_S_INIT) {
usbd_config_td_queue_command
@@ -2207,7 +2207,7 @@
break;
case IEEE80211_S_SCAN:
- __callout_reset(&(sc->sc_scan_callout), hz / 5,
+ usb_callout_reset(&(sc->sc_scan_callout), hz / 5,
&zyd_next_scan, sc);
break;
@@ -3156,7 +3156,7 @@
ieee80211_watchdog(ic);
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz, &zyd_watchdog, sc);
mtx_unlock(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#8 (text+ko) ====
@@ -1304,8 +1304,8 @@
struct ieee80211com sc_ic;
struct zyd_rf sc_rf;
- struct __callout sc_scan_callout;
- struct __callout sc_watchdog;
+ struct usb_callout sc_scan_callout;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
struct usbd_config_td sc_config_td;
struct ieee80211_beacon_offsets sc_bo;
==== //depot/projects/usb/src/sys/dev/usb/ohci.c#37 (text+ko) ====
@@ -353,7 +353,7 @@
/* set up the bus struct */
sc->sc_bus.methods = &ohci_bus_methods;
- __callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.mtx,
+ usb_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.mtx,
CALLOUT_RETURNUNLOCKED);
#ifdef USB_DEBUG
@@ -390,7 +390,7 @@
{
mtx_lock(&sc->sc_bus.mtx);
- __callout_stop(&sc->sc_tmo_rhsc);
+ usb_callout_stop(&sc->sc_tmo_rhsc);
OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS);
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
@@ -399,7 +399,7 @@
DELAY(1000 * 50); /* XXX let stray task complete */
- __callout_drain(&(sc->sc_tmo_rhsc));
+ usb_callout_drain(&(sc->sc_tmo_rhsc));
return;
}
@@ -1204,7 +1204,7 @@
mtx_lock(&(sc->sc_bus.mtx));
}
/* do not allow RHSC interrupts > 1 per second */
- __callout_reset(&sc->sc_tmo_rhsc, hz,
+ usb_callout_reset(&sc->sc_tmo_rhsc, hz,
(void *)(void *)ohci_rhsc_enable, sc);
}
status &= ~(OHCI_RHSC | OHCI_WDH | OHCI_SO);
@@ -1737,7 +1737,7 @@
xfer->td_transfer_last = NULL;
/* stop timeout */
- __callout_stop(&xfer->timeout_handle);
+ usb_callout_stop(&xfer->timeout_handle);
/* remove interrupt info */
ohci_remove_interrupt_info(xfer);
@@ -1794,7 +1794,7 @@
ohci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ohci_timeout, xfer);
}
return;
@@ -1844,7 +1844,7 @@
ohci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ohci_timeout, xfer);
}
return;
@@ -1926,7 +1926,7 @@
ohci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ohci_timeout, xfer);
}
return;
@@ -2141,7 +2141,7 @@
{
/* start timeout, if any (should not be done by the enter routine) */
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)ohci_timeout, xfer);
}
return;
==== //depot/projects/usb/src/sys/dev/usb/ohci.h#16 (text+ko) ====
@@ -311,7 +311,7 @@
struct usbd_page sc_hw_page;
struct usbd_bus sc_bus; /* base device */
struct usbd_config_td sc_config_td;
- struct __callout sc_tmo_rhsc;
+ struct usb_callout sc_tmo_rhsc;
LIST_HEAD(, usbd_xfer) sc_interrupt_list_head;
union ohci_hub_desc sc_hub_desc;
struct usbd_std_root_transfer sc_root_ctrl;
==== //depot/projects/usb/src/sys/dev/usb/uhci.c#39 (text+ko) ====
@@ -1968,7 +1968,7 @@
xfer->td_transfer_last = NULL;
}
/* stop timeout */
- __callout_stop(&xfer->timeout_handle);
+ usb_callout_stop(&xfer->timeout_handle);
/* remove interrupt info */
uhci_remove_interrupt_info(xfer);
@@ -2034,7 +2034,7 @@
uhci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)uhci_timeout, xfer);
}
return;
@@ -2099,7 +2099,7 @@
uhci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)uhci_timeout, xfer);
}
return;
@@ -2189,7 +2189,7 @@
uhci_add_interrupt_info(sc, xfer);
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)uhci_timeout, xfer);
}
return;
@@ -2393,7 +2393,7 @@
{
/* start timeout, if any (should not be done by the enter routine) */
if (xfer->timeout && (!(xfer->flags.use_polling))) {
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
(void *)(void *)uhci_timeout, xfer);
}
return;
@@ -3005,7 +3005,7 @@
sc->sc_root_intr.xfer = xfer;
- __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->interval),
+ usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->interval),
(void *)(void *)uhci_root_intr_check, xfer);
return;
}
==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#27 (text+ko) ====
@@ -117,7 +117,7 @@
keymap_t sc_keymap;
accentmap_t sc_accmap;
fkeytab_t sc_fkeymap[UKBD_NFKEY];
- struct __callout sc_callout;
+ struct usb_callout sc_callout;
struct ukbd_data sc_ndata;
struct ukbd_data sc_odata;
@@ -428,7 +428,7 @@
}
ukbd_interrupt(sc);
- __callout_reset(&(sc->sc_callout), hz / 40, &ukbd_timeout, sc);
+ usb_callout_reset(&(sc->sc_callout), hz / 40, &ukbd_timeout, sc);
mtx_unlock(&Giant);
@@ -628,7 +628,7 @@
sc->sc_mode = K_XLATE;
sc->sc_iface = uaa->iface;
- __callout_init_mtx(&(sc->sc_callout), &Giant,
+ usb_callout_init_mtx(&(sc->sc_callout), &Giant,
CALLOUT_RETURNUNLOCKED);
err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer,
@@ -715,7 +715,7 @@
}
sc->sc_flags |= UKBD_FLAG_GONE;
- __callout_stop(&(sc->sc_callout));
+ usb_callout_stop(&(sc->sc_callout));
ukbd_disable(&(sc->sc_kbd));
@@ -741,7 +741,7 @@
usbd_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER);
- __callout_drain(&(sc->sc_callout));
+ usb_callout_drain(&(sc->sc_callout));
DPRINTF(0, "%s: disconnected\n",
device_get_nameunit(dev));
==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#27 (text+ko) ====
@@ -87,7 +87,7 @@
struct ulpt_softc {
struct usb_cdev sc_cdev;
- struct __callout sc_watchdog;
+ struct usb_callout sc_watchdog;
struct mtx sc_mtx;
device_t sc_dev;
@@ -141,7 +141,7 @@
usbd_transfer_start(sc->sc_xfer[1]);
}
- __callout_reset(&(sc->sc_watchdog),
+ usb_callout_reset(&(sc->sc_watchdog),
hz / ULPT_WATCHDOG_INTERVAL,
&ulpt_watchdog, sc);
@@ -541,7 +541,7 @@
mtx_init(&(sc->sc_mtx), "ulpt lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_watchdog),
+ usb_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
/* search through all the descriptors looking for bidir mode */
@@ -682,12 +682,12 @@
usb_cdev_detach(&(sc->sc_cdev));
mtx_lock(&(sc->sc_mtx));
- __callout_stop(&(sc->sc_watchdog));
+ usb_callout_stop(&(sc->sc_watchdog));
mtx_unlock(&(sc->sc_mtx));
usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER);
- __callout_drain(&(sc->sc_watchdog));
+ usb_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
==== //depot/projects/usb/src/sys/dev/usb/ums.c#28 (text+ko) ====
@@ -87,7 +87,7 @@
struct ums_softc {
struct usb_cdev sc_cdev;
struct mtx sc_mtx;
- struct __callout sc_callout;
+ struct usb_callout sc_callout;
struct hid_location sc_loc_x;
struct hid_location sc_loc_y;
struct hid_location sc_loc_z;
@@ -286,11 +286,11 @@
(dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) &&
(buttons == 0)) {
- __callout_reset(&(sc->sc_callout), hz / 20,
+ usb_callout_reset(&(sc->sc_callout), hz / 20,
&ums_put_queue_timeout, sc);
} else {
- __callout_stop(&(sc->sc_callout));
+ usb_callout_stop(&(sc->sc_callout));
ums_put_queue(sc, dx, dy, dz, dt, buttons);
}
@@ -396,7 +396,7 @@
mtx_init(&(sc->sc_mtx), "ums lock", NULL, MTX_DEF | MTX_RECURSE);
- __callout_init_mtx(&(sc->sc_callout),
+ usb_callout_init_mtx(&(sc->sc_callout),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer,
@@ -589,7 +589,7 @@
usbd_transfer_unsetup(sc->sc_xfer, UMS_N_TRANSFER);
- __callout_drain(&(sc->sc_callout));
+ usb_callout_drain(&(sc->sc_callout));
mtx_destroy(&(sc->sc_mtx));
@@ -612,7 +612,7 @@
usbd_transfer_stop(sc->sc_xfer[1]);
usbd_transfer_stop(sc->sc_xfer[0]);
- __callout_stop(&(sc->sc_callout));
+ usb_callout_stop(&(sc->sc_callout));
return;
}
==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#20 (text+ko) ====
@@ -77,13 +77,13 @@
#define __KASSERT KASSERT
#define uio_procp uio_td
#endif
-#ifndef __callout_init_mtx
-#define __callout_init_mtx(c,m,f) callout_init_mtx(&(c)->co,m,f)
-#define __callout_reset(c,t,f,d) callout_reset(&(c)->co,t,f,d)
-#define __callout_stop(c) callout_stop(&(c)->co)
-#define __callout_drain(c) callout_drain(&(c)->co)
-#define __callout_pending(c) callout_pending(&(c)->co)
-struct __callout {
+#ifndef usb_callout_init_mtx
+#define usb_callout_init_mtx(c,m,f) callout_init_mtx(&(c)->co,m,f)
+#define usb_callout_reset(c,t,f,d) callout_reset(&(c)->co,t,f,d)
+#define usb_callout_stop(c) callout_stop(&(c)->co)
+#define usb_callout_drain(c) callout_drain(&(c)->co)
+#define usb_callout_pending(c) callout_pending(&(c)->co)
+struct usb_callout {
struct callout co;
};
==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#50 (text+ko) ====
@@ -89,7 +89,7 @@
struct usbd_std_root_transfer;
struct usbd_setup_params;
struct usbd_ifqueue;
-struct __callout;
+struct usb_callout;
struct module;
struct malloc_type;
struct proc;
@@ -381,7 +381,7 @@
};
struct usbd_xfer {
- struct __callout timeout_handle;
+ struct usb_callout timeout_handle;
struct usbd_page_cache buf_data;/* buffer page cache */
struct usbd_page_cache buf_fixup; /* fixup buffer */
LIST_ENTRY(usbd_xfer) interrupt_list; /* used by HC driver */
==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#40 (text+ko) ====
@@ -735,7 +735,7 @@
info->memory_refcount++;
info->setup_refcount++;
- __callout_init_mtx(&xfer->timeout_handle, xfer->usb_mtx,
+ usb_callout_init_mtx(&xfer->timeout_handle, xfer->usb_mtx,
CALLOUT_RETURNUNLOCKED);
} else {
/* dummy xfer */
@@ -894,7 +894,7 @@
pxfer[n_setup] = NULL;
}
- __callout_drain(&(xfer->timeout_handle));
+ usb_callout_drain(&(xfer->timeout_handle));
if (xfer->usb_root) {
info = xfer->usb_root;
@@ -1575,7 +1575,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list