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

Replace confusing references to uIP with just 'the network'

Browse Source
This commit is contained in:
Gregory Nutt
2016-05-30 09:37:34 -06:00
parent 4f208600aa
commit 44353f320c
9 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/enc28j60.c
+19 -19
View File
@@ -252,9 +252,9 @@ struct enc_driver_s
FAR struct spi_dev_s *spi;
/* This holds the information visible to uIP/NuttX */
/* This holds the information visible to the NuttX network */
struct net_driver_s dev; /* Interface understood by uIP */
struct net_driver_s dev; /* Interface understood by the network */
};
/****************************************************************************
@@ -1154,7 +1154,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
* Function: enc_txpoll
*
* Description:
* The transmitter is available, check if uIP has any outgoing packets ready
* The transmitter is available, check if the network has any outgoing packets ready
* to send. This is a callback from devif_poll(). devif_poll() may be called:
*
* 1. When the preceding TX packet send is complete,
@@ -1168,7 +1168,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
* OK on success; a negated errno on failure
*
* Assumptions:
* Interrupts are enabled but the caller holds the uIP lock.
* Interrupts are enabled but the caller holds the network lock.
*
****************************************************************************/
@@ -1261,7 +1261,7 @@ static void enc_linkstatus(FAR struct enc_driver_s *priv)
* None
*
* Assumptions:
* Interrupts are enabled but the caller holds the uIP lock.
* Interrupts are enabled but the caller holds the network lock.
*
****************************************************************************/
@@ -1288,7 +1288,7 @@ static void enc_txif(FAR struct enc_driver_s *priv)
(void)wd_start(priv->txpoll, ENC_WDDELAY, enc_polltimer, 1,
(wdparm_t)priv);
/* Then poll uIP for new XMIT data */
/* Then poll the network for new XMIT data */
(void)devif_poll(&priv->dev, enc_txpoll);
}
@@ -1362,7 +1362,7 @@ static void enc_rxerif(FAR struct enc_driver_s *priv)
* Function: enc_rxdispatch
*
* Description:
* Give the newly received packet to uIP.
* Give the newly received packet to the network.
*
* Parameters:
* priv - Reference to the driver state structure
@@ -1371,7 +1371,7 @@ static void enc_rxerif(FAR struct enc_driver_s *priv)
* None
*
* Assumptions:
* Interrupts are enabled but the caller holds the uIP lock.
* Interrupts are enabled but the caller holds the network lock.
*
****************************************************************************/
@@ -1502,7 +1502,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
* None
*
* Assumptions:
* Interrupts are enabled but the caller holds the uIP lock.
* Interrupts are enabled but the caller holds the network lock.
*
****************************************************************************/
@@ -1578,7 +1578,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
enc_rdbuffer(priv, priv->dev.d_buf, priv->dev.d_len);
enc_dumppacket("Received Packet", priv->dev.d_buf, priv->dev.d_len);
/* Dispatch the packet to uIP */
/* Dispatch the packet to the network */
enc_rxdispatch(priv);
}
@@ -1620,7 +1620,7 @@ static void enc_irqworker(FAR void *arg)
DEBUGASSERT(priv);
/* Get exclusive access to both uIP and the SPI bus. */
/* Get exclusive access to both the network and the SPI bus. */
lock = net_lock();
enc_lock(priv);
@@ -1810,7 +1810,7 @@ static void enc_irqworker(FAR void *arg)
enc_bfsgreg(priv, ENC_EIE, EIE_INTIE);
/* Release lock on the SPI bus and uIP */
/* Release lock on the SPI bus and the network */
enc_unlock(priv);
net_unlock(lock);
@@ -1881,7 +1881,7 @@ static void enc_toworker(FAR void *arg)
nlldbg("Tx timeout\n");
DEBUGASSERT(priv);
/* Get exclusive access to uIP */
/* Get exclusive access to the network */
lock = net_lock();
@@ -1899,11 +1899,11 @@ static void enc_toworker(FAR void *arg)
DEBUGASSERT(ret == OK);
UNUSED(ret);
/* Then poll uIP for new XMIT data */
/* Then poll the network for new XMIT data */
(void)devif_poll(&priv->dev, enc_txpoll);
/* Release lock on uIP */
/* Release lock on the network */
net_unlock(lock);
}
@@ -1973,7 +1973,7 @@ static void enc_pollworker(FAR void *arg)
DEBUGASSERT(priv);
/* Get exclusive access to both uIP and the SPI bus. */
/* Get exclusive access to both the network and the SPI bus. */
lock = net_lock();
enc_lock(priv);
@@ -1986,7 +1986,7 @@ static void enc_pollworker(FAR void *arg)
if ((enc_rdgreg(priv, ENC_ECON1) & ECON1_TXRTS) == 0)
{
/* Yes.. update TCP timing states and poll uIP for new XMIT data. Hmmm..
/* Yes.. update TCP timing states and poll the network for new XMIT data. Hmmm..
* looks like a bug here to me. Does this mean if there is a transmit
* in progress, we will missing TCP time state updates?
*/
@@ -1994,7 +1994,7 @@ static void enc_pollworker(FAR void *arg)
(void)devif_timer(&priv->dev, enc_txpoll);
}
/* Release lock on the SPI bus and uIP */
/* Release lock on the SPI bus and the network */
enc_unlock(priv);
net_unlock(lock);
@@ -2212,7 +2212,7 @@ static int enc_txavail(struct net_driver_s *dev)
if ((enc_rdgreg(priv, ENC_ECON1) & ECON1_TXRTS) == 0)
{
/* The interface is up and TX is idle; poll uIP for new XMIT data */
/* The interface is up and TX is idle; poll the network for new XMIT data */
(void)devif_poll(&priv->dev, enc_txpoll);
}