Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename *lldbg to *llerr

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-11 14:55:27 -06:00
parent 86b79b33cf
commit e99301d7c2
646 changed files with 2688 additions and 2688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/dm90x0.c
+4 -4
View File
@@ -1722,13 +1722,13 @@ int dm9x_initialize(void)
vid = (((uint16_t)getreg(DM9X_VIDH)) << 8) | (uint16_t)getreg(DM9X_VIDL);
pid = (((uint16_t)getreg(DM9X_PIDH)) << 8) | (uint16_t)getreg(DM9X_PIDL);
nlldbg("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
nllerr("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
/* Check if a DM90x0 chip is recognized at this I/O base */
if (vid != DM9X_DAVICOMVID || (pid != DM9X_DM9000PID && pid != DM9X_DM9010PID))
{
nlldbg("DM90x0 vendor/product ID not found at this base address\n");
nllerr("DM90x0 vendor/product ID not found at this base address\n");
return -ENODEV;
}
@@ -1738,7 +1738,7 @@ int dm9x_initialize(void)
{
/* We could not attach the ISR to the ISR */
nlldbg("irq_attach() failed\n");
nllerr("irq_attach() failed\n");
return -EAGAIN;
}
@@ -1767,7 +1767,7 @@ int dm9x_initialize(void)
mptr[i] = getreg(j);
}
nlldbg("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
nllerr("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
mptr[0], mptr[1], mptr[2], mptr[3], mptr[4], mptr[5]);
/* Register the device with the OS so that socket IOCTLs can be performed */
drivers/net/enc28j60.c
+8 -8
View File
@@ -1484,7 +1484,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
else
#endif
{
nlldbg("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
NETDEV_RXDROPPED(&priv->dev);
}
}
@@ -1550,7 +1550,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
if ((rxstat & RXSTAT_OK) == 0)
{
nlldbg("ERROR: RXSTAT: %04x\n", rxstat);
nllerr("ERROR: RXSTAT: %04x\n", rxstat);
NETDEV_RXERRORS(&priv->dev);
}
@@ -1558,7 +1558,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
{
nlldbg("Bad packet size dropped (%d)\n", pktlen);
nllerr("Bad packet size dropped (%d)\n", pktlen);
NETDEV_RXERRORS(&priv->dev);
}
@@ -1878,7 +1878,7 @@ static void enc_toworker(FAR void *arg)
net_lock_t lock;
int ret;
nlldbg("Tx timeout\n");
nllerr("Tx timeout\n");
DEBUGASSERT(priv);
/* Get exclusive access to the network */
@@ -2067,7 +2067,7 @@ static int enc_ifup(struct net_driver_s *dev)
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
int ret;
nlldbg("Bringing up: %d.%d.%d.%d\n",
nllerr("Bringing up: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
@@ -2139,7 +2139,7 @@ static int enc_ifdown(struct net_driver_s *dev)
irqstate_t flags;
int ret;
nlldbg("Taking down: %d.%d.%d.%d\n",
nllerr("Taking down: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
@@ -2473,7 +2473,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
{
uint8_t regval;
nlldbg("Reset\n");
nllerr("Reset\n");
/* Configure SPI for the ENC28J60 */
@@ -2524,7 +2524,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
regval = enc_rdbreg(priv, ENC_EREVID);
if (regval == 0x00 || regval == 0xff)
{
nlldbg("Bad Rev ID: %02x\n", regval);
nllerr("Bad Rev ID: %02x\n", regval);
return -ENODEV;
}
drivers/net/encx24j600.c
+17 -17
View File
@@ -1127,7 +1127,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv)
}
else
{
nlldbg("no free descriptors\n");
nllerr("no free descriptors\n");
ret = -ENOMEM;
}
@@ -1612,7 +1612,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
enc_rxrmpkt(priv, descr);
nlldbg("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
NETDEV_RXDROPPED(&priv->dev);
}
@@ -1707,7 +1707,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
if ((rxstat & RXSTAT_OK) == 0)
{
nlldbg("ERROR: RXSTAT: %08x\n", rxstat);
nllerr("ERROR: RXSTAT: %08x\n", rxstat);
/* Discard packet */
@@ -1719,7 +1719,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
{
nlldbg("Bad packet size dropped (%d)\n", pktlen);
nllerr("Bad packet size dropped (%d)\n", pktlen);
/* Discard packet */
@@ -1774,17 +1774,17 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
#if 0
/* Free the last received packet from the RX queue */
nlldbg("rx abort\n");
nlldbg("ESTAT: %04x\n", enc_rdreg(priv, ENC_ESTAT));
nlldbg("EIR: %04x\n", enc_rdreg(priv, ENC_EIR));
nlldbg("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
nlldbg("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
nllerr("rx abort\n");
nllerr("ESTAT: %04x\n", enc_rdreg(priv, ENC_ESTAT));
nllerr("EIR: %04x\n", enc_rdreg(priv, ENC_EIR));
nllerr("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
nllerr("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
descr = (FAR struct enc_descr_s *)sq_peek(&priv->rxqueue);
while (descr != NULL)
{
nlldbg("addr: %04x len: %d\n", descr->addr, descr->len);
nllerr("addr: %04x len: %d\n", descr->addr, descr->len);
descr = (FAR struct enc_descr_s *)sq_next(descr);
}
@@ -1797,7 +1797,7 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
{
enc_rxrmpkt(priv, descr);
nlldbg("pending packet freed\n");
nllerr("pending packet freed\n");
}
else
{
@@ -2043,7 +2043,7 @@ static void enc_toworker(FAR void *arg)
net_lock_t lock;
int ret;
nlldbg("Tx timeout\n");
nllerr("Tx timeout\n");
DEBUGASSERT(priv);
/* Get exclusive access to the network. */
@@ -2231,7 +2231,7 @@ static int enc_ifup(struct net_driver_s *dev)
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
int ret;
nlldbg("Bringing up: %d.%d.%d.%d\n",
nllerr("Bringing up: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
@@ -2307,7 +2307,7 @@ static int enc_ifdown(struct net_driver_s *dev)
irqstate_t flags;
int ret;
nlldbg("Taking down: %d.%d.%d.%d\n",
nllerr("Taking down: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
@@ -2742,7 +2742,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
if (ret != OK)
{
nlldbg("ERROR: encx24j600 clock failed to become ready\n");
nllerr("ERROR: encx24j600 clock failed to become ready\n");
return -ENODEV;
}
@@ -2756,7 +2756,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
if (regval != 0x0000)
{
nlldbg("ERROR: encx24j600 seems not to be reset properly\n");
nllerr("ERROR: encx24j600 seems not to be reset properly\n");
return -ENODEV;
}
@@ -2813,7 +2813,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
#if 0
if (ret != OK)
{
nlldbg("ERROR: encx24j600 failed to establish link\n");
nllerr("ERROR: encx24j600 failed to establish link\n");
return -ENODEV;
}
#endif
drivers/net/phy_notify.c
+4 -4
View File
@@ -83,10 +83,10 @@
#ifdef CONFIG_NETDEV_PHY_DEBUG
# define phydbg dbg
# define phylldbg lldbg
# define phyllerr llerr
#else
# define phydbg(x...)
# define phylldbg(x...)
# define phyllerr(x...)
#endif
/****************************************************************************
@@ -266,7 +266,7 @@ static int phy_handler(FAR struct phy_notify_s *client)
int ret;
DEBUGASSERT(client && client->assigned && client->enable);
phylldbg("Entry client %d, signalling PID=%d with signal %d\n",
phyllerr("Entry client %d, signalling PID=%d with signal %d\n",
client->index, client->pid, client->signo);
/* Disable further interrupts */
@@ -287,7 +287,7 @@ static int phy_handler(FAR struct phy_notify_s *client)
int errcode = errno;
DEBUGASSERT(errcode > 0);
nlldbg("ERROR: sigqueue failed: %d\n", errcode);
nllerr("ERROR: sigqueue failed: %d\n", errcode);
UNUSED(errcode);
}
drivers/net/telnet.c
+10 -10
View File
@@ -447,7 +447,7 @@ static void telnet_sendopt(FAR struct telnet_dev_s *priv, uint8_t option,
telnet_dumpbuffer("Send optbuf", optbuf, 4);
if (psock_send(&priv->td_psock, optbuf, 4, 0) < 0)
{
nlldbg("Failed to send TELNET_IAC\n");
nllerr("Failed to send TELNET_IAC\n");
}
}
@@ -548,7 +548,7 @@ static int telnet_close(FAR struct file *filep)
ret = asprintf(&devpath, TELNETD_DEVFMT, priv->td_minor);
if (ret < 0)
{
nlldbg("ERROR: Failed to allocate the driver path\n");
nllerr("ERROR: Failed to allocate the driver path\n");
}
else
{
@@ -566,7 +566,7 @@ static int telnet_close(FAR struct file *filep)
if (ret != -EBUSY)
{
nlldbg("Failed to unregister the driver %s: %d\n",
nllerr("Failed to unregister the driver %s: %d\n",
devpath, ret);
}
}
@@ -706,7 +706,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0);
if (ret < 0)
{
nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
return ret;
}
@@ -723,7 +723,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0);
if (ret < 0)
{
nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
return ret;
}
}
@@ -767,7 +767,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
priv = (FAR struct telnet_dev_s*)malloc(sizeof(struct telnet_dev_s));
if (!priv)
{
nlldbg("Failed to allocate the driver data structure\n");
nllerr("Failed to allocate the driver data structure\n");
return -ENOMEM;
}
@@ -788,7 +788,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
psock = sockfd_socket(session->ts_sd);
if (!psock)
{
nlldbg("Failed to convert sd=%d to a socket structure\n", session->ts_sd);
nllerr("Failed to convert sd=%d to a socket structure\n", session->ts_sd);
ret = -EINVAL;
goto errout_with_dev;
}
@@ -796,7 +796,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
ret = net_clone(psock, &priv->td_psock);
if (ret < 0)
{
nlldbg("net_clone failed: %d\n", ret);
nllerr("net_clone failed: %d\n", ret);
goto errout_with_dev;
}
@@ -834,7 +834,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
if (ret >= 0)
{
nlldbg("ERROR: Too many sessions\n");
nllerr("ERROR: Too many sessions\n");
ret = -ENFILE;
goto errout_with_semaphore;
}
@@ -844,7 +844,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
ret = register_driver(session->ts_devpath, &g_telnet_fops, 0666, priv);
if (ret < 0)
{
nlldbg("ERROR: Failed to register the driver %s: %d\n",
nllerr("ERROR: Failed to register the driver %s: %d\n",
session->ts_devpath, ret);
goto errout_with_semaphore;
}