summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-14 18:05:24 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-14 18:05:24 +0000
commit9264b754565c550afad96d4ef5ad1a76e6e8c233 (patch)
tree5aa49d43f2714eb95f3f13ec490f7d810d651fbe
parentee2220174467b0e456446f5faaef1bd1660f786e (diff)
downloadnuttx-9264b754565c550afad96d4ef5ad1a76e6e8c233.tar.gz
nuttx-9264b754565c550afad96d4ef5ad1a76e6e8c233.tar.bz2
nuttx-9264b754565c550afad96d4ef5ad1a76e6e8c233.zip
SLIP updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3379 42af7a65-404d-4744-a932-0658087f49c3
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/README.txt16
-rw-r--r--nuttx/drivers/net/slip.c2
2 files changed, 6 insertions, 12 deletions
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index 685401cbe..b7cc8683d 100755
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -808,13 +808,13 @@ Where <subdir> is one of the following:
1. Configure and build the slip-httpd configuration.
2. Connect to a Linux box (assuming /dev/ttyS0)
- 3. Reset on the target side / attach SLIP on the Linux side:
+ 3. Reset on the target side and attach SLIP on the Linux side:
+ $ modprobe slip
$ slattach -p slip -s 57600 /dev/ttyS0 &
- This should create an interface with a name like sl0. Add -d to
- get debug output. In the naming, slN, the N corresponds to the
- tty device number as in /dev/ttySN.
+ This should create an interface with a name like sl0, or sl1, etc.
+ Add -d to get debug output. This will show the interface name.
4. After turning over the line to the SLIP driver, you must configure
the network interface. Again, you do this using the standard
@@ -822,16 +822,10 @@ Where <subdir> is one of the following:
host PC with address 192.168.0.101 from your target with address
10.0.0.2. On the Linux PC you would execute the following as root:
- $ ifconfig sl0 192.168.0.101 pointopoint 10.0.0.2 up -OR?-
- $ ifconfig sl0 10.0.0.2 pointopoint 192.168.0.101 up
- $ route add 10.0.0.2 dev sl0
+ $ ifconfig sl0 10.0.0.2/24 up
Assuming the SLIP is attached to device sl0.
- [ NOTE: As of this writing, I actually have not yet successfully ]
- [ configured SLIP on Linux. The above are really just my working notes. ]
- [ I suspect that I may have the IP address backward for one thing. ]
-
thttpd:
This builds the THTTPD web server example using the THTTPD and
the examples/thttpd application.
diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c
index 899e4e5be..c822b5d46 100644
--- a/nuttx/drivers/net/slip.c
+++ b/nuttx/drivers/net/slip.c
@@ -73,7 +73,7 @@
# error "UIP_LLH_LEN must be set to zero"
#endif
-#ifdef CONFIG_NET_MULTIBUFFER
+#ifndef CONFIG_NET_MULTIBUFFER
# error "Requires CONFIG_NET_MULTIBUFFER"
#endif