prep for 0.4.2 release

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1542 42af7a65-404d-4744-a932-0658087f49c3
Fix errors in handling interrupt bits on context restore
2025-12-12 05:34:38 +08:00 · 2009-02-28 22:12:29 +00:00 · 2009-02-28 21:58:27 +00:00 · 2009-02-28 21:52:35 +00:00 · 2009-02-28 21:51:53 +00:00 · 2009-02-28 21:51:23 +00:00
1401 changed files with 235080 additions and 10256 deletions
--- a/44
+++ b/44
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *                                                                       *
+ * COPYING -- Describes the terms under which Nuttx is distributed. A    *
+ * copy of the BSD-style licensing is included in this file. In my       *
+ * words -- I believe that you should free to use NuttX in any           *
+ * environmnet, private, private, commercial, open, closed, etc.         *
+ * provided only that you repect the modest copyright notices as         *
+ * described in license (below).  Please feel free to contact me if you  *
+ * have any licensing concerns.                                          *
+ *                                                                       *
+ *************************************************************************
+ *                                                                       *
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.         *
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>                       *
+ *                                                                       *
+ * Redistribution and use in source and binary forms, with or without    *
+ * modification, are permitted provided that the following conditions    *
+ * are met:                                                              *
+ *                                                                       *
+ * 1. Redistributions of source code must retain the above copyright     *
+ *    notice, this list of conditions and the following disclaimer.      *
+ * 2. Redistributions in binary form must reproduce the above copyright  *
+ *    notice, this list of conditions and the following disclaimer in    *
+ *    the documentation and/or other materials provided with the         *
+ *    distribution.                                                      *
+ * 3. Neither the name NuttX nor the names of its contributors may be    *
+ *    used to endorse or promote products derived from this software     *
+ *    without specific prior written permission.                         *
+ *                                                                       *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     *
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS     *
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE        *
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,   *
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,  *
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS *
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED    *
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT           *
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN     *
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE       *
+ * POSSIBILITY OF SUCH DAMAGE.                                           *
+ *                                                                       *
+ *************************************************************************/
+
--- a/521
+++ b/521
--- a/Documentation/NXGraphicsSubsystem.html
+++ b/Documentation/NXGraphicsSubsystem.html
--- a/Documentation/NXOrganization.gif
+++ b/Documentation/NXOrganization.gif
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
--- a/Documentation/NuttXBanner.html
+++ b/Documentation/NuttXBanner.html
@@ -5,7 +5,7 @@
 <body background="backgd.gif">
 <table width="100%">
  <tr>
-  <td width="210">
+  <td width="210" valign="top">
    <a href="http://sourceforge.net/">
      <img src="http://sflogo.sourceforge.net/sflogo.php?group_id=235&amp;type=5" width="210" height="62" border="0" alt="SourceForge"/>
    </a>
@@ -13,22 +13,29 @@
  <td>
    <table width="100%">
      <tr>
-        <td bgcolor="#e4e4e4">
+        <td bgcolor="#e4e4e4" colspan="2">
          <big><b><i><font color="#3c34ec">NuttX RTOS</font></i></b></big>
        </td>
      </tr>
      <tr>
-        <td>
+        <td valign="top">
          <a href="http://sourceforge.net/projects/nuttx" target="_top">Project</a><br>
-        </td>
-      </tr>
-      <tr>
-        <td>
          <a href="http://nuttx.sourceforge.net" target="_top">Home</a>
        </td>
+        <td valign="top">
+          <a href="http://tech.groups.yahoo.com/group/nuttx" target="_top">Yahoo! Groups</a><br>
+          <a href="freeports.html">Free Ports</a><br>
+        </td>
      </tr>
    </table>
  </td>
+  <td width="100" valign="top">
+    <a href="http://groups.yahoo.com/group/nuttx/join" target="_top">
+      <img src="http://us.i1.yimg.com/us.yimg.com/i/yg/img/i/us/ui/join.gif"
+           style="border: 0px;"
+           alt="Click to join nuttx"/>
+    </a>
+  </td>
  </tr>
 </body>
-</html>
+</html>
--- a/Documentation/NuttXScreenShot.jpg
+++ b/Documentation/NuttXScreenShot.jpg
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
--- a/Documentation/NuttxUserGuide.html
+++ b/Documentation/NuttxUserGuide.html
--- a/Documentation/favicon.ico
+++ b/Documentation/favicon.ico
--- a/Documentation/freeports.gif
+++ b/Documentation/freeports.gif
--- a/Documentation/freeports.html
+++ b/Documentation/freeports.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+<title>Free NuttX Ports</title>
+</head>
+<body background="backgd.gif">
+<center>
+<table border="1" width="80%" bgcolor="#eeeeee">
+<tr>
+  <td width="210">
+    <a href="freeports.html" target="_blank">
+      <img src="freeports.gif" width="210" height="62" border="0"/>
+    </a>
+  </td>
+ <td>
+    If you have a hardware platform that you would like to see NuttX ported to then have I got a deal for you:
+    I am willing to port NuttX to run on your hardware <b><i>FREE</i></b>.
+    If you are interested, contact
+    <a href="http://sourceforge.net/users/patacongo/" target="_top">patacongo</a> at SourceForge.
+    <a href="NuttXBanner.html">&gt;&gt;back&lt;&lt;</a>.
+</td>
+</tr></table>
+</body>
+</html>
+
--- a/230
+++ b/230
@@ -1,7 +1,7 @@
-############################################################
+############################################################################
 # Makefile
 #
-#   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
-# 3. Neither the name Gregory Nutt nor the names of its contributors may be
+# 3. Neither the name NuttX nor the names of its contributors may be
 #    used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
@@ -31,23 +31,101 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-############################################################
+############################################################################

-TOPDIR		= ${shell pwd}
+TOPDIR		:= ${shell pwd | sed -e 's/ /\\ /g'}
 -include ${TOPDIR}/.config
 -include ${TOPDIR}/Make.defs

+# Default tools
+
+ifeq ($(DIRLINK),)
+DIRLINK		= $(TOPDIR)/tools/link.sh
+DIRUNLINK	= $(TOPDIR)/tools/unlink.sh
+endif
+
+# Process architecture and board-specific directories
+
 ARCH_DIR	= arch/$(CONFIG_ARCH)
 ARCH_SRC	= $(ARCH_DIR)/src
 ARCH_INC	= $(ARCH_DIR)/include
 BOARD_DIR	= configs/$(CONFIG_ARCH_BOARD)

-SUBDIRS		= sched lib $(ARCH_SRC) mm fs drivers examples/$(CONFIG_EXAMPLE)
+# Add-on directories.  These may or may not be in place in the
+# NuttX source tree (they must be specifically installed)
+
+PCODE_DIR	:= ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi}
+ADDON_DIRS	:= $(PCODE_DIR) $(NX_DIR)
+
+# FSDIRS depend on file descriptor support; NONFSDIRS do not
+#   (except for parts of FSDIRS).  We will exclude FSDIRS
+#   from the build if file descriptor support is disabled
+
+NONFSDIRS	= sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(ADDON_DIRS)
+FSDIRS		= fs drivers
+
+ifeq ($(CONFIG_NET),y)
+NONFSDIRS	+= net netutils
+endif
+
+ifeq ($(CONFIG_NX),y)
+NONFSDIRS	+= graphics
+endif
+
+# CLEANDIRS are the directories that will clean in.  These are
+#   all directories that we know about.
+# MAKEDIRS are the directories in which we will build targets
+
+CLEANDIRS	= $(NONFSDIRS) $(FSDIRS)
+MAKEDIRS	= $(NONFSDIRS)
+
+ifeq ($(CONFIG_NFILE_DESCRIPTORS),0)
+ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0)
+MAKEDIRS	+= fs
+endif
+ifeq ($(CONFIG_NET),y)
+MAKEDIRS	+= drivers
+endif
+else
+MAKEDIRS	+= $(FSDIRS)
+endif
+
+# LINKLIBS is the list of NuttX libraries that is passed to the
+#   processor-specific Makefile to build the final target.
+#   Libraries in FSDIRS are excluded if file descriptor support
+#   is disabled.

 LINKLIBS	= sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \
-		  fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) lib/liblib$(LIBEXT) \
-		  examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT)
+		  lib/liblib$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT)

+ifeq ($(CONFIG_NET),y)
+LINKLIBS	+= net/libnet$(LIBEXT) netutils/libnetutils$(LIBEXT) 
+endif
+
+ifeq ($(CONFIG_NFILE_DESCRIPTORS),0)
+ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0)
+LINKLIBS	+= fs/libfs$(LIBEXT)
+endif
+ifeq ($(CONFIG_NET),y)
+LINKLIBS	+= drivers/libdrivers$(LIBEXT)
+endif
+else
+LINKLIBS	+= fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT)
+endif
+
+ifneq ($(PCODE_DIR),)
+LINKLIBS	+= $(PCODE_DIR)/libpcode$(LIBEXT)
+endif
+
+ifneq ($(NX_DIR),)
+LINKLIBS	+= $(NX_DIR)/libnx$(LIBEXT)
+endif
+
+ifeq ($(CONFIG_NX),y)
+LINKLIBS        += graphics/libgraphics$(LIBEXT)
+endif
+
+# This is the name of the final target
 BIN		= nuttx$(EXEEXT)

 all: $(BIN)
@@ -55,7 +133,7 @@ all: $(BIN)

 # Build the mkconfig tool used to create include/nuttx/config.h
 tools/mkconfig:
-	$(MAKE) -C tools -f Makefile.mkconfig TOPDIR=$(TOPDIR)  mkconfig
+	@$(MAKE) -C tools -f Makefile.mkconfig TOPDIR="$(TOPDIR)"  mkconfig

 # Create the include/nuttx/config.h file
 include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig
@@ -63,79 +141,39 @@ include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig

 # link the arch/<arch-name>/include dir to include/arch
 include/arch: Make.defs
-	@if [ -e include/arch ]; then \
-		if [ -h include/arch ]; then \
-			rm -f include/arch ; \
-		else \
-			echo "include/arch exists but is not a symbolic link" ; \
-			exit 1 ; \
-		fi ; \
-	fi
-	@ln -s $(TOPDIR)/$(ARCH_DIR)/include include/arch
+	@$(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch

 # Link the configs/<board-name>/include dir to include/arch/board
-include/arch/board: Make.defs include/arch
-	@if [ -e include/arch/board ]; then \
-		if [ -h include/arch/board ]; then \
-			rm -f include/arch/board ; \
-		else \
-			echo "include/arch/board exists but is not a symbolic link" ; \
-			exit 1 ; \
-		fi ; \
-	fi
-	@ln -s $(TOPDIR)/$(BOARD_DIR)/include include/arch/board
+include/arch/board: include/arch Make.defs include/arch
+	@$(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/include include/arch/board

 # Link the configs/<board-name>/src dir to arch/<arch-name>/src/board
 $(ARCH_SRC)/board: Make.defs
-	@if [ -h $(ARCH_SRC)/board ]; then \
-		rm -f $(ARCH_SRC)/board ; \
-	else \
-		if [ -e $(ARCH_SRC)/board ]; then \
-			echo "$(ARCH_SRC)/board exists but is not a symbolic link" ; \
-			exit 1 ; \
-		fi ; \
-	fi
-	@ln -s $(TOPDIR)/$(BOARD_DIR)/src $(ARCH_SRC)/board
+	@$(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/src $(ARCH_SRC)/board

 # Link arch/<arch-name>/include/<chip-name> to arch/<arch-name>/include/chip
 $(ARCH_SRC)/chip: Make.defs
 ifneq ($(CONFIG_ARCH_CHIP),)
-	@if [ -h $(ARCH_SRC)/chip ]; then \
-		rm -f $(ARCH_SRC)/chip ; \
-	else \
-		if [ -e $(ARCH_SRC)/chip ]; then \
-			echo "$(ARCH_SRC)/chip exists but is not a symbolic link" ; \
-			exit 1 ; \
-		fi ; \
-	fi
-	@ln -s $(CONFIG_ARCH_CHIP) $(ARCH_SRC)/chip
+	@$(DIRLINK) $(TOPDIR)/$(ARCH_SRC)/$(CONFIG_ARCH_CHIP) $(ARCH_SRC)/chip
 endif

 # Link arch/<arch-name>/src/<chip-name> to arch/<arch-name>/src/chip
-$(ARCH_INC)/chip: Make.defs
+include/arch/chip: include/arch Make.defs
 ifneq ($(CONFIG_ARCH_CHIP),)
-	@if [ -e $(ARCH_INC)/chip ]; then \
-		if [ -h $(ARCH_INC)/chip ]; then \
-			rm -f $(ARCH_INC)/chip ; \
-		else \
-			echo "$(ARCH_INC)/chip exists but is not a symbolic link" ; \
-			exit 1 ; \
-		fi ; \
-	fi
-	@ln -s $(CONFIG_ARCH_CHIP) $(ARCH_INC)/chip
+	@$(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip
 endif

-dirlinks: include/arch include/arch/board $(ARCH_SRC)/board $(ARCH_SRC)/chip $(ARCH_INC)/chip
+dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip

 context: check_context include/nuttx/config.h dirlinks

 clean_context:
-	@rm -f include/nuttx/config.h include/arch
-	@if [ -h include/arch ]; then rm -f include/arch ; fi
-	@if [ -h $(ARCH_INC)/board ]; then rm -f $(ARCH_INC)/board ; fi
-	@if [ -h $(ARCH_SRC)/board ]; then rm -f $(ARCH_SRC)/board ; fi
-	@if [ -h $(ARCH_INC)/chip ]; then rm -f $(ARCH_INC)/chip ; fi
-	@if [ -h $(ARCH_SRC)/chip ]; then rm -f $(ARCH_SRC)/chip ; fi
+	@rm -f include/nuttx/config.h
+	@$(DIRUNLINK) include/arch/board
+	@$(DIRUNLINK) include/arch/chip
+	@$(DIRUNLINK) include/arch
+	@$(DIRUNLINK) $(ARCH_SRC)/board
+	@$(DIRUNLINK) $(ARCH_SRC)/chip

 check_context:
 	@if [ ! -e ${TOPDIR}/.config -o ! -e ${TOPDIR}/Make.defs ]; then \
@@ -145,54 +183,84 @@ check_context:
 	fi

 sched/libsched$(LIBEXT): context
-	$(MAKE) -C sched TOPDIR=$(TOPDIR) libsched$(LIBEXT)
+	@$(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT)

 lib/liblib$(LIBEXT): context
-	$(MAKE) -C lib TOPDIR=$(TOPDIR) liblib$(LIBEXT)
+	@$(MAKE) -C lib TOPDIR="$(TOPDIR)" liblib$(LIBEXT)

 $(ARCH_SRC)/libarch$(LIBEXT): context
-	$(MAKE) -C $(ARCH_SRC) TOPDIR=$(TOPDIR) libarch$(LIBEXT)
+	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT)

 mm/libmm$(LIBEXT): context
-	$(MAKE) -C mm TOPDIR=$(TOPDIR) libmm$(LIBEXT)
+	@$(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT)
+
+net/libnet$(LIBEXT): context
+	@$(MAKE) -C net TOPDIR="$(TOPDIR)" libnet$(LIBEXT)
+
+netutils/libnetutils$(LIBEXT): context
+	@$(MAKE) -C netutils TOPDIR="$(TOPDIR)" libnetutils$(LIBEXT)

 fs/libfs$(LIBEXT): context
-	$(MAKE) -C fs TOPDIR=$(TOPDIR) libfs$(LIBEXT)
+	@$(MAKE) -C fs TOPDIR="$(TOPDIR)" libfs$(LIBEXT)

 drivers/libdrivers$(LIBEXT): context
-	$(MAKE) -C drivers TOPDIR=$(TOPDIR) libdrivers$(LIBEXT)
+	@$(MAKE) -C drivers TOPDIR="$(TOPDIR)" libdrivers$(LIBEXT)
+
+pcode/libpcode$(LIBEXT): context
+	@$(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT)
+
+graphics/libgraphics$(LIBEXT): context
+	@$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT)

 examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT): context
-	$(MAKE) -C examples/$(CONFIG_EXAMPLE) TOPDIR=$(TOPDIR) lib$(CONFIG_EXAMPLE)$(LIBEXT)
+	@$(MAKE) -C examples/$(CONFIG_EXAMPLE) TOPDIR="$(TOPDIR)" lib$(CONFIG_EXAMPLE)$(LIBEXT)

 $(BIN):	context depend $(LINKLIBS)
-	$(MAKE) -C $(ARCH_SRC) TOPDIR=$(TOPDIR) LINKLIBS="$(LINKLIBS)" $(BIN)
+	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" LINKLIBS="$(LINKLIBS)" $(BIN)
+	@if [ -w /tftpboot ] ; then \
+		cp -f $(TOPDIR)/$@ /tftpboot/$@.${CONFIG_ARCH}; \
+	fi
+ifeq ($(CONFIG_RRLOAD_BINARY),y)
+	@$(TOPDIR)/tools/mkimage.sh --Prefix $(CROSSDEV) $(TOPDIR)/$@ $(TOPDIR)/$@.rr
+	@if [ -w /tftpboot ] ; then \
+		cp -f $(TOPDIR)/$@.rr /tftpboot/$@.rr.${CONFIG_ARCH}; \
+	fi
+endif
+ifeq ($(CONFIG_INTELHEX_BINARY),y)
+	@$(OBJCOPY) -O ihex $(TOPDIR)/$@ $(TOPDIR)/$@.ihx
+endif
+ifeq ($(CONFIG_MOTOROLA_SREC),y)
+	@$(OBJCOPY) -O srec $(TOPDIR)/$@ $(TOPDIR)/$@.srec
+endif
+ifeq ($(CONFIG_RAW_BINARY),y)
+	@$(OBJCOPY) -O binary $(TOPDIR)/$@ $(TOPDIR)/$@.bin
+endif

 depend:
-	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$dir TOPDIR=$(TOPDIR) depend ; \
+	@for dir in $(MAKEDIRS) ; do \
+		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \
 	done

 subdir_clean:
-	@for dir in $(SUBDIRS) ; do \
+	@for dir in $(CLEANDIRS) ; do \
 		if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir TOPDIR=$(TOPDIR) clean ; \
+			$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" clean ; \
 		fi \
 	done
-	$(MAKE) -C tools -f Makefile.mkconfig TOPDIR=$(TOPDIR) clean
-	$(MAKE) -C mm -f Makefile.test TOPDIR=$(TOPDIR) clean
+	@$(MAKE) -C tools -f Makefile.mkconfig TOPDIR="$(TOPDIR)" clean
+	@$(MAKE) -C mm -f Makefile.test TOPDIR="$(TOPDIR)" clean

 clean: subdir_clean
-	rm -f $(BIN) $(BIN).* mm_test *.map *~
+	@rm -f $(BIN) nuttx.* mm_test *.map *~

 subdir_distclean:
-	@for dir in $(SUBDIRS) ; do \
+	@for dir in $(CLEANDIRS) ; do \
 		if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir TOPDIR=$(TOPDIR) distclean ; \
+			$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" distclean ; \
 		fi \
 	done

 distclean: clean subdir_distclean clean_context
-	rm -f Make.defs setenv.sh .config
+	@rm -f Make.defs setenv.sh .config


--- a/790
+++ b/790
--- a/811
+++ b/811
--- a/arch/README.txt
+++ b/arch/README.txt
@@ -123,17 +123,17 @@ src/Makefile
 Supported Architectures
 ^^^^^^^^^^^^^^^^^^^^^^^

-arch/sim
+arch/sim - Linux/Cygwin simulation
    A user-mode port of NuttX to the x86 Linux platform is available.
-    The purpose of this port is primarily to support OS feature developement.
+    The purpose of this port is primarily to support OS feature development.
    This port does not support interrupts or a real timer (and hence no
    round robin scheduler)  Otherwise, it is complete.

-arch/arm
+arch/arm - ARM-based micro-controllers
    This directory holds common ARM architectures.  At present, this includes
    the following subdirectories:

-    arch/arm/include and arch/arm/common
+    arch/arm/include and arch/arm/src/common
        Common ARM logic.

    arch/arm/include/c5471 and arch/arm/src/c5471
@@ -146,15 +146,67 @@ arch/arm
        NuttX operates on the ARM9EJS of this dual core processor.  This port
        complete, verified, and included in the NuttX release 0.2.1.

+    arch/arm/include/lpc214x and arch/arm/src/lpc214x
+        These directories provide support for NXP LPC214x family of
+        processors.  This port boots and passes the OS test (examples/ostest).
+        The port is complete and verifed.  As of NuttX 0.3.17, the port includes:
+        timer interrupts, serial console, USB driver, and SPI-based MMC/SD card
+        support.  A verifed NuttShell (NSH) configuration is also available.
+
+    arch/arm/include/str71x and arch/arm/src/str71x
+        These directories provide support for the STMicro STR71x processors.
+        Coding is complete on the basic port (boot logic, system time, serial console),
+        but no testing has been performed due to some problems I am having with my
+        JTAG wiggler and OpenOCD on Linux.
+
 arch/m68322
    A work in progress.
+    STATUS:  Stalled for the moment.

-arch/pjrc-8051
+arch/sh - SuperH and related Hitachi/Renesas microcontrollers
+
+    arch/sh/include and arch/sh/src/common
+        Common SuperH logic.
+
+    arch/sh/include/shs and arch/sh/src/sh1
+        Support for the SH-1 processor.
+
+arch/pjrc-8051 - 8051/52 microcontrollers
    8051 Microcontroller.  This port is not quite ready for prime time.

+arch/z16 - ZiLOG 16-bit processors
+    This directory holds related, 16-bit architectures from ZiLOG.  At
+    present, this includes the following subdirectories:
+
+    arch/z16/include and arch/z16/src/common
+        Common microcontroller logic.
+
+    arch/z16/include/z16f and arch/z16/src/z16f
+        ZiLOG z16f Microcontroller.
+        STATUS: Released in nuttx-0.3.7.  Fully functional other than issues
+        addressed in ${TOPDIR}/TODO.
+
+arch/z80 - ZiLOG 8-bit microcontrollers
+    This directory holds related, 8-bit architectures from ZiLOG.  At
+    present, this includes the following subdirectories:
+
+    arch/z80/include and arch/z80/src/common
+        Common microcontroller logic.
+
+    arch/z80/include/z80 and arch/z80/src/z80
+        Classic ZiLOG z80 Microcontroller.
+        STATUS: Functional with no known defects.  There are still several
+         OS features that have not yet been tested (e.g., networking).
+
+    arch/z80/include/z8 and arch/z80/src/z8
+        ZiLOG Z8Encore! Microcontroller
+
+    arch/z80/include/ez80 and arch/z80/src/ez80
+        ZiLOG ez80 Acclaim! Microcontroller
+
 The following architecture directories are deprecated.  They have been
-replaced by the logic in arm/arm and will deleted when arch/arm is fully
-verified.
+replaced by the logic in arm/arm and will deleted at some point in the
+future.

 arch/c5471
    Replaced with arch/arm/include/c5471 and arch/arm/src/c5471
--- a/arch/arm/include/arch.h
+++ b/arch/arm/include/arch.h
@@ -1,7 +1,7 @@
-/************************************************************
- * arch/arch.h
+/****************************************************************************
+ * arch/arm/include/arch.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,38 +31,38 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

 /* This file should never be included directed but, rather,
 * only indirectly through nuttx/arch.h
 */

-#ifndef __ARCH_ARCH_H
-#define __ARCH_ARCH_H
+#ifndef __ARCH_ARM_INCLUDE_ARCH_H
+#define __ARCH_ARM_INCLUDE_ARCH_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Inline functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Variables
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Function Prototypes
- ************************************************************/
+ ****************************************************************************/

 #ifdef __cplusplus
 #define EXTERN extern "C"
@@ -76,5 +76,4 @@ extern "C" {
 }
 #endif

-#endif /* __ARCH_ARCH_H */
-
+#endif /* __ARCH_ARM_INCLUDE_ARCH_H */
--- a/arch/arm/include/c5471/irq.h
+++ b/arch/arm/include/c5471/irq.h
@@ -1,7 +1,7 @@
-/************************************************************
- * arch/c5471/irq.h
+/****************************************************************************
+ * arch/arm/include/c5471/irq.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,22 +31,22 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

 /* This file should never be included directed but, rather,
 * only indirectly through nuttx/irq.h
 */

-#ifndef __ARCH_C5471_IRQ_H
-#define __ARCH_C5471_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_C5471_IRQ_H
+#define __ARCH_ARM_INCLUDE_C5471_IRQ_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* C5471 Interrupts */

@@ -71,21 +71,21 @@
 #define C5471_IRQ_SYSTIMER      C5471_IRQ_TIMER2
 #define NR_IRQS                 (C5471_IRQ_API+1)

-/************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Inline functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Variables
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Function Prototypes
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
@@ -101,5 +101,5 @@ extern "C" {
 #endif
 #endif

-#endif /* __ARCH_C5471_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_C5471_IRQ_H */

--- a/arch/arm/include/dm320/irq.h
+++ b/arch/arm/include/dm320/irq.h
@@ -1,7 +1,7 @@
-/************************************************************
- * arch/dm320/irq.h
+/****************************************************************************
+ * arch/arm/include/dm320/irq.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,22 +31,22 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

 /* This file should never be included directed but, rather,
 * only indirectly through nuttx/irq.h
 */

-#ifndef __ARCH_DM320_IRQ_H
-#define __ARCH_DM320_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_DM320_IRQ_H
+#define __ARCH_ARM_INCLUDE_DM320_IRQ_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* DM320 Interrupts */

@@ -100,21 +100,21 @@
 #define DM320_IRQ_SYSTIMER DM320_IRQ_TMR0
 #define NR_IRQS            (DM320_IRQ_RSV+1)

-/************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Inline functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Variables
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Function Prototypes
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
@@ -130,5 +130,5 @@ extern "C" {
 #endif
 #endif

-#endif /* __ARCH_DM320_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_DM320_IRQ_H */

--- a/arch/arm/include/irq.h
+++ b/arch/arm/include/irq.h
@@ -1,7 +1,7 @@
-/************************************************************
- * arch/irq.h
+/****************************************************************************
+ * arch/arm/include/irq.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,24 +31,25 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

 /* This file should never be included directed but, rather,
 * only indirectly through nuttx/irq.h
 */

-#ifndef __ARCH_IRQ_H
-#define __ARCH_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_IRQ_H
+#define __ARCH_ARM_INCLUDE_IRQ_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

+#include <nuttx/irq.h>
 #include <arch/chip/irq.h>

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* IRQ Stack Frame Format:
 *
@@ -102,9 +103,9 @@
 #define REG_LR              REG_R14
 #define REG_PC              REG_R15

-/************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************/
+ ****************************************************************************/

 /* This struct defines the way the registers are stored.  We
 * need to save:
@@ -133,6 +134,7 @@ struct xcptcontext
   * are pending signals to be processed.
   */

+#ifndef CONFIG_DISABLE_SIGNALS
  void *sigdeliver; /* Actual type is sig_deliver_t */

  /* These are saved copies of LR and CPSR used during
@@ -141,6 +143,7 @@ struct xcptcontext

  uint32 saved_pc;
  uint32 saved_cpsr;
+#endif

  /* Register save area */

@@ -148,9 +151,9 @@ struct xcptcontext
 };
 #endif

-/************************************************************
+/****************************************************************************
 * Inline functions
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

@@ -200,13 +203,13 @@ static inline void system_call(swint_t func, int parm1,
 }
 #endif

-/************************************************************
+/****************************************************************************
 * Public Variables
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Function Prototypes
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
@@ -222,5 +225,5 @@ extern "C" {
 #endif
 #endif

-#endif /* __ARCH_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_IRQ_H */

--- a/arch/arm/include/limits.h
+++ b/arch/arm/include/limits.h
@@ -1,7 +1,7 @@
-/************************************************************
- * limits.h
+/****************************************************************************
+ * arch/arm/include/limits.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,18 +31,18 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-#ifndef __ARCH_LIMITS_H
-#define __ARCH_LIMITS_H
+#ifndef __ARCH_ARM_INCLUDE_LIMITS_H
+#define __ARCH_ARM_INCLUDE_LIMITS_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 #define CHAR_BIT        8
 #define SCHAR_MIN	0x80
@@ -72,4 +72,4 @@
 #define LLONG_MIN	0x7fffffffffffffff
 #define ULLONG_MAX	0xffffffffffffffff

-#endif /* __ARCH_LIMITS_H */
+#endif /* __ARCH_ARM_INCLUDE_LIMITS_H */
--- a/arch/arm/include/lpc214x/irq.h
+++ b/arch/arm/include/lpc214x/irq.h
@@ -0,0 +1,126 @@
+/****************************************************************************
+ * arch/lpc214x/irq.h
+ *
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* This file should never be included directed but, rather,
+ * only indirectly through nuttx/irq.h
+ */
+
+#ifndef __ARCH_LPC214X_IRQ_H
+#define __ARCH_LPC214X_IRQ_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/* LPC214X Interrupts */
+
+#define LPC214X_WDT_IRQ        0 /* Watchdog */
+#define LPC214X_RESERVED_IRQ   1 /* SWI only */
+#define LPC214X_DBGCOMMRX_IRQ  2 /* Embedded debug */
+#define LPC214X_DBGCOMMTX_IRQ  3 /* Embedded debug */
+#define LPC214X_TIMER0_IRQ     4 /* Timer 0 */
+#define LPC214X_TIMER1_IRQ     5 /* Timer 1 */
+#define LPC214X_UART0_IRQ      6 /* UART 0 */
+#define LPC214X_UART1_IRQ      7 /* UART 1 */
+#define LPC214X_PWM0_IRQ       8 /* PWM 0 */
+#define LPC214X_I2C0_IRQ       9 /* I2C 0 */
+#define LPC214X_SPI0_IRQ      10 /* SPI 0 */
+#define LPC214X_SPI1_IRQ      11 /* SPI 1 */
+#define LPC214X_PLL_IRQ       12 /* PLL Lock IRQ */
+#define LPC214X_RTC_IRQ       13 /* Real Time Clock */
+#define LPC214X_EINT0_IRQ     14 /* External interrupt 0 */
+#define LPC214X_EINT1_IRQ     15 /* External interrupt 1 */
+#define LPC214X_EINT2_IRQ     16 /* External interrupt 2 */
+#define LPC214X_EINT3_IRQ     17 /* External interrupt 3 */
+#define LPC214X_ADC0_IRQ      18 /* ADC 0 */
+#define LPC214X_I2C1_IRQ      19 /* I2C 1 */
+#define LPC214X_BOD_IRQ       20 /* Brown Out Detect */
+#define LPC214X_ADC1_IRQ      21 /* ADC 1 */
+#define LPC214X_USB_IRQ       22 /* USB */
+
+#define LPC214X_IRQ_SYSTIMER  LPC214X_TIMER0_IRQ
+#define NR_IRQS               23
+
+/* There are 16 vectored interrupts.  If vectored interrupts are enabled, the
+ * following will be used by the system.
+ */
+
+#define LPC214X_SYSTIMER_VEC  0 /* System timer */
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+typedef void (*vic_vector_t)(uint32 *regs);
+#endif
+
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#ifndef CONFIG_VECTORED_INTERRUPTS
+EXTERN void up_attach_vector(int irq, int vector, vic_vector_t handler);
+EXTERN void up_detach_vector(int vector);
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_LPC214X_IRQ_H */
+
--- a/arch/arm/include/serial.h
+++ b/arch/arm/include/serial.h
@@ -1,7 +1,7 @@
-/************************************************************
- * arch/serial.h
+/****************************************************************************
+ * arch/arm/include/serial.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,18 +31,18 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-#ifndef __ARCH_SERIAL_H
-#define __ARCH_SERIAL_H
+#ifndef __ARCH_ARM_INCLUDE_SERIAL_H
+#define __ARCH_ARM_INCLUDE_SERIAL_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* IOCTL commands supported by the ARM serial driver */

@@ -50,12 +50,12 @@
 #define TIOCCBRK        0x5402  /* " " "           " */
 #define TIOCSERGSTRUCT  0x5403  /* Get up_dev_t for port */

-/************************************************************
+/****************************************************************************
 * Public Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************/
+ ****************************************************************************/

-#endif /* __ARCH_SERIAL_H */
+#endif /* __ARCH_ARM_INCLUDE_SERIAL_H */
--- a/arch/arm/include/str71x/irq.h
+++ b/arch/arm/include/str71x/irq.h
@@ -0,0 +1,120 @@
+/************************************************************************************
+ * arch/arm/include/str71x/irq.h
+ *
+ *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/* This file should never be included directed but, rather,
+ * only indirectly through nuttx/irq.h
+ */
+
+#ifndef __ARCH_ARM_INCLUDE_STR71X_IRQ_H
+#define __ARCH_ARM_INCLUDE_STR71X_IRQ_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* IRQ channels */
+
+#define STR71X_IRQ_T0TIMI     (0)
+#define STR71X_IRQ_FLASH      (1)
+#define STR71X_IRQ_RCCU       (2)
+#define STR71X_IRQ_RTC        (3)
+#define STR71X_IRQ_WDG        (4)
+#define STR71X_IRQ_XTI        (5)
+#define STR71X_IRQ_USBHP      (6)
+#define STR71X_IRQ_I2C0ITERR  (7)
+#define STR71X_IRQ_I2C1ITERR  (8)
+#define STR71X_IRQ_UART0      (9)
+#define STR71X_IRQ_UART1     (10)
+#define STR71X_IRQ_UART2     (11)
+#define STR71X_IRQ_UART3     (12)
+#define STR71X_IRQ_SPI0      (13)
+#define STR71X_IRQ_SPI1      (14)
+#define STR71X_IRQ_I2C0      (15)
+#define STR71X_IRQ_I2C1      (16)
+#define STR71X_IRQ_CAN       (17)
+#define STR71X_IRQ_ADC       (18)
+#define STR71X_IRQ_T1TIMI    (19)
+#define STR71X_IRQ_T2TIMI    (20)
+#define STR71X_IRQ_T3TIMI    (21)
+#define STR71X_IRQ_HDLC      (25)
+#define STR71X_IRQ_USBLP     (26)
+#define STR71X_IRQ_T0TOI     (29)
+#define STR71X_IRQ_T0OC1     (30)
+#define STR71X_IRQ_T0OC2     (31)
+
+#define STR71X_IRQ_SYSTIMER  STR71X_IRQ_T0TIMI
+#define NR_IRQS               32
+
+/* FIQ channels */
+
+#define STR71X_FIQ_T0TIMI     (0X00000001)
+#define STR71X_FIQ_WDG        (0X00000002)
+#define STR71X_FIQ_WDGT0TIMIS (0X00000003)
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_ARM_INCLUDE_STR71X_IRQ_H */
+
--- a/arch/arm/include/types.h
+++ b/arch/arm/include/types.h
@@ -1,7 +1,7 @@
-/************************************************************
- * arch/types.h
+/****************************************************************************
+ * arch/arm/include/types.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,26 +31,26 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/* This file should never be included directed but, rather,
- * only indirectly through sys/types.h
+/* This file should never be included directed but, rather, only indirectly
+ * through sys/types.h
 */

-#ifndef __ARCH_TYPES_H
-#define __ARCH_TYPES_H
+#ifndef __ARCH_ARM_INCLUDE_TYPES_H
+#define __ARCH_ARM_INCLUDE_TYPES_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Type Declarations
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

@@ -75,8 +75,8 @@ typedef unsigned int irqstate_t;

 #endif /* __ASSEMBLY__ */

-/************************************************************
+/****************************************************************************
 * Global Function Prototypes
- ************************************************************/
+ ****************************************************************************/

-#endif /* __ARCH_TYPES_H */
+#endif /* __ARCH_ARM_INCLUDE_TYPES_H */
--- a/arch/arm/include/watchdog.h
+++ b/arch/arm/include/watchdog.h
@@ -1,7 +1,7 @@
-/************************************************************
- * watchdog.h
+/****************************************************************************
+ * arch/arm/include/watchdog.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,33 +31,33 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-#ifndef __ARCH_WATCHDOG_H
-#define __ARCH_WATCHDOG_H
+#ifndef __ARCH_ARM_INCLUDE_WATCHDOG_H
+#define __ARCH_ARM_INCLUDE_WATCHDOG_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* IOCTL commands supported by the C5471 watchdog driver */

 #define WDIOC_KEEPALIVE 0x5701  /* Restart the watchdog timer */

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************/
+ ****************************************************************************/

-#endif /* __ARCH_WATCHDOG_H */
+#endif /* __ARCH_ARM_INCLUDE_WATCHDOG_H */
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# Makefile
+# arch/arm/src/Makefile
 #
-#   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
-# 3. Neither the name Gregory Nutt nor the names of its contributors may be
+# 3. Neither the name NuttX nor the names of its contributors may be
 #    used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
@@ -36,7 +36,6 @@
 -include $(TOPDIR)/Make.defs
 -include chip/Make.defs

-MKDEP 		= $(TOPDIR)/tools/mkdeps.sh
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 CFLAGS		+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched

@@ -67,23 +66,28 @@ VPATH		= chip:common
 all: $(HEAD_OBJ) libarch$(LIBEXT)

 $(AOBJS) $(HEAD_AOBJ): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) -D__ASSEMBLY__ $< -o $@
+	$(call ASSEMBLE, $<, $@)

 $(COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)

 libarch$(LIBEXT): $(OBJS)
 	@( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )

 board/libboard$(LIBEXT):
-	$(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT)
+	$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT)

 nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT)
-	$(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \
-		--start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC) 
+	@echo "LD: nuttx"
+	@$(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \
+		--start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC)
+ifeq ($(CONFIG_BOOT_FROM_FLASH),y)
+	@export flashloc=`$(OBJDUMP) --all-headers $(TOPDIR)/$@ | grep _eronly | cut -d' ' -f1`;  \
+	$(OBJCOPY) --adjust-section-vma=.data=0x$$flashloc $(TOPDIR)/$@ $(TOPDIR)/$@.flashimage
+	@mv $(TOPDIR)/$@.flashimage $(TOPDIR)/$@
+endif
 	@$(NM) $(TOPDIR)/$@ | \
 	grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
 	sort > $(TOPDIR)/System.map
@@ -92,32 +96,26 @@ nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT)
 		$(OBJCOPY) --adjust-section-vma=.vector=0x$$vflashstart $(TOPDIR)/$@ $(TOPDIR)/$@.flashimage; \
 		mv $(TOPDIR)/$@.flashimage $(TOPDIR)/$@; \
 	fi
-ifeq ($(CONFIG_RRLOAD_BINARY),y)
-	@$(TOPDIR)/tools/mkimage.sh --Prefix $(CROSSDEV) $(TOPDIR)/$@ $(TOPDIR)/$@.rr
-	@if [ -w /tftpboot ] ; then \
-		cp -f $(TOPDIR)/$@.rr /tftpboot/$@.rr.${CONFIG_ARCH}; \
-	fi
-endif

-.depend: Makefile $(SRCS)
+.depend: Makefile chip/Make.defs $(SRCS)
 	@if [ -e board/Makefile ]; then \
-		$(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \
-	if
-	$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+		$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
+	fi
+	@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend

 clean:
 	@if [ -e board/Makefile ]; then \
-		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
+		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	@rm -f libarch$(LIBEXT) *~
-	@if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@if [ -e board/Makefile ]; then \
-		$(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \
+		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
 	@rm -f Make.dep .depend

--- a/arch/arm/src/c5471/Make.defs
+++ b/arch/arm/src/c5471/Make.defs
@@ -37,12 +37,13 @@ HEAD_ASRC	= up_nommuhead.S

 CMN_ASRCS	= up_saveusercontext.S up_fullcontextrestore.S
 CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
-		  up_createstack.c up_dataabort.c up_delay.c up_exit.c up_idle.c \
-		  up_initialize.c up_initialstate.c up_interruptcontext.c \
-		  up_prefetchabort.c up_releasepending.c up_releasestack.c \
-		  up_reprioritizertr.c up_schedulesigaction.c up_sigdeliver.c \
-		  up_syscall.c up_unblocktask.c up_undefinedinsn.c up_usestack.c
+		  up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c up_doirq.c \
+		  up_exit.c up_idle.c up_initialize.c up_initialstate.c \
+		  up_interruptcontext.c up_prefetchabort.c up_releasepending.c \
+		  up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c \
+		  up_sigdeliver.c up_syscall.c up_unblocktask.c \
+		  up_undefinedinsn.c up_usestack.c

 CHIP_ASRCS	= c5471_lowputc.S c5471_vectors.S
-CHIP_CSRCS	= c5471_doirq.c c5471_irq.c c5471_serial.c c5471_timerisr.c \
-		  c5471_watchdog.c
+CHIP_CSRCS	= c5471_irq.c c5471_serial.c c5471_timerisr.c c5471_watchdog.c \
+		  c5471_ethernet.c
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
--- a/arch/arm/src/c5471/c5471_lowputc.S
+++ b/arch/arm/src/c5471/c5471_lowputc.S
@@ -1,7 +1,7 @@
 /**************************************************************************
 * c5471/c5471_lowputc.S
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/arch/arm/src/c5471/c5471_serial.c
--- a/arch/arm/src/c5471/c5471_vectors.S
+++ b/arch/arm/src/c5471/c5471_vectors.S
@@ -1,7 +1,7 @@
-/********************************************************************
- * c5471/c5471_vectors.S
+/************************************************************************************
+ * arch/arm/src/c5471/c5471_vectors.S
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,23 +31,23 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ********************************************************************/
+ ************************************************************************************/

-/********************************************************************
+/************************************************************************************
 * Included Files
- ********************************************************************/
+ ************************************************************************************/

 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 #include "up_arch.h"

-/********************************************************************
+/************************************************************************************
 * Definitions
- ********************************************************************/
+ ************************************************************************************/

-/********************************************************************
+/************************************************************************************
 * Global Data
- ********************************************************************/
+ ************************************************************************************/

 	.data
 g_irqtmp:
@@ -60,29 +60,29 @@ g_aborttmp:
 	.word	0		/* Saved lr */
 	.word	0		/* Saved spsr */

-/********************************************************************
+/************************************************************************************
 * Assembly Macros
- ********************************************************************/
+ ************************************************************************************/

-/********************************************************************
+/************************************************************************************
 * Private Functions
- ********************************************************************/
+ ************************************************************************************/

 	.text

-/********************************************************************
+/************************************************************************************
 * Public Functions
- ********************************************************************/
+ ************************************************************************************/

 	.text

-/********************************************************************
+/************************************************************************************
 * Name: up_vectorirq
 *
 * Description:
 *   Interrupt excetpion. Entered in IRQ mode with spsr = SVC
 *   CPSR, lr = SVC PC
- ********************************************************************/
+ ************************************************************************************/

 	.globl	up_vectorirq
 	.type	up_vectorirq, %function
@@ -156,7 +156,15 @@ up_vectorirq:

 	mov	fp, #0			/* Init frame pointer */
 	mov	r1, sp			/* Get r1=xcp */
-	bl	c5471_doirq		/* Call the handler */
+
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+	ldr	sp, .Lirqstackbase	/* SP = interrupt stack base */
+	str	r1, [sp]		/* Save the user stack pointer */
+	bl	up_doirq		/* Call the handler */
+	ldr	sp, [sp]		/* Restore the user stack pointer */
+#else
+	bl	up_doirq		/* Call the handler */
+#endif

 	/* Restore the CPSR, SVC modr registers and return */
 .Lnoirqset:
@@ -166,15 +174,18 @@ up_vectorirq:

 .Lirqtmp:
 	.word	g_irqtmp
-
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+.Lirqstackbase:
+	.word	up_stackbase
+#endif
 	.align	5

-/********************************************************************
+/************************************************************************************
 * Function: up_vectorswi
 * 
 * Description:
 *   SWI interrupt. We enter the SWI in SVC mode
- ********************************************************************/
+ ************************************************************************************/

 	.globl	up_vectorswi
 	.type	up_vectorswi, %function
@@ -222,7 +233,7 @@ up_vectorswi:

 	.align	5

-/********************************************************************
+/************************************************************************************
 * Name: up_vectordata
 *
 * Description:
@@ -230,7 +241,7 @@ up_vectorswi:
 *   abort handler.  This function is entered in ABORT mode
 *   with spsr = SVC CPSR, lr = SVC PC
 *
- ********************************************************************/
+ ************************************************************************************/
 	
 	.globl	up_vectordata
 	.type	up_vectordata, %function
@@ -290,13 +301,13 @@ up_vectordata:

 	.align	5

-/********************************************************************
+/************************************************************************************
 * Name: up_vectorprefetch
 *
 * Description:
 *    Prefetch abort exception.  Entered in ABT mode with
 *    spsr = SVC CPSR, lr = SVC PC
- ********************************************************************/
+ ************************************************************************************/
 	
 	.globl	up_vectorprefetch
 	.type	up_vectorprefetch, %function
@@ -356,14 +367,14 @@ up_vectorprefetch:

 	.align	5

-/********************************************************************
+/************************************************************************************
 * Name: up_vectorundefinsn
 *
 * Description:
 *   Undefined instruction entry exception.  Entered in
 *   UND mode, spsr = SVC  CPSR, lr = SVC PC
 *
- ********************************************************************/
+ ************************************************************************************/
 	
 	.globl	up_vectorundefinsn
 	.type	up_vectorundefinsn, %function
@@ -422,28 +433,50 @@ up_vectorundefinsn:

 	.align	5

-/********************************************************************
+/************************************************************************************
 * Name: up_vectorfiq
 *
 * Description:
 *   Shouldn't happen
- ********************************************************************/
+ ************************************************************************************/

 	.globl	up_vectorfiq
 	.type	up_vectorfiq, %function
 up_vectorfiq:
 	subs	pc, lr, #4

-/********************************************************************
+/************************************************************************************
 *  Name: up_vectoraddrexcption
 *
 * Description:
 *   Shouldn't happen
 *
- ********************************************************************/
+ ************************************************************************************/

 	.globl	up_vectoraddrexcptn
 	.type	up_vectoraddrexcptn, %function
 up_vectoraddrexcptn:
 	b	up_vectoraddrexcptn
+
+/************************************************************************************
+ *  Name: up_interruptstack/g_userstack
+ *
+ * Description:
+ *   Shouldn't happen
+ *
+ ************************************************************************************/
+
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+	.bss
+	.align	4
+	.globl	g_userstack
+	.type	g_userstack, object
+up_interruptstack:
+	.skip	((CONFIG_ARCH_INTERRUPTSTACK & ~3) - 4)
+g_userstack:
+up_stackbase:
+	.skip	4
+	.size	g_userstack, 4
+	.size	up_interruptstack, (CONFIG_ARCH_INTERRUPTSTACK & ~3)
+#endif
 	.end
--- a/arch/arm/src/c5471/c5471_watchdog.c
+++ b/arch/arm/src/c5471/c5471_watchdog.c
@@ -365,7 +365,7 @@ int up_wdtinit(void)

  /* Register as /dev/wdt */

-  ret = register_inode("/dev/wdt", &g_wdtops, 0666, NULL);
+  ret = register_driver("/dev/wdt", &g_wdtops, 0666, NULL);
  if (ret)
    {
      return ERROR;
@@ -384,7 +384,7 @@ int up_wdtinit(void)
  ret = irq_attach(C5471_IRQ_WATCHDOG, wdt_interrupt);
  if (ret)
    {
-      unregister_inode("/dev/wdt");
+      unregister_driver("/dev/wdt");
      return ERROR;
    }

--- a/arch/arm/src/c5471/chip.h
+++ b/arch/arm/src/c5471/chip.h
@@ -1,4 +1,4 @@
-/************************************************************
+/****************************************************************************
 * c5471/chip.h
 *
 *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
@@ -31,20 +31,61 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

 #ifndef __C5471_CHIP_H
 #define __C5471_CHIP_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

-/* UARTs ****************************************************/
+#define EIM_RAM_START          0xffd00000
+
+/* Ethernet Interface Module (EIM) ******************************************/
+
+#define EIM_CTRL               0xffff0000 /* ESM control register */
+#define EIM_STATUS             0xffff0004 /* ESM status register */
+#define EIM_CPU_TXBA           0xffff0008 /* CPU TX descriptors base address */
+#define EIM_CPU_RXBA           0xffff000c /* CPU RX descriptors base address */
+#define EIM_BUFSIZE            0xffff0010 /* Packet buffer size register */
+#define EIM_CPU_FILTER         0xffff0014 /* CPU filtering contol registers */
+#define EIM_CPU_DAHI           0xffff0018 /* CPU destination address (HI) */
+#define EIM_CPU_DALO           0xffff001c /* CPU destination address (LO) */
+#define EIM_MFVHI              0xffff0020 /* Multicast filter valid (HI) */
+#define EIM_MFVLO              0xffff0024 /* Multicast filter valid (LO) */
+#define EIM_MFMHI              0xffff0028 /* Multicast filter mask (HI) */
+#define EIM_MFMLO              0xffff002c /* Multicast filter mask (LO) */
+#define EIM_RXTH               0xffff0030 /* RX threshold register */
+#define EIM_CPU_RXREADY        0xffff0034 /* CPU RX ready register */
+#define EIM_INTEN              0xffff0038 /* ESM interrupt enable register */
+#define EIM_ENET0_TXDESC       0xffff0040 /* ENET0 TX Queue pointer */
+#define EIM_ENET0_RXDESC       0xffff0044 /* ENET0 RX Queue pointer */
+#define EIM_CPU_TXDESC         0xffff0050 /* CPU TX Queue pointer */
+#define EIM_CPU_RXDESC         0xffff0054 /* CPU RX Queue pointer */
+
+#define ENET0_MODE             0xffff0100 /* Mode register */
+#define ENET0_BOFFSEED         0xffff0104 /* Backoff seed register */
+#define ENET0_BCOUNT           0xffff0108 /* Backoff count register */
+#define ENET0_FLWPAUSE         0xffff010c /* TX flow pause count register */
+#define ENET0_FLWCONTROL       0xffff0110 /* Flow control register */
+#define ENET0_VTYPE            0xffff0114 /* VTYPE tag register */
+#define ENET0_SEISR            0xffff0118 /* System error int status register */
+#define ENET0_TXBUFRDY         0xffff011c /* TX descripter buffer ready */
+#define ENET0_TDBA             0xffff0120 /* TX descriptor base address */
+#define ENET0_RDBA             0xffff0124 /* RX descriptor base address */
+#define ENET0_PARHI            0xffff0128 /* Dest phys address match (HI) */
+#define ENET0_PARLO            0xffff012c /* Dest phys address match (LO) */
+#define ENET0_LARHI            0xffff0130 /* Log address hash filter (HI) */
+#define ENET0_LARLO            0xffff0134 /* Log address hash filter (LO) */
+#define ENET0_ADRMODE_EN       0xffff0138 /* Address mode enable register */
+#define ENET0_DRP              0xffff013c /* Desc ring poll interval count */
+
+/* UARTs ********************************************************************/

 #define UART_IRDA_BASE         0xffff0800
 #define UART_MODEM_BASE        0xffff1000
@@ -110,7 +151,7 @@
 #define UART_MODEM_RDPTR_UTX   0xffff1064 /* TX FIFO Read Pointer Register */
 #define UART_MODEM_WRPTR_UTX   0xffff1068 /* TX FIFO Write Pointer Register */

-/* UART Settings ********************************************/
+/* UART Settings ************************************************************/

 /* Miscellaneous UART settings. */

@@ -164,13 +205,13 @@
 #define MDR_AUTOBAUDING_MODE 0x00000002  /* Modem UART only */
 #define MDR_RESET_MODE       0x00000007  /* Both IrDA and Modem UARTs */

-/* SPI ******************************************************/
+/* SPI **********************************************************************/

 #define MAX_SPI 3

 #define SPI_REGISTER_BASE    0xffff2000

-/* GIO ******************************************************/
+/* GIO **********************************************************************/

 #define MAX_GIO (35)

@@ -211,7 +252,7 @@
 #define KBGPIO_EN            0xffff2914 /* Selects register for muxed
 					 * KBGPIOs */

-/* Timers ***************************************************/
+/* Timers *******************************************************************/

 #define C5471_TIMER0_CTRL    0xffff2a00
 #define C5471_TIMER0_CNT     0xffff2a04
@@ -241,8 +282,8 @@
 #define ILR_IRQ3_REG         0xffff2d28 /*  3-GPIO0         */
 #define ILR_IRQ4_REG         0xffff2d2c /*  4-Ethernet      */
 #define ILR_IRQ5_REG         0xffff2d30 /*  5-KBGPIO[7:0]   */
-#define ILR_IRQ6_REG         0xffff2d34 /*  6-Uart   serial */
-#define ILR_IRQ7_REG         0xffff2d38 /*  7-Uart   IRDA   */
+#define ILR_IRQ6_REG         0xffff2d34 /*  6-Uart serial   */
+#define ILR_IRQ7_REG         0xffff2d38 /*  7-Uart IRDA     */
 #define ILR_IRQ8_REG         0xffff2d3c /*  8-KBGPIO[15:8]  */
 #define ILR_IRQ9_REG         0xffff2d40 /*  9-GPIO3         */
 #define ILR_IRQ10_REG        0xffff2d44 /* 10-GPIO2         */
@@ -252,11 +293,22 @@
 #define ILR_IRQ14_REG        0xffff2d54 /* 14-GPIO[19:4]    */
 #define ILR_IRQ15_REG        0xffff2d58 /* 15-API           */

-/* I2C ******************************************************/
+/* CLKM *********************************************************************/
+
+#define CLKM                 0xffff2f00
+#define CLKM_CTL_RST         0xffff2f10
+#define CLKM_RESET           0xffff2f18
+
+#define CLKM_RESET_EIM          0x00000008
+#define CLKM_EIM_CLK_STOP       0x00000010
+#define CLKM_CTL_RST_LEAD_RESET 0x00000000
+#define CLKM_CTL_RST_EXT_RESET  0x00000002
+
+/* I2C **********************************************************************/

 #define MAX_I2C 1

-/* API ******************************************************/
+/* API **********************************************************************/

 #define DSPRAM_BASE          0xffe00000  /* DSPRAM base address */
 #define DSPRAM_END           0xffe03fff
@@ -308,16 +360,12 @@
 #define DSPMEM_ARM_TO_DSP(addr) \
  ((((__u32)(addr) - DSPMEM_ARM_START) >> 1) + DSPMEM_DSP_START)

-/************************************************************
+/****************************************************************************
 * Inline Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Function Prototypes
- ************************************************************/
-
-#ifndef __ASSEMBLY__
-extern void c5471_doirq(int irq, uint32* regs);
-#endif
+ ****************************************************************************/

 #endif  /* __C5471_CHIP_H */
--- a/arch/arm/src/common/arm.h
+++ b/arch/arm/src/common/arm.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * common/arm.h
+ * arch/arm/src/common/arm.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARM_H
-#define __ARM_H
+#ifndef __ARCH_ARM_SRC_COMMON_ARM_H
+#define __ARCH_ARM_SRC_COMMON_ARM_H

 /************************************************************************************
 * Included Files
@@ -249,6 +249,6 @@

 #ifndef __ASSEMBLY__

-#endif
+#endif /* __ASSEMBLY__ */

-#endif  /* __ARM_H */
+#endif  /* __ARCH_ARM_SRC_COMMON_ARM_H */
--- a/arch/arm/src/common/up_allocateheap.c
+++ b/arch/arm/src/common/up_allocateheap.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_allocateheap.c
+/****************************************************************************
+ * arch/arm/src/common/up_allocateheap.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,36 +31,39 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+
 #include "up_arch.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Private Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_allocate_heap
 *
 * Description:
@@ -69,7 +72,7 @@
 *   are not defined, then this function will be called to
 *   dynamically set aside the heap region.
 *
- ************************************************************/
+ ****************************************************************************/

 void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 {
--- a/arch/arm/src/common/up_arch.h
+++ b/arch/arm/src/common/up_arch.h
@@ -1,7 +1,7 @@
-/************************************************************************************
- * common/up_arch.h
+/****************************************************************************
+ * arch/arm/src/common/up_arch.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __UP_ARCH_H
-#define __UP_ARCH_H
+#ifndef ___ARCH_ARM_SRC_COMMON_UP_ARCH_H
+#define ___ARCH_ARM_SRC_COMMON_UP_ARCH_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
@@ -49,13 +49,13 @@
 #include <arch/board/board.h>
 #include "chip.h"

-/************************************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Inline Functions
- ************************************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

@@ -84,9 +84,9 @@ static inline void putreg16(uint16 val, unsigned int addr)

 /* Most DM320 registers are 16-bits wide */

-#define getreg(a)   getreg16(1)
+#define getreg(a)   getreg16(a)
 #define putreg(v,a) putreg16(v,a)

 #endif

-#endif  /* __UP_ARCH_H */
+#endif  /* ___ARCH_ARM_SRC_COMMON_UP_ARCH_H */
--- a/arch/arm/src/common/up_assert.c
+++ b/arch/arm/src/common/up_assert.c
@@ -1,7 +1,7 @@
-/************************************************************
+/****************************************************************************
 * common/up_assert.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,25 +31,29 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <debug.h>
+
 #include <nuttx/irq.h>
+#include <nuttx/arch.h>
+
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* Output debug info if stack dump is selected -- even if 
 * debug is not selected.
@@ -60,17 +64,17 @@
 # define lldbg lib_lowprintf
 #endif

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_getsp
- ************************************************************/
+ ****************************************************************************/

 /* I don't know if the builtin to get SP is enabled */

@@ -85,55 +89,42 @@ static inline uint32 up_getsp(void)
  return sp;
 }

-/************************************************************
+/****************************************************************************
 * Name: up_stackdump
- ************************************************************/
+ ****************************************************************************/

 #ifdef CONFIG_ARCH_STACKDUMP
-static void up_stackdump(void)
+static void up_stackdump(uint32 sp, uint32 stack_base)
 {
-  _TCB *rtcb        = (_TCB*)g_readytorun.head;
-  uint32 sp         = up_getsp();
-  uint32 stack_base;
-  uint32 stack_size;
+  uint32 stack ;

-  if (rtcb->pid == 0)
+  for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
    {
-      stack_base = g_heapbase - 4;
-      stack_size = CONFIG_PROC_STACK_SIZE;
-    }
-  else
-    {
-      stack_base = (uint32)rtcb->adj_stack_ptr;
-      stack_size = (uint32)rtcb->adj_stack_size;
+      uint32 *ptr = (uint32*)stack;
+      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+             stack, ptr[0], ptr[1], ptr[2], ptr[3],
+             ptr[4], ptr[5], ptr[6], ptr[7]);
    }
+}
+#else
+# define up_stackdump()
+#endif

-  lldbg("stack_base: %08x\n", stack_base);
-  lldbg("stack_size: %08x\n", stack_size);
-  lldbg("sp:         %08x\n", sp);
+/****************************************************************************
+ * Name: up_registerdump
+ ****************************************************************************/

-  if (sp >= stack_base || sp < stack_base - stack_size)
-    {
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
-      return;
-    }
-  else
-    {
-      uint32 stack = sp & ~0x1f;
-
-      for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
-        {
-          uint32 *ptr = (uint32*)stack;
-          lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-                 stack, ptr[0], ptr[1], ptr[2], ptr[3],
-                 ptr[4], ptr[5], ptr[6], ptr[7]);
-        }
-    }
+#ifdef CONFIG_ARCH_STACKDUMP
+static inline void up_registerdump(void)
+{
+  /* Are user registers available from interrupt processing? */

  if (current_regs)
    {
      int regs;

+      /* Yes.. dump the interrupt registers */
+
      for (regs = REG_R0; regs <= REG_R15; regs += 8)
        {
          uint32 *ptr = (uint32*)&current_regs[regs];
@@ -145,12 +136,106 @@ static void up_stackdump(void)
    }
 }
 #else
-# define up_stackdump()
+# define up_registerdump()
 #endif

-/************************************************************
+/****************************************************************************
+ * Name: up_dumpstate
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_STACKDUMP
+static void up_dumpstate(void)
+{
+  _TCB *rtcb        = (_TCB*)g_readytorun.head;
+  uint32 sp         = up_getsp();
+  uint32 ustackbase;
+  uint32 ustacksize;
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+  uint32 istackbase;
+  uint32 istacksize;
+#endif
+
+  /* Get the limits on the user stack memory */
+
+  if (rtcb->pid == 0)
+    {
+      ustackbase = g_heapbase - 4;
+      ustacksize = CONFIG_IDLETHREAD_STACKSIZE;
+    }
+  else
+    {
+      ustackbase = (uint32)rtcb->adj_stack_ptr;
+      ustacksize = (uint32)rtcb->adj_stack_size;
+    }
+
+  /* Get the limits on the interrupt stack memory */
+
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+  istackbase = (uint32)&g_userstack;
+  istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3) - 4;
+
+  /* Show interrupt stack info */
+
+  lldbg("sp:     %08x\n", sp);
+  lldbg("IRQ stack:\n");
+  lldbg("  base: %08x\n", istackbase);
+  lldbg("  size: %08x\n", istacksize);
+
+  /* Does the current stack pointer lie within the interrupt
+   * stack?
+   */
+
+  if (sp <= istackbase && sp > istackbase - istacksize)
+    {
+      /* Yes.. dump the interrupt stack */
+
+      up_stackdump(sp, istackbase);
+
+      /* Extract the user stack pointer which should lie
+       * at the base of the interrupt stack.
+       */
+
+      sp = g_userstack;
+      lldbg("sp:     %08x\n", sp);
+    }
+
+  /* Show user stack info */
+
+  lldbg("User stack:\n");
+  lldbg("  base: %08x\n", ustackbase);
+  lldbg("  size: %08x\n", ustacksize);
+#else
+  lldbg("sp:         %08x\n", sp);
+  lldbg("stack base: %08x\n", ustackbase);
+  lldbg("stack size: %08x\n", ustacksize);
+#endif
+
+  /* Dump the user stack if the stack pointer lies within the allocated user
+   * stack memory.
+   */
+
+  if (sp > ustackbase || sp <= ustackbase - ustacksize)
+    {
+#if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
+      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+#endif
+    }
+  else
+    {
+      up_stackdump(sp, ustackbase);
+    }
+
+  /* Then dump the registers (if available) */
+
+  up_registerdump();
+}
+#else
+# define up_dumpstate()
+#endif
+
+/****************************************************************************
 * Name: _up_assert
- ************************************************************/
+ ****************************************************************************/

 static void _up_assert(int errorcode) /* __attribute__ ((noreturn)) */
 {
@@ -163,9 +248,9 @@ static void _up_assert(int errorcode) /* __attribute__ ((noreturn)) */
          {
 #ifdef CONFIG_ARCH_LEDS
            up_ledon(LED_PANIC);
-            up_delay(250);
+            up_mdelay(250);
            up_ledoff(LED_PANIC);
-            up_delay(250);
+            up_mdelay(250);
 #endif
          }
    }
@@ -175,17 +260,17 @@ static void _up_assert(int errorcode) /* __attribute__ ((noreturn)) */
    }
 }

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_assert
- ************************************************************/
+ ****************************************************************************/

 void up_assert(const ubyte *filename, int lineno)
 {
-#if CONFIG_TASK_NAME_SIZE > 0
+#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG)
  _TCB *rtcb = (_TCB*)g_readytorun.head;
 #endif

@@ -197,17 +282,17 @@ void up_assert(const ubyte *filename, int lineno)
  lldbg("Assertion failed at file:%s line: %d\n",
        filename, lineno);
 #endif
-  up_stackdump();
+  up_dumpstate();
  _up_assert(EXIT_FAILURE);
 }

-/************************************************************
+/****************************************************************************
 * Name: up_assert_code
- ************************************************************/
+ ****************************************************************************/

 void up_assert_code(const ubyte *filename, int lineno, int errorcode)
 {
-#if CONFIG_TASK_NAME_SIZE > 0
+#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG)
  _TCB *rtcb = (_TCB*)g_readytorun.head;
 #endif

@@ -219,6 +304,6 @@ void up_assert_code(const ubyte *filename, int lineno, int errorcode)
  lldbg("Assertion failed at file:%s line: %d error code: %d\n",
        filename, lineno, errorcode);
 #endif
-  up_stackdump();
+  up_dumpstate();
  _up_assert(errorcode);
 }
--- a/arch/arm/src/common/up_blocktask.c
+++ b/arch/arm/src/common/up_blocktask.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_blocktask.c
+/****************************************************************************
+ * arch/arm/src/common/up_blocktask.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <sys/types.h>
@@ -45,23 +45,23 @@
 #include "os_internal.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Private Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Private Funtions
- ************************************************************/
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_block_task
 *
 * Description:
@@ -79,7 +79,7 @@
 *   task_state: Specifies which waiting task list should be
 *     hold the blocked task TCB.
 *
- ************************************************************/
+ ****************************************************************************/

 void up_block_task(_TCB *tcb, tstate_t task_state)
 {
@@ -95,8 +95,6 @@ void up_block_task(_TCB *tcb, tstate_t task_state)
      _TCB *rtcb = (_TCB*)g_readytorun.head;
      boolean switch_needed;

-      lldbg("Blocking TCB=%p\n", tcb);
-
      /* Remove the tcb task from the ready-to-run list.  If we
       * are blocking the task at the head of the task list (the
       * most likely case), then a context switch to the next
@@ -138,7 +136,6 @@ void up_block_task(_TCB *tcb, tstate_t task_state)
               */

              rtcb = (_TCB*)g_readytorun.head;
-              lldbg("New Active Task TCB=%p\n", rtcb);

              /* Then switch contexts */

@@ -157,7 +154,6 @@ void up_block_task(_TCB *tcb, tstate_t task_state)
               */

              rtcb = (_TCB*)g_readytorun.head;
-              lldbg("New Active Task TCB=%p\n", rtcb);

              /* Then switch contexts */

--- a/arch/arm/src/common/up_copystate.c
+++ b/arch/arm/src/common/up_copystate.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_copystate.c
+/****************************************************************************
+ * arch/arm/src/common/up_copystate.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,36 +31,38 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
+
 #include "os_internal.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_undefinedinsn
- ************************************************************/
+ ****************************************************************************/

 /* A little faster than most memcpy's */

--- a/arch/arm/src/common/up_createstack.c
+++ b/arch/arm/src/common/up_createstack.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_createstack.c
+/****************************************************************************
+ * arch/arm/src/common/up_createstack.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,34 +31,37 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
+
 #include "up_arch.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Private Types
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Function Prototypes
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Global Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_create_stack
 *
 * Description:
@@ -77,7 +80,7 @@
 *   tcb: The TCB of new task
 *   stack_size:  The requested stack size.  At least this much
 *     must be allocated.
- ************************************************************/
+ ****************************************************************************/

 STATUS up_create_stack(_TCB *tcb, size_t stack_size)
 {
--- a/arch/arm/src/common/up_dataabort.c
+++ b/arch/arm/src/common/up_dataabort.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_dataabort.c
+/****************************************************************************
+ * arch/arm/src/common/up_dataabort.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <sys/types.h>
@@ -44,9 +44,9 @@
 #include "os_internal.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* Output debug info if stack dump is selected -- even if 
 * debug is not selected.
@@ -57,21 +57,21 @@
 # define lldbg lib_lowprintf
 #endif

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_dataabort
- ************************************************************/
+ ****************************************************************************/

 void up_dataabort(uint32 *regs)
 {
--- a/arch/arm/src/common/up_doirq.c
+++ b/arch/arm/src/common/up_doirq.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_doirq.c
+/****************************************************************************
+ * arch/arm/src/common/up_doirq.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <sys/types.h>
@@ -46,25 +46,25 @@
 #include "os_internal.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Public Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

 void up_doirq(int irq, uint32* regs)
 {
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -1,7 +1,7 @@
-/************************************************************
+/****************************************************************************
 * common/up_exit.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <sys/types.h>
@@ -49,85 +49,98 @@
 #include <nuttx/fs.h>
 #endif

-/************************************************************
+/****************************************************************************
 * Private Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Private Funtions
- ************************************************************/
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: _up_dumponexit
 *
 * Description:
- *   Dump the state of all tasks whenever on task exits.  This
- *   is debug instrumentation that was added to check file-
- *   related reference counting but could be useful again
- *   sometime in the future.
+ *   Dump the state of all tasks whenever on task exits.  This is debug
+ *   instrumentation that was added to check file-related reference counting
+ *   but could be useful again sometime in the future.
 *
- ************************************************************/
+ ****************************************************************************/

 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
 static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 {
+#if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NFILE_STREAMS > 0
  int i;
-  dbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+#endif
+
+  sdbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
  if (tcb->filelist)
    {
-      dbg("    filelist refcount=%d\n",
-          tcb->filelist->fl_crefs);
+      sdbg("    filelist refcount=%d\n",
+           tcb->filelist->fl_crefs);

      for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
        {
          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
          if (inode)
            {
-              dbg("      fd=%d refcount=%d\n",
-                  i, inode->i_crefs);
+              sdbg("      fd=%d refcount=%d\n",
+                   i, inode->i_crefs);
            }
        }
    }
+#endif

+#if CONFIG_NFILE_STREAMS > 0
  if (tcb->streams)
    {
-      dbg("    streamlist refcount=%d\n",
-          tcb->streams->sl_crefs);
+      sdbg("    streamlist refcount=%d\n",
+           tcb->streams->sl_crefs);

      for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
        {
          struct file_struct *filep = &tcb->streams->sl_streams[i];
          if (filep->fs_filedes >= 0)
            {
-              dbg("      fd=%d nbytes=%d\n",
-                  filep->fs_filedes,
+#if CONFIG_STDIO_BUFFER_SIZE > 0
+              sdbg("      fd=%d nbytes=%d\n",
+                   filep->fs_filedes,
                  filep->fs_bufpos - filep->fs_bufstart);
+#else
+              sdbg("      fd=%d\n", filep->fs_filedes);
+#endif
            }
        }
    }
+#endif
 }
 #endif

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: _exit
 *
 * Description:
 *   This function causes the currently executing task to cease
- *   to exist.  This is a special case of task_delete().
+ *   to exist.  This is a special case of task_delete() where the task to
+ *   be deleted is the currently executing task.  It is more complex because
+ *   a context switch must be perform to the the next ready to run task.
 *
- ************************************************************/
+ ****************************************************************************/

 void _exit(int status)
 {
-  _TCB* tcb = (_TCB*)g_readytorun.head;
+  _TCB* tcb;

  /* Disable interrupts.  They will be restored when the next
   * task is started.
@@ -135,51 +148,22 @@ void _exit(int status)

  (void)irqsave();

-  lldbg("TCB=%p exitting\n", tcb);
+  slldbg("TCB=%p exitting\n", g_readytorun.head);

 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
-  dbg("Other tasks:\n");
+  slldbg("Other tasks:\n");
  sched_foreach(_up_dumponexit, NULL);
 #endif

-  /* Remove the tcb task from the ready-to-run list.  We can
-   * ignore the return value because we know that a context
-   * switch is needed.
-   */
+  /* Destroy the task at the head of the ready to run list. */

-  (void)sched_removereadytorun(tcb);
-
-  /* We are not in a bad stack-- the head of the ready to run task list
-   * does not correspond to the thread that is running.  Disabling pre-
-   * emption on this TCB should be enough to keep things stable.
-   */
-
-  sched_lock();
-
-  /* Move the TCB to the specified blocked task list and delete it */
-
-  sched_addblocked(tcb, TSTATE_TASK_INACTIVE);
-  task_delete(tcb->pid);
-
-  /* If there are any pending tasks, then add them to the g_readytorun
-   * task list now
-   */
-
-  if (g_pendingtasks.head)
-    {
-      (void)sched_mergepending();
-    }
-
-  /* Now calling sched_unlock() should have no effect */
-
-  sched_unlock();
+  (void)task_deletecurrent();

  /* Now, perform the context switch to the new ready-to-run task at the
   * head of the list.
   */

  tcb = (_TCB*)g_readytorun.head;
-  lldbg("New Active Task TCB=%p\n", tcb);

  /* Then switch contexts */

--- a/arch/arm/src/common/up_head.S
+++ b/arch/arm/src/common/up_head.S
@@ -284,7 +284,7 @@ __start:
 #endif
 	/* Perform early serial initialization */

-#ifdef CONFIG_DEV_CONSOLE
+#ifdef CONFIG_USE_EARLYSERIALINIT
 	bl      up_earlyserialinit
 #endif

@@ -297,7 +297,7 @@ __start:
 	 * _sbss is the start of the BSS region (see ld.script)
 	 * _ebss is the end of the BSS regsion (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
-	 * of size CONFIG_PROC_STACK_SIZE.  The heap continues
+	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_heapbase
 	 * below.
 	 */
@@ -305,7 +305,7 @@ __start:
 .Linitparms:
 	.long	_sbss
 	.long	_ebss
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 	.size	.Lvstart, .-.Lvstart

 	/* This global variable is unsigned long g_heapbase and is
@@ -318,7 +318,7 @@ __start:
 	.globl	g_heapbase
 	.type	g_heapbase, object
 g_heapbase:
-	.long	_ebss+CONFIG_PROC_STACK_SIZE
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 	.size	g_heapbase, .-g_heapbase
 	.end

--- a/arch/arm/src/common/up_idle.c
+++ b/arch/arm/src/common/up_idle.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_idle.c
+/****************************************************************************
+ *  arch/arm/src/common/up_idle.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,34 +31,34 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <nuttx/arch.h>
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
 * Private Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Private Funtions
- ************************************************************/
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_idle
 *
 * Description:
@@ -71,7 +71,7 @@
 *   this is where power management operations might be
 *   performed.
 *
- ************************************************************/
+ ****************************************************************************/

 void up_idle(void)
 {
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_initialize.c
+/****************************************************************************
+ * arch/arm/src/common/up_initialize.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,51 +31,84 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/fs.h>
+
 #include "up_arch.h"
 #include "up_internal.h"

-/************************************************************
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/* Define to enable timing loop calibration */
+
+#undef CONFIG_ARM_CALIBRATION
+
+/****************************************************************************
 * Private Types
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Private Function Prototypes
- ************************************************************/
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/

-/************************************************************
- * Global Functions
- ************************************************************/
+/****************************************************************************
+ * Name: up_calibratedelay
+ *
+ * Description:
+ *   Delay loops are provided for short timing loops.  This function, if
+ *   enabled, will just wait for 100 seconds.  Using a stopwatch, you can
+ *   can then determine if the timing loops are properly calibrated.
+ *
+ ****************************************************************************/

-/************************************************************
+#if defined(CONFIG_ARM_CALIBRATION) & defined(CONFIG_DEBUG)
+static void up_calibratedelay(void)
+{
+  int i;
+  slldbg("Beginning 100s delay\n");
+  for (i = 0; i < 100; i++)
+    {
+      up_mdelay(1000);
+    }
+  slldbg("End 100s delay\n");
+}
+#else
+# define up_calibratedelay()
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
 * Name: up_initialize
 *
 * Description:
- *   up_initialize will be called once during OS
- *   initialization after the basic OS services have been
- *   initialized.  The architecture specific details of
- *   initializing the OS will be handled here.  Such things as
- *   setting up interrupt service routines, starting the
- *   clock, and registering device drivers are some of the
- *   things that are different for each processor and hardware
- *   platform.
+ *   up_initialize will be called once during OS initialization after the
+ *   basic OS services have been initialized.  The architecture specific
+ *   details of initializing the OS will be handled here.  Such things as
+ *   setting up interrupt service routines, starting the clock, and
+ *   registering device drivers are some of the things that are different
+ *   for each processor and hardware platform.
 *
- *   up_initialize is called after the OS initialized but
- *   before the init process has been started and before the
- *   libraries have been initialized.  OS services and driver
- *   services are available.
+ *   up_initialize is called after the OS initialized but before the user
+ *   initialization logic has been started and before the libraries have
+ *   been initialized.  OS services and driver services are available.
 *
- ************************************************************/
+ ****************************************************************************/

 void up_initialize(void)
 {
@@ -83,6 +116,10 @@ void up_initialize(void)

  current_regs = NULL;

+  /* Calibrate the timing loop */
+
+  up_calibratedelay();
+
  /* Initialize the interrupt subsystem */

  up_irqinitialize();
@@ -95,10 +132,25 @@ void up_initialize(void)

  /* Register devices */

+#if CONFIG_NFILE_DESCRIPTORS > 0
  devnull_register();   /* Standard /dev/null */
+#endif

  /* Initialize the serial device driver */

+#ifdef CONFIG_USE_SERIALDRIVER
  up_serialinit();
+#elif defined(CONFIG_DEV_LOWCONSOLE)
+  lowconsole_init();
+#endif
+
+  /* Initialize the netwok */
+
+  up_netinitialize();
+
+  /* Initializ USB */
+
+  up_usbinitialize();
+
  up_ledon(LED_IRQSENABLED);
 }
--- a/arch/arm/src/common/up_initialstate.c
+++ b/arch/arm/src/common/up_initialstate.c
@@ -1,7 +1,7 @@
-/************************************************************
- * common/up_initialstate.c
+/****************************************************************************
+ *  arch/arm/src/common/up_initialstate.c
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <sys/types.h>
@@ -44,23 +44,23 @@
 #include "up_internal.h"
 #include "up_arch.h"

-/************************************************************
+/****************************************************************************
 * Private Definitions
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Private Data
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
- * Private Funtions
- ************************************************************/
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/

-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Name: up_initial_state
 *
 * Description:
@@ -72,7 +72,7 @@
 *   and/or  stack so that execution will begin at tcb->start
 *   on the next context switch.
 *
- ************************************************************/
+ ****************************************************************************/

 void up_initial_state(_TCB *tcb)
 {
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -1,7 +1,7 @@
-/************************************************************
+/****************************************************************************
 * common/up_internal.h
 *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 *
 * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
 *    used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
@@ -31,41 +31,57 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************/
+ ****************************************************************************/

 #ifndef __UP_INTERNAL_H
 #define __UP_INTERNAL_H

-/************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************/
+ ****************************************************************************/

-/************************************************************
+/****************************************************************************
 * Definitions
- ************************************************************/
+ ****************************************************************************/

 /* Bring-up debug configurations.  These are here (vs defconfig)
 * because these should only be controlled during low level
 * board bring-up and not part of normal platform configuration.
 */

-#undef  CONFIG_SUPPRESS_INTERRUPTS    /* Do not enable interrupts */
-#undef  CONFIG_SUPPRESS_TIMER_INTS    /* No timer */
-#undef  CONFIG_SUPPRESS_SERIAL_INTS   /* Console will poll */
-#undef  CONFIG_SUPPRESS_UART_CONFIG   /* Do not reconfig UART */
-#define CONFIG_DUMP_ON_EXIT         1 /* Dump task state on exit */
+#undef  CONFIG_SUPPRESS_INTERRUPTS    /* DEFINED: Do not enable interrupts */
+#undef  CONFIG_SUPPRESS_TIMER_INTS    /* DEFINED: No timer */
+#undef  CONFIG_SUPPRESS_SERIAL_INTS   /* DEFINED: Console will poll */
+#undef  CONFIG_SUPPRESS_UART_CONFIG   /* DEFINED: Do not reconfig UART */
+#undef  CONFIG_DUMP_ON_EXIT           /* DEFINED: Dump task state on exit */

-/************************************************************
+/* Determine which (if any) console driver to use */
+
+#if CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE)
+#  undef CONFIG_USE_SERIALDRIVER
+#  undef CONFIG_USE_EARLYSERIALINIT
+#elif defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0
+#  define CONFIG_USE_SERIALDRIVER 1
+#  define CONFIG_USE_EARLYSERIALINIT 1
+#endif
+
+/* Check if an interrupt stack size is configured */
+
+#ifndef CONFIG_ARCH_INTERRUPTSTACK
+# define CONFIG_ARCH_INTERRUPTSTACK 0
+#endif
+
+/****************************************************************************
 * Public Types
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__
 typedef void (*up_vector_t)(void);
 #endif

-/************************************************************
+/****************************************************************************
 * Public Variables
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level
@@ -82,16 +98,21 @@ extern uint32 *current_regs;
 */

 extern uint32 g_heapbase;
+
+/* Address of the saved user stack pointer */
+
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+extern uint32 g_userstack;
+#endif
 #endif

-/************************************************************
+/****************************************************************************
 * Inline Functions
- ************************************************************/
+ ****************************************************************************/

-
-/************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

@@ -100,8 +121,8 @@ extern uint32 g_heapbase;
 extern void up_boot(void);
 extern void up_copystate(uint32 *dest, uint32 *src);
 extern void up_dataabort(uint32 *regs);
-extern void up_delay(int milliseconds);
-extern void up_doirq(uint32 *regs);
+extern void up_decodeirq(uint32 *regs);
+extern void up_doirq(int irq, uint32 *regs);
 extern void up_fullcontextrestore(uint32 *regs) __attribute__ ((noreturn));
 extern void up_irqinitialize(void);
 extern void up_prefetchabort(uint32 *regs);
@@ -110,12 +131,9 @@ extern void up_sigdeliver(void);
 extern void up_syscall(uint32 *regs);
 extern int  up_timerisr(int irq, uint32 *regs);
 extern void up_undefinedinsn(uint32 *regs);
-
-#ifdef CONFIG_DEBUG
 extern void up_lowputc(char ch);
-#else
-# define up_lowputc(ch)
-#endif
+extern void up_puts(const char *str);
+extern void up_lowputs(const char *str);

 /* Defined in up_vectors.S */

@@ -129,8 +147,21 @@ extern void up_vectorfiq(void);

 /* Defined in up_serial.c */

+#if CONFIG_NFILE_DESCRIPTORS > 0
 extern void up_earlyserialinit(void);
 extern void up_serialinit(void);
+#else
+# define up_earlyserialinit()
+# define up_serialinit()
+#endif
+
+/* Defined in drivers/lowconsole.c */
+
+#ifdef CONFIG_DEV_LOWCONSOLE
+extern void lowconsole_init(void);
+#else
+# define lowconsole_init()
+#endif

 /* Defined in up_watchdog.c */

@@ -156,6 +187,23 @@ extern void up_ledoff(int led);
 # define up_ledoff(led)
 #endif

+/* Defined in board/up_network.c */
+
+#ifdef CONFIG_NET
+extern void up_netinitialize(void);
+#else
+# define up_netinitialize()
+#endif
+
+
+#ifdef CONFIG_USBDEV
+extern void up_usbinitialize(void);
+extern void up_usbuninitialize(void);
+#else
+# define up_usbinitialize()
+# define up_usbuninitialize()
+#endif
+
 #endif /* __ASSEMBLY__ */

 #endif  /* __UP_INTERNAL_H */
--- a/Show More
+++ b/Show More