diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index a37fc33e7f..a58e2a9ddd 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -77,13 +77,13 @@ static void up_calibratedelay(void) { int i; - _llwarn("Beginning 100s delay\n"); + _warn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - _llwarn("End 100s delay\n"); + _warn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c index 20deacf2bc..c9e339e6ea 100644 --- a/arch/arm/src/efm32/efm32_adc.c +++ b/arch/arm/src/efm32/efm32_adc.c @@ -1191,7 +1191,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev) adcsr = adc_getreg(priv, EFM32_ADC_SR_OFFSET); if ((adcsr & ADC_SR_AWD) != 0) { - allwarn("WARNING: Analog Watchdog, Value converted out of range!\n"); + awarn("WARNING: Analog Watchdog, Value converted out of range!\n"); } /* EOC: End of conversion */ diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h index 709c53e48d..1bcfec2d33 100644 --- a/arch/arm/src/efm32/efm32_rmu.h +++ b/arch/arm/src/efm32/efm32_rmu.h @@ -55,9 +55,9 @@ #endif #ifdef CONFIG_EFM32_RMU_DEBUG -# define rmuerr _llerr -# define rmuwarn _llwarn -# define rmuinfo _llinfo +# define rmuerr _err +# define rmuwarn _warn +# define rmuinfo _info #else # define rmuerr(x...) # define rmuwarn(x...) diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c index f9665a04c4..8de2524ef5 100644 --- a/arch/arm/src/kinetis/kinetis_start.c +++ b/arch/arm/src/kinetis/kinetis_start.c @@ -156,8 +156,8 @@ void __start(void) /* Show reset status */ - _llwarn("Reset status: %02x:%02x\n", - getreg8(KINETIS_SMC_SRSH), getreg8(KINETIS_SMC_SRSL)); + _warn("Reset status: %02x:%02x\n", + getreg8(KINETIS_SMC_SRSH), getreg8(KINETIS_SMC_SRSL)); /* Then start NuttX */ diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 8f8d2bd524..1373050682 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -837,8 +837,8 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) if ((*rxstat & RXSTAT_INFO_ERROR) != 0) { - nllerr("ERROR: considx: %08x prodidx: %08x rxstat: %08x\n", - considx, prodidx, *rxstat); + nerr("ERROR: considx: %08x prodidx: %08x rxstat: %08x\n", + considx, prodidx, *rxstat); NETDEV_RXERRORS(&priv->lp_dev); } @@ -850,21 +850,21 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) /* else */ if (pktlen > CONFIG_NET_ETH_MTU + CONFIG_NET_GUARDSIZE) { - nllwarn("WARNING: Too big. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", - considx, prodidx, pktlen, *rxstat); + nwarn("WARNING: Too big. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", + considx, prodidx, pktlen, *rxstat); NETDEV_RXERRORS(&priv->lp_dev); } else if ((*rxstat & RXSTAT_INFO_LASTFLAG) == 0) { - nllinfo("Fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", - considx, prodidx, pktlen, *rxstat); + ninfo("Fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", + considx, prodidx, pktlen, *rxstat); NETDEV_RXFRAGMENTS(&priv->lp_dev); fragment = true; } else if (fragment) { - nllinfo("Last fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", - considx, prodidx, pktlen, *rxstat); + ninfo("Last fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", + considx, prodidx, pktlen, *rxstat); NETDEV_RXFRAGMENTS(&priv->lp_dev); fragment = false; } @@ -906,7 +906,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllinfo("IPv4 frame\n"); + ninfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->lp_dev); /* Handle ARP on input then give the IPv4 packet to the @@ -948,7 +948,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllinfo("Iv6 frame\n"); + ninfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->lp_dev); /* Give the IPv6 packet to the network layer */ @@ -1202,13 +1202,13 @@ static int lpc17_interrupt(int irq, void *context) { if ((status & ETH_INT_RXOVR) != 0) { - nllerr("ERROR: RX Overrun. status: %08x\n", status); + nerr("ERROR: RX Overrun. status: %08x\n", status); NETDEV_RXERRORS(&priv->lp_dev); } if ((status & ETH_INT_TXUNR) != 0) { - nllerr("ERROR: TX Underrun. status: %08x\n", status); + nerr("ERROR: TX Underrun. status: %08x\n", status); NETDEV_TXERRORS(&priv->lp_dev); } @@ -1229,7 +1229,7 @@ static int lpc17_interrupt(int irq, void *context) if ((status & ETH_INT_RXERR) != 0) { - nllerr("ERROR: RX ERROR: status: %08x\n", status); + nerr("ERROR: RX ERROR: status: %08x\n", status); NETDEV_RXERRORS(&priv->lp_dev); } @@ -1281,7 +1281,7 @@ static int lpc17_interrupt(int irq, void *context) if ((status & ETH_INT_TXERR) != 0) { - nllerr("ERROR: TX ERROR: status: %08x\n", status); + nerr("ERROR: TX ERROR: status: %08x\n", status); NETDEV_TXERRORS(&priv->lp_dev); } @@ -2145,8 +2145,8 @@ static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac) uint32_t crc; unsigned int ndx; - nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Hash function: * @@ -2221,8 +2221,8 @@ static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac) uint32_t crc; unsigned int ndx; - nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Hash function: * diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c index 269f2de253..58e95d48e7 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -1698,7 +1698,7 @@ static int lpc17_usbinterrupt(int irq, void *context) } else { - ullwarn("WARNING: Spurious status change (connected)\n"); + uwarn("WARNING: Spurious status change (connected)\n"); } /* The LSDA (Low speed device attached) bit is valid @@ -1754,7 +1754,7 @@ static int lpc17_usbinterrupt(int irq, void *context) } else { - ullwarn("WARNING: Spurious status change (disconnected)\n"); + uwarn("WARNING: Spurious status change (disconnected)\n"); } } diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index 9c0022b3c4..5aeae7b691 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -1547,7 +1547,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) * scanning logic, and continue scanning with the next frame. */ - nllwarn("WARNING: Dropped, RX descriptor errors: %08x\n", rxdesc->rdes0); + nwarn("WARNING: Dropped, RX descriptor errors: %08x\n", rxdesc->rdes0); lpc43_freesegment(priv, rxcurr, priv->segments); } } @@ -1608,7 +1608,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); + nwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); /* Free dropped packet buffer */ if (dev->d_buf) @@ -1727,7 +1727,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) else #endif { - nllwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); + nwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); } /* We are finished with the RX buffer. NOTE: If the buffer is diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 3f849b96ab..61459e9b83 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -1207,7 +1207,7 @@ static void sam_receive(struct sam_emac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); + nwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); continue; } @@ -1317,7 +1317,7 @@ static void sam_receive(struct sam_emac_s *priv) else #endif { - nllwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); + nwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); } } } @@ -1578,7 +1578,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PFNZ) != 0) { - nllwarn("WARNING: Pause frame received\n"); + nwarn("WARNING: Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1588,7 +1588,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PTZ) != 0) { - nllwarn("WARNING: Pause TO!\n"); + nwarn("WARNING: Pause TO!\n"); } #endif } diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 6260bf332d..d85b9796b5 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -1212,7 +1212,7 @@ static void sam_receive(struct sam_emac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); + nwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); continue; } @@ -1322,7 +1322,7 @@ static void sam_receive(struct sam_emac_s *priv) else #endif { - nllwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); + nwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); } } } @@ -1584,7 +1584,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((pending & EMAC_INT_PFR) != 0) { - nllwarn("WARNING: Pause frame received\n"); + nwarn("WARNING: Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1594,7 +1594,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((pending & EMAC_INT_PTZ) != 0) { - nllwarn("WARNING: Pause TO!\n"); + nwarn("WARNING: Pause TO!\n"); } #endif diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index 6dab62599f..3de390e6f7 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -1575,7 +1575,7 @@ static void sam_receive(struct sam_emac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); + nwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); continue; } @@ -1685,7 +1685,7 @@ static void sam_receive(struct sam_emac_s *priv) else #endif { - nllwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); + nwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); } } } @@ -1972,7 +1972,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PFNZ) != 0) { - nllwarn("WARNING: Pause frame received\n"); + nwarn("WARNING: Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1982,7 +1982,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PTZ) != 0) { - nllwarn("WARNING: Pause TO!\n"); + nwarn("WARNING: Pause TO!\n"); } #endif } diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index dbea76bd22..61ca2f7a12 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -1142,7 +1142,7 @@ static void sam_receive(struct sam_gmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); + nwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); continue; } @@ -1252,7 +1252,7 @@ static void sam_receive(struct sam_gmac_s *priv) else #endif { - nllwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); + nwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); } } } @@ -1536,7 +1536,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((pending & GMAC_INT_PFNZ) != 0) { - nllwarn("WARNING: Pause frame received\n"); + nwarn("WARNING: Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1546,7 +1546,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((pending & GMAC_INT_PTZ) != 0) { - nllwarn("WARNING: Pause TO!\n"); + nwarn("WARNING: Pause TO!\n"); } #endif diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index 8df2561bd9..5b5f55e1a3 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -1896,7 +1896,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); + nwarn("WARNING: Dropped, Too big: %d\n", dev->d_len); NETDEV_RXERRORS(&priv->dev); continue; } @@ -2010,7 +2010,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid) else #endif { - nllwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); + nwarn("WARNING: Dropped, Unknown type: %04x\n", BUF->type); NETDEV_RXDROPPED(&priv->dev); } } diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index 3b541dde8a..34393f5c30 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -2718,12 +2718,12 @@ static int adc_interrupt(FAR struct adc_dev_s *dev) if ((regval & ADC_ISR_AWD) != 0) { - allwarn("WARNING: Analog Watchdog, Value converted out of range!\n"); + awarn("WARNING: Analog Watchdog, Value converted out of range!\n"); } if ((regval & ADC_ISR_OVR) != 0) { - allwarn("WARNING: Overrun has occurred!\n"); + awarn("WARNING: Overrun has occurred!\n"); } /* EOC: End of conversion */ diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c index 82f7c43782..7af39a1f7b 100644 --- a/arch/arm/src/stm32f7/stm32_adc.c +++ b/arch/arm/src/stm32f7/stm32_adc.c @@ -1612,12 +1612,12 @@ static int adc_interrupt(FAR struct adc_dev_s *dev) if ((regval & ADC_ISR_AWD) != 0) { - allwarn("WARNING: Analog Watchdog, Value converted out of range!\n"); + awarn("WARNING: Analog Watchdog, Value converted out of range!\n"); } if ((regval & ADC_ISR_OVR) != 0) { - allwarn("WARNING: Overrun has occurred!\n"); + awarn("WARNING: Overrun has occurred!\n"); } /* EOC: End of conversion */ diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index ccee26653a..2bc6018621 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -1718,7 +1718,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv) * scanning logic, and continue scanning with the next frame. */ - nllwarn("WARNING: DROPPED RX descriptor errors: %08x\n", rxdesc->rdes0); + nwarn("WARNING: DROPPED RX descriptor errors: %08x\n", rxdesc->rdes0); stm32_freesegment(priv, rxcurr, priv->segments); } } @@ -1784,7 +1784,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: DROPPED Too big: %d\n", dev->d_len); + nwarn("WARNING: DROPPED Too big: %d\n", dev->d_len); continue; } @@ -1894,7 +1894,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv) else #endif { - nllwarn("WARNING: DROPPED Unknown type: %04x\n", BUF->type); + nwarn("WARNING: DROPPED Unknown type: %04x\n", BUF->type); } /* We are finished with the RX buffer. NOTE: If the buffer is diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c index 15f743e072..78f9ed426a 100644 --- a/arch/arm/src/tiva/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm3s_ethernet.c @@ -686,7 +686,7 @@ static void tiva_receive(struct tiva_driver_s *priv) /* We will have to drop this packet */ - nllwarn("WARNING: Bad packet size dropped (%d)\n", pktlen); + nwarn("WARNING: Bad packet size dropped (%d)\n", pktlen); NETDEV_RXERRORS(&priv->ld_dev); /* The number of bytes and words left to read is pktlen - 4 (including, @@ -867,7 +867,7 @@ static void tiva_receive(struct tiva_driver_s *priv) else #endif { - nllwarn("WARNING: Unsupported packet type dropped (%02x)\n", + nwarn("WARNING: Unsupported packet type dropped (%02x)\n", htons(ETHBUF->type)); NETDEV_RXDROPPED(&priv->ld_dev); } diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index 575f6b2edc..cfd6e1aefb 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c_ethernet.c @@ -1651,7 +1651,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv) * scanning logic, and continue scanning with the next frame. */ - nllwarn("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); + nwarn("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); tiva_freesegment(priv, rxcurr, priv->segments); } } @@ -1712,7 +1712,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nllwarn("DROPPED: Too big: %d\n", dev->d_len); + nwarn("DROPPED: Too big: %d\n", dev->d_len); } else @@ -1815,7 +1815,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv) else #endif { - nllwarn("DROPPED: Unknown type: %04x\n", BUF->type); + nwarn("DROPPED: Unknown type: %04x\n", BUF->type); } /* We are finished with the RX buffer. NOTE: If the buffer is diff --git a/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/arch/avr/src/at32uc3/at32uc3_gpioirq.c index a62dc41aa6..171fa39f1f 100644 --- a/arch/avr/src/at32uc3/at32uc3_gpioirq.c +++ b/arch/avr/src/at32uc3/at32uc3_gpioirq.c @@ -228,8 +228,8 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi } else { - _llerr("ERROR: No handler: pin=%d ifr=%08x irqset=%08x", - pin, ifr, irqset); + _err("ERROR: No handler: pin=%d ifr=%08x irqset=%08x", + pin, ifr, irqset); } } @@ -247,8 +247,8 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi putreg32(bit, regbase + AVR32_GPIO_IFRC_OFFSET); ifr &= ~bit; - _llwarn("WARNING: IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x", - pin, ifr, irqset); + warn("WARNING: IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x", + pin, ifr, irqset); } } } diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 3b5df4f848..5a650957b8 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -118,13 +118,13 @@ static void up_calibratedelay(void) { int i; - _llwarn("Beginning 100s delay\n"); + _warn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - _llwarn("End 100s delay\n"); + _warn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index 621fae32cd..dfa15d6872 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -74,13 +74,13 @@ static void up_calibratedelay(void) { int i; - _llwarn("Beginning 100s delay\n"); + _warn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - _llwarn("End 100s delay\n"); + _warn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index d09c34e547..927bd5fcef 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -76,13 +76,13 @@ static void up_calibratedelay(void) { int i; - _llwarn("Beginning 100s delay\n"); + _warn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - _llwarn("End 100s delay\n"); + _warn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c index 85d2705c70..51c790504c 100644 --- a/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -280,9 +280,9 @@ # undef CONFIG_PIC32MX_USBDEV_BDTDEBUG # define CONFIG_PIC32MX_USBDEV_BDTDEBUG 1 -# define regerr _llerr -# define regwarn _llwarn -# define reginfo _llinfo +# define regerr _err +# define regwarn _warn +# define reginfo _info #else @@ -298,9 +298,9 @@ #ifdef CONFIG_PIC32MX_USBDEV_BDTDEBUG -# define bdterr _llerr -# define bdtwarn _llwarn -# define bdtinfo _llinfo +# define bdterr _err +# define bdtwarn _warn +# define bdtinfo _info #else diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index c1e2671f92..14cf4cf6a3 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -1384,8 +1384,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) if ((rxdesc->rsv2 & RXDESC_RSV2_OK) == 0) { - nllwarn("WARNING. rsv1: %08x rsv2: %08x\n", - rxdesc->rsv1, rxdesc->rsv2); + nwarn("WARNING. rsv1: %08x rsv2: %08x\n", + rxdesc->rsv1, rxdesc->rsv2); NETDEV_RXERRORS(&priv->pd_dev); pic32mz_rxreturn(rxdesc); } @@ -1398,8 +1398,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) else if (priv->pd_dev.d_len > CONFIG_NET_ETH_MTU) { - nllwarn("WARNING: Too big. packet length: %d rxdesc: %08x\n", - priv->pd_dev.d_len, rxdesc->status); + nwarn("WARNING: Too big. packet length: %d rxdesc: %08x\n", + priv->pd_dev.d_len, rxdesc->status); NETDEV_RXERRORS(&priv->pd_dev); pic32mz_rxreturn(rxdesc); } @@ -1409,8 +1409,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) else if ((rxdesc->status & (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) != (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) { - nllwarn("WARNING: Fragment. packet length: %d rxdesc: %08x\n", - priv->pd_dev.d_len, rxdesc->status); + nwarn("WARNING: Fragment. packet length: %d rxdesc: %08x\n", + priv->pd_dev.d_len, rxdesc->status); NETDEV_RXFRAGMENTS(&priv->pd_dev); pic32mz_rxreturn(rxdesc); } @@ -1549,8 +1549,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) { /* Unrecognized... drop it. */ - nllwarn("WARNING: Unrecognized packet type dropped: %04x\n", - ntohs(BUF->type)); + nwarn("WARNING: Unrecognized packet type dropped: %04x\n", + ntohs(BUF->type)); NETDEV_RXDROPPED(&priv->pd_dev); } diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c index 6bfebb2f0d..bdacd41ba9 100644 --- a/arch/sh/src/common/up_initialize.c +++ b/arch/sh/src/common/up_initialize.c @@ -82,13 +82,13 @@ static void up_calibratedelay(void) { int i; - sllwarn("Beginning 100s delay\n"); + swarn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - sllwarn("End 100s delay\n"); + swarn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index 72f1b7a075..9e0c1ad1c2 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -76,13 +76,13 @@ static void up_calibratedelay(void) { int i; - _llwarn("Beginning 100s delay\n"); + _warn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - _llwarn("End 100s delay\n"); + _warn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index 597170a276..efdf975d52 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -87,13 +87,13 @@ static void up_calibratedelay(void) { int i; - _llwarn("Beginning 100s delay\n"); + _warn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - _llwarn("End 100s delay\n"); + _warn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index 3032b9cdf5..c1a2137a72 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -76,13 +76,13 @@ static void up_calibratedelay(void) { int i; - _llwarn("Beginning 100s delay\n"); + _warn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - _llwarn("End 100s delay\n"); + _warn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c index 1e2948da57..b15cf06107 100644 --- a/configs/sam4e-ek/src/sam_ethernet.c +++ b/configs/sam4e-ek/src/sam_ethernet.c @@ -77,16 +77,10 @@ # define phyerr _err # define phywarn _warn # define phyinfo _info -# define phyllerr _llerr -# define phyllwarn _llwarn -# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) # define phyinfo(x...) -# define phyllerr(x...) -# define phyllwarn(x...) -# define phyllinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c index 5f38d395b1..8505711302 100644 --- a/configs/sama5d3-xplained/src/sam_ethernet.c +++ b/configs/sama5d3-xplained/src/sam_ethernet.c @@ -87,16 +87,10 @@ # define phyerr _err # define phywarn _warn # define phyinfo _info -# define phyllerr _llerr -# define phyllwarn _llwarn -# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) # define phyinfo(x...) -# define phyllerr(x...) -# define phyllwarn(x...) -# define phyllinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c index b4d0d31c0b..87ee620ba7 100644 --- a/configs/sama5d3x-ek/src/sam_ethernet.c +++ b/configs/sama5d3x-ek/src/sam_ethernet.c @@ -87,16 +87,10 @@ # define phyerr _err # define phywarn _warn # define phyinfo _info -# define phyllerr _llerr -# define phyllwarn _llwarn -# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) # define phyinfo(x...) -# define phyllerr(x...) -# define phyllwarn(x...) -# define phyllinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c index 30fd1e6124..edda5f686a 100644 --- a/configs/sama5d4-ek/src/sam_ethernet.c +++ b/configs/sama5d4-ek/src/sam_ethernet.c @@ -87,16 +87,10 @@ # define phyerr _err # define phywarn _warn # define phyinfo _info -# define phyllerr _llerr -# define phyllwarn _llwarn -# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) # define phyinfo(x...) -# define phyllerr(x...) -# define phyllwarn(x...) -# define phyllinfo(x...) #endif /************************************************************************************ diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c index f7a2d9113c..8f427e8c97 100644 --- a/configs/same70-xplained/src/sam_ethernet.c +++ b/configs/same70-xplained/src/sam_ethernet.c @@ -83,16 +83,10 @@ # define phyerr _err # define phywarn _warn # define phyinfo _info -# define phyllerr _llerr -# define phyllwarn _llwarn -# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) # define phyinfo(x...) -# define phyllerr(x...) -# define phyllwarn(x...) -# define phyllinfo(x...) #endif /************************************************************************************ diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c index 00d91314a0..2714eab3be 100644 --- a/configs/samv71-xult/src/sam_ethernet.c +++ b/configs/samv71-xult/src/sam_ethernet.c @@ -83,16 +83,10 @@ # define phyerr _err # define phywarn _warn # define phyinfo _info -# define phyllerr _llerr -# define phyllwarn _llwarn -# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) # define phyinfo(x...) -# define phyllerr(x...) -# define phyllwarn(x...) -# define phyllinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c index 5dc94ece4e..47801c86e2 100644 --- a/configs/stm3210e-eval/src/stm32_idle.c +++ b/configs/stm3210e-eval/src/stm32_idle.c @@ -366,7 +366,7 @@ static void stm32_idlepm(void) ret = stm32_rtc_cancelalarm(); if (ret < 0) { - sllwarn("WARNING: Cancel alarm failed\n"); + swarn("WARNING: Cancel alarm failed\n"); } #endif /* Note: See the additional PM_STANDBY related logic at the diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c index e8418d41f7..67b7b9e95e 100644 --- a/configs/stm32f4discovery/src/stm32_ethernet.c +++ b/configs/stm32f4discovery/src/stm32_ethernet.c @@ -82,16 +82,10 @@ # define phyerr _err # define phywarn _warn # define phyinfo _info -# define phyllerr _llerr -# define phyllwarn _llwarn -# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) # define phyinfo(x...) -# define phyllerr(x...) -# define phyllwarn(x...) -# define phyllinfo(x...) #endif /************************************************************************************ diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 32f1bb5756..627caa8716 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -2473,7 +2473,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) { uint8_t regval; - nllwarn("WARNING: Reset\n"); + nwarn("WARNING: Reset\n"); /* Configure SPI for the ENC28J60 */ diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h index fc1e398fc4..b513861fe8 100644 --- a/graphics/vnc/server/vnc_server.h +++ b/graphics/vnc/server/vnc_server.h @@ -187,34 +187,22 @@ #ifdef CONFIG_VNCSERVER_UPDATE_DEBUG # ifdef CONFIG_CPP_HAVE_VARARGS # define upderr(format, ...) _err(format, ##__VA_ARGS__) -# define updllerr(format, ...) _llerr(format, ##__VA_ARGS__) # define updinfo(format, ...) _info(format, ##__VA_ARGS__) -# define updllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) # define updinfo(format, ...) _info(format, ##__VA_ARGS__) -# define updllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) # else # define upderr _err -# define updllerr _llerr # define updwarn _warn -# define updllwarn _llwarn # define updinfo _info -# define updllinfo _llinfo # endif #else # ifdef CONFIG_CPP_HAVE_VARARGS # define upderr(x...) -# define updllerr(x...) # define updwarn(x...) -# define updllwarn(x...) # define updinfo(x...) -# define updllinfo(x...) # else # define upderr (void) -# define updllerr (void) # define updwarn (void) -# define updllwarn (void) # define updinfo (void) -# define updllinfo (void) # endif #endif diff --git a/include/debug.h b/include/debug.h index 06c92f99d5..69f88d227e 100644 --- a/include/debug.h +++ b/include/debug.h @@ -96,11 +96,6 @@ * in low-level code where it is inappropriate to use file descriptors. For * example, only [a-z]llinfo() should be used in interrupt handlers. * - * [a-z]llwarn() -- Identical to [a-z]llinfo() except that it also requires that - * CONFIG_DEBUG_WARN be defined. This is intended for important exception - * conditions that are potential errors (or perhaps real errors with non- - * fatal consequences). - * * [a-z]llerr() -- Identical to [a-z]llinfo() except that it also requires that * CONFIG_DEBUG_ERROR be defined. This is intended for important error-related * information that you probably not want to suppress during normal debug @@ -155,16 +150,8 @@ #ifdef CONFIG_DEBUG_WARN # define _warn(format, ...) \ __arch_syslog(LOG_WARNING, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) - -# ifdef CONFIG_ARCH_LOWPUTC -# define _llwarn(format, ...) \ - __arch_syslog(LOG_WARNING, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) -# else -# define _llwarn(x...) -# endif #else /* CONFIG_DEBUG_INFO */ # define _warn(x...) -# define _llwarn(x...) #endif /* CONFIG_DEBUG_INFO */ #ifdef CONFIG_DEBUG_INFO @@ -194,10 +181,8 @@ #ifdef CONFIG_DEBUG_MM_WARN # define mwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define mllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define mwarn(x...) -# define mllwarn(x...) #endif #ifdef CONFIG_DEBUG_MM_INFO @@ -218,10 +203,8 @@ #ifdef CONFIG_DEBUG_SCHED_WARN # define swarn(format, ...) _warn(format, ##__VA_ARGS__) -# define sllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define swarn(x...) -# define sllwarn(x...) #endif #ifdef CONFIG_DEBUG_SCHED_INFO @@ -242,10 +225,8 @@ #ifdef CONFIG_DEBUG_SYSCALL_WARN # define svcwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define svcllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define svcwarn(x...) -# define svcllwarn(x...) #endif #ifdef CONFIG_DEBUG_SYSCALL_INFO @@ -266,10 +247,8 @@ #ifdef CONFIG_DEBUG_PAGING_WARN # define pgwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define pgllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define pgwarn(x...) -# define pgllwarn(x...) #endif #ifdef CONFIG_DEBUG_PAGING_INFO @@ -290,10 +269,8 @@ #ifdef CONFIG_DEBUG_NET_WARN # define nwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define nllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define nwarn(x...) -# define nllwarn(x...) #endif #ifdef CONFIG_DEBUG_NET_INFO @@ -314,10 +291,8 @@ #ifdef CONFIG_DEBUG_FS_WARN # define fwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define fllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define fwarn(x...) -# define fllwarn(x...) #endif #ifdef CONFIG_DEBUG_FS_INFO @@ -338,10 +313,8 @@ #ifdef CONFIG_DEBUG_CRYPTO_WARN # define cryptwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define cryptllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define cryptwarn(x...) -# define cryptllwarn(x...) #endif #ifdef CONFIG_DEBUG_CRYPTO_INFO @@ -362,10 +335,8 @@ #ifdef CONFIG_DEBUG_INPUT_WARN # define iwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define illwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define iwarn(x...) -# define illwarn(x...) #endif #ifdef CONFIG_DEBUG_INPUT_INFO @@ -386,10 +357,8 @@ #ifdef CONFIG_DEBUG_ANALOG_WARN # define awarn(format, ...) _warn(format, ##__VA_ARGS__) -# define allwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define awarn(x...) -# define allwarn(x...) #endif #ifdef CONFIG_DEBUG_ANALOG_INFO @@ -410,10 +379,8 @@ #ifdef CONFIG_DEBUG_CAN_WARN # define canwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define canllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define canwarn(x...) -# define canllwarn(x...) #endif #ifdef CONFIG_DEBUG_CAN_INFO @@ -434,10 +401,8 @@ #ifdef CONFIG_DEBUG_GRAPHICS_WARN # define gwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define gllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define gwarn(x...) -# define gllwarn(x...) #endif #ifdef CONFIG_DEBUG_GRAPHICS_INFO @@ -458,10 +423,8 @@ #ifdef CONFIG_DEBUG_BINFMT_WARN # define bwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define bllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define bwarn(x...) -# define bllwarn(x...) #endif #ifdef CONFIG_DEBUG_BINFMT_INFO @@ -482,10 +445,8 @@ #ifdef CONFIG_DEBUG_LIB_WARN # define lwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define lllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define lwarn(x...) -# define lllwarn(x...) #endif #ifdef CONFIG_DEBUG_LIB_INFO @@ -506,10 +467,8 @@ #ifdef CONFIG_DEBUG_AUDIO_WARN # define audwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define audllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define audwarn(x...) -# define audllwarn(x...) #endif #ifdef CONFIG_DEBUG_AUDIO_INFO @@ -530,10 +489,8 @@ #ifdef CONFIG_DEBUG_DMA_WARN # define dmawarn(format, ...) _warn(format, ##__VA_ARGS__) -# define dmallwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define dmawarn(x...) -# define dmallwarn(x...) #endif #ifdef CONFIG_DEBUG_DMA_INFO @@ -554,10 +511,8 @@ #ifdef CONFIG_DEBUG_IRQ_WARN # define irqwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define irqllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define irqwarn(x...) -# define irqllwarn(x...) #endif #ifdef CONFIG_DEBUG_IRQ_INFO @@ -578,10 +533,8 @@ #ifdef CONFIG_DEBUG_LCD_WARN # define lcdwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define lcdllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define lcdwarn(x...) -# define lcdllwarn(x...) #endif #ifdef CONFIG_DEBUG_LCD_INFO @@ -602,10 +555,8 @@ #ifdef CONFIG_DEBUG_LEDS_WARN # define ledwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define ledllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define ledwarn(x...) -# define ledllwarn(x...) #endif #ifdef CONFIG_DEBUG_LEDS_INFO @@ -626,10 +577,8 @@ #ifdef CONFIG_DEBUG_GPIO_WARN # define gpiowarn(format, ...) _warn(format, ##__VA_ARGS__) -# define gpiollwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define gpiowarn(x...) -# define gpiollwarn(x...) #endif #ifdef CONFIG_DEBUG_GPIO_INFO @@ -650,10 +599,8 @@ #ifdef CONFIG_DEBUG_I2C_WARN # define i2cwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define i2cllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define i2cwarn(x...) -# define i2cllwarn(x...) #endif #ifdef CONFIG_DEBUG_I2C_INFO @@ -674,10 +621,8 @@ #ifdef CONFIG_DEBUG_I2S_WARN # define i2swarn(format, ...) _warn(format, ##__VA_ARGS__) -# define i2sllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define i2swarn(x...) -# define i2sllwarn(x...) #endif #ifdef CONFIG_DEBUG_I2S_INFO @@ -698,10 +643,8 @@ #ifdef CONFIG_DEBUG_PWM_WARN # define pwmwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define pwmllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define pwmwarn(x...) -# define pwmllwarn(x...) #endif #ifdef CONFIG_DEBUG_PWM_INFO @@ -722,10 +665,8 @@ #ifdef CONFIG_DEBUG_RTC_WARN # define rtcwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define rtcllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define rtcwarn(x...) -# define rtcllwarn(x...) #endif #ifdef CONFIG_DEBUG_RTC_INFO @@ -746,10 +687,8 @@ #ifdef CONFIG_DEBUG_MEMCARD_WARN # define mcwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define mcllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define mcwarn(x...) -# define mcllwarn(x...) #endif #ifdef CONFIG_DEBUG_MEMCARD_INFO @@ -770,10 +709,8 @@ #ifdef CONFIG_DEBUG_SENSORS_WARN # define snwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define snllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define snwarn(x...) -# define snllwarn(x...) #endif #ifdef CONFIG_DEBUG_SENSORS_INFO @@ -794,10 +731,8 @@ #ifdef CONFIG_DEBUG_SPI_WARN # define spiwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define spillwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define spiwarn(x...) -# define spillwarn(x...) #endif #ifdef CONFIG_DEBUG_SPI_INFO @@ -818,10 +753,8 @@ #ifdef CONFIG_DEBUG_TIMER_WARN # define tmrwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define tmrllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define tmrwarn(x...) -# define tmrllwarn(x...) #endif #ifdef CONFIG_DEBUG_TIMER_INFO @@ -842,10 +775,8 @@ #ifdef CONFIG_DEBUG_USB_WARN # define uwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define ullwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define uwarn(x...) -# define ullwarn(x...) #endif #ifdef CONFIG_DEBUG_USB_INFO @@ -866,10 +797,8 @@ #ifdef CONFIG_DEBUG_WATCHDOG_WARN # define wdwarn(format, ...) _warn(format, ##__VA_ARGS__) -# define wdllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define wdwarn(x...) -# define wdllwarn(x...) #endif #ifdef CONFIG_DEBUG_WATCHDOG_INFO @@ -897,13 +826,8 @@ # define _llerr (void) #endif -#ifdef CONFIG_DEBUG_WARN -# ifndef CONFIG_ARCH_LOWPUTC -# define _llwarn (void) -# endif -#else +#ifndef CONFIG_DEBUG_WARN # define _warn (void) -# define _llwarn (void) #endif #ifdef CONFIG_DEBUG_INFO @@ -927,10 +851,8 @@ #ifdef CONFIG_DEBUG_MM_WARN # define mwarn _warn -# define mllwarn _llwarn #else # define mwarn (void) -# define mllwarn (void) #endif #ifdef CONFIG_DEBUG_MM_INFO @@ -951,10 +873,8 @@ #ifdef CONFIG_DEBUG_SCHED_WARN # define swarn _warn -# define sllwarn _llwarn #else # define swarn (void) -# define sllwarn (void) #endif #ifdef CONFIG_DEBUG_SCHED_INFO @@ -975,10 +895,8 @@ #ifdef CONFIG_DEBUG_SYSCALL_WARN # define svcwarn _warn -# define svcllwarn _llwarn #else # define svcwarn (void) -# define svcllwarn (void) #endif #ifdef CONFIG_DEBUG_SYSCALL_INFO @@ -999,10 +917,8 @@ #ifdef CONFIG_DEBUG_PAGING_WARN # define pgwarn _warn -# define pgllwarn _llwarn #else # define pgwarn (void) -# define pgllwarn (void) #endif #ifdef CONFIG_DEBUG_PAGING_INFO @@ -1023,10 +939,8 @@ #ifdef CONFIG_DEBUG_NET_WARN # define nwarn _warn -# define nllwarn _llwarn #else # define nwarn (void) -# define nllwarn (void) #endif #ifdef CONFIG_DEBUG_NET_INFO @@ -1047,10 +961,8 @@ #ifdef CONFIG_DEBUG_FS_WARN # define fwarn _warn -# define fllwarn _llwarn #else # define fwarn (void) -# define fllwarn (void) #endif #ifdef CONFIG_DEBUG_FS_INFO @@ -1071,10 +983,8 @@ #ifdef CONFIG_DEBUG_CRYPTO_WARN # define cryptwarn _warn -# define cryptllwarn _llwarn #else # define cryptwarn (void) -# define cryptllwarn (void) #endif #ifdef CONFIG_DEBUG_CRYPTO_INFO @@ -1095,10 +1005,8 @@ #ifdef CONFIG_DEBUG_INPUT_WARN # define iwarn _warn -# define illwarn _llwarn #else # define iwarn (void) -# define illwarn (void) #endif #ifdef CONFIG_DEBUG_INPUT_INFO @@ -1119,10 +1027,8 @@ #ifdef CONFIG_DEBUG_ANALOG_WARN # define awarn _warn -# define allwarn _llwarn #else # define awarn (void) -# define allwarn (void) #endif #ifdef CONFIG_DEBUG_ANALOG_INFO @@ -1143,10 +1049,8 @@ #ifdef CONFIG_DEBUG_CAN_WARN # define canwarn _warn -# define canllwarn _llwarn #else # define canwarn (void) -# define canllwarn (void) #endif #ifdef CONFIG_DEBUG_CAN_INFO @@ -1167,10 +1071,8 @@ #ifdef CONFIG_DEBUG_GRAPHICS_WARN # define gwarn _warn -# define gllwarn _llwarn #else # define gwarn (void) -# define gllwarn (void) #endif #ifdef CONFIG_DEBUG_GRAPHICS_INFO @@ -1191,10 +1093,8 @@ #ifdef CONFIG_DEBUG_BINFMT_WARN # define bwarn _warn -# define bllwarn _llwarn #else # define bwarn (void) -# define bllwarn (void) #endif #ifdef CONFIG_DEBUG_BINFMT_INFO @@ -1215,10 +1115,8 @@ #ifdef CONFIG_DEBUG_LIB_WARN # define lwarn _warn -# define lllwarn _llwarn #else # define lwarn (void) -# define lllwarn (void) #endif #ifdef CONFIG_DEBUG_LIB_INFO @@ -1239,10 +1137,8 @@ #ifdef CONFIG_DEBUG_AUDIO_WARN # define audwarn _warn -# define audllwarn _llwarn #else # define audwarn (void) -# define audllwarn (void) #endif #ifdef CONFIG_DEBUG_AUDIO_INFO @@ -1263,10 +1159,8 @@ #ifdef CONFIG_DEBUG_DMA_WARN # define dmawarn _warn -# define dmallwarn _llwarn #else # define dmawarn (void) -# define dmallwarn (void) #endif #ifdef CONFIG_DEBUG_DMA_INFO @@ -1287,10 +1181,8 @@ #ifdef CONFIG_DEBUG_IRQ_WARN # define irqwarn _warn -# define irqllwarn _llwarn #else # define irqwarn (void) -# define irqllwarn (void) #endif #ifdef CONFIG_DEBUG_IRQ_INFO @@ -1311,10 +1203,8 @@ #ifdef CONFIG_DEBUG_LCD_WARN # define lcdwarn _warn -# define lcdllwarn _llwarn #else # define lcdwarn (void) -# define lcdllwarn (void) #endif #ifdef CONFIG_DEBUG_LCD_INFO @@ -1335,10 +1225,8 @@ #ifdef CONFIG_DEBUG_LEDS_WARN # define ledwarn _warn -# define ledllwarn _llwarn #else # define ledwarn (void) -# define ledllwarn (void) #endif #ifdef CONFIG_DEBUG_LEDS_INFO @@ -1359,10 +1247,8 @@ #ifdef CONFIG_DEBUG_GPIO_WARN # define gpiowarn _warn -# define gpiollwarn _llwarn #else # define gpiowarn (void) -# define gpiollwarn (void) #endif #ifdef CONFIG_DEBUG_GPIO_INFO @@ -1383,10 +1269,8 @@ #ifdef CONFIG_DEBUG_I2C_WARN # define i2cwarn _warn -# define i2cllwarn _llwarn #else # define i2cwarn (void) -# define i2cllwarn (void) #endif #ifdef CONFIG_DEBUG_I2C_INFO @@ -1407,10 +1291,8 @@ #ifdef CONFIG_DEBUG_I2S_WARN # define i2swarn _warn -# define i2sllwarn _llwarn #else # define i2swarn (void) -# define i2sllwarn (void) #endif #ifdef CONFIG_DEBUG_I2S_INFO @@ -1431,10 +1313,8 @@ #ifdef CONFIG_DEBUG_PWM_WARN # define pwmwarn _warn -# define pwmllwarn _llwarn #else # define pwmwarn (void) -# define pwmllwarn (void) #endif #ifdef CONFIG_DEBUG_PWM_INFO @@ -1455,10 +1335,8 @@ #ifdef CONFIG_DEBUG_RTC_WARN # define rtcwarn _warn -# define rtcllwarn _llwarn #else # define rtcwarn (void) -# define rtcllwarn (void) #endif #ifdef CONFIG_DEBUG_RTC_INFO @@ -1479,10 +1357,8 @@ #ifdef CONFIG_DEBUG_MEMCARD_WARN # define mcwarn _warn -# define mcllwarn _llwarn #else # define mcwarn (void) -# define mcllwarn (void) #endif #ifdef CONFIG_DEBUG_MEMCARD_INFO @@ -1503,10 +1379,8 @@ #ifdef CONFIG_DEBUG_SENSORS_WARN # define snwarn _warn -# define snllwarn _llwarn #else # define snwarn (void) -# define snllwarn (void) #endif #ifdef CONFIG_DEBUG_SENSORS_INFO @@ -1527,10 +1401,8 @@ #ifdef CONFIG_DEBUG_SPI_WARN # define spiwarn _warn -# define spillwarn _llwarn #else # define spiwarn (void) -# define spillwarn (void) #endif #ifdef CONFIG_DEBUG_SPI_INFO @@ -1551,10 +1423,8 @@ #ifdef CONFIG_DEBUG_TIMER_WARN # define tmrwarn _warn -# define tmrllwarn _llwarn #else # define tmrwarn (void) -# define tmrllwarn (void) #endif #ifdef CONFIG_DEBUG_TIMER_INFO @@ -1575,10 +1445,8 @@ #ifdef CONFIG_DEBUG_USB_WARN # define uwarn _warn -# define ullwarn _llwarn #else # define uwarn (void) -# define ullwarn (void) #endif #ifdef CONFIG_DEBUG_USB_INFO @@ -1599,10 +1467,8 @@ #ifdef CONFIG_DEBUG_WATCHDOG_WARN # define wdwarn _warn -# define wdllwarn _llwarn #else # define wdwarn (void) -# define wdllwarn (void) #endif #ifdef CONFIG_DEBUG_WATCHDOG_INFO @@ -1901,11 +1767,7 @@ int _llerr(const char *format, ...); #ifdef CONFIG_DEBUG_WARN int _warn(const char *format, ...); - -# ifdef CONFIG_ARCH_LOWPUTC -int _llwarn(const char *format, ...); -# endif -#endif /* CONFIG_DEBUG_WARN */ +#endif #ifdef CONFIG_DEBUG_INFO int _info(const char *format, ...); diff --git a/libc/libc.csv b/libc/libc.csv index cb673d23ad..ae50fc8952 100644 --- a/libc/libc.csv +++ b/libc/libc.csv @@ -66,7 +66,7 @@ "llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int" "_llerr","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." "_llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." -"_llwarn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." +"_warn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." "match","nuttx/regex.h","","int","const char *","const char *" "memccpy","string.h","","FAR void","FAR void *","FAR const void *","int c","size_t" "memchr","string.h","","FAR void","FAR const void *","int c","size_t" diff --git a/libc/misc/lib_debug.c b/libc/misc/lib_debug.c index 7e6a33f8aa..4e3a0ef416 100644 --- a/libc/misc/lib_debug.c +++ b/libc/misc/lib_debug.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: alert, err, llerr, warn, llwarn, info, _llinfo + * Name: alert, err, llerr, warn, and info, _llinfo * * Description: * If the cross-compiler's pre-processor does not support variable @@ -113,21 +113,7 @@ int _warn(const char *format, ...) return ret; } - -#ifdef CONFIG_ARCH_LOWPUTC -int _llwarn(const char *format, ...) -{ - va_list ap; - int ret; - - va_start(ap, format); - ret = lowvsyslog(LOG_WARNING, format, ap); - va_end(ap); - - return ret; -} -#endif /* CONFIG_ARCH_LOWPUTC */ -#endif /* CONFIG_DEBUG_INFO */ +#endif /* CONFIG_DEBUG_WARN */ #ifdef CONFIG_DEBUG_INFO int _info(const char *format, ...) diff --git a/net/devif/ipv4_input.c b/net/devif/ipv4_input.c index 05f661a39d..ee959754e2 100644 --- a/net/devif/ipv4_input.c +++ b/net/devif/ipv4_input.c @@ -339,8 +339,8 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.drop++; g_netstats.ipv4.vhlerr++; #endif - nllwarn("WARNING: Invalid IP version or header length: %02x\n", - pbuf->vhl); + nwarn("WARNING: Invalid IP version or header length: %02x\n", + pbuf->vhl); goto drop; } @@ -349,7 +349,7 @@ int ipv4_input(FAR struct net_driver_s *dev) hdrlen = NET_LL_HDRLEN(dev); if ((hdrlen + IPv4_HDRLEN) > dev->d_len) { - nllwarn("WARNING: Packet shorter than IPv4 header\n"); + nwarn("WARNING: Packet shorter than IPv4 header\n"); goto drop; } @@ -369,7 +369,7 @@ int ipv4_input(FAR struct net_driver_s *dev) } else { - nllwarn("WARNING: IP packet shorter than length in IP header\n"); + nwarn("WARNING: IP packet shorter than length in IP header\n"); goto drop; } @@ -388,7 +388,7 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.drop++; g_netstats.ipv4.fragerr++; #endif - nllwarn("WARNING: IP fragment dropped\n"); + nwarn("WARNING: IP fragment dropped\n"); goto drop; #endif /* CONFIG_NET_TCP_REASSEMBLY */ } @@ -414,7 +414,7 @@ int ipv4_input(FAR struct net_driver_s *dev) #ifdef CONFIG_NET_ICMP if (net_ipv4addr_cmp(dev->d_ipaddr, INADDR_ANY)) { - nllwarn("WARNING: No IP address assigned\n"); + nwarn("WARNING: No IP address assigned\n"); goto drop; } @@ -447,7 +447,7 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.drop++; g_netstats.ipv4.chkerr++; #endif - nllwarn("WARNING: Bad IP checksum\n"); + nwarn("WARNING: Bad IP checksum\n"); goto drop; } @@ -495,7 +495,7 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.protoerr++; #endif - nllwarn("WARNING: Unrecognized IP protocol\n"); + nwarn("WARNING: Unrecognized IP protocol\n"); goto drop; } diff --git a/net/devif/ipv6_input.c b/net/devif/ipv6_input.c index e3e7ba46f2..d51d7aa805 100644 --- a/net/devif/ipv6_input.c +++ b/net/devif/ipv6_input.c @@ -151,7 +151,7 @@ int ipv6_input(FAR struct net_driver_s *dev) g_netstats.ipv6.vhlerr++; #endif - nllwarn("WARNING: Invalid IPv6 version: %d\n", ipv6->vtc >> 4); + nwarn("WARNING: Invalid IPv6 version: %d\n", ipv6->vtc >> 4); goto drop; } @@ -160,7 +160,7 @@ int ipv6_input(FAR struct net_driver_s *dev) hdrlen = NET_LL_HDRLEN(dev); if ((hdrlen + IPv6_HDRLEN) > dev->d_len) { - nllwarn("WARNING: Packet shorter than IPv6 header\n"); + nwarn("WARNING: Packet shorter than IPv6 header\n"); goto drop; } @@ -187,7 +187,7 @@ int ipv6_input(FAR struct net_driver_s *dev) } else { - nllwarn("WARNING: IP packet shorter than length in IP header\n"); + nwarn("WARNING: IP packet shorter than length in IP header\n"); goto drop; } @@ -216,7 +216,7 @@ int ipv6_input(FAR struct net_driver_s *dev) * packets. */ - nllwarn("WARNING: No IP address assigned\n"); + nwarn("WARNING: No IP address assigned\n"); goto drop; } @@ -279,7 +279,7 @@ int ipv6_input(FAR struct net_driver_s *dev) g_netstats.ipv6.protoerr++; #endif - nllwarn("WARNING: Unrecognized IP protocol: %04x\n", ipv6->proto); + nwarn("WARNING: Unrecognized IP protocol: %04x\n", ipv6->proto); goto drop; } diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index a065848270..cb9607a65a 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -164,7 +164,7 @@ void icmp_input(FAR struct net_driver_s *dev) else { - nllwarn("WARNING: Unknown ICMP cmd: %d\n", picmp->type); + nwarn("WARNING: Unknown ICMP cmd: %d\n", picmp->type); goto typeerr; } diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c index 31de97b332..ab20878f77 100644 --- a/net/icmpv6/icmpv6_input.c +++ b/net/icmpv6/icmpv6_input.c @@ -307,7 +307,7 @@ void icmpv6_input(FAR struct net_driver_s *dev) default: { - nllwarn("WARNING: Unknown ICMPv6 type: %d\n", icmp->type); + nwarn("WARNING: Unknown ICMPv6 type: %d\n", icmp->type); goto icmpv6_type_error; } } diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c index 01d645715c..3084168b4f 100644 --- a/net/igmp/igmp_input.c +++ b/net/igmp/igmp_input.c @@ -124,7 +124,7 @@ void igmp_input(struct net_driver_s *dev) if (dev->d_len < NET_LL_HDRLEN(dev) + IPIGMP_HDRLEN) { IGMP_STATINCR(g_netstats.igmp.length_errors); - nllwarn("WARNING: Length error\n"); + nwarn("WARNING: Length error\n"); return; } @@ -133,7 +133,7 @@ void igmp_input(struct net_driver_s *dev) if (net_chksum((FAR uint16_t *)&IGMPBUF->type, IGMP_HDRLEN) != 0) { IGMP_STATINCR(g_netstats.igmp.chksum_errors); - nllwarn("WARNING: Checksum error\n"); + nwarn("WARNING: Checksum error\n"); return; } @@ -192,7 +192,7 @@ void igmp_input(struct net_driver_s *dev) IGMP_STATINCR(g_netstats.igmp.v1_received); IGMPBUF->maxresp = 10; - nllwarn("WARNING: V1 not implemented\n"); + nwarn("WARNING: V1 not implemented\n"); } IGMP_STATINCR(g_netstats.igmp.query_received); @@ -270,7 +270,7 @@ void igmp_input(struct net_driver_s *dev) default: { - nllwarn("WARNING: Unexpected msg %02x\n", IGMPBUF->type); + nwarn("WARNING: Unexpected msg %02x\n", IGMPBUF->type); } break; } diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c index c1c42b4b31..7780c39e63 100644 --- a/net/socket/net_sendfile.c +++ b/net/socket/net_sendfile.c @@ -206,7 +206,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, } else if ((flags & TCP_REXMIT) != 0) { - nllwarn("WARNING: TCP_REXMIT\n"); + nwarn("WARNING: TCP_REXMIT\n"); /* Yes.. in this case, reset the number of bytes that have been sent * to the number of bytes that have been ACKed. @@ -221,7 +221,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, { /* Report not connected */ - nllwarn("WARNING: Lost connection\n"); + nwarn("WARNING: Lost connection\n"); net_lostconnection(pstate->snd_sock, flags); pstate->snd_sent = -ENOTCONN; @@ -345,7 +345,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon { /* Report not connected */ - nllwarn("WARNING: Lost connection\n"); + nwarn("WARNING: Lost connection\n"); net_lostconnection(pstate->snd_sock, flags); pstate->snd_sent = -ENOTCONN; @@ -430,7 +430,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon } else { - nllwarn("WARNING: Window full, wait for ack\n"); + nwarn("WARNING: Window full, wait for ack\n"); goto wait; } } @@ -444,7 +444,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon { /* Yes.. report the timeout */ - nllwarn("WARNING: SEND timeout\n"); + nwarn("WARNING: SEND timeout\n"); pstate->snd_sent = -ETIMEDOUT; goto end_wait; } diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index 83ca79f8e4..53fa0fec2f 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -760,7 +760,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain) if (conn != NULL) { - nllwarn("WARNING: Closing unestablished connection: %p\n", conn); + nwarn("WARNING: Closing unestablished connection: %p\n", conn); /* Yes... free it. This will remove the connection from the list * of active connections and release all resources held by the diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index 3834a5cf47..184dfebb01 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -126,7 +126,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen) g_netstats.tcp.drop++; g_netstats.tcp.chkerr++; #endif - nllwarn("WARNING: Bad TCP checksum\n"); + nwarn("WARNING: Bad TCP checksum\n"); goto drop; } @@ -206,7 +206,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen) #ifdef CONFIG_NET_STATISTICS g_netstats.tcp.syndrop++; #endif - nllerr("ERROR: No free TCP connections\n"); + nerr("ERROR: No free TCP connections\n"); goto drop; } @@ -308,7 +308,7 @@ found: if ((tcp->flags & TCP_RST) != 0) { conn->tcpstateflags = TCP_CLOSED; - nllwarn("WARNING: RESET - TCP state: TCP_CLOSED\n"); + nwarn("WARNING: RESET - TCP state: TCP_CLOSED\n"); (void)tcp_callback(dev, conn, TCP_ABORT); goto drop; @@ -398,8 +398,8 @@ found: if ((conn->tcpstateflags & TCP_STATE_MASK) == TCP_ESTABLISHED) { - nllwarn("WARNING: conn->sndseq %d, conn->unacked %d\n", - tcp_getsequence(conn->sndseq), conn->unacked); + nwarn("WARNING: conn->sndseq %d, conn->unacked %d\n", + tcp_getsequence(conn->sndseq), conn->unacked); goto reset; } } @@ -409,8 +409,8 @@ found: * be beyond ackseq. */ - nllinfo("sndseq: %08x->%08x unackseq: %08x new unacked: %d\n", - conn->sndseq, ackseq, unackseq, conn->unacked); + ninfo("sndseq: %08x->%08x unackseq: %08x new unacked: %d\n", + conn->sndseq, ackseq, unackseq, conn->unacked); tcp_setsequence(conn->sndseq, ackseq); /* Do RTT estimation, unless we have done retransmissions. */ @@ -472,7 +472,7 @@ found: #endif conn->unacked = 0; flags = TCP_CONNECTED; - nllinfo("TCP state: TCP_ESTABLISHED\n"); + ninfo("TCP state: TCP_ESTABLISHED\n"); if (dev->d_len > 0) { @@ -572,7 +572,7 @@ found: dev->d_len = 0; dev->d_sndlen = 0; - nllinfo("TCP state: TCP_ESTABLISHED\n"); + ninfo("TCP state: TCP_ESTABLISHED\n"); result = tcp_callback(dev, conn, TCP_CONNECTED | TCP_NEWDATA); tcp_appsend(dev, conn, result); return; @@ -585,7 +585,7 @@ found: /* The connection is closed after we send the RST */ conn->tcpstateflags = TCP_CLOSED; - nllinfo("Connection failed - TCP state: TCP_CLOSED\n"); + ninfo("Connection failed - TCP state: TCP_CLOSED\n"); /* We do not send resets in response to resets. */ @@ -641,7 +641,7 @@ found: conn->tcpstateflags = TCP_LAST_ACK; conn->unacked = 1; conn->nrtx = 0; - nllinfo("TCP state: TCP_LAST_ACK\n"); + ninfo("TCP state: TCP_LAST_ACK\n"); tcp_send(dev, conn, TCP_FIN | TCP_ACK, tcpiplen); return; @@ -749,7 +749,7 @@ found: if ((flags & TCP_ACKDATA) != 0) { conn->tcpstateflags = TCP_CLOSED; - nllinfo("TCP_LAST_ACK TCP state: TCP_CLOSED\n"); + ninfo("TCP_LAST_ACK TCP state: TCP_CLOSED\n"); (void)tcp_callback(dev, conn, TCP_CLOSE); } @@ -773,12 +773,12 @@ found: conn->tcpstateflags = TCP_TIME_WAIT; conn->timer = 0; conn->unacked = 0; - nllinfo("TCP state: TCP_TIME_WAIT\n"); + ninfo("TCP state: TCP_TIME_WAIT\n"); } else { conn->tcpstateflags = TCP_CLOSING; - nllinfo("TCP state: TCP_CLOSING\n"); + ninfo("TCP state: TCP_CLOSING\n"); } net_incr32(conn->rcvseq, 1); @@ -790,7 +790,7 @@ found: { conn->tcpstateflags = TCP_FIN_WAIT_2; conn->unacked = 0; - nllinfo("TCP state: TCP_FIN_WAIT_2\n"); + ninfo("TCP state: TCP_FIN_WAIT_2\n"); goto drop; } @@ -812,7 +812,7 @@ found: { conn->tcpstateflags = TCP_TIME_WAIT; conn->timer = 0; - nllinfo("TCP state: TCP_TIME_WAIT\n"); + ninfo("TCP state: TCP_TIME_WAIT\n"); net_incr32(conn->rcvseq, 1); (void)tcp_callback(dev, conn, TCP_CLOSE); @@ -837,7 +837,7 @@ found: { conn->tcpstateflags = TCP_TIME_WAIT; conn->timer = 0; - nllinfo("TCP state: TCP_TIME_WAIT\n"); + ninfo("TCP state: TCP_TIME_WAIT\n"); } default: diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 9d4068af24..468f90b9da 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -350,7 +350,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, } #endif - nllinfo("flags: %04x\n", flags); + ninfo("flags: %04x\n", flags); /* If this packet contains an acknowledgement, then update the count of * acknowledged bytes. @@ -389,7 +389,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, /* Get the ACK number from the TCP header */ ackno = tcp_getsequence(tcp->ackno); - nllinfo("ACK: ackno=%u flags=%04x\n", ackno, flags); + ninfo("ACK: ackno=%u flags=%04x\n", ackno, flags); /* Look at every write buffer in the unacked_q. The unacked_q * holds write buffers that have been entirely sent, but which @@ -415,14 +415,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, /* Get the sequence number at the end of the data */ lastseq = WRB_SEQNO(wrb) + WRB_PKTLEN(wrb); - nllinfo("ACK: wrb=%p seqno=%u lastseq=%u pktlen=%u ackno=%u\n", - wrb, WRB_SEQNO(wrb), lastseq, WRB_PKTLEN(wrb), ackno); + ninfo("ACK: wrb=%p seqno=%u lastseq=%u pktlen=%u ackno=%u\n", + wrb, WRB_SEQNO(wrb), lastseq, WRB_PKTLEN(wrb), ackno); /* Has the entire buffer been ACKed? */ if (ackno >= lastseq) { - nllinfo("ACK: wrb=%p Freeing write buffer\n", wrb); + ninfo("ACK: wrb=%p Freeing write buffer\n", wrb); /* Yes... Remove the write buffer from ACK waiting queue */ @@ -450,7 +450,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, trimlen = WRB_SENT(wrb); } - nllinfo("ACK: wrb=%p trim %u bytes\n", wrb, trimlen); + ninfo("ACK: wrb=%p trim %u bytes\n", wrb, trimlen); WRB_TRIM(wrb, trimlen); WRB_SEQNO(wrb) = ackno; @@ -458,7 +458,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, /* Set the new sequence number for what remains */ - nllinfo("ACK: wrb=%p seqno=%u pktlen=%u\n", + ninfo("ACK: wrb=%p seqno=%u pktlen=%u\n", wrb, WRB_SEQNO(wrb), WRB_PKTLEN(wrb)); } } @@ -484,8 +484,8 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, nacked = WRB_SENT(wrb); } - nllinfo("ACK: wrb=%p seqno=%u nacked=%u sent=%u ackno=%u\n", - wrb, WRB_SEQNO(wrb), nacked, WRB_SENT(wrb), ackno); + ninfo("ACK: wrb=%p seqno=%u nacked=%u sent=%u ackno=%u\n", + wrb, WRB_SEQNO(wrb), nacked, WRB_SENT(wrb), ackno); /* Trim the ACKed bytes from the beginning of the write buffer. */ @@ -493,8 +493,8 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, WRB_SEQNO(wrb) = ackno; WRB_SENT(wrb) -= nacked; - nllinfo("ACK: wrb=%p seqno=%u pktlen=%u sent=%u\n", - wrb, WRB_SEQNO(wrb), WRB_PKTLEN(wrb), WRB_SENT(wrb)); + ninfo("ACK: wrb=%p seqno=%u pktlen=%u sent=%u\n", + wrb, WRB_SEQNO(wrb), WRB_PKTLEN(wrb), WRB_SENT(wrb)); } } @@ -502,7 +502,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, else if ((flags & TCP_DISCONN_EVENTS) != 0) { - nllinfo("Lost connection: %04x\n", flags); + ninfo("Lost connection: %04x\n", flags); if (psock->s_conn != NULL) { @@ -524,14 +524,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, FAR struct tcp_wrbuffer_s *wrb; FAR sq_entry_t *entry; - nllinfo("REXMIT: %04x\n", flags); + ninfo("REXMIT: %04x\n", flags); /* If there is a partially sent write buffer at the head of the * write_q? Has anything been sent from that write buffer? */ wrb = (FAR struct tcp_wrbuffer_s *)sq_peek(&conn->write_q); - nllinfo("REXMIT: wrb=%p sent=%u\n", wrb, wrb ? WRB_SENT(wrb) : 0); + ninfo("REXMIT: wrb=%p sent=%u\n", wrb, wrb ? WRB_SENT(wrb) : 0); if (wrb != NULL && WRB_SENT(wrb) > 0) { @@ -560,15 +560,15 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, } WRB_SENT(wrb) = 0; - nllinfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", - wrb, WRB_SENT(wrb), conn->unacked, conn->sent); + ninfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", + wrb, WRB_SENT(wrb), conn->unacked, conn->sent); /* Increment the retransmit count on this write buffer. */ if (++WRB_NRTX(wrb) >= TCP_MAXRTX) { - nllwarn("WARNING: Expiring wrb=%p nrtx=%u\n", - wrb, WRB_NRTX(wrb)); + nwarn("WARNING: Expiring wrb=%p nrtx=%u\n", + wrb, WRB_NRTX(wrb)); /* The maximum retry count as been exhausted. Remove the write * buffer at the head of the queue. @@ -626,15 +626,15 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, } WRB_SENT(wrb) = 0; - nllinfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", - wrb, WRB_SENT(wrb), conn->unacked, conn->sent); + ninfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", + wrb, WRB_SENT(wrb), conn->unacked, conn->sent); /* Free any write buffers that have exceed the retry count */ if (++WRB_NRTX(wrb) >= TCP_MAXRTX) { - nllwarn("WARNING: Expiring wrb=%p nrtx=%u\n", - wrb, WRB_NRTX(wrb)); + nwarn("WARNING: Expiring wrb=%p nrtx=%u\n", + wrb, WRB_NRTX(wrb)); /* Return the write buffer to the free list */ @@ -659,7 +659,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, * is pulled from the write_q again. */ - nllinfo("REXMIT: Moving wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); + ninfo("REXMIT: Moving wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); psock_insert_segment(wrb, &conn->write_q); } @@ -725,8 +725,8 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, sndlen = conn->winsize; } - nllinfo("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n", - wrb, WRB_PKTLEN(wrb), WRB_SENT(wrb), sndlen); + ninfo("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n", + wrb, WRB_PKTLEN(wrb), WRB_SENT(wrb), sndlen); /* Set the sequence number for this segment. If we are * retransmitting, then the sequence number will already @@ -782,15 +782,15 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, conn->sndseq_max = predicted_seqno; } - nllinfo("SEND: wrb=%p nrtx=%u unacked=%u sent=%u\n", - wrb, WRB_NRTX(wrb), conn->unacked, conn->sent); + ninfo("SEND: wrb=%p nrtx=%u unacked=%u sent=%u\n", + wrb, WRB_NRTX(wrb), conn->unacked, conn->sent); /* Increment the count of bytes sent from this write buffer */ WRB_SENT(wrb) += sndlen; - nllinfo("SEND: wrb=%p sent=%u pktlen=%u\n", - wrb, WRB_SENT(wrb), WRB_PKTLEN(wrb)); + ninfo("SEND: wrb=%p sent=%u pktlen=%u\n", + wrb, WRB_SENT(wrb), WRB_PKTLEN(wrb)); /* Remove the write buffer from the write queue if the * last of the data has been sent from the buffer. @@ -801,7 +801,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, { FAR struct tcp_wrbuffer_s *tmp; - nllinfo("SEND: wrb=%p Move to unacked_q\n", wrb); + ninfo("SEND: wrb=%p Move to unacked_q\n", wrb); tmp = (FAR struct tcp_wrbuffer_s *)sq_remfirst(&conn->write_q); DEBUGASSERT(tmp == wrb); @@ -1070,9 +1070,9 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf, */ sq_addlast(&wrb->wb_node, &conn->write_q); - nllinfo("Queued WRB=%p pktlen=%u write_q(%p,%p)\n", - wrb, WRB_PKTLEN(wrb), - conn->write_q.head, conn->write_q.tail); + ninfo("Queued WRB=%p pktlen=%u write_q(%p,%p)\n", + wrb, WRB_PKTLEN(wrb), + conn->write_q.head, conn->write_q.tail); /* Notify the device driver of the availability of TX data */ diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 0e7e9fe7c4..f5e9da20e3 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -570,7 +570,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, { /* Yes.. report the timeout */ - nllwarn("WARNING: SEND timeout\n"); + nwarn("WARNING: SEND timeout\n"); pstate->snd_sent = -ETIMEDOUT; goto end_wait; } diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c index 9047cf02ca..6678e3e4b5 100644 --- a/net/udp/udp_input.c +++ b/net/udp/udp_input.c @@ -149,7 +149,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen) g_netstats.udp.drop++; g_netstats.udp.chkerr++; #endif - nllwarn("WARNING: Bad UDP checksum\n"); + nwarn("WARNING: Bad UDP checksum\n"); dev->d_len = 0; } else @@ -207,7 +207,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen) } else { - nllwarn("WARNING: No listener on UDP port\n"); + nwarn("WARNING: No listener on UDP port\n"); dev->d_len = 0; } } diff --git a/net/udp/udp_psock_sendto.c b/net/udp/udp_psock_sendto.c index b962dadbfd..593e0f0540 100644 --- a/net/udp/udp_psock_sendto.c +++ b/net/udp/udp_psock_sendto.c @@ -235,7 +235,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { /* Terminate the transfer with an error. */ - nllwarn("WARNING: Network is down\n"); + nwarn("WARNING: Network is down\n"); pstate->st_sndlen = -ENETUNREACH; } @@ -257,7 +257,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { /* Yes.. report the timeout */ - nllwarn("WARNING: SEND timeout\n"); + nwarn("WARNING: SEND timeout\n"); pstate->st_sndlen = -ETIMEDOUT; } else