diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-12 15:36:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-12 15:36:28 +0000 |
| commit | e6f93f774080d42c3f954a862709d047df2d7e7a (patch) | |
| tree | 487b0ec566d911458a00e1803392b817e84b7809 | |
| parent | 95317af605c883b464a4c5b524632193614bfd24 (diff) | |
| download | nuttx-e6f93f774080d42c3f954a862709d047df2d7e7a.tar.gz nuttx-e6f93f774080d42c3f954a862709d047df2d7e7a.tar.bz2 nuttx-e6f93f774080d42c3f954a862709d047df2d7e7a.zip | |
More support for SLIP data link protocol
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3370 42af7a65-404d-4744-a932-0658087f49c3
120 files changed, 390 insertions, 381 deletions
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index a110d5ff2..f2b4938b7 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -467,6 +467,13 @@ <td><br></td> <td> <p> + <li>SLIP</li> + </p> +</tr> +<tr> + <td><br></td> + <td> + <p> <li>Small footprint (based on uIP).</li> </p> </tr> diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index a3ffa2122..c9d7f6bd2 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -12,7 +12,7 @@ <h1><big><font color="#3c34ec"> <i>NuttX RTOS Porting Guide</i> </font></big></h1> - <p>Last Updated: March 3, 2011</p> + <p>Last Updated: March 12, 2011</p> </td> </tr> </table> @@ -3304,6 +3304,19 @@ build <code>CONFIG_NET</code>: Enable or disable all network features </li> <li> + <code>CONFIG_NET_SLIP</code>: Selects the Serial Line Internet Protocol (SLIP) data link layer. + The default data link layer for uIP is Ethernet. + If <code>CONFIG_NET_SLIP</code> is defined in the NuttX header file, then SLIP will be supported. + The basic differences between the SLIP and Ethernet configurations is that when SLIP is selected: + <ul> + <li>The link level header (that comes before the IP header) is omitted.</li> + <li>All MAC address processing is suppressed.</li> + <li>ARP is disabled.</li> + </ul> + If <code>CONFIG_NET_SLIP</code> is not supported, then Ethernet will be used + (there is no need to define anything special in the configuration file to use Ethernet -- it is the default). + </li> + <li> <code>CONFIG_NET_IPv6</code>: Build in support for IPv6 </li> <li> @@ -3391,9 +3404,6 @@ build <code>CONFIG_NET_MULTICAST</code>: Outgoing multi-cast address support </li> <li> - <code>CONFIG_NET_LLH_LEN</code>: The link level header length - </li> - <li> <code>CONFIG_NET_FWCACHE_SIZE</code>: number of packets to remember when looking for duplicates </li> </ul> diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 860d2323a..723656a85 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -625,11 +625,10 @@ defconfig -- This is a configuration file similar to the Linux CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window CONFIG_NET_ARPTAB_SIZE - The size of the ARP table - CONFIG_NET_ARP_IPIN - Harvest IP/MAC address mappings from the ARP table - from incoming IP packets. + CONFIG_NET_ARP_IPIN - Harvest IP/MAC address mappings from the ARP table + from incoming IP packets. CONFIG_NET_BROADCAST - Incoming UDP broadcast support CONFIG_NET_MULTICAST - Outgoing multi-cast address support - CONFIG_NET_LLH_LEN - The link level header length CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig index 717fc8a3e..cacd37b18 100755 --- a/nuttx/configs/avr32dev1/nsh/defconfig +++ b/nuttx/configs/avr32dev1/nsh/defconfig @@ -508,7 +508,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -529,7 +528,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig index a6588daf4..d42dc96dc 100755 --- a/nuttx/configs/avr32dev1/ostest/defconfig +++ b/nuttx/configs/avr32dev1/ostest/defconfig @@ -508,7 +508,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -529,7 +528,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig index 947da1355..15d5f7f06 100644 --- a/nuttx/configs/c5471evm/defconfig +++ b/nuttx/configs/c5471evm/defconfig @@ -349,8 +349,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -371,7 +371,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/dhcpconfig index de4e9141f..ccfa1e7aa 100644 --- a/nuttx/configs/c5471evm/dhcpconfig +++ b/nuttx/configs/c5471evm/dhcpconfig @@ -349,8 +349,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -371,7 +371,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=y -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/netconfig index 34d45e24a..b28b4c4e9 100644 --- a/nuttx/configs/c5471evm/netconfig +++ b/nuttx/configs/c5471evm/netconfig @@ -349,8 +349,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -371,7 +371,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nshconfig index b1b1844a6..b557874da 100644 --- a/nuttx/configs/c5471evm/nshconfig +++ b/nuttx/configs/c5471evm/nshconfig @@ -349,8 +349,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -371,7 +371,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig index ff5e58e8d..21151bb63 100755 --- a/nuttx/configs/demo9s12ne64/ostest/defconfig +++ b/nuttx/configs/demo9s12ne64/ostest/defconfig @@ -487,7 +487,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -508,7 +507,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/detron/hidkbd/defconfig b/nuttx/configs/detron/hidkbd/defconfig index 1e7fe5e5e..b0e767579 100755 --- a/nuttx/configs/detron/hidkbd/defconfig +++ b/nuttx/configs/detron/hidkbd/defconfig @@ -528,7 +528,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -549,7 +548,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/detron/nsh/defconfig b/nuttx/configs/detron/nsh/defconfig index 1d0ea610f..3480dd779 100755 --- a/nuttx/configs/detron/nsh/defconfig +++ b/nuttx/configs/detron/nsh/defconfig @@ -533,7 +533,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET_WLAN - Enable or disable WLAN network interface # @@ -555,7 +554,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 CONFIG_NET_WLAN=y diff --git a/nuttx/configs/detron/ostest/defconfig b/nuttx/configs/detron/ostest/defconfig index 1816157de..609071311 100755 --- a/nuttx/configs/detron/ostest/defconfig +++ b/nuttx/configs/detron/ostest/defconfig @@ -522,7 +522,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -543,7 +542,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/detron/wlan/defconfig b/nuttx/configs/detron/wlan/defconfig index 142c25393..504fe356b 100755 --- a/nuttx/configs/detron/wlan/defconfig +++ b/nuttx/configs/detron/wlan/defconfig @@ -532,7 +532,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET_WLAN - Enable or disable WLAN network interface # @@ -554,7 +553,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 CONFIG_NET_WLAN=y diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig index 999af1ace..15bf7abc9 100755 --- a/nuttx/configs/ea3131/nsh/defconfig +++ b/nuttx/configs/ea3131/nsh/defconfig @@ -479,7 +479,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -500,7 +499,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig index 1bcf96434..0688c1e81 100755 --- a/nuttx/configs/ea3131/ostest/defconfig +++ b/nuttx/configs/ea3131/ostest/defconfig @@ -479,7 +479,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -500,7 +499,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index 3075bcb77..676e59419 100755 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/nuttx/configs/ea3131/pgnsh/defconfig @@ -624,7 +624,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -645,7 +644,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig index 9839df9b4..6758fcaa0 100755 --- a/nuttx/configs/ea3131/usbserial/defconfig +++ b/nuttx/configs/ea3131/usbserial/defconfig @@ -482,7 +482,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -503,7 +502,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig index d3d848682..9ff7a9911 100755 --- a/nuttx/configs/ea3131/usbstorage/defconfig +++ b/nuttx/configs/ea3131/usbstorage/defconfig @@ -482,7 +482,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -503,7 +502,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index 72177e5e5..f9ed12452 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/nuttx/configs/eagle100/httpd/defconfig @@ -441,7 +441,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -464,7 +463,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index bab51c133..ded9f0f19 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/nuttx/configs/eagle100/nettest/defconfig @@ -441,7 +441,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -464,7 +463,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index 9bc045703..bb09da1b6 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/nuttx/configs/eagle100/nsh/defconfig @@ -440,7 +440,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -461,7 +460,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index 0ba898d60..50d5e98dc 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/nuttx/configs/eagle100/nxflat/defconfig @@ -453,7 +453,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -474,7 +473,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig index 62fa96eb3..a71bf61f4 100644 --- a/nuttx/configs/eagle100/ostest/defconfig +++ b/nuttx/configs/eagle100/ostest/defconfig @@ -447,7 +447,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -468,7 +467,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index 9591c7137..54ddb6b5b 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/nuttx/configs/eagle100/thttpd/defconfig @@ -460,7 +460,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -483,7 +482,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig index d916fe74f..7aaabc009 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/defconfig +++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig @@ -410,8 +410,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -430,7 +430,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig index c22ccb128..7d283d23b 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig +++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig @@ -416,8 +416,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -438,7 +438,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=y -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig index e2d7c0e01..deb71f1a9 100644 --- a/nuttx/configs/ez80f910200zco/httpd/defconfig +++ b/nuttx/configs/ez80f910200zco/httpd/defconfig @@ -416,8 +416,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=16 @@ -438,7 +438,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig index 842b095ef..47994153b 100644 --- a/nuttx/configs/ez80f910200zco/nettest/defconfig +++ b/nuttx/configs/ez80f910200zco/nettest/defconfig @@ -416,8 +416,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -438,7 +438,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig index 28da9ba4d..f91c216d2 100644 --- a/nuttx/configs/ez80f910200zco/nsh/defconfig +++ b/nuttx/configs/ez80f910200zco/nsh/defconfig @@ -416,8 +416,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -438,7 +438,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig index e43c6c1fa..2022ff608 100644 --- a/nuttx/configs/ez80f910200zco/ostest/defconfig +++ b/nuttx/configs/ez80f910200zco/ostest/defconfig @@ -413,8 +413,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -433,7 +433,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig index 245adc8a5..cdbb56604 100644 --- a/nuttx/configs/ez80f910200zco/poll/defconfig +++ b/nuttx/configs/ez80f910200zco/poll/defconfig @@ -416,8 +416,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -438,7 +438,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index 7ea3ef1e1..3cdb92a69 100755 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig @@ -462,7 +462,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -485,7 +484,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 5b9c03e2e..a39c01208 100755 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -476,7 +476,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -497,7 +496,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig index 1a6307ff9..fc17aeb86 100755 --- a/nuttx/configs/lm3s6965-ek/ostest/defconfig +++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig @@ -461,7 +461,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -482,7 +481,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig index b1009f71f..0b6532371 100755 --- a/nuttx/configs/lm3s8962-ek/nsh/defconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig @@ -462,7 +462,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -485,7 +484,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index 5cd426256..e386634a7 100755 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -476,7 +476,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -497,7 +496,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig index 4d55397ca..7e7c84dda 100755 --- a/nuttx/configs/lm3s8962-ek/ostest/defconfig +++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig @@ -461,7 +461,6 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -482,7 +481,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig index f9750900e..db8c91dde 100644 --- a/nuttx/configs/m68332evb/defconfig +++ b/nuttx/configs/m68332evb/defconfig @@ -315,8 +315,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -335,7 +335,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig index 64d3ec267..a4e45838f 100644 --- a/nuttx/configs/mbed/hidkbd/defconfig +++ b/nuttx/configs/mbed/hidkbd/defconfig @@ -531,7 +531,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -554,7 +553,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig index 1cddaa924..6e482ff65 100755 --- a/nuttx/configs/mbed/nsh/defconfig +++ b/nuttx/configs/mbed/nsh/defconfig @@ -522,7 +522,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -543,7 +542,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig index 1c1bc78c7..4d781194e 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig @@ -386,8 +386,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -406,7 +406,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index 40a997e44..29331a9fa 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -376,8 +376,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -396,7 +396,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig index f8921b126..57643cea9 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig @@ -376,8 +376,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -396,7 +396,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig index 1f2c1b6aa..aa6f392ba 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig @@ -377,8 +377,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -397,7 +397,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig index b705f5a0d..06ab2a83f 100644 --- a/nuttx/configs/mx1ads/ostest/defconfig +++ b/nuttx/configs/mx1ads/ostest/defconfig @@ -369,8 +369,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -389,7 +389,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig index 3c39a6e3e..b2d74a5e6 100755 --- a/nuttx/configs/ne64badge/ostest/defconfig +++ b/nuttx/configs/ne64badge/ostest/defconfig @@ -498,7 +498,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -519,7 +518,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig index cc03db7cf..bb6351bff 100644 --- a/nuttx/configs/ntosd-dm320/nettest/defconfig +++ b/nuttx/configs/ntosd-dm320/nettest/defconfig @@ -357,8 +357,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -379,7 +379,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig index 9dd069fd9..cd0bd274a 100644 --- a/nuttx/configs/ntosd-dm320/nsh/defconfig +++ b/nuttx/configs/ntosd-dm320/nsh/defconfig @@ -364,8 +364,8 @@ CONFIG_FS_ROMFS=y # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -386,7 +386,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig index 4966efdc8..9d4e026c5 100644 --- a/nuttx/configs/ntosd-dm320/ostest/defconfig +++ b/nuttx/configs/ntosd-dm320/ostest/defconfig @@ -357,8 +357,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -377,7 +377,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig index 6e6ca0f4e..b0c549897 100644 --- a/nuttx/configs/ntosd-dm320/poll/defconfig +++ b/nuttx/configs/ntosd-dm320/poll/defconfig @@ -357,8 +357,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -379,7 +379,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig index 83a8245bd..c23e7b89f 100644 --- a/nuttx/configs/ntosd-dm320/thttpd/defconfig +++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig @@ -405,8 +405,8 @@ CONFIG_MMCSD_SPICLOCK=12500000 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=16 @@ -427,7 +427,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig index b2fbe192d..487bed2ab 100644 --- a/nuttx/configs/ntosd-dm320/udp/defconfig +++ b/nuttx/configs/ntosd-dm320/udp/defconfig @@ -357,7 +357,6 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates CONFIG_NET=y CONFIG_NET_IPv6=n @@ -379,7 +378,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig index e604067f5..d78927ed4 100644 --- a/nuttx/configs/ntosd-dm320/uip/defconfig +++ b/nuttx/configs/ntosd-dm320/uip/defconfig @@ -357,8 +357,8 @@ CONFIG_PREALLOC_TIMERS=8 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -379,7 +379,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig index 048e7dea2..6b0b35559 100755 --- a/nuttx/configs/nucleus2g/nsh/defconfig +++ b/nuttx/configs/nucleus2g/nsh/defconfig @@ -527,7 +527,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -548,7 +547,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig index 4f5321289..78e8e5bb8 100755 --- a/nuttx/configs/nucleus2g/ostest/defconfig +++ b/nuttx/configs/nucleus2g/ostest/defconfig @@ -522,7 +522,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -543,7 +542,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig index aaed805b1..71ee3c1eb 100755 --- a/nuttx/configs/nucleus2g/usbserial/defconfig +++ b/nuttx/configs/nucleus2g/usbserial/defconfig @@ -523,7 +523,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -544,7 +543,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig index e898ff644..4a30ba3a8 100755 --- a/nuttx/configs/nucleus2g/usbstorage/defconfig +++ b/nuttx/configs/nucleus2g/usbstorage/defconfig @@ -523,7 +523,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -544,7 +543,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig index fe415736e..b57152909 100755 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig @@ -531,7 +531,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -554,7 +553,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index 9da6d0b8f..aa4ed7f7c 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig @@ -531,7 +531,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -554,7 +553,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig index 8869ab2fb..24239d6ee 100755 --- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig @@ -531,7 +531,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -554,7 +553,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index 163964f4f..d6b3d8279 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -543,7 +543,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -564,7 +563,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig index 19c30b63b..bdca7c32d 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig @@ -524,7 +524,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -545,7 +544,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig index d85afadc0..b2f1a8232 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig @@ -540,7 +540,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=y @@ -563,7 +562,6 @@ CONFIG_NET_STATISTICS=n #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig index 7262247c2..48e0f8407 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig @@ -525,7 +525,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -546,7 +545,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig index 6cdd31aeb..7c6795401 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig @@ -525,7 +525,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -546,7 +545,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig index 089800e38..cb5e24d98 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig @@ -531,7 +531,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET_WLAN - Enable or disable WLAN network interface # @@ -553,7 +552,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 CONFIG_NET_WLAN=y diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig index 09f6312c6..985f654d6 100755 --- a/nuttx/configs/olimex-strp711/nettest/defconfig +++ b/nuttx/configs/olimex-strp711/nettest/defconfig @@ -480,8 +480,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -502,7 +502,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig index 36e74bc97..87d75418f 100644 --- a/nuttx/configs/olimex-strp711/nsh/defconfig +++ b/nuttx/configs/olimex-strp711/nsh/defconfig @@ -439,8 +439,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -459,7 +459,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig index 509346817..9bb56b7c1 100644 --- a/nuttx/configs/olimex-strp711/ostest/defconfig +++ b/nuttx/configs/olimex-strp711/ostest/defconfig @@ -439,8 +439,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -459,7 +459,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig index ad4b41731..1c1340a8a 100644 --- a/nuttx/configs/pjrc-8051/defconfig +++ b/nuttx/configs/pjrc-8051/defconfig @@ -313,8 +313,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -333,7 +333,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig index 3cec37a3b..91f34e55c 100644 --- a/nuttx/configs/qemu-i486/nsh/defconfig +++ b/nuttx/configs/qemu-i486/nsh/defconfig @@ -396,8 +396,8 @@ CONFIG_FS_ROMFS=y # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -416,7 +416,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig index c84f50822..394761ed2 100644 --- a/nuttx/configs/qemu-i486/ostest/defconfig +++ b/nuttx/configs/qemu-i486/ostest/defconfig @@ -312,8 +312,8 @@ CONFIG_FS_ROMFS=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -332,7 +332,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 54b1e368c..61f49da6c 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -498,7 +498,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -519,7 +518,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index c48cf66bd..12ae973c8 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -507,7 +507,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -528,7 +527,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index 475ab094c..cdb31139f 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -496,7 +496,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -517,7 +516,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig index c7bd8329c..98ac9d119 100644 --- a/nuttx/configs/sim/mount/defconfig +++ b/nuttx/configs/sim/mount/defconfig @@ -288,8 +288,8 @@ CONFIG_FS_ROMFS=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -308,7 +308,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig index 549497092..8c3713207 100644 --- a/nuttx/configs/sim/nettest/defconfig +++ b/nuttx/configs/sim/nettest/defconfig @@ -288,8 +288,8 @@ CONFIG_FS_ROMFS=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=y CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=8 @@ -308,7 +308,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig index 381e71956..9547e45ac 100644 --- a/nuttx/configs/sim/nsh/defconfig +++ b/nuttx/configs/sim/nsh/defconfig @@ -288,8 +288,8 @@ CONFIG_FS_ROMFS=y # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -308,7 +308,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index 580b78a29..688fb6a66 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -304,8 +304,8 @@ CONFIG_FS_ROMFS=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -324,7 +324,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sim/nx/defconfig-x11 b/nuttx/configs/sim/nx/defconfig-x11 index fd7699fca..3594732cc 100644 --- a/nuttx/configs/sim/nx/defconfig-x11 +++ b/nuttx/configs/sim/nx/defconfig-x11 @@ -304,8 +304,8 @@ CONFIG_FS_ROMFS=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -324,7 +324,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig index 29e42a813..625feca2a 100644 --- a/nuttx/configs/sim/ostest/defconfig +++ b/nuttx/configs/sim/ostest/defconfig @@ -288,8 +288,8 @@ CONFIG_FS_ROMFS=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -308,7 +308,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig index 533f93ac0..5466c71e0 100644 --- a/nuttx/configs/sim/pashello/defconfig +++ b/nuttx/configs/sim/pashello/defconfig @@ -288,8 +288,8 @@ CONFIG_FS_ROMFS=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -308,7 +308,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig index edea10652..335337307 100644 --- a/nuttx/configs/skp16c26/ostest/defconfig +++ b/nuttx/configs/skp16c26/ostest/defconfig @@ -360,8 +360,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -380,7 +380,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig index 9c948f966..7725c6d0a 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/defconfig +++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig @@ -519,7 +519,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -540,7 +539,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index 604e00dcf..352133a8c 100755 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -528,7 +528,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -549,7 +548,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig index 9bdcf8500..7038add28 100755 --- a/nuttx/configs/stm3210e-eval/ostest/defconfig +++ b/nuttx/configs/stm3210e-eval/ostest/defconfig @@ -530,7 +530,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -551,7 +550,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index 3fb27d2b8..7bef8a50b 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -531,7 +531,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -552,7 +551,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig index 6ee1cc301..ceeabb907 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig +++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig @@ -530,7 +530,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -551,7 +550,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig index 65d5c60f9..a5a4bf350 100644 --- a/nuttx/configs/us7032evb1/nsh/defconfig +++ b/nuttx/configs/us7032evb1/nsh/defconfig @@ -383,8 +383,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -403,7 +403,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig index b87e4705a..ae8716101 100644 --- a/nuttx/configs/us7032evb1/ostest/defconfig +++ b/nuttx/configs/us7032evb1/ostest/defconfig @@ -383,8 +383,8 @@ CONFIG_MMCSD_READONLY=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -403,7 +403,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index 2d3e5b2b3..e6503f376 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -532,7 +532,6 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -553,7 +552,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig index ade89d8fc..4026adf6f 100644 --- a/nuttx/configs/xtrs/nsh/defconfig +++ b/nuttx/configs/xtrs/nsh/defconfig @@ -309,8 +309,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -329,7 +329,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig index 78de1e491..21af7f055 100644 --- a/nuttx/configs/xtrs/ostest/defconfig +++ b/nuttx/configs/xtrs/ostest/defconfig @@ -309,8 +309,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -329,7 +329,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig index 22685f05a..017024747 100644 --- a/nuttx/configs/xtrs/pashello/defconfig +++ b/nuttx/configs/xtrs/pashello/defconfig @@ -309,8 +309,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -329,7 +329,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig index 0a173b008..ea7aa62db 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/defconfig +++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig @@ -337,8 +337,8 @@ CONFIG_PREALLOC_TIMERS=4 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -357,7 +357,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig index 8a7ede12a..10761a6a4 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/defconfig +++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig @@ -337,8 +337,8 @@ CONFIG_PREALLOC_TIMERS=4 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -357,7 +357,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig index 18741528d..38c3c2b41 100644 --- a/nuttx/configs/z80sim/nsh/defconfig +++ b/nuttx/configs/z80sim/nsh/defconfig @@ -299,8 +299,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -319,7 +319,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig index 6045ca4b4..f978e75b0 100644 --- a/nuttx/configs/z80sim/ostest/defconfig +++ b/nuttx/configs/z80sim/ostest/defconfig @@ -299,7 +299,6 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET=n @@ -320,7 +319,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig index 1e36a9bd9..0fe2828db 100644 --- a/nuttx/configs/z80sim/pashello/defconfig +++ b/nuttx/configs/z80sim/pashello/defconfig @@ -299,8 +299,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -319,7 +319,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig index aa162c596..b206996a4 100644 --- a/nuttx/configs/z8encore000zco/ostest/defconfig +++ b/nuttx/configs/z8encore000zco/ostest/defconfig @@ -333,8 +333,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -353,7 +353,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig index e534908c3..34181dd5a 100644 --- a/nuttx/configs/z8f64200100kit/ostest/defconfig +++ b/nuttx/configs/z8f64200100kit/ostest/defconfig @@ -333,8 +333,8 @@ CONFIG_PREALLOC_TIMERS=0 # CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window # CONFIG_NET_ARPTAB_SIZE - The size of the ARP table # CONFIG_NET_BROADCAST - Broadcast support -# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET=n CONFIG_NET_IPv6=n CONFIG_NSOCKET_DESCRIPTORS=0 @@ -353,7 +353,6 @@ CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_ARPTAB_SIZE=8 CONFIG_NET_BROADCAST=n -#CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 # diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c index fab395b72..37e57f77b 100644 --- a/nuttx/drivers/net/slip.c +++ b/nuttx/drivers/net/slip.c @@ -72,7 +72,7 @@ /* Configuration ************************************************************/ #if UIP_LLH_LEN > 0 -# error "CONFIG_NET_LLH_LEN must be set to zero" +# error "UIP_LLH_LEN must be set to zero" #endif #ifndef CONFIG_SLIP_STACKSIZE diff --git a/nuttx/drivers/usbhost/Make.defs b/nuttx/drivers/usbhost/Make.defs index 531ff983d..9587cab08 100644 --- a/nuttx/drivers/usbhost/Make.defs +++ b/nuttx/drivers/usbhost/Make.defs @@ -39,7 +39,7 @@ USBHOST_CSRCS = hid_parser.c ifeq ($(CONFIG_USBHOST),y) USBHOST_CSRCS += usbhost_registry.c usbhost_registerclass.c usbhost_findclass.c USBHOST_CSRCS += usbhost_enumerate.c usbhost_storage.c usbhost_hidkbd.c -#ifeq ($(CONFIG_NET),y) -USBHOST_CSRCS += usbhost_rtl8187.c -#endif +ifeq ($(CONFIG_NET),y) + USBHOST_CSRCS += usbhost_rtl8187.c +endif endif diff --git a/nuttx/examples/wlan/wlan_main.c b/nuttx/examples/wlan/wlan_main.c index fa13d76d9..9bfb78fa7 100755 --- a/nuttx/examples/wlan/wlan_main.c +++ b/nuttx/examples/wlan/wlan_main.c @@ -178,7 +178,7 @@ int user_start(int argc, char *argv[]) { /* Start a thread to handle device connection. */ - printf("user_start: Start hidkbd_waiter\n"); + printf("user_start: Start wlan_waiter\n"); #ifndef CONFIG_CUSTOM_STACK pid = task_create("usbhost", CONFIG_EXAMPLES_WLAN_DEFPRIO, diff --git a/nuttx/include/net/ioctls.h b/nuttx/include/net/ioctls.h index 7bb6c18b3..8398e51ed 100644 --- a/nuttx/include/net/ioctls.h +++ b/nuttx/include/net/ioctls.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/net/ioctls.h * - * Copyright (C) 2007, 2008, 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2008, 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ * Definitions ****************************************************************************/ -/* These are ioctl commands to use with a socket FD. At present, commnads +/* These are ioctl commands to use with a socket FD. At present, commands * are accepted only to set/get IP addresses, broadcast address, network * masks, and hardware address, and a few others */ @@ -54,22 +54,83 @@ #define _SIOCVALID(c) (_IOC_TYPE(c)==_SIOCBASE) #define _SIOC(nr) _IOC(_SIOCBASE,nr) -#define SIOCGIFADDR _SIOC(0x0001) /* Get IP address */ -#define SIOCSIFADDR _SIOC(0x0002) /* Set IP address */ -#define SIOCGIFDSTADDR _SIOC(0x0003) /* Get P-to-P address */ -#define SIOCSIFDSTADDR _SIOC(0x0004) /* Set P-to-P address */ -#define SIOCGIFBRDADDR _SIOC(0x0005) /* Get broadcast IP address */ -#define SIOCSIFBRDADDR _SIOC(0x0006) /* Set broadcast IP address */ -#define SIOCGIFNETMASK _SIOC(0x0007) /* Get network mask */ -#define SIOCSIFNETMASK _SIOC(0x0008) /* Set network mask */ -#define SIOCGIFMTU _SIOC(0x0009) /* Get MTU size */ -#define SIOCGIFHWADDR _SIOC(0x000a) /* Get hardware address */ -#define SIOCSIFHWADDR _SIOC(0x000b) /* Set hardware address */ -#define SIOCDIFADDR _SIOC(0x000c) /* Delete IP address */ -#define SIOCGIFCOUNT _SIOC(0x000d) /* Get number of devices */ - -#define SIOCGIPMSFILTER _SIOC(0x000e) /* Retrieve source filter addresses */ -#define SIOCSIPMSFILTER _SIOC(0x000f) /* Set source filter content */ +#define SIOCGIFADDR _SIOC(0x0001) /* Get IP address */ +#define SIOCSIFADDR _SIOC(0x0002) /* Set IP address */ +#define SIOCGIFDSTADDR _SIOC(0x0003) /* Get P-to-P address */ +#define SIOCSIFDSTADDR _SIOC(0x0004) /* Set P-to-P address */ +#define SIOCGIFBRDADDR _SIOC(0x0005) /* Get broadcast IP address */ +#define SIOCSIFBRDADDR _SIOC(0x0006) /* Set broadcast IP address */ +#define SIOCGIFNETMASK _SIOC(0x0007) /* Get network mask */ +#define SIOCSIFNETMASK _SIOC(0x0008) /* Set network mask */ +#define SIOCGIFMTU _SIOC(0x0009) /* Get MTU size */ +#define SIOCGIFHWADDR _SIOC(0x000a) /* Get hardware address */ +#define SIOCSIFHWADDR _SIOC(0x000b) /* Set hardware address */ +#define SIOCDIFADDR _SIOC(0x000c) /* Delete IP address */ +#define SIOCGIFCOUNT _SIOC(0x000d) /* Get number of devices */ + +#define SIOCGIPMSFILTER _SIOC(0x000e) /* Retrieve source filter addresses */ +#define SIOCSIPMSFILTER _SIOC(0x000f) /* Set source filter content */ + +/* Wireless ioctl commands **************************************************/ + +#define SIOCSIWCOMMIT _SIOC(0x0010) /* Commit pending changes to driver */ +#define SIOCGIWNAME _SIOC(0x0011) /* Get name of wireless protocol */ + +#define SIOCSIWNWID _SIOC(0x0012) /* Set network ID (pre-802.11) */ +#define SIOCGIWNWID _SIOC(0x0013) /* Get network ID (the cell) */ +#define SIOCSIWFREQ _SIOC(0x0014) /* Set channel/frequency (Hz) */ +#define SIOCGIWFREQ _SIOC(0x0015) /* Get channel/frequency (Hz) */ +#define SIOCSIWMODE _SIOC(0x0016) /* Set operation mode */ +#define SIOCGIWMODE _SIOC(0x0017) /* Get operation mode */ +#define SIOCSIWSENS _SIOC(0x0018) /* Set sensitivity (dBm) */ +#define SIOCGIWSENS _SIOC(0x0019) /* Get sensitivity (dBm) */ + +#define SIOCGIWRANGE _SIOC(0x001a) /* Get range of parameters */ +#define SIOCGIWPRIV _SIOC(0x001b) /* Get private ioctl interface info */ +#define SIOCGIWSTATS _SIOC(0x001c) /* Get wireless stats */ + +#define SIOCSIWSPY _SIOC(0x001d) /* Set spy addresses */ +#define SIOCGIWSPY _SIOC(0x001e) /* Get spy info (quality of link) */ +#define SIOCSIWTHRSPY _SIOC(0x001f) /* Set spy threshold (spy event) */ +#define SIOCGIWTHRSPY _SIOC(0x0020) /* Get spy threshold */ + +#define SIOCSIWAP _SIOC(0x0021) /* Set access point MAC addresses */ +#define SIOCGIWAP _SIOC(0x0022) /* Get access point MAC addresses */ +#define SIOCGIWAPLIST _SIOC(0x0023) /* Deprecated in favor of scanning */ +#define SIOCSIWSCAN _SIOC(0x0024) /* Trigger scanning (list cells) */ +#define SIOCGIWSCAN _SIOC(0x0025) /* Get scanning results */ + +#define SIOCSIWESSID _SIOC(0x0026) /* Set ESSID (network name) */ +#define SIOCGIWESSID _SIOC(0x0027) /* Get ESSID */ +#define SIOCSIWNICKN _SIOC(0x0028) /* Set node name/nickname */ +#define SIOCGIWNICKN _SIOC(0x0029) /* Get node name/nickname */ + +#define SIOCSIWRATE _SIOC(0x002a) /* Set default bit rate (bps) */ +#define SIOCGIWRATE _SIOC(0x002b) /* Get default bit rate (bps) */ +#define SIOCSIWRTS _SIOC(0x002c) /* Set RTS/CTS threshold (bytes) */ +#define SIOCGIWRTS _SIOC(0x002d) /* Get RTS/CTS threshold (bytes) */ +#define SIOCSIWFRAG _SIOC(0x002e) /* Set fragmentation thr (bytes) */ +#define SIOCGIWFRAG _SIOC(0x002f) /* Get fragmentation thr (bytes) */ +#define SIOCSIWTXPOW _SIOC(0x0030) /* Set transmit power (dBm) */ +#define SIOCGIWTXPOW _SIOC(0x0031) /* Get transmit power (dBm) */ +#define SIOCSIWRETRY _SIOC(0x0032) /* Set retry limits and lifetime */ +#define SIOCGIWRETRY _SIOC(0x0033) /* Get retry limits and lifetime */ + +#define SIOCSIWPOWER _SIOC(0x0034) /* Set Power Management settings */ +#define SIOCGIWPOWER _SIOC(0x0035) /* Get Power Management settings */ + +#define SIOCSIWGENIE _SIOC(0x0030) /* Set generic IE */ +#define SIOCGIWGENIE _SIOC(0x0031) /* Get generic IE */ + +#define SIOCSIWMLME _SIOC(0x0016) /* Request MLME operation */ + +#define SIOCSIWAUTH _SIOC(0x0032) /* Set authentication mode params */ +#define SIOCGIWAUTH _SIOC(0x0033) /* Get authentication mode params */ + +#define SIOCSIWENCODEEXT _SIOC(0x0034) /* Set encoding token & mode */ +#define SIOCGIWENCODEEXT _SIOC(0x0035) /* Get encoding token & mode */ + +#define SIOCSIWPMKSA _SIOC(0x0036) /* PMKSA cache operation */ /**************************************************************************** * Type Definitions diff --git a/nuttx/include/net/uip/uip-arch.h b/nuttx/include/net/uip/uip-arch.h index c7e8687c1..49608de49 100644 --- a/nuttx/include/net/uip/uip-arch.h +++ b/nuttx/include/net/uip/uip-arch.h @@ -2,7 +2,7 @@ * uip-arch.h * Defines architecture-specific device driver interfaces to uIP * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Derived largely from portions of uIP with has a similar BSD-styple license: @@ -90,9 +90,11 @@ struct uip_driver_s char d_ifname[IFNAMSIZ]; #endif - /* Device identitity */ + /* Ethernet device identity */ +#ifdef CONFIG_NET_ETHERNET struct ether_addr d_mac; /* Device MAC address */ +#endif /* Network identity */ diff --git a/nuttx/include/net/uip/uip-arp.h b/nuttx/include/net/uip/uip-arp.h index 439960e9a..3afe1b252 100644 --- a/nuttx/include/net/uip/uip-arp.h +++ b/nuttx/include/net/uip/uip-arp.h @@ -2,7 +2,7 @@ * include/net/uip/uip-arch.h * Macros and definitions for the ARP module. * - * Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Derived from uIP with has a similar BSD-styple license: @@ -49,7 +49,9 @@ #include <nuttx/compiler.h> #include <stdint.h> + #include <net/ethernet.h> +#include <net/uip/uipopt.h> #include <net/uip/uip.h> /**************************************************************************** @@ -102,6 +104,7 @@ extern "C" { * Public Function Prototypes ****************************************************************************/ +#ifdef CONFIG_NET_ARP /**************************************************************************** * Name: uip_arp_init * @@ -236,6 +239,21 @@ EXTERN struct arp_entry *uip_arp_find(in_addr_t ipaddr); } \ } +#else /* CONFIG_NET_ARP */ + +/* If ARP is disabled, stub out all ARP interfaces */ + +# define uip_arp_init() +# define uip_arp_ipin(dev) +# define uip_arp_arpin(dev) +# define uip_arp_out(dev) +# define uip_arp_timer() +# define uip_arp_update(pipaddr,ethaddr) +# define uip_arp_find(ipaddr) NULL +# define uip_arp_delete(ipaddr) + +#endif /* CONFIG_NET_ARP */ + #undef EXTERN #ifdef __cplusplus } diff --git a/nuttx/include/net/uip/uipopt.h b/nuttx/include/net/uip/uipopt.h index be62d1a6e..f6aff58bd 100644 --- a/nuttx/include/net/uip/uipopt.h +++ b/nuttx/include/net/uip/uipopt.h @@ -16,7 +16,7 @@ * Note: Most of the configuration options in the uipopt.h should not * be changed, but rather the per-project defconfig file. * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * This logic was leveraged from uIP which also has a BSD-style license: @@ -69,6 +69,42 @@ * Public Type Definitions ****************************************************************************/ +/* Layer 2 Configuration Options ********************************************/ + +/* The default data link layer for uIP is Ethernet. If CONFIG_NET_SLIP is + * defined in the NuttX header file, then SLIP will be supported. The basic + * differences between the SLIP and Ethernet configurations is that when SLIP + * is selected: + * + * - The link level header (that comes before the IP header) is omitted. + * - All MAC address processing is suppressed. + * - ARP is disabled. + * + * If CONFIG_NET_SLIP is not supported, then Ethernet will be used (there is + * no need to define anything special in the configuration file to use + * Ethernet -- it is the default). + * + * The "link level header" is the offset into the d_buf where the IP header + * can be found. For Ethernet, this should be set to 14. For SLIP, this + * should be set to 0. + */ + +#undef CONFIG_NET_ETHERNET +#undef CONFIG_NET_ARP + +#ifdef CONFIG_NET_SLIP +# ifdef CONFIG_NET_IPv6 +# error "SLIP is not implemented for IPv6" +# endif +# define UIP_LLH_LEN 0 +#else +# define CONFIG_NET_ETHERNET 1 +# define CONFIG_NET_ARP 1 +# define UIP_LLH_LEN 14 +#endif + +/* Layer 3/4 Configuration Options ******************************************/ + /* IP configuration options */ /* The IP TTL (time to live) of IP packets sent by uIP. @@ -251,19 +287,6 @@ # define CONFIG_NET_TCP_READAHEAD_BUFSIZE UIP_TCP_MSS #endif -/* The link level header length. - * - * This is the offset into the d_buf where the IP header can be - * found. For Ethernet, this should be set to 14. For SLIP, this - * should be set to 0. - */ - -#ifdef CONFIG_NET_LLH_LEN -# define UIP_LLH_LEN CONFIG_NET_LLH_LEN -#else -# define UIP_LLH_LEN 14 -#endif - /**************************************************************************** * Public Type Definitions ****************************************************************************/ diff --git a/nuttx/net/Makefile b/nuttx/net/Makefile index 203aa0e53..40eb2af50 100644 --- a/nuttx/net/Makefile +++ b/nuttx/net/Makefile @@ -1,7 +1,7 @@ ############################################################################ # net/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -46,9 +46,12 @@ SOCK_CSRCS += send.c listen.c accept.c endif ifeq ($(CONFIG_NET_SOCKOPTS),y) -SOCK_CSRCS += setsockopt.c getsockopt.c +SOCK_CSRCS += setsockopt.c getsockopt.c ifneq ($(CONFIG_DISABLE_CLOCK),y) -SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c net_arptimer.c +SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c +ifneq ($(CONFIG_NET_SLIP),y) +SOCK_CSRCS += net_arptimer.c +endif endif endif diff --git a/nuttx/net/net_arptimer.c b/nuttx/net/net_arptimer.c index f019fdb75..fe835d0fe 100644 --- a/nuttx/net/net_arptimer.c +++ b/nuttx/net/net_arptimer.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/net_arptimer.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -45,10 +45,13 @@ #include <wdog.h> #include <debug.h> +#include <net/uip/uipopt.h> #include <net/uip/uip-arp.h> #include "net_internal.h" +#ifdef CONFIG_NET_ARP + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -127,4 +130,5 @@ void arptimer_init(void) (void)wd_start(g_arptimer, ARPTIMER_WDINTERVAL, arptimer_poll, 0); } +#endif /* CONFIG_NET_ARP */ #endif /* CONFIG_NET */ diff --git a/nuttx/net/net_internal.h b/nuttx/net/net_internal.h index 0ddb98b30..e3498cd44 100644 --- a/nuttx/net/net_internal.h +++ b/nuttx/net/net_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * net/net_internal.h * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -200,7 +200,11 @@ EXTERN int netdev_count(void); /* net_arptimer.c ************************************************************/ +#ifdef CONFIG_NET_ARP EXTERN void arptimer_init(void); +#else +# define arptimer_init() +#endif #undef EXTERN #if defined(__cplusplus) diff --git a/nuttx/net/netdev_ioctl.c b/nuttx/net/netdev_ioctl.c index d4be2b64a..d32f6a24f 100644 --- a/nuttx/net/netdev_ioctl.c +++ b/nuttx/net/netdev_ioctl.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/netdev_ioctl.c * - * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -205,6 +205,9 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd, struct ifreq *req) req->ifr_mtu = CONFIG_NET_BUFSIZE; break; + /* MAC address operations only make sense if Ethernet is supported */ + +#ifdef CONFIG_NET_ETHERNET case SIOCGIFHWADDR: /* Get hardware address */ req->ifr_hwaddr.sa_family = AF_INETX; memcpy(req->ifr_hwaddr.sa_data, dev->d_mac.ether_addr_octet, IFHWADDRLEN); @@ -214,6 +217,7 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd, struct ifreq *req) req->ifr_hwaddr.sa_family = AF_INETX; memcpy(dev->d_mac.ether_addr_octet, req->ifr_hwaddr.sa_data, IFHWADDRLEN); break; +#endif case SIOCDIFADDR: /* Delete IP address */ ioctl_ifdown(dev); diff --git a/nuttx/net/netdev_register.c b/nuttx/net/netdev_register.c index 15a71c209..7283574dd 100644 --- a/nuttx/net/netdev_register.c +++ b/nuttx/net/netdev_register.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/netdev_register.c * - * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -148,12 +148,15 @@ int netdev_register(FAR struct uip_driver_s *dev) #endif netdev_semgive(); +#ifdef CONFIG_NET_ETHERNET nlldbg("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n", dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1], dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3], dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5], dev->d_ifname); - +#else + nlldbg("Registered dev: %s\n", dev->d_ifname); +#endif return OK; } return -EINVAL; diff --git a/nuttx/net/send.c b/nuttx/net/send.c index b3f137376..475344c03 100644 --- a/nuttx/net/send.c +++ b/nuttx/net/send.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/send.c * - * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -277,6 +277,7 @@ static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn, * should already be in the ARP table. */ +#ifdef CONFIG_NET_ETHERNET #ifndef CONFIG_NET_ARP_IPIN if (pstate->snd_sent != 0 || uip_arp_find(conn->ripaddr) != NULL) #endif @@ -293,6 +294,7 @@ static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn, pstate->snd_time = g_system_timer; #endif } +#endif /* CONFIG_NET_ETHERNET */ } /* All data has been send and we are just waiting for ACK or re-transmit diff --git a/nuttx/net/uip/Make.defs b/nuttx/net/uip/Make.defs index 3c7e2ac23..c544765ac 100644 --- a/nuttx/net/uip/Make.defs +++ b/nuttx/net/uip/Make.defs @@ -40,14 +40,22 @@ ifeq ($(CONFIG_NET),y) # Common IP source files -UIP_CSRCS += uip_initialize.c uip_setipid.c uip_arp.c uip_arptab.c uip_input.c \ - uip_send.c uip_poll.c uip_chksum.c uip_callback.c +UIP_CSRCS += uip_initialize.c uip_setipid.c uip_input.c uip_send.c \ + uip_poll.c uip_chksum.c uip_callback.c + +# ARP supported is not provided for SLIP (Ethernet only) + +ifneq ($(CONFIG_NET_SLIP),y) +UIP_CSRCS += uip_arp.c uip_arptab.c +endif + +# IPv6-specific logic ifeq ($(CONFIG_NET_IPv6),y) UIP_CSRCS += uip_neighbor.c endif -# TCP source files +# TCP/IP source files ifeq ($(CONFIG_NET_TCP),y) diff --git a/nuttx/net/uip/uip_arp.c b/nuttx/net/uip/uip_arp.c index 413fcddc2..03a68ec2f 100644 --- a/nuttx/net/uip/uip_arp.c +++ b/nuttx/net/uip/uip_arp.c @@ -2,7 +2,7 @@ * net/uip/uip_arp.c * Implementation of the ARP Address Resolution Protocol. * - * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Based on uIP which also has a BSD style license: @@ -61,10 +61,14 @@ #include <debug.h> #include <netinet/in.h> + #include <net/ethernet.h> +#include <net/uip/uipopt.h> #include <net/uip/uip-arch.h> #include <net/uip/uip-arp.h> +#ifdef CONFIG_NET_ARP + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -422,4 +426,6 @@ void uip_arp_out(struct uip_driver_s *dev) peth->type = HTONS(UIP_ETHTYPE_IP); dev->d_len += UIP_LLH_LEN; } + +#endif /* CONFIG_NET_ARP */ #endif /* CONFIG_NET */ diff --git a/nuttx/net/uip/uip_arptab.c b/nuttx/net/uip/uip_arptab.c index b777727d4..b93ea761a 100644 --- a/nuttx/net/uip/uip_arptab.c +++ b/nuttx/net/uip/uip_arptab.c @@ -2,7 +2,7 @@ * net/uip/uip_arptab.c * Implementation of the ARP Address Resolution Protocol. * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Based originally on uIP which also has a BSD style license: @@ -51,10 +51,14 @@ #include <debug.h> #include <netinet/in.h> + #include <net/ethernet.h> +#include <net/uip/uipopt.h> #include <net/uip/uip-arch.h> #include <net/uip/uip-arp.h> +#ifdef CONFIG_NET_ARP + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -249,4 +253,5 @@ struct arp_entry *uip_arp_find(in_addr_t ipaddr) return NULL; } +#endif /* CONFIG_NET_ARP */ #endif /* CONFIG_NET */ diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt index c62c18fb0..5e7edaf4f 100755 --- a/nuttx/tools/README.txt +++ b/nuttx/tools/README.txt @@ -1,118 +1,118 @@ -tools/README.txt
-^^^^^^^^^^^^^^^^
-
-This README file addresses the contents of the NuttX tools/ directory.
-
-The tools/ directory contains miscellaneous scripts and host C programs
-that are necessary parts of the the NuttX build system. These files
-include:
-
-README.txt
-
- This file
-
-configure.sh
-
- This is a bash script that is used to configure NuttX for a given
- target board. See configs/README.txt or Documentation/NuttxPortingGuide.html
- for a description of how to configure NuttX with this script.
-
-mkconfig.c
-
- This is C file that is used to build mkconfig program. The mkconfig
- program is used during the intial NuttX build.
-
- When you configure NuttX, you will copy a configuration file called .config
- into the top level NuttX directory (See configs/README.txt or
- Documentation/NuttxPortingGuide.html). The first time you make NuttX,
- the top-level makefile will build the mkconfig executable from mkconfig.c
- (using Makefile.mkconfig). The top-level Makefile will then execute the
- mkconfig program to convert the .config file in the top level directory
- into include/nuttx/config.h. config.h is a another version of the
- NuttX configuration that can be included by C files.
-
-mkromfsimg.sh
-
- This script may be used to automate the generate of a ROMFS file system
- image. It accepts an rcS script "template" and generates and image that
- may be mounted under /etc in the NuttX pseudo file system.
-
-Makefile.mkconfig
-
- This is the makefile that is used to make the mkconfig program from
- the mkconfig.c C file.
-
-mkdeps.sh
-mknulldeps.sh
-
- NuttX uses the GCC compilers capabilities to create Makefile dependencies.
- The bash script mkdeps.sh is used to run GCC in order to create the
- dependencies. If a NuttX configuration uses the GCC toolchain, its Make.defs
- file (see configs/README.txt) will include a line like:
-
- MKDEP = $(TOPDIR)/tools/mkdeps.sh
-
- If the NuttX configuration does not use a GCC compatible toolchain, then
- it cannot use the dependencies and instead it uses mknulldeps.sh:
-
- MKDEP = $(TOPDIR)/tools/mknulldeps.sh
-
- The mknulldeps.sh is a stub script that does essentially nothing.
-
-
-incdir.sh
-
- Different compilers have different conventions for specifying lists
- of include file paths on the the compiler command line. This bash
- script allows the build system to create include file paths without
- concern for the particular compiler in use.
-
-link.sh
-winlink.sh
-unlink.sh
-
- Different file system have different capabilities for symbolic links.
- Some windows file systems have no native support for symbolic links.
- Cygwin running under windows has special links built in that work with
- all cygwin tools. However, they do not work when Windows native tools
- are used with cygwin. In that case something different must be done.
-
- If you are building under Linux or under cygwin with a cygwin tool
- chain, then your Make.defs file may have definitions like the
- following:
-
- DIRLINK = $(TOPDIR)/tools/link.sh
- DIRUNLINK = (TOPDIR)/tools/unlink.sh
-
- The first definition is not always present because link.sh is the
- default. link.sh is a bash script that performs a normal, Linux-style
- symbolic link; unlink.sh is a do-it-all unlinking script.
-
- But if you are building under cygwin using a Windows native toolchain,
- then you will need something like the following in you Make.defs file:
-
- DIRLINK = $(TOPDIR)/tools/winlink.sh
- DIRUNLINK = (TOPDIR)/tools/unlink.sh
-
- winlink.sh will copy the whole directory instead of linking it.
-
- NOTE: I have been told that some NuttX users have been able to build
- successfully using the GnuWin32 tools and modifying the link.sh
- script so that it uses the NTFS mklink command. But I have never
- tried that
-
-mkimage.sh
-
- The creates a downloadable image as needed with the rrload bootloader.
-
-indent.sh
-
- This script can be used to indent .c and .h files in a manner similar
- to my coding NuttX coding style. It doesn't do a really good job,
- however (see the comments at the top of the indent.sh file).
-
-zipme.sh
-
- I use this script to create the nutt-xx.yy.tar.gz tarballs for
- release on SourceForge. It is handy because it also does the
- kind of clean that you need to do to make a clean code release.
+tools/README.txt +^^^^^^^^^^^^^^^^ + +This README file addresses the contents of the NuttX tools/ directory. + +The tools/ directory contains miscellaneous scripts and host C programs +that are necessary parts of the the NuttX build system. These files +include: + +README.txt + + This file + +configure.sh + + This is a bash script that is used to configure NuttX for a given + target board. See configs/README.txt or Documentation/NuttxPortingGuide.html + for a description of how to configure NuttX with this script. + +mkconfig.c + + This is C file that is used to build mkconfig program. The mkconfig + program is used during the initial NuttX build. + + When you configure NuttX, you will copy a configuration file called .config + into the top level NuttX directory (See configs/README.txt or + Documentation/NuttxPortingGuide.html). The first time you make NuttX, + the top-level makefile will build the mkconfig executable from mkconfig.c + (using Makefile.mkconfig). The top-level Makefile will then execute the + mkconfig program to convert the .config file in the top level directory + into include/nuttx/config.h. config.h is a another version of the + NuttX configuration that can be included by C files. + +mkromfsimg.sh + + This script may be used to automate the generate of a ROMFS file system + image. It accepts an rcS script "template" and generates and image that + may be mounted under /etc in the NuttX pseudo file system. + +Makefile.mkconfig + + This is the makefile that is used to make the mkconfig program from + the mkconfig.c C file. + +mkdeps.sh +mknulldeps.sh + + NuttX uses the GCC compilers capabilities to create Makefile dependencies. + The bash script mkdeps.sh is used to run GCC in order to create the + dependencies. If a NuttX configuration uses the GCC toolchain, its Make.defs + file (see configs/README.txt) will include a line like: + + MKDEP = $(TOPDIR)/tools/mkdeps.sh + + If the NuttX configuration does not use a GCC compatible toolchain, then + it cannot use the dependencies and instead it uses mknulldeps.sh: + + MKDEP = $(TOPDIR)/tools/mknulldeps.sh + + The mknulldeps.sh is a stub script that does essentially nothing. + + +incdir.sh + + Different compilers have different conventions for specifying lists + of include file paths on the the compiler command line. This bash + script allows the build system to create include file paths without + concern for the particular compiler in use. + +link.sh +winlink.sh +unlink.sh + + Different file system have different capabilities for symbolic links. + Some windows file systems have no native support for symbolic links. + Cygwin running under windows has special links built in that work with + all cygwin tools. However, they do not work when Windows native tools + are used with cygwin. In that case something different must be done. + + If you are building under Linux or under cygwin with a cygwin tool + chain, then your Make.defs file may have definitions like the + following: + + DIRLINK = $(TOPDIR)/tools/link.sh + DIRUNLINK = (TOPDIR)/tools/unlink.sh + + The first definition is not always present because link.sh is the + default. link.sh is a bash script that performs a normal, Linux-style + symbolic link; unlink.sh is a do-it-all unlinking script. + + But if you are building under cygwin using a Windows native toolchain, + then you will need something like the following in you Make.defs file: + + DIRLINK = $(TOPDIR)/tools/winlink.sh + DIRUNLINK = (TOPDIR)/tools/unlink.sh + + winlink.sh will copy the whole directory instead of linking it. + + NOTE: I have been told that some NuttX users have been able to build + successfully using the GnuWin32 tools and modifying the link.sh + script so that it uses the NTFS mklink command. But I have never + tried that + +mkimage.sh + + The creates a downloadable image as needed with the rrload bootloader. + +indent.sh + + This script can be used to indent .c and .h files in a manner similar + to my coding NuttX coding style. It doesn't do a really good job, + however (see the comments at the top of the indent.sh file). + +zipme.sh + + I use this script to create the nuttx-xx.yy.tar.gz tarballs for + release on SourceForge. It is handy because it also does the + kind of clean that you need to do to make a clean code release. diff --git a/nuttx/tools/indent.sh b/nuttx/tools/indent.sh index 8168a1807..938502e0f 100755 --- a/nuttx/tools/indent.sh +++ b/nuttx/tools/indent.sh @@ -37,9 +37,9 @@ # This script uses the Linux 'indent' utility to re-format C source files # to match the coding style that I use. It differs from my coding style in that # -# - I normally put the traiing */ of a multi-line comment on a separate line, -# - I usually align things vertically (like '='in assignments. -# - indent puts a bogus blank line at the top of the file +# - I normally put the trailing */ of a multi-line comment on a separate line, +# - I usually align things vertically (like '=' in assignments), +# - indent puts a bogus blank line at the top of the file, # - I don't like the way it handles nested conditional compilation intermixed with code. # @@ -63,7 +63,7 @@ if [ -z "$infile" ]; then fi if [ ! -r $infile ]; then - echo "Readable $nfile does not exist" + echo "Readable $infile does not exist" exit 1 fi |