mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 00:14:22 +08:00
Replace all occurrences of vdbg with vinfo
This commit is contained in:
@@ -467,7 +467,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
NETDEV_RXIPV4(&priv->cs_dev);
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
@@ -508,7 +508,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
NETDEV_RXIPV6(&priv->cs_dev);
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
@@ -561,7 +561,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq)
|
||||
else
|
||||
#endif
|
||||
{
|
||||
nllvdbg("Unrecognized packet type %02x\n", BUF->type);
|
||||
nllinfo("Unrecognized packet type %02x\n", BUF->type);
|
||||
NETDEV_RXDROPPED(&priv->cs_dev);
|
||||
}
|
||||
}
|
||||
@@ -690,7 +690,7 @@ static int cs89x0_interrupt(int irq, FAR void *context)
|
||||
|
||||
while ((isq = cs89x0_getreg(dev, CS89x0_ISQ_OFFSET)) != 0)
|
||||
{
|
||||
nvdbg("ISQ: %04x\n", isq);
|
||||
ninfo("ISQ: %04x\n", isq);
|
||||
switch (isq & ISQ_EVENTMASK)
|
||||
{
|
||||
case ISQ_RXEVENT:
|
||||
|
||||
+15
-15
@@ -433,7 +433,7 @@ static void putreg(int reg, uint8_t value)
|
||||
|
||||
static void read8(FAR uint8_t *ptr, int len)
|
||||
{
|
||||
nvdbg("Read %d bytes (8-bit mode)\n", len);
|
||||
ninfo("Read %d bytes (8-bit mode)\n", len);
|
||||
for (; len > 0; len--)
|
||||
{
|
||||
*ptr++ = DM9X_DATA;
|
||||
@@ -444,7 +444,7 @@ static void read16(FAR uint8_t *ptr, int len)
|
||||
{
|
||||
FAR uint16_t *ptr16 = (FAR uint16_t *)ptr;
|
||||
|
||||
nvdbg("Read %d bytes (16-bit mode)\n", len);
|
||||
ninfo("Read %d bytes (16-bit mode)\n", len);
|
||||
for (; len > 0; len -= sizeof(uint16_t))
|
||||
{
|
||||
*ptr16++ = DM9X_DATA;
|
||||
@@ -455,7 +455,7 @@ static void read32(FAR uint8_t *ptr, int len)
|
||||
{
|
||||
FAR uint32_t *ptr32 = (FAR uint32_t *)ptr;
|
||||
|
||||
nvdbg("Read %d bytes (32-bit mode)\n", len);
|
||||
ninfo("Read %d bytes (32-bit mode)\n", len);
|
||||
for (; len > 0; len -= sizeof(uint32_t))
|
||||
{
|
||||
*ptr32++ = DM9X_DATA;
|
||||
@@ -481,7 +481,7 @@ static void read32(FAR uint8_t *ptr, int len)
|
||||
|
||||
static void discard8(int len)
|
||||
{
|
||||
nvdbg("Discard %d bytes (8-bit mode)\n", len);
|
||||
ninfo("Discard %d bytes (8-bit mode)\n", len);
|
||||
for (; len > 0; len--)
|
||||
{
|
||||
DM9X_DATA;
|
||||
@@ -490,7 +490,7 @@ static void discard8(int len)
|
||||
|
||||
static void discard16(int len)
|
||||
{
|
||||
nvdbg("Discard %d bytes (16-bit mode)\n", len);
|
||||
ninfo("Discard %d bytes (16-bit mode)\n", len);
|
||||
for (; len > 0; len -= sizeof(uint16_t))
|
||||
{
|
||||
DM9X_DATA;
|
||||
@@ -499,7 +499,7 @@ static void discard16(int len)
|
||||
|
||||
static void discard32(int len)
|
||||
{
|
||||
nvdbg("Discard %d bytes (32-bit mode)\n", len);
|
||||
ninfo("Discard %d bytes (32-bit mode)\n", len);
|
||||
for (; len > 0; len -= sizeof(uint32_t))
|
||||
{
|
||||
DM9X_DATA;
|
||||
@@ -525,7 +525,7 @@ static void discard32(int len)
|
||||
|
||||
static void write8(FAR const uint8_t *ptr, int len)
|
||||
{
|
||||
nvdbg("Write %d bytes (8-bit mode)\n", len);
|
||||
ninfo("Write %d bytes (8-bit mode)\n", len);
|
||||
|
||||
for (; len > 0; len--)
|
||||
{
|
||||
@@ -537,7 +537,7 @@ static void write16(const uint8_t *ptr, int len)
|
||||
{
|
||||
FAR uint16_t *ptr16 = (FAR uint16_t *)ptr;
|
||||
|
||||
nvdbg("Write %d bytes (16-bit mode)\n", len);
|
||||
ninfo("Write %d bytes (16-bit mode)\n", len);
|
||||
|
||||
for (; len > 0; len -= sizeof(uint16_t))
|
||||
{
|
||||
@@ -549,7 +549,7 @@ static void write32(FAR const uint8_t *ptr, int len)
|
||||
{
|
||||
FAR uint32_t *ptr32 = (FAR uint32_t *)ptr;
|
||||
|
||||
nvdbg("Write %d bytes (32-bit mode)\n", len);
|
||||
ninfo("Write %d bytes (32-bit mode)\n", len);
|
||||
|
||||
for (; len > 0; len -= sizeof(uint32_t))
|
||||
{
|
||||
@@ -831,7 +831,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
|
||||
bool bchecksumready;
|
||||
uint8_t rxbyte;
|
||||
|
||||
nvdbg("Packet received\n");
|
||||
ninfo("Packet received\n");
|
||||
|
||||
do
|
||||
{
|
||||
@@ -902,7 +902,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
NETDEV_RXIPV4(&priv->dm_dev);
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
@@ -943,7 +943,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
NETDEV_RXIPV6(&priv->dm_dev);
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
@@ -1004,7 +1004,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
|
||||
dm9x->ncrxpackets++;
|
||||
}
|
||||
while ((rxbyte & 0x01) == DM9X_PKTRDY && dm9x->ncrxpackets < DM9X_CRXTHRES);
|
||||
nvdbg("All RX packets processed\n");
|
||||
ninfo("All RX packets processed\n");
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -1027,7 +1027,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
|
||||
{
|
||||
int nsr;
|
||||
|
||||
nvdbg("TX done\n");
|
||||
ninfo("TX done\n");
|
||||
|
||||
/* Another packet has completed transmission. Decrement the count of
|
||||
* of pending TX transmissions.
|
||||
@@ -1110,7 +1110,7 @@ static int dm9x_interrupt(int irq, FAR void *context)
|
||||
|
||||
isr = getreg(DM9X_ISR);
|
||||
putreg(DM9X_ISR, isr);
|
||||
nvdbg("Interrupt status: %02x\n", isr);
|
||||
ninfo("Interrupt status: %02x\n", isr);
|
||||
|
||||
/* Check for link status change */
|
||||
|
||||
|
||||
+2
-2
@@ -602,7 +602,7 @@ static void e1000_receive(struct e1000_dev *e1000)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
* layer
|
||||
@@ -642,7 +642,7 @@ static void e1000_receive(struct e1000_dev *e1000)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
|
||||
|
||||
+11
-11
@@ -1092,7 +1092,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
|
||||
|
||||
/* Increment statistics */
|
||||
|
||||
nllvdbg("Sending packet, pktlen: %d\n", priv->dev.d_len);
|
||||
nllinfo("Sending packet, pktlen: %d\n", priv->dev.d_len);
|
||||
NETDEV_TXPACKETS(&priv->dev);
|
||||
|
||||
/* Verify that the hardware is ready to send another packet. The driver
|
||||
@@ -1180,7 +1180,7 @@ static int enc_txpoll(struct net_driver_s *dev)
|
||||
* the field d_len is set to a value > 0.
|
||||
*/
|
||||
|
||||
nllvdbg("Poll result: d_len=%d\n", priv->dev.d_len);
|
||||
nllinfo("Poll result: d_len=%d\n", priv->dev.d_len);
|
||||
if (priv->dev.d_len > 0)
|
||||
{
|
||||
/* Look up the destination MAC address and add it to the Ethernet
|
||||
@@ -1388,7 +1388,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
NETDEV_RXIPV4(&priv->dev);
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
@@ -1429,7 +1429,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
NETDEV_RXIPV6(&priv->dev);
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
@@ -1467,7 +1467,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
|
||||
#ifdef CONFIG_NET_ARP
|
||||
if (BUF->type == htons(ETHTYPE_ARP))
|
||||
{
|
||||
nllvdbg("ARP packet received (%02x)\n", BUF->type);
|
||||
nllinfo("ARP packet received (%02x)\n", BUF->type);
|
||||
NETDEV_RXARP(&priv->dev);
|
||||
|
||||
arp_arpin(&priv->dev);
|
||||
@@ -1543,7 +1543,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
|
||||
pktlen = (uint16_t)rsv[3] << 8 | (uint16_t)rsv[2];
|
||||
rxstat = (uint16_t)rsv[5] << 8 | (uint16_t)rsv[4];
|
||||
|
||||
nllvdbg("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n",
|
||||
nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n",
|
||||
priv->nextpkt, pktlen, rxstat);
|
||||
|
||||
/* Check if the packet was received OK */
|
||||
@@ -1647,7 +1647,7 @@ static void enc_irqworker(FAR void *arg)
|
||||
* settings.
|
||||
*/
|
||||
|
||||
nllvdbg("EIR: %02x\n", eir);
|
||||
nllinfo("EIR: %02x\n", eir);
|
||||
|
||||
/* DMAIF: The DMA interrupt indicates that the DMA module has completed
|
||||
* its memory copy or checksum calculation. Additionally, this interrupt
|
||||
@@ -1767,7 +1767,7 @@ static void enc_irqworker(FAR void *arg)
|
||||
uint8_t pktcnt = enc_rdbreg(priv, ENC_EPKTCNT);
|
||||
if (pktcnt > 0)
|
||||
{
|
||||
nllvdbg("EPKTCNT: %02x\n", pktcnt);
|
||||
nllinfo("EPKTCNT: %02x\n", pktcnt);
|
||||
|
||||
/* Handle packet receipt */
|
||||
|
||||
@@ -2336,7 +2336,7 @@ static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
|
||||
|
||||
static void enc_pwrsave(FAR struct enc_driver_s *priv)
|
||||
{
|
||||
nllvdbg("Set PWRSV\n");
|
||||
nllinfo("Set PWRSV\n");
|
||||
|
||||
/* 1. Turn off packet reception by clearing ECON1.RXEN. */
|
||||
|
||||
@@ -2396,7 +2396,7 @@ static void enc_pwrsave(FAR struct enc_driver_s *priv)
|
||||
|
||||
static void enc_pwrfull(FAR struct enc_driver_s *priv)
|
||||
{
|
||||
nllvdbg("Clear PWRSV\n");
|
||||
nllinfo("Clear PWRSV\n");
|
||||
|
||||
/* 1. Wake-up by clearing ECON2.PWRSV. */
|
||||
|
||||
@@ -2528,7 +2528,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
nllvdbg("Rev ID: %02x\n", regval);
|
||||
nllinfo("Rev ID: %02x\n", regval);
|
||||
|
||||
/* Set filter mode: unicast OR broadcast AND crc valid */
|
||||
|
||||
|
||||
+15
-15
@@ -1165,7 +1165,7 @@ static int enc_txpoll(struct net_driver_s *dev)
|
||||
* the field d_len is set to a value > 0.
|
||||
*/
|
||||
|
||||
nllvdbg("Poll result: d_len=%d\n", priv->dev.d_len);
|
||||
nllinfo("Poll result: d_len=%d\n", priv->dev.d_len);
|
||||
|
||||
if (priv->dev.d_len > 0)
|
||||
{
|
||||
@@ -1331,7 +1331,7 @@ static void enc_rxldpkt(FAR struct enc_driver_s *priv,
|
||||
{
|
||||
DEBUGASSERT(priv != NULL && descr != NULL);
|
||||
|
||||
nllvdbg("load packet @%04x len: %d\n", descr->addr, descr->len);
|
||||
nllinfo("load packet @%04x len: %d\n", descr->addr, descr->len);
|
||||
|
||||
/* Set the rx data pointer to the start of the received packet (ERXRDPT) */
|
||||
|
||||
@@ -1403,7 +1403,7 @@ static void enc_rxrmpkt(FAR struct enc_driver_s *priv, FAR struct enc_descr_s *d
|
||||
{
|
||||
uint16_t addr;
|
||||
|
||||
nllvdbg("free descr: %p\n", descr);
|
||||
nllinfo("free descr: %p\n", descr);
|
||||
|
||||
/* If it is the last descriptor in the queue, advance ERXTAIL.
|
||||
* This way it is possible that gaps occcur. Maybe pending packets
|
||||
@@ -1420,7 +1420,7 @@ static void enc_rxrmpkt(FAR struct enc_driver_s *priv, FAR struct enc_descr_s *d
|
||||
|
||||
DEBUGASSERT(addr >= PKTMEM_RX_START && addr < PKTMEM_RX_END);
|
||||
|
||||
nllvdbg("ERXTAIL %04x\n", addr);
|
||||
nllinfo("ERXTAIL %04x\n", addr);
|
||||
|
||||
enc_wrreg(priv, ENC_ERXTAIL, addr);
|
||||
|
||||
@@ -1490,7 +1490,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
NETDEV_RXIPV4(&priv->dev);
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
@@ -1540,7 +1540,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
NETDEV_RXIPV6(&priv->dev);
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
@@ -1587,7 +1587,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
|
||||
#ifdef CONFIG_NET_ARP
|
||||
if (BUF->type == htons(ETHTYPE_ARP))
|
||||
{
|
||||
nllvdbg("ARP packet received (%02x)\n", BUF->type);
|
||||
nllinfo("ARP packet received (%02x)\n", BUF->type);
|
||||
NETDEV_RXARP(&priv->dev);
|
||||
|
||||
arp_arpin(&priv->dev);
|
||||
@@ -1684,7 +1684,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
|
||||
rxstat = (uint32_t)rsv[7] << 24 | (uint32_t)rsv[6] << 16 |
|
||||
(uint32_t)rsv[5] << 8 | (uint32_t)rsv[4];
|
||||
|
||||
nllvdbg("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %08x pktcnt: %d\n",
|
||||
nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %08x pktcnt: %d\n",
|
||||
priv->nextpkt, pktlen, rxstat, pktcnt);
|
||||
|
||||
/* We enqueue the packet first and remove it later if its faulty.
|
||||
@@ -1859,7 +1859,7 @@ static void enc_irqworker(FAR void *arg)
|
||||
* settings.
|
||||
*/
|
||||
|
||||
nllvdbg("EIR: %04x\n", eir);
|
||||
nllinfo("EIR: %04x\n", eir);
|
||||
|
||||
if ((eir & EIR_DMAIF) != 0) /* DMA interrupt */
|
||||
{
|
||||
@@ -2420,7 +2420,7 @@ static int enc_rxavail(struct net_driver_s *dev)
|
||||
|
||||
if (!sq_empty(&priv->rxqueue))
|
||||
{
|
||||
nllvdbg("RX queue not empty, trying to dispatch\n");
|
||||
nllinfo("RX queue not empty, trying to dispatch\n");
|
||||
enc_rxdispatch(priv);
|
||||
}
|
||||
|
||||
@@ -2546,7 +2546,7 @@ static void enc_pwrsave(FAR struct enc_driver_s *priv)
|
||||
{
|
||||
uint16_t regval;
|
||||
|
||||
nllvdbg("Set PWRSV\n");
|
||||
nllinfo("Set PWRSV\n");
|
||||
|
||||
/* 1. Turn off AES */
|
||||
|
||||
@@ -2597,7 +2597,7 @@ static void enc_ldmacaddr(FAR struct enc_driver_s *priv)
|
||||
uint16_t regval;
|
||||
uint8_t *mac = priv->dev.d_mac.ether_addr_octet;
|
||||
|
||||
nvdbg("Using ENCX24J600's built in MAC address\n");
|
||||
ninfo("Using ENCX24J600's built in MAC address\n");
|
||||
|
||||
regval = enc_rdreg(priv, ENC_MAADR1);
|
||||
mac[0] = regval & 0xff;
|
||||
@@ -2648,7 +2648,7 @@ static void enc_setmacaddr(FAR struct enc_driver_s *priv)
|
||||
{
|
||||
/* There is a user defined mac address. Write it to the ENCXJ600 */
|
||||
|
||||
nvdbg("Using an user defined MAC address\n");
|
||||
ninfo("Using an user defined MAC address\n");
|
||||
|
||||
enc_wrreg(priv, ENC_MAADR1, (uint16_t)mac[1] << 8 | (uint16_t)mac[0]);
|
||||
enc_wrreg(priv, ENC_MAADR2, (uint16_t)mac[3] << 8 | (uint16_t)mac[2]);
|
||||
@@ -2728,7 +2728,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
|
||||
int ret;
|
||||
uint16_t regval;
|
||||
|
||||
nllvdbg("Reset\n");
|
||||
nllinfo("Reset\n");
|
||||
|
||||
do
|
||||
{
|
||||
@@ -2793,7 +2793,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
|
||||
}
|
||||
while ((regval & PHSTAT1_ANDONE) != 0);
|
||||
|
||||
nllvdbg("Auto-negotation completed\n");
|
||||
nllinfo("Auto-negotation completed\n");
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
+25
-25
@@ -285,7 +285,7 @@ static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv)
|
||||
int len = priv->ft_dev.d_len;
|
||||
//irqstate_t flags;
|
||||
//flags = enter_critical_section();
|
||||
//nvdbg("flags=%08x\n", flags);
|
||||
//ninfo("flags=%08x\n", flags);
|
||||
|
||||
txdes = ftmac100_current_txdes(priv);
|
||||
|
||||
@@ -307,7 +307,7 @@ static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv)
|
||||
FTMAC100_TXDES1_TXBUF_SIZE(len));
|
||||
txdes->txdes0 |= FTMAC100_TXDES0_TXDMA_OWN;
|
||||
|
||||
nvdbg("ftmac100_transmit[%x]: copy %08x to %08x %04x\n",
|
||||
ninfo("ftmac100_transmit[%x]: copy %08x to %08x %04x\n",
|
||||
priv->tx_pointer, priv->ft_dev.d_buf, txdes->txdes2, len);
|
||||
|
||||
priv->tx_pointer = (priv->tx_pointer + 1) & (CONFIG_FTMAC100_TX_DESC - 1);
|
||||
@@ -422,7 +422,7 @@ static void ftmac100_reset(FAR struct ftmac100_driver_s *priv)
|
||||
{
|
||||
FAR struct ftmac100_register_s *iobase = (FAR struct ftmac100_register_s *)priv->iobase;
|
||||
|
||||
nvdbg("%s(): iobase=%p\n", __func__, iobase);
|
||||
ninfo("%s(): iobase=%p\n", __func__, iobase);
|
||||
|
||||
putreg32 (FTMAC100_MACCR_SW_RST, &iobase->maccr);
|
||||
|
||||
@@ -472,7 +472,7 @@ static void ftmac100_init(FAR struct ftmac100_driver_s *priv)
|
||||
|
||||
kmem = memalign(RX_BUF_SIZE, CONFIG_FTMAC100_RX_DESC * RX_BUF_SIZE);
|
||||
|
||||
nvdbg("KMEM=%08x\n", kmem);
|
||||
ninfo("KMEM=%08x\n", kmem);
|
||||
|
||||
for (i = 0; i < CONFIG_FTMAC100_RX_DESC; i++)
|
||||
{
|
||||
@@ -502,7 +502,7 @@ static void ftmac100_init(FAR struct ftmac100_driver_s *priv)
|
||||
|
||||
/* transmit ring */
|
||||
|
||||
nvdbg("priv=%08x txdes=%08x rxdes=%08x\n", priv, txdes, rxdes);
|
||||
ninfo("priv=%08x txdes=%08x rxdes=%08x\n", priv, txdes, rxdes);
|
||||
|
||||
putreg32 ((unsigned int)txdes, &iobase->txr_badr);
|
||||
|
||||
@@ -568,7 +568,7 @@ static uint32_t ftmac100_mdio_read(FAR struct ftmac100_register_s *iobase, int r
|
||||
for (i = 0; i < 10; i++)
|
||||
{
|
||||
phycr = getreg32(&iobase->phycr);
|
||||
nvdbg("%02x %d phycr=%08x\n", reg, i, phycr);
|
||||
ninfo("%02x %d phycr=%08x\n", reg, i, phycr);
|
||||
|
||||
if ((phycr & FTMAC100_PHYCR_MIIRD) == 0)
|
||||
{
|
||||
@@ -603,7 +603,7 @@ static void ftmac100_set_mac(FAR struct ftmac100_driver_s *priv,
|
||||
unsigned int maddr = mac[0] << 8 | mac[1];
|
||||
unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5];
|
||||
|
||||
nvdbg("%s(%x %x)\n", __func__, maddr, laddr);
|
||||
ninfo("%s(%x %x)\n", __func__, maddr, laddr);
|
||||
|
||||
putreg32(maddr, &iobase->mac_madr);
|
||||
putreg32(laddr, &iobase->mac_ladr);
|
||||
@@ -656,7 +656,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
|
||||
|
||||
if (!found)
|
||||
{
|
||||
nvdbg("\nNOT FOUND\nCurrent RX %d rxdes0=%08x\n",
|
||||
ninfo("\nNOT FOUND\nCurrent RX %d rxdes0=%08x\n",
|
||||
priv->rx_pointer, rxdes->rxdes0);
|
||||
return;
|
||||
}
|
||||
@@ -664,7 +664,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
|
||||
len = FTMAC100_RXDES0_RFL(rxdes->rxdes0);
|
||||
data = (uint8_t *)rxdes->rxdes2;
|
||||
|
||||
nvdbg ("RX buffer %d (%08x), %x received (%d)\n",
|
||||
ninfo ("RX buffer %d (%08x), %x received (%d)\n",
|
||||
priv->rx_pointer, data, len, (rxdes->rxdes0 & FTMAC100_RXDES0_LRS));
|
||||
|
||||
/* Copy the data data from the hardware to priv->ft_dev.d_buf. Set
|
||||
@@ -685,7 +685,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
* layer
|
||||
@@ -725,7 +725,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
|
||||
@@ -835,7 +835,7 @@ static void ftmac100_txdone(FAR struct ftmac100_driver_s *priv)
|
||||
* disable further Tx interrupts.
|
||||
*/
|
||||
|
||||
nvdbg("txpending=%d\n", priv->tx_pending);
|
||||
ninfo("txpending=%d\n", priv->tx_pending);
|
||||
|
||||
/* Cancel the TX timeout */
|
||||
|
||||
@@ -884,7 +884,7 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv
|
||||
status = getreg32 (&iobase->isr);
|
||||
#endif
|
||||
|
||||
nvdbg("status=%08x(%08x) BASE=%p ISR=%p PHYCR=%p\n",
|
||||
ninfo("status=%08x(%08x) BASE=%p ISR=%p PHYCR=%p\n",
|
||||
status, getreg32(&iobase->isr), iobase, &iobase->isr, &iobase->phycr);
|
||||
|
||||
if (!status)
|
||||
@@ -913,7 +913,7 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv
|
||||
|
||||
if (status & (FTMAC100_INT_XPKT_OK))
|
||||
{
|
||||
nvdbg("\n\nTXDONE\n\n");
|
||||
ninfo("\n\nTXDONE\n\n");
|
||||
ftmac100_txdone(priv);
|
||||
}
|
||||
|
||||
@@ -931,27 +931,27 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv
|
||||
priv->ft_bifup = false;
|
||||
}
|
||||
|
||||
nvdbg("Link: %s\n", priv->ft_bifup ? "UP" : "DOWN");
|
||||
ninfo("Link: %s\n", priv->ft_bifup ? "UP" : "DOWN");
|
||||
ftmac100_mdio_read(iobase, 5);
|
||||
}
|
||||
|
||||
#if 0
|
||||
#define REG(x) (*(volatile uint32_t *)(x))
|
||||
nvdbg("\n=============================================================\n");
|
||||
nvdbg("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n",
|
||||
ninfo("\n=============================================================\n");
|
||||
ninfo("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n",
|
||||
REG(0x98400030), REG(0x98400034), REG(0x98400038), REG(0x98400004),
|
||||
REG(0x98400000), REG(0x98400008));
|
||||
nvdbg("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
|
||||
ninfo("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
|
||||
REG(0x98800014), REG(0x98800004), REG(0x9880000C), REG(0x98800010));
|
||||
nvdbg("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800034),
|
||||
ninfo("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800034),
|
||||
REG(0x98800024), REG(0x9880002C), REG(0x98800020));
|
||||
nvdbg("=============================================================\n");
|
||||
ninfo("=============================================================\n");
|
||||
#endif
|
||||
|
||||
out:
|
||||
putreg32 (INT_MASK_ALL_ENABLED, &iobase->imr);
|
||||
|
||||
nvdbg("ISR-done\n");
|
||||
ninfo("ISR-done\n");
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -1034,7 +1034,7 @@ static int ftmac100_interrupt(int irq, FAR void *context)
|
||||
|
||||
/* TODO: Determine if a TX transfer just completed */
|
||||
|
||||
nvdbg("===> status=%08x\n", priv->status);
|
||||
ninfo("===> status=%08x\n", priv->status);
|
||||
|
||||
if (priv->status & (FTMAC100_INT_XPKT_OK))
|
||||
{
|
||||
@@ -1043,7 +1043,7 @@ static int ftmac100_interrupt(int irq, FAR void *context)
|
||||
* expiration and the deferred interrupt processing.
|
||||
*/
|
||||
|
||||
nvdbg("\n\nTXDONE 0\n\n");
|
||||
ninfo("\n\nTXDONE 0\n\n");
|
||||
wd_cancel(priv->ft_txtimeout);
|
||||
}
|
||||
|
||||
@@ -1087,7 +1087,7 @@ static inline void ftmac100_txtimeout_process(FAR struct ftmac100_driver_s *priv
|
||||
{
|
||||
/* Then reset the hardware */
|
||||
|
||||
nvdbg("TXTIMEOUT\n");
|
||||
ninfo("TXTIMEOUT\n");
|
||||
|
||||
/* Then poll the network for new XMIT data */
|
||||
|
||||
@@ -1658,7 +1658,7 @@ static void ftmac100_ipv6multicast(FAR struct ftmac100_driver_s *priv)
|
||||
mac[4] = tmp16 & 0xff;
|
||||
mac[5] = tmp16 >> 8;
|
||||
|
||||
nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
|
||||
|
||||
(void)ftmac100_addmac(dev, mac);
|
||||
|
||||
@@ -187,7 +187,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if ((IPv4BUF->vhl & IP_VERSION_MASK) == IPv4_VERSION)
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
NETDEV_RXIPV4(&priv->lo_dev);
|
||||
ipv4_input(&priv->lo_dev);
|
||||
}
|
||||
@@ -196,7 +196,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if ((IPv6BUF->vtc & IP_VERSION_MASK) == IPv6_VERSION)
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
NETDEV_RXIPV6(&priv->lo_dev);
|
||||
ipv6_input(&priv->lo_dev);
|
||||
}
|
||||
|
||||
@@ -360,7 +360,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, int signo,
|
||||
FAR struct phy_notify_s *client;
|
||||
DEBUGASSERT(intf);
|
||||
|
||||
nvdbg("%s: PID=%d signo=%d arg=%p\n", intf, pid, signo, arg);
|
||||
ninfo("%s: PID=%d signo=%d arg=%p\n", intf, pid, signo, arg);
|
||||
|
||||
/* The special value pid == 0 means to use the pid of the current task. */
|
||||
|
||||
@@ -439,7 +439,7 @@ int phy_notify_unsubscribe(FAR const char *intf, pid_t pid)
|
||||
{
|
||||
FAR struct phy_notify_s *client;
|
||||
|
||||
nvdbg("%s: PID=%d\n", intf, pid);
|
||||
ninfo("%s: PID=%d\n", intf, pid);
|
||||
|
||||
/* Find the client entry for this interface */
|
||||
|
||||
|
||||
@@ -334,7 +334,7 @@ static void skel_receive(FAR struct skel_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
NETDEV_RXIPV4(&priv->sk_dev);
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
@@ -375,7 +375,7 @@ static void skel_receive(FAR struct skel_driver_s *priv)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
NETDEV_RXIPV6(&priv->sk_dev);
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
@@ -1152,7 +1152,7 @@ static void skel_ipv6multicast(FAR struct skel_driver_s *priv)
|
||||
mac[4] = tmp16 & 0xff;
|
||||
mac[5] = tmp16 >> 8;
|
||||
|
||||
nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
|
||||
|
||||
(void)skel_addmac(dev, mac);
|
||||
|
||||
+8
-8
@@ -287,7 +287,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv)
|
||||
|
||||
/* Increment statistics */
|
||||
|
||||
nvdbg("Sending packet size %d\n", priv->dev.d_len);
|
||||
ninfo("Sending packet size %d\n", priv->dev.d_len);
|
||||
NETDEV_TXPACKETS(&priv->dev);
|
||||
|
||||
/* Send an initial END character to flush out any data that may have
|
||||
@@ -555,7 +555,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
|
||||
* packet if we run out of room.
|
||||
*/
|
||||
|
||||
nvdbg("Receiving packet\n");
|
||||
ninfo("Receiving packet\n");
|
||||
for (; ; )
|
||||
{
|
||||
/* Get the next character in the stream. */
|
||||
@@ -572,7 +572,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
|
||||
|
||||
case SLIP_END:
|
||||
{
|
||||
nvdbg("END\n");
|
||||
ninfo("END\n");
|
||||
|
||||
/* A minor optimization: if there is no data in the packet,
|
||||
* ignore it. This is meant to avoid bothering IP with all the
|
||||
@@ -582,7 +582,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
|
||||
|
||||
if (priv->rxlen > 0)
|
||||
{
|
||||
nvdbg("Received packet size %d\n", priv->rxlen);
|
||||
ninfo("Received packet size %d\n", priv->rxlen);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -595,7 +595,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
|
||||
|
||||
case SLIP_ESC:
|
||||
{
|
||||
nvdbg("ESC\n");
|
||||
ninfo("ESC\n");
|
||||
ch = slip_getc(priv);
|
||||
|
||||
/* if "ch" is not one of these two, then we have a protocol
|
||||
@@ -606,12 +606,12 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
|
||||
switch (ch)
|
||||
{
|
||||
case SLIP_ESC_END:
|
||||
nvdbg("ESC-END\n");
|
||||
ninfo("ESC-END\n");
|
||||
ch = SLIP_END;
|
||||
break;
|
||||
|
||||
case SLIP_ESC_ESC:
|
||||
nvdbg("ESC-ESC\n");
|
||||
ninfo("ESC-ESC\n");
|
||||
ch = SLIP_ESC;
|
||||
break;
|
||||
|
||||
@@ -677,7 +677,7 @@ static int slip_rxtask(int argc, FAR char *argv[])
|
||||
{
|
||||
/* Wait for the next character to be available on the input stream. */
|
||||
|
||||
nvdbg("Waiting...\n");
|
||||
ninfo("Waiting...\n");
|
||||
ch = slip_getc(priv);
|
||||
|
||||
/* Ignore any input that we receive before the interface is up. */
|
||||
|
||||
@@ -234,7 +234,7 @@ static inline void telnet_dumpbuffer(FAR const char *msg,
|
||||
* defined or the following does nothing.
|
||||
*/
|
||||
|
||||
nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
|
||||
ninfodumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -277,12 +277,12 @@ static ssize_t telnet_receive(FAR struct telnet_dev_s *priv, FAR const char *src
|
||||
int nread;
|
||||
uint8_t ch;
|
||||
|
||||
nllvdbg("srclen: %d destlen: %d\n", srclen, destlen);
|
||||
nllinfo("srclen: %d destlen: %d\n", srclen, destlen);
|
||||
|
||||
for (nread = 0; srclen > 0 && nread < destlen; srclen--)
|
||||
{
|
||||
ch = *src++;
|
||||
nllvdbg("ch=%02x state=%d\n", ch, priv->td_state);
|
||||
nllinfo("ch=%02x state=%d\n", ch, priv->td_state);
|
||||
|
||||
switch (priv->td_state)
|
||||
{
|
||||
@@ -462,7 +462,7 @@ static int telnet_open(FAR struct file *filep)
|
||||
int tmp;
|
||||
int ret;
|
||||
|
||||
nllvdbg("td_crefs: %d\n", priv->td_crefs);
|
||||
nllinfo("td_crefs: %d\n", priv->td_crefs);
|
||||
|
||||
/* O_NONBLOCK is not supported */
|
||||
|
||||
@@ -518,7 +518,7 @@ static int telnet_close(FAR struct file *filep)
|
||||
FAR char *devpath;
|
||||
int ret;
|
||||
|
||||
nllvdbg("td_crefs: %d\n", priv->td_crefs);
|
||||
nllinfo("td_crefs: %d\n", priv->td_crefs);
|
||||
|
||||
/* Get exclusive access to the device structures */
|
||||
|
||||
@@ -608,7 +608,7 @@ static ssize_t telnet_read(FAR struct file *filep, FAR char *buffer, size_t len)
|
||||
FAR struct telnet_dev_s *priv = inode->i_private;
|
||||
ssize_t ret;
|
||||
|
||||
nllvdbg("len: %d\n", len);
|
||||
nllinfo("len: %d\n", len);
|
||||
|
||||
/* First, handle the case where there are still valid bytes left in the
|
||||
* I/O buffer from the last time that read was called. NOTE: Much of
|
||||
@@ -681,7 +681,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
|
||||
char ch;
|
||||
bool eol;
|
||||
|
||||
nllvdbg("len: %d\n", len);
|
||||
nllinfo("len: %d\n", len);
|
||||
|
||||
/* Process each character from the user buffer */
|
||||
|
||||
|
||||
+2
-2
@@ -425,7 +425,7 @@ static void tun_receive(FAR struct tun_device_s *priv)
|
||||
/* We only accept IP packets of the configured type and ARP packets */
|
||||
|
||||
#if defined(CONFIG_NET_IPv4)
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
NETDEV_RXIPV4(&priv->dev);
|
||||
|
||||
/* Give the IPv4 packet to the network layer */
|
||||
@@ -448,7 +448,7 @@ static void tun_receive(FAR struct tun_device_s *priv)
|
||||
}
|
||||
|
||||
#elif defined(CONFIG_NET_IPv6)
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
NETDEV_RXIPV6(&priv->dev);
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
|
||||
+2
-2
@@ -332,7 +332,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len)
|
||||
#ifdef CONFIG_NET_IPv4
|
||||
if (BUF->type == HTONS(ETHTYPE_IP))
|
||||
{
|
||||
nllvdbg("IPv4 frame\n");
|
||||
nllinfo("IPv4 frame\n");
|
||||
|
||||
/* Handle ARP on input then give the IPv4 packet to the network
|
||||
* layer
|
||||
@@ -372,7 +372,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len)
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
if (BUF->type == HTONS(ETHTYPE_IP6))
|
||||
{
|
||||
nllvdbg("Iv6 frame\n");
|
||||
nllinfo("Iv6 frame\n");
|
||||
|
||||
/* Give the IPv6 packet to the network layer */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user