sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Standardize naming of all SLIP configuration options

Browse Source
This commit is contained in:
Gregory Nutt 2015-08-06 15:08:15 -06:00
parent 86769101a1
commit 0dd273935a
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs

@ -1 +1 @@
Subproject commit 639546480f11f4438ab84aef4a51a82ab937c716
Subproject commit abab21dfa553656a0ce40423931a2af2c61f3466

2
drivers/net/Kconfig
View File

@ -319,7 +319,7 @@ config NET_SLIP_MTU
256 MSS, but restrict transfers to 128 bytes (possibly by modifying
the tcp_mss() macro).
config SLIP_NINTERFACES
config NET_SLIP_NINTERFACES
int "Number of SLIP interfaces"
default 1
---help---

16
drivers/net/slip.c
View File

@ -108,12 +108,12 @@
# warning "CONFIG_NET_SLIP_MTU == 296 is optimal"
#endif
/* CONFIG_SLIP_NINTERFACES determines the number of physical interfaces
/* CONFIG_NET_SLIP_NINTERFACES determines the number of physical interfaces
* that will be supported.
*/
#ifndef CONFIG_SLIP_NINTERFACES
# define CONFIG_SLIP_NINTERFACES 1
#ifndef CONFIG_NET_SLIP_NINTERFACES
# define CONFIG_NET_SLIP_NINTERFACES 1
#endif
/* SLIP special character codes *******************************************/
@ -183,11 +183,11 @@ struct slip_driver_s
* Private Data
****************************************************************************/
/* We really should get rid of CONFIG_SLIP_NINTERFACES and, instead,
/* We really should get rid of CONFIG_NET_SLIP_NINTERFACES and, instead,
* kmm_malloc() new interface instances as needed.
*/
static struct slip_driver_s g_slip[CONFIG_SLIP_NINTERFACES];
static struct slip_driver_s g_slip[CONFIG_NET_SLIP_NINTERFACES];
/****************************************************************************
* Private Function Prototypes
@ -462,7 +462,7 @@ static void slip_txtask(int argc, FAR char *argv[])
unsigned int hsec;
ndbg("index: %d\n", index);
DEBUGASSERT(index < CONFIG_SLIP_NINTERFACES);
DEBUGASSERT(index < CONFIG_NET_SLIP_NINTERFACES);
/* Get our private data structure instance and wake up the waiting
* initialization logic.
@ -685,7 +685,7 @@ static int slip_rxtask(int argc, FAR char *argv[])
int ch;
ndbg("index: %d\n", index);
DEBUGASSERT(index < CONFIG_SLIP_NINTERFACES);
DEBUGASSERT(index < CONFIG_NET_SLIP_NINTERFACES);
/* Get our private data structure instance and wake up the waiting
* initialization logic.
@ -959,7 +959,7 @@ int slip_initialize(int intf, FAR const char *devname)
/* Get the interface structure associated with this interface number. */
DEBUGASSERT(intf < CONFIG_SLIP_NINTERFACES);
DEBUGASSERT(intf < CONFIG_NET_SLIP_NINTERFACES);
priv = &g_slip[intf];
/* Initialize the driver structure */

14
include/nuttx/net/slip.h
View File

@ -59,11 +59,11 @@
* SLIP Configuration:
*
* CONFIG_NET_SLIP - Enables building of the SLIP driver
* CONFIG_SLIP_STACKSIZE - Provides the stack size for SLIP RX and TX
* CONFIG_NET_SLIP_STACKSIZE - Provides the stack size for SLIP RX and TX
* threads. Default: 2048
* CONFIG_SLIP_DEFPRIO - Provides the priority for SLIP RX and TX threads.
* Default 128.
* CONFIG_NET_SLIP_MTU - Provides the size of the SLIP packet buffers.
* CONFIG_NET_SLIP_DEFPRIO - Provides the priority for SLIP RX and TX
* threads. Default 128.
* CONFIG_NET_NET_SLIP_MTU - Provides the size of the SLIP packet buffers.
* Default 296
*
* The Linux slip module hard-codes its MTU size to 296 (40 bytes for the
@ -74,10 +74,10 @@
* uses a MTU of 296 and window of 256, but actually only sends 168 bytes
* of data: 40 + 128. I believe that is to allow for the 2x worst cast
* packet expansion. Ideally we would like to advertise the 256 MSS,
* but restrict transfers to 128 bytes (possibly by modifying the tcp_mss()
* macro).
* but restrict transfers to 128 bytes (possibly by modifying the
* tcp_mss() macro).
*
* CONFIG_SLIP_NINTERFACES determines the number of physical interfaces
* CONFIG_NET_SLIP_NINTERFACES determines the number of physical interfaces
* that will be supported.
*/