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

Without lowsyslog() *llinfo() is not useful. Eliminate and replace with *info().

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-20 11:59:15 -06:00
parent d40a473f72
commit 43eb04bb8f
329 changed files with 2252 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/can.c
+11 -11
View File
@@ -281,9 +281,9 @@ static void can_txready_work(FAR void *arg)
irqstate_t flags;
int ret;
canllinfo("xmit head: %d queue: %d tail: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue,
dev->cd_xmit.tx_tail);
caninfo("xmit head: %d queue: %d tail: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue,
dev->cd_xmit.tx_tail);
/* Verify that the xmit FIFO is not empty. The following operations must
* be performed with interrupt disabled.
@@ -634,8 +634,8 @@ static int can_xmit(FAR struct can_dev_s *dev)
int tmpndx;
int ret = -EBUSY;
canllinfo("xmit head: %d queue: %d tail: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail);
caninfo("xmit head: %d queue: %d tail: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail);
/* If there is nothing to send, then just disable interrupts and return */
@@ -1003,7 +1003,7 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr,
int errcode = -ENOMEM;
int i;
canllinfo("ID: %d DLC: %d\n", hdr->ch_id, hdr->ch_dlc);
caninfo("ID: %d DLC: %d\n", hdr->ch_id, hdr->ch_dlc);
/* Check if adding this new message would over-run the drivers ability to
* enqueue read data.
@@ -1188,8 +1188,8 @@ int can_txdone(FAR struct can_dev_s *dev)
{
int ret = -ENOENT;
canllinfo("xmit head: %d queue: %d tail: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail);
caninfo("xmit head: %d queue: %d tail: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail);
/* Verify that the xmit FIFO is not empty */
@@ -1292,9 +1292,9 @@ int can_txready(FAR struct can_dev_s *dev)
{
int ret = -ENOENT;
canllinfo("xmit head: %d queue: %d tail: %d waiters: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail,
dev->cd_ntxwaiters);
caninfo("xmit head: %d queue: %d tail: %d waiters: %d\n",
dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail,
dev->cd_ntxwaiters);
/* Verify that the xmit FIFO is not empty. This is safe because interrupts
* are always disabled when calling into can_xmit(); this cannot collide
drivers/input/ajoystick.c
+13 -13
View File
@@ -414,7 +414,7 @@ static int ajoy_open(FAR struct file *filep)
ret = ajoy_takesem(&priv->au_exclsem);
if (ret < 0)
{
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
return ret;
}
@@ -423,7 +423,7 @@ static int ajoy_open(FAR struct file *filep)
opriv = (FAR struct ajoy_open_s *)kmm_zalloc(sizeof(struct ajoy_open_s));
if (!opriv)
{
iinfo("ERROR: Failled to allocate open structure\n");
ierr("ERROR: Failled to allocate open structure\n");
ret = -ENOMEM;
goto errout_with_sem;
}
@@ -502,7 +502,7 @@ static int ajoy_close(FAR struct file *filep)
ret = ajoy_takesem(&priv->au_exclsem);
if (ret < 0)
{
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
return ret;
}
@@ -515,7 +515,7 @@ static int ajoy_close(FAR struct file *filep)
DEBUGASSERT(curr);
if (!curr)
{
iinfo("ERROR: Failed to find open entry\n");
ierr("ERROR: Failed to find open entry\n");
ret = -ENOENT;
goto errout_with_exclsem;
}
@@ -570,7 +570,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer,
if (len < sizeof(struct ajoy_sample_s))
{
iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
ierr("ERROR: buffer too small: %lu\n", (unsigned long)len);
return -EINVAL;
}
@@ -579,7 +579,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer,
ret = ajoy_takesem(&priv->au_exclsem);
if (ret < 0)
{
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
return ret;
}
@@ -620,7 +620,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
ret = ajoy_takesem(&priv->au_exclsem);
if (ret < 0)
{
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
return ret;
}
@@ -720,7 +720,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
#endif
default:
iinfo("ERROR: Unrecognized command: %ld\n", cmd);
ierr("ERROR: Unrecognized command: %ld\n", cmd);
ret = -ENOTTY;
break;
}
@@ -754,7 +754,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
ret = ajoy_takesem(&priv->au_exclsem);
if (ret < 0)
{
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
return ret;
}
@@ -782,7 +782,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_AJOYSTICK_NPOLLWAITERS)
{
iinfo("ERROR: Too man poll waiters\n");
ierr("ERROR: Too man poll waiters\n");
fds->priv = NULL;
ret = -EBUSY;
goto errout_with_dusem;
@@ -797,7 +797,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
iinfo("ERROR: Poll slot not found\n");
ierr("ERROR: Poll slot not found\n");
ret = -EIO;
goto errout_with_dusem;
}
@@ -856,7 +856,7 @@ int ajoy_register(FAR const char *devname,
if (!priv)
{
iinfo("ERROR: Failed to allocate device structure\n");
ierr("ERROR: Failed to allocate device structure\n");
return -ENOMEM;
}
@@ -878,7 +878,7 @@ int ajoy_register(FAR const char *devname,
ret = register_driver(devname, &ajoy_fops, 0666, priv);
if (ret < 0)
{
iinfo("ERROR: register_driver failed: %d\n", ret);
ierr("ERROR: register_driver failed: %d\n", ret);
goto errout_with_priv;
}
drivers/input/button_lower.c
+2 -2
View File
@@ -138,8 +138,8 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower,
flags = enter_critical_section();
btn_disable();
illinfo("press: %02x release: %02x handler: %p arg: %p\n",
press, release, handler, arg);
iinfo("press: %02x release: %02x handler: %p arg: %p\n",
press, release, handler, arg);
/* If no events are indicated or if no handler is provided, then this
* must really be a request to disable interrupts.
drivers/input/button_upper.c
+13 -13
View File
@@ -410,7 +410,7 @@ static int btn_open(FAR struct file *filep)
ret = btn_takesem(&priv->bu_exclsem);
if (ret < 0)
{
iinfo("ERROR: btn_takesem failed: %d\n", ret);
ierr("ERROR: btn_takesem failed: %d\n", ret);
return ret;
}
@@ -419,7 +419,7 @@ static int btn_open(FAR struct file *filep)
opriv = (FAR struct btn_open_s *)kmm_zalloc(sizeof(struct btn_open_s));
if (!opriv)
{
iinfo("ERROR: Failled to allocate open structure\n");
ierr("ERROR: Failled to allocate open structure\n");
ret = -ENOMEM;
goto errout_with_sem;
}
@@ -498,7 +498,7 @@ static int btn_close(FAR struct file *filep)
ret = btn_takesem(&priv->bu_exclsem);
if (ret < 0)
{
iinfo("ERROR: btn_takesem failed: %d\n", ret);
ierr("ERROR: btn_takesem failed: %d\n", ret);
return ret;
}
@@ -511,7 +511,7 @@ static int btn_close(FAR struct file *filep)
DEBUGASSERT(curr);
if (!curr)
{
iinfo("ERROR: Failed to find open entry\n");
ierr("ERROR: Failed to find open entry\n");
ret = -ENOENT;
goto errout_with_exclsem;
}
@@ -566,7 +566,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
if (len < sizeof(btn_buttonset_t))
{
iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
ierr("ERROR: buffer too small: %lu\n", (unsigned long)len);
return -EINVAL;
}
@@ -575,7 +575,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
ret = btn_takesem(&priv->bu_exclsem);
if (ret < 0)
{
iinfo("ERROR: btn_takesem failed: %d\n", ret);
ierr("ERROR: btn_takesem failed: %d\n", ret);
return ret;
}
@@ -612,7 +612,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
ret = btn_takesem(&priv->bu_exclsem);
if (ret < 0)
{
iinfo("ERROR: btn_takesem failed: %d\n", ret);
ierr("ERROR: btn_takesem failed: %d\n", ret);
return ret;
}
@@ -712,7 +712,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
#endif
default:
iinfo("ERROR: Unrecognized command: %ld\n", cmd);
ierr("ERROR: Unrecognized command: %ld\n", cmd);
ret = -ENOTTY;
break;
}
@@ -746,7 +746,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
ret = btn_takesem(&priv->bu_exclsem);
if (ret < 0)
{
iinfo("ERROR: btn_takesem failed: %d\n", ret);
ierr("ERROR: btn_takesem failed: %d\n", ret);
return ret;
}
@@ -774,7 +774,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_BUTTONS_NPOLLWAITERS)
{
iinfo("ERROR: Too man poll waiters\n");
ierr("ERROR: Too man poll waiters\n");
fds->priv = NULL;
ret = -EBUSY;
goto errout_with_dusem;
@@ -789,7 +789,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
iinfo("ERROR: Poll slot not found\n");
ierr("ERROR: Poll slot not found\n");
ret = -EIO;
goto errout_with_dusem;
}
@@ -847,7 +847,7 @@ int btn_register(FAR const char *devname,
if (!priv)
{
iinfo("ERROR: Failed to allocate device structure\n");
ierr("ERROR: Failed to allocate device structure\n");
return -ENOMEM;
}
@@ -869,7 +869,7 @@ int btn_register(FAR const char *devname,
ret = register_driver(devname, &btn_fops, 0666, priv);
if (ret < 0)
{
iinfo("ERROR: register_driver failed: %d\n", ret);
ierr("ERROR: register_driver failed: %d\n", ret);
goto errout_with_priv;
}
drivers/input/djoystick.c
+14 -14
View File
@@ -352,7 +352,7 @@ static void djoy_sample(FAR struct djoy_upperhalf_s *priv)
fds->revents |= (fds->events & POLLIN);
if (fds->revents != 0)
{
illinfo("Report events: %02x\n", fds->revents);
iinfo("Report events: %02x\n", fds->revents);
sem_post(fds->sem);
}
}
@@ -414,7 +414,7 @@ static int djoy_open(FAR struct file *filep)
ret = djoy_takesem(&priv->du_exclsem);
if (ret < 0)
{
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
ierr("ERROR: djoy_takesem failed: %d\n", ret);
return ret;
}
@@ -423,7 +423,7 @@ static int djoy_open(FAR struct file *filep)
opriv = (FAR struct djoy_open_s *)kmm_zalloc(sizeof(struct djoy_open_s));
if (!opriv)
{
iinfo("ERROR: Failled to allocate open structure\n");
ierr("ERROR: Failled to allocate open structure\n");
ret = -ENOMEM;
goto errout_with_sem;
}
@@ -502,7 +502,7 @@ static int djoy_close(FAR struct file *filep)
ret = djoy_takesem(&priv->du_exclsem);
if (ret < 0)
{
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
ierr("ERROR: djoy_takesem failed: %d\n", ret);
return ret;
}
@@ -515,7 +515,7 @@ static int djoy_close(FAR struct file *filep)
DEBUGASSERT(curr);
if (!curr)
{
iinfo("ERROR: Failed to find open entry\n");
ierr("ERROR: Failed to find open entry\n");
ret = -ENOENT;
goto errout_with_exclsem;
}
@@ -568,7 +568,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer,
if (len < sizeof(djoy_buttonset_t))
{
iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
ierr("ERROR: buffer too small: %lu\n", (unsigned long)len);
return -EINVAL;
}
@@ -577,7 +577,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer,
ret = djoy_takesem(&priv->du_exclsem);
if (ret < 0)
{
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
ierr("ERROR: djoy_takesem failed: %d\n", ret);
return ret;
}
@@ -616,7 +616,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
ret = djoy_takesem(&priv->du_exclsem);
if (ret < 0)
{
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
ierr("ERROR: djoy_takesem failed: %d\n", ret);
return ret;
}
@@ -716,7 +716,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
#endif
default:
iinfo("ERROR: Unrecognized command: %ld\n", cmd);
ierr("ERROR: Unrecognized command: %ld\n", cmd);
ret = -ENOTTY;
break;
}
@@ -750,7 +750,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
ret = djoy_takesem(&priv->du_exclsem);
if (ret < 0)
{
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
ierr("ERROR: djoy_takesem failed: %d\n", ret);
return ret;
}
@@ -778,7 +778,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_DJOYSTICK_NPOLLWAITERS)
{
iinfo("ERROR: Too man poll waiters\n");
ierr("ERROR: Too man poll waiters\n");
fds->priv = NULL;
ret = -EBUSY;
goto errout_with_dusem;
@@ -793,7 +793,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
iinfo("ERROR: Poll slot not found\n");
ierr("ERROR: Poll slot not found\n");
ret = -EIO;
goto errout_with_dusem;
}
@@ -852,7 +852,7 @@ int djoy_register(FAR const char *devname,
if (!priv)
{
iinfo("ERROR: Failed to allocate device structure\n");
ierr("ERROR: Failed to allocate device structure\n");
return -ENOMEM;
}
@@ -874,7 +874,7 @@ int djoy_register(FAR const char *devname,
ret = register_driver(devname, &djoy_fops, 0666, priv);
if (ret < 0)
{
iinfo("ERROR: register_driver failed: %d\n", ret);
ierr("ERROR: register_driver failed: %d\n", ret);
sem_destroy(&priv->du_exclsem);
kmm_free(priv);
}
drivers/leds/pca9635pw.c
+3 -3
View File
@@ -121,8 +121,8 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
/* Write the register address followed by the data (no RESTART) */
lcdllinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
buffer[0], buffer[1]);
lcdinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
buffer[0], buffer[1]);
ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
if (ret != OK)
@@ -280,7 +280,7 @@ static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct pca9635pw_dev_s *priv = inode->i_private;
int ret = OK;
lcdllinfo("cmd: %d arg: %ld\n", cmd, arg);
lcdinfo("cmd: %d arg: %ld\n", cmd, arg);
switch (cmd)
{
drivers/leds/userled_upper.c
+10 -10
View File
@@ -176,7 +176,7 @@ static int userled_open(FAR struct file *filep)
ret = userled_takesem(&priv->lu_exclsem);
if (ret < 0)
{
lcdinfo("ERROR: userled_takesem failed: %d\n", ret);
lcderr("ERROR: userled_takesem failed: %d\n", ret);
return ret;
}
@@ -185,7 +185,7 @@ static int userled_open(FAR struct file *filep)
opriv = (FAR struct userled_open_s *)kmm_zalloc(sizeof(struct userled_open_s));
if (!opriv)
{
lcdinfo("ERROR: Failled to allocate open structure\n");
lcderr("ERROR: Failled to allocate open structure\n");
ret = -ENOMEM;
goto errout_with_sem;
}
@@ -253,7 +253,7 @@ static int userled_close(FAR struct file *filep)
ret = userled_takesem(&priv->lu_exclsem);
if (ret < 0)
{
lcdinfo("ERROR: userled_takesem failed: %d\n", ret);
lcderr("ERROR: userled_takesem failed: %d\n", ret);
return ret;
}
@@ -266,7 +266,7 @@ static int userled_close(FAR struct file *filep)
DEBUGASSERT(curr);
if (!curr)
{
lcdinfo("ERROR: Failed to find open entry\n");
lcderr("ERROR: Failed to find open entry\n");
ret = -ENOENT;
goto errout_with_exclsem;
}
@@ -318,7 +318,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer,
if (len < sizeof(userled_set_t))
{
lcdinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
lcderr("ERROR: buffer too small: %lu\n", (unsigned long)len);
return -EINVAL;
}
@@ -335,7 +335,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer,
ret = userled_takesem(&priv->lu_exclsem);
if (ret < 0)
{
lcdinfo("ERROR: userled_takesem failed: %d\n", ret);
lcderr("ERROR: userled_takesem failed: %d\n", ret);
return ret;
}
@@ -370,7 +370,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
ret = userled_takesem(&priv->lu_exclsem);
if (ret < 0)
{
lcdinfo("ERROR: userled_takesem failed: %d\n", ret);
lcderr("ERROR: userled_takesem failed: %d\n", ret);
return ret;
}
@@ -500,7 +500,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
break;
default:
lcdinfo("ERROR: Unrecognized command: %ld\n", cmd);
lcderr("ERROR: Unrecognized command: %ld\n", cmd);
ret = -ENOTTY;
break;
}
@@ -548,7 +548,7 @@ int userled_register(FAR const char *devname,
if (!priv)
{
lcdinfo("ERROR: Failed to allocate device structure\n");
lcderr("ERROR: Failed to allocate device structure\n");
return -ENOMEM;
}
@@ -569,7 +569,7 @@ int userled_register(FAR const char *devname,
ret = register_driver(devname, &userled_fops, 0666, priv);
if (ret < 0)
{
lcdinfo("ERROR: register_driver failed: %d\n", ret);
lcderr("ERROR: register_driver failed: %d\n", ret);
goto errout_with_priv;
}
drivers/mmcsd/mmcsd_sdio.c
+1 -1
View File
@@ -413,7 +413,7 @@ static int mmcsd_recvR1(FAR struct mmcsd_state_s *priv, uint32_t cmd)
* indication for later use.
*/
finfo("ERROR: R1=%08x\n", r1);
ferr("ERROR: R1=%08x\n", r1);
priv->locked = ((r1 & MMCSD_R1_CARDISLOCKED) != 0);
ret = -EIO;
}
drivers/modem/u-blox.c
-4
View File
@@ -60,13 +60,9 @@
#ifdef CONFIG_MODEM_U_BLOX_DEBUG
# define m_err _err
# define m_info _info
# define m_vllerr _llerr
# define m_vllinfo _llinfo
#else
# define m_err(x...)
# define m_info(x...)
# define m_llerr(x...)
# define m_llinfo(x...)
#endif
/****************************************************************************
drivers/mtd/smart.c
+1 -1
View File
@@ -4678,7 +4678,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
sizeof(struct smart_sect_header_s), (FAR uint8_t *) &header);
if (ret != sizeof(struct smart_sect_header_s))
{
finfo("ERROR: Error reading sector %d header\n", physsector);
ferr("ERROR: Error reading sector %d header\n", physsector);
ret = -EIO;
goto errout;
}
drivers/mtd/sst26.c
+2 -6
View File
@@ -209,14 +209,10 @@
#ifdef CONFIG_SST26_DEBUG
# define ssterr(format, ...) _err(format, ##__VA_ARGS__)
# define sstllerr(format, ...) _llerr(format, ##__VA_ARGS__)
# define sstinfo(format, ...) _info(format, ##__VA_ARGS__)
# define sstllinfo(format, ...) _llinfo(format, ##__VA_ARGS__)
#else
# define ssterr(x...)
# define sstllerr(x...)
# define sstinfo(x...)
# define sstllinfo(x...)
#endif
/************************************************************************************
@@ -340,8 +336,8 @@ static inline int sst26_readid(struct sst26_dev_s *priv)
SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
sst26_unlock(priv->dev);
_llinfo("manufacturer: %02x memory: %02x capacity: %02x\n",
manufacturer, memory, capacity);
_info("manufacturer: %02x memory: %02x capacity: %02x\n",
manufacturer, memory, capacity);
/* Check for a valid manufacturer and memory type */
drivers/net/cs89x0.c
+3 -3
View File
@@ -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))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("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
{
nllinfo("Unrecognized packet type %02x\n", BUF->type);
ninfo("Unrecognized packet type %02x\n", BUF->type);
NETDEV_RXDROPPED(&priv->cs_dev);
}
}
drivers/net/dm90x0.c
+7 -7
View File
@@ -902,7 +902,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
#ifdef CONFIG_NET_IPv4
if (BUF->type == HTONS(ETHTYPE_IP))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("Iv6 frame\n");
NETDEV_RXIPV6(&priv->dm_dev);
/* Give the IPv6 packet to the network layer */
@@ -1723,13 +1723,13 @@ int dm9x_initialize(void)
vid = (((uint16_t)getreg(DM9X_VIDH)) << 8) | (uint16_t)getreg(DM9X_VIDL);
pid = (((uint16_t)getreg(DM9X_PIDH)) << 8) | (uint16_t)getreg(DM9X_PIDL);
nllinfo("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
ninfo("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
/* Check if a DM90x0 chip is recognized at this I/O base */
if (vid != DM9X_DAVICOMVID || (pid != DM9X_DM9000PID && pid != DM9X_DM9010PID))
{
nllerr("ERROR: DM90x0 vendor/product ID not found at this base address\n");
nerr("ERROR: DM90x0 vendor/product ID not found at this base address\n");
return -ENODEV;
}
@@ -1739,7 +1739,7 @@ int dm9x_initialize(void)
{
/* We could not attach the ISR to the ISR */
nllerr("ERROR: irq_attach() failed\n");
nerr("ERROR: irq_attach() failed\n");
return -EAGAIN;
}
@@ -1768,8 +1768,8 @@ int dm9x_initialize(void)
mptr[i] = getreg(j);
}
nllinfo("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
mptr[0], mptr[1], mptr[2], mptr[3], mptr[4], mptr[5]);
ninfo("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
mptr[0], mptr[1], mptr[2], mptr[3], mptr[4], mptr[5]);
/* Register the device with the OS so that socket IOCTLs can be performed */
drivers/net/e1000.c
+2 -2
View File
@@ -602,7 +602,7 @@ static void e1000_receive(struct e1000_dev *e1000)
#ifdef CONFIG_NET_IPv4
if (BUF->type == HTONS(ETHTYPE_IP))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("Iv6 frame\n");
/* Give the IPv6 packet to the network layer */
drivers/net/enc28j60.c
+23 -23
View File
@@ -1092,7 +1092,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
/* Increment statistics */
nllinfo("Sending packet, pktlen: %d\n", priv->dev.d_len);
ninfo("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.
*/
nllinfo("Poll result: d_len=%d\n", priv->dev.d_len);
ninfo("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))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("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))
{
nllinfo("ARP packet received (%02x)\n", BUF->type);
ninfo("ARP packet received (%02x)\n", BUF->type);
NETDEV_RXARP(&priv->dev);
arp_arpin(&priv->dev);
@@ -1484,7 +1484,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
else
#endif
{
nllerr("ERROR: Unsupported packet type dropped (%02x)\n", htons(BUF->type));
nerr("ERROR: Unsupported packet type dropped (%02x)\n", htons(BUF->type));
NETDEV_RXDROPPED(&priv->dev);
}
}
@@ -1543,14 +1543,14 @@ 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];
nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n",
priv->nextpkt, pktlen, rxstat);
ninfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n",
priv->nextpkt, pktlen, rxstat);
/* Check if the packet was received OK */
if ((rxstat & RXSTAT_OK) == 0)
{
nllerr("ERROR: RXSTAT: %04x\n", rxstat);
nerr("ERROR: RXSTAT: %04x\n", rxstat);
NETDEV_RXERRORS(&priv->dev);
}
@@ -1558,7 +1558,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
{
nllerr("ERROR: Bad packet size dropped (%d)\n", pktlen);
nerr("ERROR: Bad packet size dropped (%d)\n", pktlen);
NETDEV_RXERRORS(&priv->dev);
}
@@ -1647,7 +1647,7 @@ static void enc_irqworker(FAR void *arg)
* settings.
*/
nllinfo("EIR: %02x\n", eir);
ninfo("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)
{
nllinfo("EPKTCNT: %02x\n", pktcnt);
nerr("EPKTCNT: %02x\n", pktcnt);
/* Handle packet receipt */
@@ -1878,7 +1878,7 @@ static void enc_toworker(FAR void *arg)
net_lock_t lock;
int ret;
nllerr("ERROR: Tx timeout\n");
nerr("ERROR: Tx timeout\n");
DEBUGASSERT(priv);
/* Get exclusive access to the network */
@@ -2067,9 +2067,9 @@ static int enc_ifup(struct net_driver_s *dev)
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
int ret;
nllinfo("Bringing up: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
ninfo("Bringing up: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
/* Lock the SPI bus so that we have exclusive access */
@@ -2139,9 +2139,9 @@ static int enc_ifdown(struct net_driver_s *dev)
irqstate_t flags;
int ret;
nllinfo("Taking down: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
ninfo("Taking down: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
/* Lock the SPI bus so that we have exclusive access */
@@ -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)
{
nllinfo("Set PWRSV\n");
ninfo("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)
{
nllinfo("Clear PWRSV\n");
ninfo("Clear PWRSV\n");
/* 1. Wake-up by clearing ECON2.PWRSV. */
@@ -2524,11 +2524,11 @@ static int enc_reset(FAR struct enc_driver_s *priv)
regval = enc_rdbreg(priv, ENC_EREVID);
if (regval == 0x00 || regval == 0xff)
{
nllerr("ERROR: Bad Rev ID: %02x\n", regval);
nerr("ERROR: Bad Rev ID: %02x\n", regval);
return -ENODEV;
}
nllinfo("Rev ID: %02x\n", regval);
ninfo("Rev ID: %02x\n", regval);
/* Set filter mode: unicast OR broadcast AND crc valid */
drivers/net/encx24j600.c
+35 -35
View File
@@ -1127,7 +1127,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv)
}
else
{
nllerr("ERROR: no free descriptors\n");
nerr("ERROR: no free descriptors\n");
ret = -ENOMEM;
}
@@ -1165,7 +1165,7 @@ static int enc_txpoll(struct net_driver_s *dev)
* the field d_len is set to a value > 0.
*/
nllinfo("Poll result: d_len=%d\n", priv->dev.d_len);
ninfo("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);
nllinfo("load packet @%04x len: %d\n", descr->addr, descr->len);
ninfo("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;
nllinfo("free descr: %p\n", descr);
ninfo("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);
nllinfo("ERXTAIL %04x\n", addr);
ninfo("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))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("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))
{
nllinfo("ARP packet received (%02x)\n", BUF->type);
ninfo("ARP packet received (%02x)\n", BUF->type);
NETDEV_RXARP(&priv->dev);
arp_arpin(&priv->dev);
@@ -1612,7 +1612,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
enc_rxrmpkt(priv, descr);
nllerr("ERROR: Unsupported packet type dropped (%02x)\n", htons(BUF->type));
nerr("ERROR: Unsupported packet type dropped (%02x)\n", htons(BUF->type));
NETDEV_RXDROPPED(&priv->dev);
}
@@ -1684,8 +1684,8 @@ 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];
nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %08x pktcnt: %d\n",
priv->nextpkt, pktlen, rxstat, pktcnt);
ninfo("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.
* This way we avoid freeing packets that are not processed yet.
@@ -1707,7 +1707,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
if ((rxstat & RXSTAT_OK) == 0)
{
nllerr("ERROR: RXSTAT: %08x\n", rxstat);
nerr("ERROR: RXSTAT: %08x\n", rxstat);
/* Discard packet */
@@ -1719,7 +1719,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
{
nllerr("ERROR: Bad packet size dropped (%d)\n", pktlen);
nerr("ERROR: Bad packet size dropped (%d)\n", pktlen);
/* Discard packet */
@@ -1774,17 +1774,17 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
#if 0
/* Free the last received packet from the RX queue */
nllinfo("rx abort\n");
nllinfo("ESTAT: %04x\n", enc_rdreg(priv, ENC_ESTAT));
nllinfo("EIR: %04x\n", enc_rdreg(priv, ENC_EIR));
nllinfo("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
nllinfo("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
ninfo("rx abort\n");
ninfo("ESTAT: %04x\n", enc_rdreg(priv, ENC_ESTAT));
ninfo("EIR: %04x\n", enc_rdreg(priv, ENC_EIR));
ninfo("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
ninfo("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
descr = (FAR struct enc_descr_s *)sq_peek(&priv->rxqueue);
while (descr != NULL)
{
nllinfo("addr: %04x len: %d\n", descr->addr, descr->len);
ninfo("addr: %04x len: %d\n", descr->addr, descr->len);
descr = (FAR struct enc_descr_s *)sq_next(descr);
}
@@ -1797,7 +1797,7 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
{
enc_rxrmpkt(priv, descr);
nllinfo("pending packet freed\n");
ninfo("pending packet freed\n");
}
else
{
@@ -1859,7 +1859,7 @@ static void enc_irqworker(FAR void *arg)
* settings.
*/
nllinfo("EIR: %04x\n", eir);
ninfo("EIR: %04x\n", eir);
if ((eir & EIR_DMAIF) != 0) /* DMA interrupt */
{
@@ -2043,7 +2043,7 @@ static void enc_toworker(FAR void *arg)
net_lock_t lock;
int ret;
nllerr("ERROR: Tx timeout\n");
nerr("ERROR: Tx timeout\n");
DEBUGASSERT(priv);
/* Get exclusive access to the network. */
@@ -2231,9 +2231,9 @@ static int enc_ifup(struct net_driver_s *dev)
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
int ret;
nllinfo("Bringing up: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
ninfo("Bringing up: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
/* Lock the SPI bus so that we have exclusive access */
@@ -2307,9 +2307,9 @@ static int enc_ifdown(struct net_driver_s *dev)
irqstate_t flags;
int ret;
nllinfo("Taking down: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
ninfo("Taking down: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
/* Lock the SPI bus so that we have exclusive access */
@@ -2420,7 +2420,7 @@ static int enc_rxavail(struct net_driver_s *dev)
if (!sq_empty(&priv->rxqueue))
{
nllinfo("RX queue not empty, trying to dispatch\n");
ninfo("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;
nllinfo("Set PWRSV\n");
ninfo("Set PWRSV\n");
/* 1. Turn off AES */
@@ -2728,7 +2728,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
int ret;
uint16_t regval;
nllinfo("Reset\n");
ninfo("Reset\n");
do
{
@@ -2742,7 +2742,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
if (ret != OK)
{
nllerr("ERROR: encx24j600 clock failed to become ready\n");
nerr("ERROR: encx24j600 clock failed to become ready\n");
return -ENODEV;
}
@@ -2756,7 +2756,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
if (regval != 0x0000)
{
nllerr("ERROR: encx24j600 seems not to be reset properly\n");
nerr("ERROR: encx24j600 seems not to be reset properly\n");
return -ENODEV;
}
@@ -2793,7 +2793,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
}
while ((regval & PHSTAT1_ANDONE) != 0);
nllinfo("Auto-negotation completed\n");
ninfo("Auto-negotation completed\n");
#endif
@@ -2813,7 +2813,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
#if 0
if (ret != OK)
{
nllerr("ERROR: encx24j600 failed to establish link\n");
nerr("ERROR: encx24j600 failed to establish link\n");
return -ENODEV;
}
#endif
drivers/net/ftmac100.c
+2 -2
View File
@@ -685,7 +685,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
#ifdef CONFIG_NET_IPv4
if (BUF->type == HTONS(ETHTYPE_IP))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("Iv6 frame\n");
/* Give the IPv6 packet to the network layer */
drivers/net/loopback.c
+2 -2
View File
@@ -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)
{
nllinfo("IPv4 frame\n");
ninfo("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)
{
nllinfo("Iv6 frame\n");
ninfo("Iv6 frame\n");
NETDEV_RXIPV6(&priv->lo_dev);
ipv6_input(&priv->lo_dev);
}
drivers/net/phy_notify.c
+3 -7
View File
@@ -83,14 +83,10 @@
#ifdef CONFIG_NETDEV_PHY_DEBUG
# define phyinfo _info
# define phyllinfo _llinfo
# define phyerr _err
# define phyllerr _llerr
#else
# define phyinfo(x...)
# define phyllinfo(x...)
# define phyerr(x...)
# define phyllerr(x...)
#endif
/****************************************************************************
@@ -270,8 +266,8 @@ static int phy_handler(FAR struct phy_notify_s *client)
int ret;
DEBUGASSERT(client && client->assigned && client->enable);
phyllinfo("Entry client %d, signalling PID=%d with signal %d\n",
client->index, client->pid, client->signo);
phyinfo("Entry client %d, signalling PID=%d with signal %d\n",
client->index, client->pid, client->signo);
/* Disable further interrupts */
@@ -291,7 +287,7 @@ static int phy_handler(FAR struct phy_notify_s *client)
int errcode = errno;
DEBUGASSERT(errcode > 0);
nllinfo("ERROR: sigqueue failed: %d\n", errcode);
nerr("ERROR: sigqueue failed: %d\n", errcode);
UNUSED(errcode);
}
drivers/net/skeleton.c
+2 -2
View File
@@ -334,7 +334,7 @@ static void skel_receive(FAR struct skel_driver_s *priv)
#ifdef CONFIG_NET_IPv4
if (BUF->type == HTONS(ETHTYPE_IP))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("Iv6 frame\n");
NETDEV_RXIPV6(&priv->sk_dev);
/* Give the IPv6 packet to the network layer */
drivers/net/telnet.c
+6 -6
View File
@@ -277,12 +277,12 @@ static ssize_t telnet_receive(FAR struct telnet_dev_s *priv, FAR const char *src
int nread;
uint8_t ch;
nllinfo("srclen: %d destlen: %d\n", srclen, destlen);
ninfo("srclen: %d destlen: %d\n", srclen, destlen);
for (nread = 0; srclen > 0 && nread < destlen; srclen--)
{
ch = *src++;
nllinfo("ch=%02x state=%d\n", ch, priv->td_state);
ninfo("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;
nllinfo("td_crefs: %d\n", priv->td_crefs);
ninfo("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;
nllinfo("td_crefs: %d\n", priv->td_crefs);
ninfo("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;
nllinfo("len: %d\n", len);
ninfo("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;
nllinfo("len: %d\n", len);
ninfo("len: %d\n", len);
/* Process each character from the user buffer */
drivers/net/tun.c
+2 -2
View File
@@ -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)
nllinfo("IPv4 frame\n");
ninfo("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)
nllinfo("Iv6 frame\n");
ninfo("Iv6 frame\n");
NETDEV_RXIPV6(&priv->dev);
/* Give the IPv6 packet to the network layer */
drivers/net/vnet.c
+2 -2
View File
@@ -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))
{
nllinfo("IPv4 frame\n");
ninfo("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))
{
nllinfo("Iv6 frame\n");
ninfo("Iv6 frame\n");
/* Give the IPv6 packet to the network layer */
drivers/pwm.c
+1 -1
View File
@@ -652,7 +652,7 @@ void pwm_expired(FAR void *handle)
{
FAR struct pwm_upperhalf_s *upper = (FAR struct pwm_upperhalf_s *)handle;
pwmllinfo("started: %d waiting: %d\n", upper->started, upper->waiting);
pwminfo("started: %d waiting: %d\n", upper->started, upper->waiting);
/* Make sure that the PWM is started */
drivers/sensors/zerocross.c
+6 -6
View File
@@ -244,7 +244,7 @@ static int zc_open(FAR struct file *filep)
ret = sem_wait(&priv->exclsem);
if (ret < 0)
{
sninfo("ERROR: sem_wait failed: %d\n", ret);
snerr("ERROR: sem_wait failed: %d\n", ret);
return ret;
}
@@ -253,7 +253,7 @@ static int zc_open(FAR struct file *filep)
opriv = (FAR struct zc_open_s *)kmm_zalloc(sizeof(struct zc_open_s));
if (!opriv)
{
sninfo("ERROR: Failled to allocate open structure\n");
snerr("ERROR: Failled to allocate open structure\n");
ret = -ENOMEM;
goto errout_with_sem;
}
@@ -325,7 +325,7 @@ static int zc_close(FAR struct file *filep)
ret = sem_wait(&priv->exclsem);
if (ret < 0)
{
sninfo("ERROR: sem_wait failed: %d\n", ret);
snerr("ERROR: sem_wait failed: %d\n", ret);
return ret;
}
@@ -338,7 +338,7 @@ static int zc_close(FAR struct file *filep)
DEBUGASSERT(curr);
if (!curr)
{
sninfo("ERROR: Failed to find open entry\n");
snerr("ERROR: Failed to find open entry\n");
ret = -ENOENT;
goto errout_with_exclsem;
}
@@ -516,7 +516,7 @@ int zc_register(FAR const char *devname, FAR struct zc_lowerhalf_s *lower)
if (!priv)
{
sninfo("ERROR: Failed to allocate device structure\n");
snerr("ERROR: Failed to allocate device structure\n");
return -ENOMEM;
}
@@ -535,7 +535,7 @@ int zc_register(FAR const char *devname, FAR struct zc_lowerhalf_s *lower)
ret = register_driver(devname, &g_zcops, 0666, priv);
if (ret < 0)
{
sninfo("ERROR: register_driver failed: %d\n", ret);
snerr("ERROR: register_driver failed: %d\n", ret);
sem_destroy(&priv->exclsem);
kmm_free(priv);
}
drivers/usbhost/usbhost_hidkbd.c
+7 -11
View File
@@ -178,12 +178,8 @@
#ifndef CONFIG_DEBUG_INPUT
# undef ierr
# define ierr uerr
# undef illerr
# define illerr ullerr
# undef iinfo
# define iinfo uinfo
# undef illinfo
# define illinfo ullinfo
#endif
/****************************************************************************
@@ -1524,9 +1520,9 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
if ((found & USBHOST_RQDFOUND) != USBHOST_RQDFOUND)
{
ullerr("ERROR: Found IF:%s EPIN:%s\n",
(found & USBHOST_IFFOUND) != 0 ? "YES" : "NO",
(found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO");
uerr("ERROR: Found IF:%s EPIN:%s\n",
(found & USBHOST_IFFOUND) != 0 ? "YES" : "NO",
(found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO");
return -EINVAL;
}
@@ -1543,8 +1539,8 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
/* Then the optional interrupt OUT endpoint */
ullinfo("Found EPOOUT:%s\n",
(found & USBHOST_EPOUTFOUND) != 0 ? "YES" : "NO");
uinfo("Found EPOOUT:%s\n",
(found & USBHOST_EPOUTFOUND) != 0 ? "YES" : "NO");
if ((found & USBHOST_EPOUTFOUND) != 0)
{
@@ -1557,7 +1553,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
}
}
ullinfo("Endpoints allocated\n");
uinfo("Endpoints allocated\n");
return OK;
}
@@ -1991,7 +1987,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
*/
priv->disconnected = true;
ullinfo("Disconnected\n");
uinfo("Disconnected\n");
/* Is there a thread waiting for keyboard data that will never come? */
drivers/usbhost/usbhost_hidmouse.c
+5 -9
View File
@@ -199,12 +199,8 @@
#ifndef CONFIG_DEBUG_INPUT
# undef ierr
# define ierr uerr
# undef illerr
# define illerr ullerr
# undef iinfo
# define iinfo uinfo
# undef illinfo
# define illinfo ullinfo
#endif
/****************************************************************************
@@ -1613,9 +1609,9 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
if ((found & USBHOST_ALLFOUND) != USBHOST_ALLFOUND)
{
ullerr("ERROR: Found IF:%s EPIN:%s\n",
(found & USBHOST_IFFOUND) != 0 ? "YES" : "NO",
(found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO");
uerr("ERROR: Found IF:%s EPIN:%s\n",
(found & USBHOST_IFFOUND) != 0 ? "YES" : "NO",
(found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO");
return -EINVAL;
}
@@ -1628,7 +1624,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
return ret;
}
ullinfo("Endpoint allocated\n");
uinfo("Endpoint allocated\n");
return OK;
}
@@ -2062,7 +2058,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
*/
priv->disconnected = true;
ullinfo("Disconnected\n");
uinfo("Disconnected\n");
/* Are there a thread(s) waiting for mouse data that will never come? */
drivers/usbhost/usbhost_hub.c
+1 -1
View File
@@ -479,7 +479,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
return ret;
}
ullinfo("Endpoint allocated\n");
uinfo("Endpoint allocated\n");
return OK;
}
drivers/usbhost/usbhost_skeleton.c
+2 -2
View File
@@ -600,7 +600,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
return ret;
}
ullinfo("Endpoints allocated\n");
uinfo("Endpoints allocated\n");
return OK;
}
@@ -1013,7 +1013,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
* block driver.
*/
ullinfo("crefs: %d\n", priv->crefs);
uinfo("crefs: %d\n", priv->crefs);
if (priv->crefs == 1)
{
/* Destroy the class instance. If we are executing from an interrupt
drivers/usbhost/usbhost_storage.c
+4 -4
View File
@@ -377,7 +377,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void)
}
leave_critical_section(flags);
ullinfo("Allocated: %p\n", entry);
uinfo("Allocated: %p\n", entry);
return (FAR struct usbhost_state_s *)entry;
}
#else
@@ -417,7 +417,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass)
irqstate_t flags;
DEBUGASSERT(entry != NULL);
ullinfo("Freeing: %p\n", entry);
uinfo("Freeing: %p\n", entry);
/* Just put the pre-allocated class structure back on the freelist */
@@ -1185,7 +1185,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
return ret;
}
ullinfo("Endpoints allocated\n");
uinfo("Endpoints allocated\n");
return OK;
}
@@ -1830,7 +1830,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
* block driver.
*/
ullinfo("crefs: %d\n", priv->crefs);
uinfo("crefs: %d\n", priv->crefs);
if (priv->crefs == 1)
{
/* Destroy the class instance. If we are executing from an interrupt
drivers/wireless/cc3000/cc3000.c
+30 -30
View File
@@ -124,8 +124,8 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE);
# define PROBE(pin,state)
#endif
#define waitllerr(x,...) // _llerr
#define waitllinfo(x,...) // _llinfo
#define waiterr(x,...) // _err
#define waitinfo(x,...) // _info
/****************************************************************************
* Private Function Prototypes
@@ -419,7 +419,7 @@ static void cc3000_pollnotify(FAR struct cc3000_dev_s *priv, uint32_t type)
if (fds)
{
fds->revents |= type;
nllinfo("Report events: %02x\n", fds->revents);
ninfo("Report events: %02x\n", fds->revents);
sem_post(fds->sem);
}
}
@@ -497,7 +497,7 @@ static void * select_thread_func(FAR void *arg)
if (priv->sockets[s].sd == CLOSE_SLOT)
{
priv->sockets[s].sd = FREE_SLOT;
waitllinfo("Close\n");
waitinfo("Close\n");
int count;
do
{
@@ -506,7 +506,7 @@ static void * select_thread_func(FAR void *arg)
{
/* Release the waiting threads */
waitllinfo("Closed Signaled %d\n", count);
waitinfo("Closed Signaled %d\n", count);
sem_post(&priv->sockets[s].semwait);
}
}
@@ -553,17 +553,17 @@ static void * select_thread_func(FAR void *arg)
{
if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &readsds)) /* and has pending data */
{
waitllinfo("Signaled %d\n", priv->sockets[s].sd);
waitinfo("Signaled %d\n", priv->sockets[s].sd);
sem_post(&priv->sockets[s].semwait); /* release the waiting thread */
}
else if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &exceptsds)) /* or has pending exception */
{
waitllinfo("Signaled %d (exception)\n", priv->sockets[s].sd);
waitinfo("Signaled %d (exception)\n", priv->sockets[s].sd);
sem_post(&priv->sockets[s].semwait); /* release the waiting thread */
}
else if (priv->sockets[s].received_closed_event) /* or remote has closed connection and we have now read all of HW buffer. */
{
waitllinfo("Signaled %d (closed & empty)\n", priv->sockets[s].sd);
waitinfo("Signaled %d (closed & empty)\n", priv->sockets[s].sd);
priv->sockets[s].emptied_and_remotely_closed = true;
sem_post(&priv->sockets[s].semwait); /* release the waiting thread */
}
@@ -620,7 +620,7 @@ static void * cc3000_worker(FAR void *arg)
if ((cc3000_wait_irq(priv) != -EINTR) && (priv->workertid != -1))
{
PROBE(0, 0);
nllinfo("State%d\n", priv->state);
ninfo("State%d\n", priv->state);
switch (priv->state)
{
case eSPI_STATE_POWERUP:
@@ -707,10 +707,10 @@ static void * cc3000_worker(FAR void *arg)
cc3000_devgive(priv);
nllinfo("Wait On Completion\n");
ninfo("Wait On Completion\n");
sem_wait(priv->wrkwaitsem);
nllinfo("Completed S:%d irq :%d\n",
priv->state, priv->config->irq_read(priv->config));
ninfo("Completed S:%d irq :%d\n",
priv->state, priv->config->irq_read(priv->config));
sem_getvalue(&priv->irqsem, &count);
if (priv->config->irq_read(priv->config) && count == 0)
@@ -729,7 +729,7 @@ static void * cc3000_worker(FAR void *arg)
break;
default:
nllinfo("default: State%d\n", priv->state);
ninfo("default: State%d\n", priv->state);
break;
}
}
@@ -799,7 +799,7 @@ static int cc3000_open(FAR struct file *filep)
CHECK_GUARD(priv);
nllinfo("crefs: %d\n", priv->crefs);
ninfo("crefs: %d\n", priv->crefs);
/* Get exclusive access to the driver data structure */
@@ -979,7 +979,7 @@ static int cc3000_close(FAR struct file *filep)
CHECK_GUARD(priv);
nllinfo("crefs: %d\n", priv->crefs);
ninfo("crefs: %d\n", priv->crefs);
/* Get exclusive access to the driver data structure */
@@ -1049,7 +1049,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
int ret;
ssize_t nread;
nllinfo("buffer:%p len:%d\n", buffer, len);
ninfo("buffer:%p len:%d\n", buffer, len);
DEBUGASSERT(filep);
inode = filep->f_inode;
@@ -1088,7 +1088,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
* option, then just return an error.
*/
nllinfo("CC3000 data is not available\n");
ninfo("CC3000 data is not available\n");
if (filep->f_oflags & O_NONBLOCK)
{
nread = -EAGAIN;
@@ -1109,7 +1109,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
* but will be re-enabled while we are waiting.
*/
nllinfo("Waiting..\n");
ninfo("Waiting..\n");
ret = sem_wait(&priv->waitsem);
priv->nwaiters--;
sched_unlock();
@@ -1163,7 +1163,7 @@ errout_with_sem:
cc3000_devgive(priv);
errout_without_sem:
nllinfo("Returning: %d\n", nread);
ninfo("Returning: %d\n", nread);
#ifndef CONFIG_DISABLE_POLL
if (nread > 0)
{
@@ -1195,7 +1195,7 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s
size_t tx_len = (len & 1) ? len : len +1;
nllinfo("buffer:%p len:%d tx_len:%d\n", buffer, len, tx_len);
ninfo("buffer:%p len:%d tx_len:%d\n", buffer, len, tx_len);
DEBUGASSERT(filep);
inode = filep->f_inode;
@@ -1260,18 +1260,18 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s
}
else
{
nllinfo("Assert CS\n");
ninfo("Assert CS\n");
priv->state = eSPI_STATE_WRITE_WAIT_IRQ;
cc3000_lock_and_select(priv->spi); /* Assert CS */
nllinfo("Wait on IRQ Active\n");
ninfo("Wait on IRQ Active\n");
ret = cc3000_wait_ready(priv);
nllinfo("IRQ Signaled\n");
ninfo("IRQ Signaled\n");
if (ret < 0)
{
/* This should only happen if the wait was canceled by an signal */
cc3000_deselect_and_unlock(priv->spi);
nllinfo("sem_wait: %d\n", errno);
ninfo("sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
nwritten = ret;
goto errout_without_sem;
@@ -1281,13 +1281,13 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s
}
priv->state = eSPI_STATE_WRITE_DONE;
nllinfo("Deassert CS S:eSPI_STATE_WRITE_DONE\n");
ninfo("Deassert CS S:eSPI_STATE_WRITE_DONE\n");
cc3000_deselect_and_unlock(priv->spi);
nwritten = tx_len;
cc3000_devgive(priv);
errout_without_sem:
nllinfo("Returning: %d\n", ret);
ninfo("Returning: %d\n", ret);
return nwritten;
}
@@ -1301,7 +1301,7 @@ static int cc3000_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct cc3000_dev_s *priv;
int ret;
nllinfo("cmd: %d arg: %ld\n", cmd, arg);
ninfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
@@ -1406,7 +1406,7 @@ static int cc3000_poll(FAR struct file *filep, FAR struct pollfd *fds,
int ret = OK;
int i;
nllinfo("setup: %d\n", (int)setup);
ninfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
inode = filep->f_inode;
@@ -1514,7 +1514,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
#endif
int ret;
nllinfo("spi: %p minor: %d\n", spi, minor);
ninfo("spi: %p minor: %d\n", spi, minor);
/* Debug-only sanity checks */
@@ -1569,7 +1569,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
/* Register the device as an input device */
(void)snprintf(drvname, DEV_NAMELEN, DEV_FORMAT, minor);
nllinfo("Registering %s\n", drvname);
ninfo("Registering %s\n", drvname);
ret = register_driver(drvname, &cc3000_fops, 0666, priv);
if (ret < 0)
drivers/wireless/cc3000/cc3000drv.c
+2 -2
View File
@@ -98,7 +98,7 @@ void cc3000_resume(void)
{
DEBUGASSERT(spiconf.cc3000fd >= 0 && spiconf.done);
sem_post(spiconf.done);
nllinfo("Done\n");
ninfo("Done\n");
}
/****************************************************************************
@@ -203,7 +203,7 @@ static void *unsoliced_thread_func(void *parameter)
sizeof(spiconf.rx_buffer), 0);
if (nbytes > 0)
{
nllinfo("%d Processed\n", nbytes);
ninfo("%d Processed\n", nbytes);
spiconf.pfRxHandler(spiconf.rx_buffer.pbuffer);
}
}
drivers/wireless/cc3000/evnt_handler.c
+11 -11
View File
@@ -924,12 +924,12 @@ void SimpleLinkWaitEvent(uint16_t opcode, void *pRetParams)
*/
tSLInformation.usRxEventOpcode = opcode;
nllinfo("Looking for opcode 0x%x\n", opcode);
ninfo("Looking for opcode 0x%x\n", opcode);
uint16_t event_type;
do
{
nllinfo("cc3000_wait\n");
ninfo("cc3000_wait\n");
tSLInformation.pucReceivedData = cc3000_wait();
tSLInformation.usEventOrDataReceived = 1;
STREAM_TO_UINT16((FAR char *)tSLInformation.pucReceivedData,
@@ -937,25 +937,25 @@ void SimpleLinkWaitEvent(uint16_t opcode, void *pRetParams)
if (*tSLInformation.pucReceivedData == HCI_TYPE_EVNT)
{
nllinfo("Evtn:0x%x\n", event_type);
ninfo("Evtn:0x%x\n", event_type);
}
if (event_type != opcode)
{
if (hci_unsolicited_event_handler() == 1)
{
nllinfo("Processed Event 0x%x want 0x%x\n", event_type, opcode);
ninfo("Processed Event 0x%x want 0x%x\n", event_type, opcode);
}
}
else
{
nllinfo("Processing opcode 0x%x\n", opcode);
ninfo("Processing opcode 0x%x\n", opcode);
hci_event_handler(pRetParams, 0, 0);
}
}
while (tSLInformation.usRxEventOpcode != 0);
nllinfo("Done for opcode 0x%x\n", opcode);
ninfo("Done for opcode 0x%x\n", opcode);
}
/****************************************************************************
@@ -981,7 +981,7 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen)
* after the end of current transaction, i.e. only after data will be received
*/
nllinfo("Looking for Data\n");
ninfo("Looking for Data\n");
uint16_t event_type;
uint16_t opcode = tSLInformation.usRxEventOpcode;
@@ -999,15 +999,15 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen)
else
{
STREAM_TO_UINT16((char *)tSLInformation.pucReceivedData, HCI_EVENT_OPCODE_OFFSET, event_type);
nllinfo("Evtn:0x%x\n", event_type);
ninfo("Evtn:0x%x\n", event_type);
if (hci_unsolicited_event_handler() == 1)
{
nllinfo("Processed Event 0x%x want Data! Opcode 0x%x\n", event_type, opcode);
ninfo("Processed Event 0x%x want Data! Opcode 0x%x\n", event_type, opcode);
}
else
{
nllinfo("!!!!!opcode 0x%x\n", opcode);
ninfo("!!!!!opcode 0x%x\n", opcode);
}
UNUSED(event_type);
@@ -1015,6 +1015,6 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen)
}
while (*tSLInformation.pucReceivedData == HCI_TYPE_EVNT);
nllinfo("Done for Data 0x%x\n", opcode);
ninfo("Done for Data 0x%x\n", opcode);
UNUSED(opcode);
}
drivers/wireless/cc3000/hci.c
+2 -2
View File
@@ -79,7 +79,7 @@ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff,
stream = (pucBuff + SPI_HEADER_SIZE);
nllinfo("Send 0x%x\n", usOpcode);
ninfo("Send 0x%x\n", usOpcode);
UINT8_TO_STREAM(stream, HCI_TYPE_CMND);
stream = UINT16_TO_STREAM(stream, usOpcode);
UINT8_TO_STREAM(stream, ucArgsLength);
@@ -87,7 +87,7 @@ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff,
/* Update the opcode of the event we will be waiting for */
cc3000_write(pucBuff, ucArgsLength + SIMPLE_LINK_HCI_CMND_HEADER_SIZE);
nllinfo("Send of 0x%x Completed\n", usOpcode);
ninfo("Send of 0x%x Completed\n", usOpcode);
return 0;
}
drivers/wireless/cc3000/socket.c
+9 -9
View File
@@ -62,8 +62,8 @@
# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#endif
#define waitllerr(x,...) // _llerr
#define waitllinfo(x,...) // _llinfo
#define waitllerr(x,...) // _err
#define waitinfo(x,...) // _info
/****************************************************************************
* Private Types
@@ -195,13 +195,13 @@ int cc3000_closesocket(int sockfd)
int ret;
#ifdef CONFIG_CC3000_MT
waitllinfo("remove\n");
waitinfo("remove\n");
cc3000_remove_socket(sockfd);
#endif
cc3000_lib_lock();
waitllinfo("Call closesocketl\n");
waitinfo("Call closesocketl\n");
ret = cc3000_closesocket_impl(sockfd);
waitllinfo("return closesocket\n");
waitinfo("return closesocket\n");
cc3000_lib_unlock();
return ret;
}
@@ -597,9 +597,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
ssize_t ret;
#ifdef CONFIG_CC3000_MT
waitllinfo("wait\n");
waitinfo("wait\n");
ret = cc3000_wait_data(sockfd);
waitllinfo("wait %d\n", ret);
waitinfo("wait %d\n", ret);
if (ret == -ECONNABORTED)
{
@@ -613,9 +613,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
#endif
cc3000_lib_lock();
waitllinfo("recv\n");
waitinfo("recv\n");
ret = cc3000_recv_impl(sockfd, buf, len, flags);
waitllinfo("recv %d\n", ret);
waitinfo("recv %d\n", ret);
cc3000_lib_unlock();
return ret;
}
drivers/wireless/cc3000/wlan.c
+1 -1
View File
@@ -261,7 +261,7 @@ void SpiReceiveHandler(void *pvBuffer)
STREAM_TO_UINT16((char *)tSLInformation.pucReceivedData,
HCI_EVENT_OPCODE_OFFSET, event_type);
nllinfo("Evnt:0x%x\n", event_type);
ninfo("Evnt:0x%x\n", event_type);
UNUSED(event_type);
hci_unsolicited_event_handler();
drivers/wireless/ieee802154/mrf24j40.c
+1 -1
View File
@@ -779,7 +779,7 @@ static int mrf24j40_settxpower(FAR struct ieee802154_dev_s *ieee,
return -EINVAL;
}
_llinfo("remaining attenuation: %d mBm\n",txpwr);
_info("remaining attenuation: %d mBm\n",txpwr);
switch(txpwr/100)
{
drivers/wireless/nrf24l01.c
+1 -1
View File
@@ -495,7 +495,7 @@ static int nrf24l01_irqhandler(int irq, FAR void *context)
{
FAR struct nrf24l01_dev_s *dev = g_nrf24l01dev;
wllinfo("*IRQ*");
winfo("*IRQ*");
#ifdef CONFIG_WL_NRF24L01_RXSUPPORT