From f92e169dc053b0e5638a5052a12aad983c28ca5a Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 24 Mar 2012 22:07:50 +0000 Subject: [PATCH] Backout recent change to PIC32 network configuration -- doesn't work right with fewer I/O buffers git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4518 42af7a65-404d-4744-a932-0658087f49c3 --- configs/compal_e88/README.txt | 2 +- configs/compal_e99/README.txt | 2 +- configs/pic32-starterkit/README.txt | 3 ++- configs/pic32-starterkit/nsh/defconfig | 4 ++-- configs/pic32-starterkit/nsh2/defconfig | 6 +++--- configs/pic32-starterkit/ostest/defconfig | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/configs/compal_e88/README.txt b/configs/compal_e88/README.txt index 637d5e3aecc..2d2839b61b4 100755 --- a/configs/compal_e88/README.txt +++ b/configs/compal_e88/README.txt @@ -30,7 +30,7 @@ If you attempt to build this configuration without osmocom-bb, you will get compilation errors in drivers/sercomm due to header files that are needed from the osmocom-bb directory. -By defult, NuttX will use sercomm (HDLC protocol) to communicate with the +By default, NuttX will use sercomm (HDLC protocol) to communicate with the host system. Sercomm is the transport used by osmocom-bb that runs on top of serial. See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed the usage of nuttx with sercomm. diff --git a/configs/compal_e99/README.txt b/configs/compal_e99/README.txt index 47ad8deb04a..7126e5f123b 100755 --- a/configs/compal_e99/README.txt +++ b/configs/compal_e99/README.txt @@ -30,7 +30,7 @@ If you attempt to build this configuration without osmocom-bb, you will get compilation errors in drivers/sercomm due to header files that are needed from the osmocom-bb directory. -By defult, NuttX will use sercomm (HDLC protocol) to communicate with the +By default, NuttX will use sercomm (HDLC protocol) to communicate with the host system. Sercomm is the transport used by osmocom-bb that runs on top of serial. See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed the usage of nuttx with sercomm. diff --git a/configs/pic32-starterkit/README.txt b/configs/pic32-starterkit/README.txt index db38863430a..bd04bc37fca 100644 --- a/configs/pic32-starterkit/README.txt +++ b/configs/pic32-starterkit/README.txt @@ -1086,7 +1086,8 @@ Where is one of the following: CONFIG_NET=y : Enable networking support CONFIG_PIC32MX_ETHERNET=y : Enable the PIC32 Ethernet driver - CONFIG_NSH_TELNET=y : Enable the Telnet NSH console (optional) + CONFIG_NSH_CONSOLE=n : Disable NSH serial console + CONFIG_NSH_TELNET=y : Enable the Telnet NSH console See apps/nshlib/README.txt for other NSH networking-related configuration settings. diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig index 2c39be26214..0abaae58b37 100644 --- a/configs/pic32-starterkit/nsh/defconfig +++ b/configs/pic32-starterkit/nsh/defconfig @@ -305,8 +305,8 @@ CONFIG_PHY_LAN8720=n CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y -CONFIG_NET_NTXDESC=3 -CONFIG_NET_NRXDESC=5 +CONFIG_NET_NTXDESC=7 +CONFIG_NET_NRXDESC=7 CONFIG_NET_REGDEBUG=n CONFIG_NET_DESCDEBUG=n CONFIG_NET_DUMPPACKET=n diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig index d2734561f2b..e4f4e4eb290 100644 --- a/configs/pic32-starterkit/nsh2/defconfig +++ b/configs/pic32-starterkit/nsh2/defconfig @@ -305,8 +305,8 @@ CONFIG_PHY_LAN8720=n CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y -CONFIG_NET_NTXDESC=3 -CONFIG_NET_NRXDESC=5 +CONFIG_NET_NTXDESC=7 +CONFIG_NET_NRXDESC=7 CONFIG_NET_REGDEBUG=n CONFIG_NET_DESCDEBUG=n CONFIG_NET_DUMPPACKET=n @@ -1229,7 +1229,7 @@ CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n CONFIG_NSH_ROMFSETC=n -CONFIG_NSH_CONSOLE=y +CONFIG_NSH_CONSOLE=n CONFIG_NSH_TELNET=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 diff --git a/configs/pic32-starterkit/ostest/defconfig b/configs/pic32-starterkit/ostest/defconfig index c1a33b13ee3..d4ac9cd8a29 100644 --- a/configs/pic32-starterkit/ostest/defconfig +++ b/configs/pic32-starterkit/ostest/defconfig @@ -305,8 +305,8 @@ CONFIG_PHY_LAN8720=n CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y -CONFIG_NET_NTXDESC=3 -CONFIG_NET_NRXDESC=5 +CONFIG_NET_NTXDESC=7 +CONFIG_NET_NRXDESC=7 CONFIG_NET_REGDEBUG=n CONFIG_NET_DESCDEBUG=n CONFIG_NET_DUMPPACKET=n