Misc, most cosmetic, updates

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1609 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 75 insertions, 3 deletions

diff --git a/nuttx/configs/ez80f910200zco/README.txt b/nuttx/configs/ez80f910200zco/README.txt
index 1720f9926..69ec3f91d 100644
--- a/nuttx/configs/ez80f910200zco/README.txt
+++ b/nuttx/configs/ez80f910200zco/README.txt
@@ -31,6 +31,10 @@ Version 4.11.0
  
    /* Set up global variables */
 
+   UPDATE:  I don't know if 4.11.1 has this same problem (I bet not since
+   I submitted the bug to ZiLOG), but I have permanently worked around the
+   above problem for all ZiLOG compiler.
+
 Other Versions
   If you use any version of ZDS-II other than 4.11.0 or if you install ZDS-II
   at any location other than the default location, you will have to modify
@@ -71,4 +75,9 @@ nettest
     builds examples/nettest.  See examples/README.txt for more information
     about nettest.
 
+poll
+    This configuration is also used for testing the eZ80F91 EMAC driver.  It
+    builds examples/poll.  See examples/README.txt for more information
+    about the poll test.
+
 Check out any README.txt files in these <sub-directory>s.
diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index 04f7c8f1e..f4cc622fc 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -210,7 +210,19 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_MUTEX_TYPES: Set to enable support for recursive and
 #   errorcheck mutexes. Enables pthread_mutexattr_settype().
 # CONFIG_PRIORITY_INHERITANCE : Set to enable support for priority
-#   inheritance on mutexes and semaphores. 
+#   inheritance on mutexes and semaphores.
+# CONFIG_SEM_PREALLOCHOLDERS: This setting is only used if priority
+#   inheritance is enabled.  It defines the maximum number of different
+#   threads (minus one) that can take counts on a semaphore with priority
+#   inheritance support.  This may be set to zero if priority inheritance
+#   is disabled OR if you are only using semaphores as mutexes (only
+#   one holder) OR if no more than two threads participate using a
+#   counting semaphore.
+# CONFIG_SEM_NNESTPRIO.  If priority inheritance is enabled, then this
+#   setting is the maximum number of higher priority threads (minus 1)
+#   than can be waiting for another thread to release a count on a
+#   semaphore.  This value may be set to zero if no more than one
+#   thread is expected to wait for a semaphore.
 #
 CONFIG_EXAMPLE=nettest
 CONFIG_DEBUG=y
@@ -230,6 +242,8 @@ CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=n
 CONFIG_PRIORITY_INHERITANCE=n
+CONFIG_SEM_PREALLOCHOLDERS=0
+CONFIG_SEM_NNESTPRIO=0
 
 #
 # The following can be used to disable categories of
@@ -590,6 +604,13 @@ CONFIG_NX_MXSERVERMSGS=32
 CONFIG_NX_MXCLIENTMSGS=16
 
 #
+# Settings for examples/poll
+CONFIG_EXAMPLE_POLL_NOMAC=y
+CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+
+#
 # Settings for examples/uip
 CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index a717089c4..8656fcec9 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -210,7 +210,19 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_MUTEX_TYPES: Set to enable support for recursive and
 #   errorcheck mutexes. Enables pthread_mutexattr_settype().
 # CONFIG_PRIORITY_INHERITANCE : Set to enable support for priority
-#   inheritance on mutexes and semaphores. 
+#   inheritance on mutexes and semaphores.
+# CONFIG_SEM_PREALLOCHOLDERS: This setting is only used if priority
+#   inheritance is enabled.  It defines the maximum number of different
+#   threads (minus one) that can take counts on a semaphore with priority
+#   inheritance support.  This may be set to zero if priority inheritance
+#   is disabled OR if you are only using semaphores as mutexes (only
+#   one holder) OR if no more than two threads participate using a
+#   counting semaphore.
+# CONFIG_SEM_NNESTPRIO.  If priority inheritance is enabled, then this
+#   setting is the maximum number of higher priority threads (minus 1)
+#   than can be waiting for another thread to release a count on a
+#   semaphore.  This value may be set to zero if no more than one
+#   thread is expected to wait for a semaphore.
 #
 CONFIG_EXAMPLE=nsh
 CONFIG_DEBUG=y
@@ -230,6 +242,8 @@ CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=n
 CONFIG_MUTEX_TYPES=n
 CONFIG_PRIORITY_INHERITANCE=n
+CONFIG_SEM_PREALLOCHOLDERS=0
+CONFIG_SEM_NNESTPRIO=0
 
 #
 # The following can be used to disable categories of
@@ -590,6 +604,13 @@ CONFIG_NX_MXSERVERMSGS=32
 CONFIG_NX_MXCLIENTMSGS=16
 
 #
+# Settings for examples/poll
+CONFIG_EXAMPLE_POLL_NOMAC=y
+CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+
+#
 # Settings for examples/uip
 CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index 4b14b024b..1b49f66da 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -208,7 +208,19 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_MUTEX_TYPES: Set to enable support for recursive and
 #   errorcheck mutexes. Enables pthread_mutexattr_settype().
 # CONFIG_PRIORITY_INHERITANCE : Set to enable support for priority
-#   inheritance on mutexes and semaphores. 
+#   inheritance on mutexes and semaphores.
+# CONFIG_SEM_PREALLOCHOLDERS: This setting is only used if priority
+#   inheritance is enabled.  It defines the maximum number of different
+#   threads (minus one) that can take counts on a semaphore with priority
+#   inheritance support.  This may be set to zero if priority inheritance
+#   is disabled OR if you are only using semaphores as mutexes (only
+#   one holder) OR if no more than two threads participate using a
+#   counting semaphore.
+# CONFIG_SEM_NNESTPRIO.  If priority inheritance is enabled, then this
+#   setting is the maximum number of higher priority threads (minus 1)
+#   than can be waiting for another thread to release a count on a
+#   semaphore.  This value may be set to zero if no more than one
+#   thread is expected to wait for a semaphore.
 #
 CONFIG_EXAMPLE=ostest
 CONFIG_DEBUG=y
@@ -227,6 +239,8 @@ CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=n
 CONFIG_PRIORITY_INHERITANCE=n
+CONFIG_SEM_PREALLOCHOLDERS=0
+CONFIG_SEM_NNESTPRIO=0
 
 #
 # The following can be used to disable categories of
@@ -585,6 +599,13 @@ CONFIG_NX_MXSERVERMSGS=32
 CONFIG_NX_MXCLIENTMSGS=16
 
 #
+# Settings for examples/poll
+CONFIG_EXAMPLE_POLL_NOMAC=y
+CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+
+#
 # Settings for examples/uip
 CONFIG_EXAMPLE_UIP_IPADDR=(192L<<24|168L<<16|0L<<8|128L)
 CONFIG_EXAMPLE_UIP_DRIPADDR=(192L<<24|168L<<16|0L<<8|1L)