Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb s/__FUNCTION__/__func__/
details: https://anonhg.NetBSD.org/src/rev/f51891ed81ba
branches: trunk
changeset: 533735:f51891ed81ba
user: augustss <augustss%NetBSD.org@localhost>
date: Mon Jul 08 17:46:23 2002 +0000
description:
s/__FUNCTION__/__func__/
diffstat:
sys/dev/usb/if_aue.c | 62 ++++++++++++++--------------
sys/dev/usb/if_cue.c | 30 +++++++-------
sys/dev/usb/if_kue.c | 50 +++++++++++-----------
sys/dev/usb/if_upl.c | 40 +++++++++---------
sys/dev/usb/if_url.c | 98 +++++++++++++++++++++++-----------------------
sys/dev/usb/uirda.c | 38 ++++++++--------
sys/dev/usb/umass_isdata.c | 42 +++++++++---------
sys/dev/usb/ustir.c | 84 +++++++++++++++++++-------------------
8 files changed, 222 insertions(+), 222 deletions(-)
diffs (truncated from 1948 to 300 lines):
diff -r a289ff262693 -r f51891ed81ba sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c Mon Jul 08 16:27:05 2002 +0000
+++ b/sys/dev/usb/if_aue.c Mon Jul 08 17:46:23 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.77 2002/07/08 09:00:56 rh Exp $ */
+/* $NetBSD: if_aue.c,v 1.78 2002/07/08 17:46:23 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul%ee.columbia.edu@localhost>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.77 2002/07/08 09:00:56 rh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.78 2002/07/08 17:46:23 augustss Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -413,7 +413,7 @@
int off = 0;
int word;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
for (i = 0; i < 3; i++) {
word = aue_eeprom_getword(sc, off + i);
@@ -486,7 +486,7 @@
val = aue_csr_read_2(sc, AUE_PHY_DATA);
DPRINTFN(11,("%s: %s: phy=%d reg=%d => 0x%04x\n",
- USBDEVNAME(sc->aue_dev), __FUNCTION__, phy, reg, val));
+ USBDEVNAME(sc->aue_dev), __func__, phy, reg, val));
aue_unlock_mii(sc);
return (val);
@@ -507,7 +507,7 @@
#endif
DPRINTFN(11,("%s: %s: phy=%d reg=%d data=0x%04x\n",
- USBDEVNAME(sc->aue_dev), __FUNCTION__, phy, reg, data));
+ USBDEVNAME(sc->aue_dev), __func__, phy, reg, data));
aue_lock_mii(sc);
aue_csr_write_2(sc, AUE_PHY_DATA, data);
@@ -532,7 +532,7 @@
struct aue_softc *sc = USBGETSOFTC(dev);
struct mii_data *mii = GET_MII(sc);
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
aue_lock_mii(sc);
AUE_CLRBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB);
@@ -561,7 +561,7 @@
auxmode = aue_miibus_readreg(dev, 0, 0x1b);
aue_miibus_writereg(dev, 0, 0x1b, auxmode | 0x04);
}
- DPRINTFN(5,("%s: %s: exit\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: exit\n", USBDEVNAME(sc->aue_dev), __func__));
}
#define AUE_POLY 0xEDB88320
@@ -591,7 +591,7 @@
struct ether_multistep step;
u_int32_t h = 0, i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
ifp = GET_IFP(sc);
@@ -646,7 +646,7 @@
{
int i;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
AUE_SETBIT(sc, AUE_CTL1, AUE_CTL1_RESETMAC);
@@ -857,7 +857,7 @@
struct ifnet *ifp = GET_IFP(sc);
int s;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
if (!sc->aue_attached) {
/* Detached before attached finished, so just bail out. */
@@ -915,7 +915,7 @@
{
struct aue_softc *sc = (struct aue_softc *)self;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
switch (act) {
case DVACT_ACTIVATE:
@@ -938,7 +938,7 @@
{
struct mbuf *m_new = NULL;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
if (m == NULL) {
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
@@ -975,7 +975,7 @@
struct aue_chain *c;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
cd = &sc->aue_cdata;
for (i = 0; i < AUE_RX_LIST_CNT; i++) {
@@ -1004,7 +1004,7 @@
struct aue_chain *c;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
cd = &sc->aue_cdata;
for (i = 0; i < AUE_TX_LIST_CNT; i++) {
@@ -1032,7 +1032,7 @@
struct ifnet *ifp = GET_IFP(sc);
struct aue_intrpkt *p = &sc->aue_cdata.aue_ibuf;
- DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__FUNCTION__));
+ DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
if (sc->aue_dying)
return;
@@ -1078,7 +1078,7 @@
struct aue_rxpkt r;
int s;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
if (sc->aue_dying)
return;
@@ -1147,7 +1147,7 @@
#endif
DPRINTFN(10,("%s: %s: deliver %d\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__, m->m_len));
+ __func__, m->m_len));
IF_INPUT(ifp, m);
done1:
splx(s);
@@ -1162,7 +1162,7 @@
usbd_transfer(xfer);
DPRINTFN(10,("%s: %s: start rx\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__));
+ __func__));
}
/*
@@ -1184,7 +1184,7 @@
s = splnet();
DPRINTFN(10,("%s: %s: enter status=%d\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__, status));
+ __func__, status));
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_OACTIVE;
@@ -1219,7 +1219,7 @@
{
struct aue_softc *sc = xsc;
- DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__FUNCTION__));
+ DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
if (sc == NULL)
return;
@@ -1239,7 +1239,7 @@
struct mii_data *mii;
int s;
- DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__FUNCTION__));
+ DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
if (sc->aue_dying)
return;
@@ -1257,7 +1257,7 @@
if (mii->mii_media_status & IFM_ACTIVE &&
IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
DPRINTFN(2,("%s: %s: got link\n",
- USBDEVNAME(sc->aue_dev),__FUNCTION__));
+ USBDEVNAME(sc->aue_dev),__func__));
sc->aue_link++;
if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
aue_start(ifp);
@@ -1276,7 +1276,7 @@
struct aue_chain *c;
usbd_status err;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
c = &sc->aue_cdata.aue_tx_chain[idx];
@@ -1311,7 +1311,7 @@
return (EIO);
}
DPRINTFN(5,("%s: %s: send %d bytes\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__, total_len));
+ __func__, total_len));
sc->aue_cdata.aue_tx_cnt++;
@@ -1325,7 +1325,7 @@
struct mbuf *m_head = NULL;
DPRINTFN(5,("%s: %s: enter, link=%d\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__, sc->aue_link));
+ __func__, sc->aue_link));
if (sc->aue_dying)
return;
@@ -1373,7 +1373,7 @@
int i, s;
u_char *eaddr;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
if (sc->aue_dying)
return;
@@ -1482,7 +1482,7 @@
aue_rxeof);
(void)usbd_transfer(c->aue_xfer); /* XXX */
DPRINTFN(5,("%s: %s: start read\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__));
+ __func__));
}
return (0);
@@ -1497,7 +1497,7 @@
struct aue_softc *sc = ifp->if_softc;
struct mii_data *mii = GET_MII(sc);
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
if (sc->aue_dying)
return (0);
@@ -1523,7 +1523,7 @@
struct aue_softc *sc = ifp->if_softc;
struct mii_data *mii = GET_MII(sc);
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
mii_pollstat(mii);
ifmr->ifm_active = mii->mii_media_active;
@@ -1637,7 +1637,7 @@
usbd_status stat;
int s;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
ifp->if_oerrors++;
printf("%s: watchdog timeout\n", USBDEVNAME(sc->aue_dev));
@@ -1663,7 +1663,7 @@
struct ifnet *ifp;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
ifp = GET_IFP(sc);
ifp->if_timer = 0;
diff -r a289ff262693 -r f51891ed81ba sys/dev/usb/if_cue.c
--- a/sys/dev/usb/if_cue.c Mon Jul 08 16:27:05 2002 +0000
+++ b/sys/dev/usb/if_cue.c Mon Jul 08 17:46:23 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.38 2001/12/12 15:36:08 augustss Exp $ */
+/* $NetBSD: if_cue.c,v 1.39 2002/07/08 17:46:24 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul%ee.columbia.edu@localhost>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.38 2001/12/12 15:36:08 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.39 2002/07/08 17:46:24 augustss Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -602,7 +602,7 @@
struct ifnet *ifp = GET_IFP(sc);
int s;
Home |
Main Index |
Thread Index |
Old Index