diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-15 01:54:49 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-15 01:54:49 +0000 |
commit | 7506c552caceee913d936fde61c22ecb6ecc96c7 (patch) | |
tree | e1d082f0902d82e0bed238e434c275440e5de545 /nuttx/drivers | |
parent | b2a7bfbb51f5bf8b34ea593f3b5e76aecf9161ea (diff) | |
download | px4-nuttx-7506c552caceee913d936fde61c22ecb6ecc96c7.tar.gz px4-nuttx-7506c552caceee913d936fde61c22ecb6ecc96c7.tar.bz2 px4-nuttx-7506c552caceee913d936fde61c22ecb6ecc96c7.zip |
Basic SLIP functionality -- but there are issues
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3382 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
-rw-r--r-- | nuttx/drivers/net/skeleton.c | 4 | ||||
-rw-r--r-- | nuttx/drivers/net/slip.c | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c index 16aab6d87..5956f72c6 100644 --- a/nuttx/drivers/net/skeleton.c +++ b/nuttx/drivers/net/skeleton.c @@ -663,8 +663,8 @@ int skel_initialize(int intf) /* Initialize the driver structure */ memset(priv, 0, sizeof(struct skel_driver_s)); - priv->sk_dev.d_ifup = skel_ifup; /* I/F down callback */ - priv->sk_dev.d_ifdown = skel_ifdown; /* I/F up (new IP address) callback */ + priv->sk_dev.d_ifup = skel_ifup; /* I/F up (new IP address) callback */ + priv->sk_dev.d_ifdown = skel_ifdown; /* I/F down callback */ priv->sk_dev.d_txavail = skel_txavail; /* New TX data callback */ #ifdef CONFIG_NET_IGMP priv->sk_dev.d_addmac = skel_addmac; /* Add multicast MAC address */ diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c index 6fedb829a..fd38c5f32 100644 --- a/nuttx/drivers/net/slip.c +++ b/nuttx/drivers/net/slip.c @@ -83,15 +83,17 @@ #endif #ifndef CONFIG_SLIP_STACKSIZE -# define CONFIG_SLIP_STACKSIZE 1024 +# define CONFIG_SLIP_STACKSIZE 2048 #endif #ifndef CONFIG_SLIP_DEFPRIO # define CONFIG_SLIP_DEFPRIO 128 #endif -/* The Linux slip module hard-codes its MTU size to 296. So you - might as well set CONFIG_NET_BUFSIZE to 296 as well. +/* The Linux slip module hard-codes its MTU size to 296. So you might as + * well set CONFIG_NET_BUFSIZE to 296 as well. + */ + #if CONFIG_NET_BUFSIZE < 296 # error "CONFIG_NET_BUFSIZE >= 296 is required" #elif CONFIG_NET_BUFSIZE > 296 @@ -278,7 +280,7 @@ static inline void slip_write(FAR struct slip_driver_s *priv, static inline void slip_putc(FAR struct slip_driver_s *priv, int ch) { -#if CONFIG_DEBUG +#if 0 // CONFIG_DEBUG int ret = putc(ch, priv->stream); DEBUGASSERT(ret == ch); #else @@ -385,7 +387,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv) src++; } - /* We have looked at every charcter in the packet. Now flush any unsent + /* We have looked at every character in the packet. Now flush any unsent * data */ @@ -919,8 +921,8 @@ int slip_initialize(int intf, const char *devname) /* Initialize the driver structure */ memset(priv, 0, sizeof(struct slip_driver_s)); - priv->dev.d_ifup = slip_ifup; /* I/F down callback */ - priv->dev.d_ifdown = slip_ifdown; /* I/F up (new IP address) callback */ + priv->dev.d_ifup = slip_ifup; /* I/F up (new IP address) callback */ + priv->dev.d_ifdown = slip_ifdown; /* I/F down callback */ priv->dev.d_txavail = slip_txavail; /* New TX data callback */ #ifdef CONFIG_NET_IGMP priv->dev.d_addmac = slip_addmac; /* Add multicast MAC address */ @@ -976,9 +978,6 @@ int slip_initialize(int intf, const char *devname) /* Register the device with the OS so that socket IOCTLs can be performed */ -#if CONFIG_NSOCKET_DESCRIPTORS > 0 - snprintf(priv->dev.d_ifname, IFNAMSIZ, "slip%d", intf); -#endif (void)netdev_register(&priv->dev); return OK; } |