summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/mii/urlphy.c10
-rw-r--r--sys/dev/usb/if_aue.c60
-rw-r--r--sys/dev/usb/if_cue.c28
-rw-r--r--sys/dev/usb/if_kue.c48
-rw-r--r--sys/dev/usb/if_upl.c38
-rw-r--r--sys/dev/usb/if_url.c96
6 files changed, 140 insertions, 140 deletions
diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c
index 19c8734c2a8..45ac4d5979e 100644
--- a/sys/dev/mii/urlphy.c
+++ b/sys/dev/mii/urlphy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: urlphy.c,v 1.2 2002/05/07 19:50:01 nate Exp $ */
+/* $OpenBSD: urlphy.c,v 1.3 2002/06/26 11:29:55 espie Exp $ */
/* $NetBSD: urlphy.c,v 1.1 2002/03/28 21:07:53 ichiro Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -105,7 +105,7 @@ urlphy_attach(struct device *parent, struct device *self, void *aux)
struct mii_attach_args *ma = aux;
struct mii_data *mii = ma->mii_data;
- DPRINTF(("%s: %s: enter\n", sc->mii_dev.dv_xname, __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", sc->mii_dev.dv_xname, __func__));
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
@@ -138,7 +138,7 @@ urlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
- DPRINTF(("%s: %s: enter\n", sc->mii_dev.dv_xname, __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", sc->mii_dev.dv_xname, __func__));
if ((sc->mii_dev.dv_flags & DVF_ACTIVE) == 0)
return (ENXIO);
@@ -227,7 +227,7 @@ urlphy_status(struct mii_softc *sc)
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int msr, bmsr, bmcr;
- DPRINTF(("%s: %s: enter\n", sc->mii_dev.dv_xname, __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", sc->mii_dev.dv_xname, __func__));
mii->mii_media_status = IFM_AVALID;
mii->mii_media_active = IFM_ETHER;
@@ -240,7 +240,7 @@ urlphy_status(struct mii_softc *sc)
if (msr & URLPHY_MSR_LINK)
mii->mii_media_status |= IFM_ACTIVE;
- DPRINTF(("%s: %s: link %s\n", sc->mii_dev.dv_xname, __FUNCTION__,
+ DPRINTF(("%s: %s: link %s\n", sc->mii_dev.dv_xname, __func__,
mii->mii_media_status & IFM_ACTIVE ? "up" : "down"));
bmcr = PHY_READ(sc, MII_BMCR);
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 6d3402c5501..8d247a216ba 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aue.c,v 1.20 2002/04/01 21:47:07 nate Exp $ */
+/* $OpenBSD: if_aue.c,v 1.21 2002/06/26 11:29:55 espie Exp $ */
/* $NetBSD: if_aue.c,v 1.75 2002/03/18 14:01:05 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -411,7 +411,7 @@ aue_read_mac(struct aue_softc *sc, u_char *dest)
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);
@@ -484,7 +484,7 @@ aue_miibus_readreg(device_ptr_t dev, int phy, int reg)
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);
@@ -505,7 +505,7 @@ aue_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
#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);
@@ -530,7 +530,7 @@ aue_miibus_statchg(device_ptr_t dev)
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);
@@ -559,7 +559,7 @@ aue_miibus_statchg(device_ptr_t dev)
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
@@ -589,7 +589,7 @@ aue_setmulti(struct aue_softc *sc)
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);
@@ -644,7 +644,7 @@ aue_reset(struct aue_softc *sc)
{
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);
@@ -856,7 +856,7 @@ USB_DETACH(aue)
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. */
@@ -913,7 +913,7 @@ aue_activate(device_ptr_t self, enum devact act)
{
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:
@@ -936,7 +936,7 @@ aue_newbuf(struct aue_softc *sc, struct aue_chain *c, struct mbuf *m)
{
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);
@@ -973,7 +973,7 @@ aue_rx_list_init(struct aue_softc *sc)
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++) {
@@ -1002,7 +1002,7 @@ aue_tx_list_init(struct aue_softc *sc)
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++) {
@@ -1030,7 +1030,7 @@ aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
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;
@@ -1076,7 +1076,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
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;
@@ -1145,7 +1145,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
#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);
@@ -1160,7 +1160,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_transfer(xfer);
DPRINTFN(10,("%s: %s: start rx\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__));
+ __func__));
}
/*
@@ -1182,7 +1182,7 @@ aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
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;
@@ -1217,7 +1217,7 @@ aue_tick(void *xsc)
{
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;
@@ -1237,7 +1237,7 @@ aue_tick_task(void *xsc)
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;
@@ -1255,7 +1255,7 @@ aue_tick_task(void *xsc)
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);
@@ -1274,7 +1274,7 @@ aue_send(struct aue_softc *sc, struct mbuf *m, int idx)
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];
@@ -1309,7 +1309,7 @@ aue_send(struct aue_softc *sc, struct mbuf *m, int idx)
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++;
@@ -1323,7 +1323,7 @@ aue_start(struct ifnet *ifp)
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;
@@ -1371,7 +1371,7 @@ aue_init(void *xsc)
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;
@@ -1480,7 +1480,7 @@ aue_openpipes(struct aue_softc *sc)
aue_rxeof);
(void)usbd_transfer(c->aue_xfer); /* XXX */
DPRINTFN(5,("%s: %s: start read\n", USBDEVNAME(sc->aue_dev),
- __FUNCTION__));
+ __func__));
}
return (0);
@@ -1495,7 +1495,7 @@ aue_ifmedia_upd(struct ifnet *ifp)
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);
@@ -1521,7 +1521,7 @@ aue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
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;
@@ -1640,7 +1640,7 @@ aue_watchdog(struct ifnet *ifp)
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));
@@ -1666,7 +1666,7 @@ aue_stop(struct aue_softc *sc)
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 --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index e22bb339133..5b539465ee8 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cue.c,v 1.12 2002/05/06 05:19:20 nate Exp $ */
+/* $OpenBSD: if_cue.c,v 1.13 2002/06/26 11:29:55 espie Exp $ */
/* $NetBSD: if_cue.c,v 1.38 2001/12/12 15:36:08 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -602,7 +602,7 @@ USB_DETACH(cue)
struct ifnet *ifp = GET_IFP(sc);
int s;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __func__));
usb_uncallout(sc->cue_stat_ch, cue_tick, sc);
/*
@@ -653,7 +653,7 @@ cue_activate(device_ptr_t self, enum devact act)
{
struct cue_softc *sc = (struct cue_softc *)self;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __func__));
switch (act) {
case DVACT_ACTIVATE:
@@ -778,7 +778,7 @@ cue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
int s;
DPRINTFN(10,("%s: %s: enter status=%d\n", USBDEVNAME(sc->cue_dev),
- __FUNCTION__, status));
+ __func__, status));
if (sc->cue_dying)
return;
@@ -842,7 +842,7 @@ cue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
#endif
DPRINTFN(10,("%s: %s: deliver %d\n", USBDEVNAME(sc->cue_dev),
- __FUNCTION__, m->m_len));
+ __func__, m->m_len));
IF_INPUT(ifp, m);
done1:
splx(s);
@@ -855,7 +855,7 @@ done:
usbd_transfer(c->cue_xfer);
DPRINTFN(10,("%s: %s: start rx\n", USBDEVNAME(sc->cue_dev),
- __FUNCTION__));
+ __func__));
}
/*
@@ -876,7 +876,7 @@ cue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
s = splnet();
DPRINTFN(10,("%s: %s: enter status=%d\n", USBDEVNAME(sc->cue_dev),
- __FUNCTION__, status));
+ __func__, status));
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_OACTIVE;
@@ -917,7 +917,7 @@ cue_tick(void *xsc)
if (sc->cue_dying)
return;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __func__));
/* Perform statistics update in process context. */
usb_add_task(sc->cue_udev, &sc->cue_tick_task);
@@ -932,7 +932,7 @@ cue_tick_task(void *xsc)
if (sc->cue_dying)
return;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __func__));
ifp = GET_IFP(sc);
@@ -963,7 +963,7 @@ cue_send(struct cue_softc *sc, struct mbuf *m, int idx)
total_len = m->m_pkthdr.len + 2;
DPRINTFN(10,("%s: %s: total_len=%d\n",
- USBDEVNAME(sc->cue_dev), __FUNCTION__, total_len));
+ USBDEVNAME(sc->cue_dev), __func__, total_len));
/* The first two bytes are the frame length */
c->cue_buf[0] = (u_int8_t)m->m_pkthdr.len;
@@ -997,7 +997,7 @@ cue_start(struct ifnet *ifp)
if (sc->cue_dying)
return;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__func__));
if (ifp->if_flags & IFF_OACTIVE)
return;
@@ -1041,7 +1041,7 @@ cue_init(void *xsc)
if (sc->cue_dying)
return;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__func__));
if (ifp->if_flags & IFF_RUNNING)
return;
@@ -1253,7 +1253,7 @@ cue_watchdog(struct ifnet *ifp)
usbd_status stat;
int s;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__func__));
if (sc->cue_dying)
return;
@@ -1282,7 +1282,7 @@ cue_stop(struct cue_softc *sc)
struct ifnet *ifp;
int i;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev),__func__));
ifp = GET_IFP(sc);
ifp->if_timer = 0;
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 8e3132d1666..2b12c931010 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_kue.c,v 1.17 2002/05/06 05:34:39 nate Exp $ */
+/* $OpenBSD: if_kue.c,v 1.18 2002/06/26 11:29:55 espie Exp $ */
/* $NetBSD: if_kue.c,v 1.47 2002/03/17 18:02:52 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -214,7 +214,7 @@ kue_setword(struct kue_softc *sc, u_int8_t breq, u_int16_t word)
{
usb_device_request_t req;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = breq;
@@ -232,7 +232,7 @@ kue_ctl(struct kue_softc *sc, int rw, u_int8_t breq, u_int16_t val,
usb_device_request_t req;
DPRINTFN(10,("%s: %s: enter, len=%d\n", USBDEVNAME(sc->kue_dev),
- __FUNCTION__, len));
+ __func__, len));
if (rw == KUE_CTL_WRITE)
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -253,7 +253,7 @@ kue_load_fw(struct kue_softc *sc)
usb_device_descriptor_t dd;
usbd_status err;
- DPRINTFN(1,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __FUNCTION__));
+ DPRINTFN(1,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__));
/*
* First, check if we even need to load the firmware.
@@ -325,7 +325,7 @@ kue_load_fw(struct kue_softc *sc)
*/
(void)usbd_reload_device_desc(sc->kue_udev);
- DPRINTFN(1,("%s: %s: done\n", USBDEVNAME(sc->kue_dev), __FUNCTION__));
+ DPRINTFN(1,("%s: %s: done\n", USBDEVNAME(sc->kue_dev), __func__));
/* Reset the adapter. */
kue_reset(sc);
@@ -341,7 +341,7 @@ kue_setmulti(struct kue_softc *sc)
struct ether_multistep step;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__));
if (ifp->if_flags & IFF_PROMISC) {
allmulti:
@@ -390,7 +390,7 @@ kue_reset(struct kue_softc *sc)
{
usbd_status err;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__));
err = usbd_set_config_no(sc->kue_udev, KUE_CONFIG_NO, 1);
if (err)
@@ -601,7 +601,7 @@ kue_activate(device_ptr_t self, enum devact act)
{
struct kue_softc *sc = (struct kue_softc *)self;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__));
switch (act) {
case DVACT_ACTIVATE:
@@ -627,7 +627,7 @@ kue_newbuf(struct kue_softc *sc, struct kue_chain *c, struct mbuf *m)
{
struct mbuf *m_new = NULL;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
if (m == NULL) {
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
@@ -663,7 +663,7 @@ kue_rx_list_init(struct kue_softc *sc)
struct kue_chain *c;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__));
cd = &sc->kue_cdata;
for (i = 0; i < KUE_RX_LIST_CNT; i++) {
@@ -692,7 +692,7 @@ kue_tx_list_init(struct kue_softc *sc)
struct kue_chain *c;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__));
cd = &sc->kue_cdata;
for (i = 0; i < KUE_TX_LIST_CNT; i++) {
@@ -728,7 +728,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
int s;
DPRINTFN(10,("%s: %s: enter status=%d\n", USBDEVNAME(sc->kue_dev),
- __FUNCTION__, status));
+ __func__, status));
if (sc->kue_dying)
return;
@@ -754,7 +754,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_get_xfer_status(xfer, NULL, NULL, &total_len, NULL);
DPRINTFN(10,("%s: %s: total_len=%d len=%d\n", USBDEVNAME(sc->kue_dev),
- __FUNCTION__, total_len,
+ __func__, total_len,
UGETW(mtod(c->kue_mbuf, u_int8_t *))));
if (total_len <= 1)
@@ -798,7 +798,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
#endif
DPRINTFN(10,("%s: %s: deliver %d\n", USBDEVNAME(sc->kue_dev),
- __FUNCTION__, m->m_len));
+ __func__, m->m_len));
IF_INPUT(ifp, m);
done1:
splx(s);
@@ -812,7 +812,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_transfer(c->kue_xfer);
DPRINTFN(10,("%s: %s: start rx\n", USBDEVNAME(sc->kue_dev),
- __FUNCTION__));
+ __func__));
}
/*
@@ -834,7 +834,7 @@ kue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
s = splnet();
DPRINTFN(10,("%s: %s: enter status=%d\n", USBDEVNAME(sc->kue_dev),
- __FUNCTION__, status));
+ __func__, status));
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_OACTIVE;
@@ -871,7 +871,7 @@ kue_send(struct kue_softc *sc, struct mbuf *m, int idx)
struct kue_chain *c;
usbd_status err;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
c = &sc->kue_cdata.kue_tx_chain[idx];
@@ -914,7 +914,7 @@ kue_start(struct ifnet *ifp)
struct kue_softc *sc = ifp->if_softc;
struct mbuf *m_head = NULL;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
if (sc->kue_dying)
return;
@@ -958,7 +958,7 @@ kue_init(void *xsc)
int s;
u_char *eaddr;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
if (ifp->if_flags & IFF_RUNNING)
return;
@@ -1028,7 +1028,7 @@ kue_open_pipes(struct kue_softc *sc)
struct kue_chain *c;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
/* Open RX and TX pipes. */
err = usbd_open_pipe(sc->kue_iface, sc->kue_ed[KUE_ENDPT_RX],
@@ -1055,7 +1055,7 @@ kue_open_pipes(struct kue_softc *sc)
USBD_SHORT_XFER_OK | USBD_NO_COPY, USBD_NO_TIMEOUT,
kue_rxeof);
DPRINTFN(5,("%s: %s: start read\n", USBDEVNAME(sc->kue_dev),
- __FUNCTION__));
+ __func__));
usbd_transfer(c->kue_xfer);
}
@@ -1070,7 +1070,7 @@ kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
struct ifreq *ifr = (struct ifreq *)data;
int s, error = 0;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
if (sc->kue_dying)
return (EIO);
@@ -1170,7 +1170,7 @@ kue_watchdog(struct ifnet *ifp)
usbd_status stat;
int s;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
if (sc->kue_dying)
return;
@@ -1199,7 +1199,7 @@ kue_stop(struct kue_softc *sc)
struct ifnet *ifp;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev),__func__));
ifp = GET_IFP(sc);
ifp->if_timer = 0;
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 04d6f593bb9..688b2fdf0d5 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_upl.c,v 1.8 2002/06/07 06:26:28 fgsch Exp $ */
+/* $OpenBSD: if_upl.c,v 1.9 2002/06/26 11:29:55 espie Exp $ */
/* $NetBSD: if_upl.c,v 1.15 2001/06/14 05:44:27 itojun Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -367,7 +367,7 @@ USB_DETACH(upl)
struct ifnet *ifp = &sc->sc_if;
int s;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
s = splusb();
@@ -411,7 +411,7 @@ upl_activate(device_ptr_t self, enum devact act)
{
struct upl_softc *sc = (struct upl_softc *)self;
- DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
switch (act) {
case DVACT_ACTIVATE:
@@ -435,7 +435,7 @@ upl_newbuf(struct upl_softc *sc, struct upl_chain *c, struct mbuf *m)
{
struct mbuf *m_new = NULL;
- DPRINTFN(8,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTFN(8,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (m == NULL) {
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
@@ -471,7 +471,7 @@ upl_rx_list_init(struct upl_softc *sc)
struct upl_chain *c;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
cd = &sc->sc_cdata;
for (i = 0; i < UPL_RX_LIST_CNT; i++) {
@@ -502,7 +502,7 @@ upl_tx_list_init(struct upl_softc *sc)
struct upl_chain *c;
int i;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
cd = &sc->sc_cdata;
for (i = 0; i < UPL_TX_LIST_CNT; i++) {
@@ -563,7 +563,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_get_xfer_status(xfer, NULL, NULL, &total_len, NULL);
DPRINTFN(9,("%s: %s: enter status=%d length=%d\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, status, total_len));
+ USBDEVNAME(sc->sc_dev), __func__, status, total_len));
m = c->upl_mbuf;
memcpy(mtod(c->upl_mbuf, char *), c->upl_buf, total_len);
@@ -594,7 +594,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
#endif
DPRINTFN(10,("%s: %s: deliver %d\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__, m->m_len));
+ __func__, m->m_len));
#if defined(__NetBSD__) || defined(__OpenBSD__)
IF_INPUT(ifp, m);
@@ -614,7 +614,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_transfer(c->upl_xfer);
DPRINTFN(10,("%s: %s: start rx\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__));
+ __func__));
#endif
}
@@ -636,7 +636,7 @@ upl_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
s = splnet();
DPRINTFN(10,("%s: %s: enter status=%d\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__, status));
+ __func__, status));
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_OACTIVE;
@@ -685,7 +685,7 @@ upl_send(struct upl_softc *sc, struct mbuf *m, int idx)
total_len = m->m_pkthdr.len;
DPRINTFN(10,("%s: %s: total_len=%d\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, total_len));
+ USBDEVNAME(sc->sc_dev), __func__, total_len));
usbd_setup_xfer(c->upl_xfer, sc->sc_ep[UPL_ENDPT_TX],
c, c->upl_buf, total_len, USBD_NO_COPY, USBD_DEFAULT_TIMEOUT,
@@ -714,7 +714,7 @@ upl_start(struct ifnet *ifp)
if (sc->sc_dying)
return;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
if (ifp->if_flags & IFF_OACTIVE)
return;
@@ -757,7 +757,7 @@ upl_init(void *xsc)
if (sc->sc_dying)
return;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
if (ifp->if_flags & IFF_RUNNING)
return;
@@ -846,7 +846,7 @@ upl_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
struct ifnet *ifp = &sc->sc_if;
uByte stat;
- DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+ DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
if (sc->sc_dying)
return;
@@ -876,7 +876,7 @@ upl_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
DPRINTFN(10,("%s: %s: stat=0x%02x\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__, stat));
+ __func__, stat));
}
@@ -892,7 +892,7 @@ upl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
return (EIO);
DPRINTFN(5,("%s: %s: cmd=0x%08lx\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, command));
+ USBDEVNAME(sc->sc_dev), __func__, command));
s = splnet();
@@ -956,7 +956,7 @@ upl_watchdog(struct ifnet *ifp)
{
struct upl_softc *sc = ifp->if_softc;
- DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+ DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
if (sc->sc_dying)
return;
@@ -982,7 +982,7 @@ upl_stop(struct upl_softc *sc)
struct ifnet *ifp;
int i;
- DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+ DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
ifp = &sc->sc_if;
ifp->if_timer = 0;
@@ -1066,7 +1066,7 @@ upl_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
DPRINTFN(10,("%s: %s: enter\n",
USBDEVNAME(((struct upl_softc *)ifp->if_softc)->sc_dev),
- __FUNCTION__));
+ __func__));
/*
* if the queueing discipline needs packet classification,
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 560e2bbe862..74697ce6697 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.4 2002/05/09 16:13:31 nate Exp $ */
+/* $OpenBSD: if_url.c,v 1.5 2002/06/26 11:29:55 espie Exp $ */
/* $NetBSD: if_url.c,v 1.2 2002/03/28 21:49:19 ichiro Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -347,7 +347,7 @@ USB_DETACH(url)
struct ifnet *ifp = GET_IFP(sc);
int s;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
/* Detached before attached finished */
if (!sc->sc_attached)
@@ -410,7 +410,7 @@ url_mem(struct url_softc *sc, int cmd, int offset, void *buf, int len)
return (0);
DPRINTFN(0x200,
- ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@@ -445,7 +445,7 @@ url_csr_read_1(struct url_softc *sc, int reg)
u_int8_t val = 0;
DPRINTFN(0x100,
- ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@@ -460,7 +460,7 @@ url_csr_read_2(struct url_softc *sc, int reg)
uWord val;
DPRINTFN(0x100,
- ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@@ -476,7 +476,7 @@ url_csr_write_1(struct url_softc *sc, int reg, int aval)
u_int8_t val = aval;
DPRINTFN(0x100,
- ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@@ -491,7 +491,7 @@ url_csr_write_2(struct url_softc *sc, int reg, int aval)
uWord val;
DPRINTFN(0x100,
- ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
USETW(val, aval);
@@ -508,7 +508,7 @@ url_csr_write_4(struct url_softc *sc, int reg, int aval)
uDWord val;
DPRINTFN(0x100,
- ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
USETDW(val, aval);
@@ -526,7 +526,7 @@ url_init(struct ifnet *ifp)
u_char *eaddr;
int i, s;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return (EIO);
@@ -608,7 +608,7 @@ url_reset(struct url_softc *sc)
{
int i;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return;
@@ -630,7 +630,7 @@ url_activate(device_ptr_t self, enum devact act)
struct url_softc *sc = (struct url_softc *)self;
DPRINTF(("%s: %s: enter, act=%d\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__, act));
+ __func__, act));
switch (act) {
case DVACT_ACTIVATE:
@@ -659,7 +659,7 @@ url_setmulti(struct url_softc *sc)
int h = 0;
int mcnt = 0;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return;
@@ -768,7 +768,7 @@ url_openpipes(struct url_softc *sc)
USBD_NO_TIMEOUT, url_rxeof);
(void)usbd_transfer(c->url_xfer);
DPRINTF(("%s: %s: start read\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__));
+ __func__));
}
done:
@@ -783,7 +783,7 @@ url_newbuf(struct url_softc *sc, struct url_chain *c, struct mbuf *m)
{
struct mbuf *m_new = NULL;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (m == NULL) {
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
@@ -820,7 +820,7 @@ url_rx_list_init(struct url_softc *sc)
struct url_chain *c;
int i;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
cd = &sc->sc_cdata;
for (i = 0; i < URL_RX_LIST_CNT; i++) {
@@ -851,7 +851,7 @@ url_tx_list_init(struct url_softc *sc)
struct url_chain *c;
int i;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
cd = &sc->sc_cdata;
for (i = 0; i < URL_TX_LIST_CNT; i++) {
@@ -881,7 +881,7 @@ url_start(struct ifnet *ifp)
struct mbuf *m_head = NULL;
DPRINTF(("%s: %s: enter, link=%d\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__, sc->sc_link));
+ __func__, sc->sc_link));
if (sc->sc_dying)
return;
@@ -921,7 +921,7 @@ url_send(struct url_softc *sc, struct mbuf *m, int idx)
struct url_chain *c;
usbd_status err;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
c = &sc->sc_cdata.url_tx_chain[idx];
@@ -950,7 +950,7 @@ url_send(struct url_softc *sc, struct mbuf *m, int idx)
}
DPRINTF(("%s: %s: send %d bytes\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__, total_len));
+ __func__, total_len));
sc->sc_cdata.url_tx_cnt++;
@@ -970,7 +970,7 @@ url_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
s = splnet();
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_OACTIVE;
@@ -1015,7 +1015,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
url_rxhdr_t rxhdr;
int s;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
if (sc->sc_dying)
return;
@@ -1083,7 +1083,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
#endif
DPRINTF(("%s: %s: deliver %d\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__, m->m_len));
+ __func__, m->m_len));
IF_INPUT(ifp, m);
done1:
@@ -1099,7 +1099,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
- DPRINTF(("%s: %s: start rx\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: start rx\n", USBDEVNAME(sc->sc_dev), __func__));
}
#if 0
@@ -1117,7 +1117,7 @@ url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
struct mii_data *mii;
int s, error = 0;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return (EIO);
@@ -1212,7 +1212,7 @@ url_watchdog(struct ifnet *ifp)
usbd_status stat;
int s;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
ifp->if_oerrors++;
printf("%s: watchdog timeout\n", USBDEVNAME(sc->sc_dev));
@@ -1241,7 +1241,7 @@ url_stop(struct ifnet *ifp, int disable)
usbd_status err;
int i;
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
ifp->if_timer = 0;
@@ -1327,7 +1327,7 @@ url_ifmedia_change(struct ifnet *ifp)
struct url_softc *sc = ifp->if_softc;
struct mii_data *mii = GET_MII(sc);
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@@ -1350,7 +1350,7 @@ url_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
struct url_softc *sc = ifp->if_softc;
struct mii_data *mii = GET_MII(sc);
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
if (sc->sc_dying)
return;
@@ -1375,7 +1375,7 @@ url_tick(void *xsc)
return;
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__));
+ __func__));
if (sc->sc_dying)
return;
@@ -1396,7 +1396,7 @@ url_tick_task(void *xsc)
return;
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__));
+ __func__));
if (sc->sc_dying)
return;
@@ -1415,7 +1415,7 @@ url_tick_task(void *xsc)
if (mii->mii_media_status & IFM_ACTIVE &&
IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
DPRINTF(("%s: %s: got link\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ USBDEVNAME(sc->sc_dev), __func__));
sc->sc_link++;
if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
url_start(ifp);
@@ -1432,7 +1432,7 @@ Static void
url_lock_mii(struct url_softc *sc)
{
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__));
+ __func__));
sc->sc_refcnt++;
usb_lockmgr(&sc->sc_mii_lock, LK_EXCLUSIVE, NULL, curproc);
@@ -1442,7 +1442,7 @@ Static void
url_unlock_mii(struct url_softc *sc)
{
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__));
+ __func__));
usb_lockmgr(&sc->sc_mii_lock, LK_RELEASE, NULL, curproc);
if (--sc->sc_refcnt < 0)
@@ -1461,12 +1461,12 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
sc = USBGETSOFTC(dev);
DPRINTFN(0xff, ("%s: %s: enter, phy=%d reg=0x%04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg));
+ USBDEVNAME(sc->sc_dev), __func__, phy, reg));
if (sc->sc_dying) {
#ifdef DIAGNOSTIC
printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__);
+ __func__);
#endif
return (0);
}
@@ -1474,7 +1474,7 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
/* XXX: one PHY only for the RTL8150 internal PHY */
if (phy != 0) {
DPRINTFN(0xff, ("%s: %s: phy=%d is not supported\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy));
+ USBDEVNAME(sc->sc_dev), __func__, phy));
return (0);
}
@@ -1503,7 +1503,7 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
break;
default:
printf("%s: %s: bad register %04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, reg);
+ USBDEVNAME(sc->sc_dev), __func__, reg);
val = 0;
goto R_DONE;
break;
@@ -1516,7 +1516,7 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
R_DONE:
DPRINTFN(0xff, ("%s: %s: phy=%d reg=0x%04x => 0x%04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, val));
+ USBDEVNAME(sc->sc_dev), __func__, phy, reg, val));
url_unlock_mii(sc);
return (val);
@@ -1533,12 +1533,12 @@ url_int_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
sc = USBGETSOFTC(dev);
DPRINTFN(0xff, ("%s: %s: enter, phy=%d reg=0x%04x data=0x%04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, data));
+ USBDEVNAME(sc->sc_dev), __func__, phy, reg, data));
if (sc->sc_dying) {
#ifdef DIAGNOSTIC
printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__);
+ __func__);
#endif
return;
}
@@ -1546,7 +1546,7 @@ url_int_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
/* XXX: one PHY only for the RTL8150 internal PHY */
if (phy != 0) {
DPRINTFN(0xff, ("%s: %s: phy=%d is not supported\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy));
+ USBDEVNAME(sc->sc_dev), __func__, phy));
return;
}
@@ -1574,7 +1574,7 @@ url_int_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
break;
default:
printf("%s: %s: bad register %04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, reg);
+ USBDEVNAME(sc->sc_dev), __func__, reg);
goto W_DONE;
break;
}
@@ -1599,7 +1599,7 @@ url_miibus_statchg(device_ptr_t dev)
return;
sc = USBGETSOFTC(dev);
- DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
#endif
/* Nothing to do */
}
@@ -1615,12 +1615,12 @@ url_ext_miibus_redreg(device_ptr_t dev, int phy, int reg)
u_int16_t val;
DPRINTF(("%s: %s: enter, phy=%d reg=0x%04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg));
+ USBDEVNAME(sc->sc_dev), __func__, phy, reg));
if (sc->sc_dying) {
#ifdef DIAGNOSTIC
printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__);
+ __func__);
#endif
return (0);
}
@@ -1646,7 +1646,7 @@ url_ext_miibus_redreg(device_ptr_t dev, int phy, int reg)
val = url_csr_read_2(sc, URL_PHYDAT);
DPRINTF(("%s: %s: phy=%d reg=0x%04x => 0x%04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, val));
+ USBDEVNAME(sc->sc_dev), __func__, phy, reg, val));
url_unlock_mii(sc);
return (val);
@@ -1658,12 +1658,12 @@ url_ext_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
struct url_softc *sc = USBGETSOFTC(dev);
DPRINTF(("%s: %s: enter, phy=%d reg=0x%04x data=0x%04x\n",
- USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, data));
+ USBDEVNAME(sc->sc_dev), __func__, phy, reg, data));
if (sc->sc_dying) {
#ifdef DIAGNOSTIC
printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
- __FUNCTION__);
+ __func__);
#endif
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 22:35:11 +0000