Add a stub for the QEMU serial driver

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

ChangeLog

@@ -1519,4 +1519,10 @@
 	  advantage that it runs in the actual NuttX tasking environment (the
 	  mm/mm_test.c only runs in a PC simulation environment).
 	* drivers/mmcsd_sdio.c/h -- Several corrections submitted by Uros Platise.
+	* arch/x86 - Provide support for x86 architectures.  Support for the i486
+	  architecture under QEMU is provided under arch/x86/include/i486,
+	  arch/x86/include/qemu, arch/x86/src/i486, and arch/x86/src/qemu.
+	* configs/qemu-i486 - "Board" support configurations for verifying the QEME
+	  i486 port.
+
 

Documentation/NuttX.html

@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: March 2, 2011</p>
+      <p>Last Updated: March 5, 2011</p>
     </td>
   </tr>
 </table>
@@ -2115,12 +2115,17 @@ nuttx-5.19 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
       occurs.
     * configs/olimex-lpc1766stk -- Added an LED encoded to indicate if the LPC1766
       is in sleeping.      
-	* examples/mm  -- This is a simplified version of the "built-in" memory manager
+    * examples/mm  -- This is a simplified version of the "built-in" memory manager
-	  test of mm/mm_test.c.  It is simplified because it does not have access to
+      test of mm/mm_test.c.  It is simplified because it does not have access to
-	  the internals of the memory manager as does mm/mm_test.c, but it has the
+      the internals of the memory manager as does mm/mm_test.c, but it has the
-	  advantage that it runs in the actual NuttX tasking environment (the
+      advantage that it runs in the actual NuttX tasking environment (the
-	  mm/mm_test.c only runs in a PC simulation environment).
+      mm/mm_test.c only runs in a PC simulation environment).
     * drivers/mmcsd_sdio.c/h -- Several corrections submitted by Uros Platise.
+    * arch/x86 - Provide support for x86 architectures.  Support for the i486
+      architecture under QEMU is provided under arch/x86/include/i486,
+      arch/x86/include/qemu, arch/x86/src/i486, and arch/x86/src/qemu.
+    * configs/qemu-i486 - "Board" support configurations for verifying the QEME
+      i486 port.
 
 pascal-2.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 

Documentation/README.html

@@ -9,7 +9,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX README Files</i></font></big></h1>
-      <p>Last Updated: February 27, 2010</p>
+      <p>Last Updated: March 5, 2010</p>
     </td>
   </tr>
 </table>
@@ -38,6 +38,11 @@
  |   |   |   |-<a href="arch/sh/src/m16c/README.txt?view=log">m16c/README.txt</a>
  |   |   |   |-<a href="arch/sh/src/sh1/README.txt?view=log">sh1/README.txt</a>
  |   |   |   `-<a href="arch/sh/src/README.txt?view=log">README.txt</a>
+ |   |- x86/
+ |   |   |- include/
+ |   |   |   `-<a href="arch/x86/include/README.txt?view=log">README.txt</a>
+ |   |   `- src/
+ |   |       `-<a href="arch/x86/src/README.txt?view=log">README.txt</a>
  |   `- z80/
  |   |   `- src/
  |   |       `- <a href="arch/z80/src/z80/README.txt?view=log">z80/README.txt</a>
@@ -111,6 +116,10 @@
  |   |   |- <a href="configs/pjrc-8051/include/README.txt?view=log">include/README.txt</a>
  |   |   |- <a href="configs/pjrc-8051/src/README.txt?view=log">src/README.txt</a>
  |   |   `- <a href="configs/pjrc-8051/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |   |- qemu-i486/
+ |   |   |- <a href="configs/qemu-i486/include/README.txt?view=log">include/README.txt</a>
+ |   |   |- <a href="configs/qemu-i486/src/README.txt?view=log">src/README.txt</a>
+ |   |   `- <a href="configs/qemu-i486/README.txt?view=log"><b><i>README.txt</i></b></a>
  |   |- sam3u-ek/
  |   |   `- <a href="configs/sam3u-ek/README.txt?view=log"><b><i>README.txt</i></b></a>
  |   |- sim/

README.txt

@@ -251,6 +251,11 @@ Below is a guide to the available README files in the NuttX source tree:
  |   |   |   |-m16c/README.txt
  |   |   |   |-sh1/README.txt
  |   |   |   `-README.txt
+ |   |- x86/
+ |   |   |- include/
+ |   |   |   `-README.txt
+ |   |   `- src/
+ |   |       `-README.txt
  |   `- z80/
  |   |   `- src/
  |   |       `- z80/README.txt
@@ -324,6 +329,10 @@ Below is a guide to the available README files in the NuttX source tree:
  |   |   |- include/README.txt
  |   |   |- src/README.txt
  |   |   `- README.txt
+ |   |- qemu-i486/
+ |   |   |- include/README.txt
+ |   |   |- src/README.txt
+ |   |   `- README.txt
  |   |- sam3u-ek/
  |   |   `- README.txt
  |   |- sim/

arch/x86/src/qemu/Make.defs

@@ -52,6 +52,6 @@ CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
 
 CHIP_ASRCS	= qemu_saveusercontext.S qemu_fullcontextrestore.S qemu_vectors.S
 CHIP_CSRCS	= qemu_handlers.c qemu_idle.c qemu_irq.c qemu_lowputc.c \
-			  qemu_lowsetup.c qemu_timerisr.c
+			  qemu_lowsetup.c qemu_serial.c qemu_timerisr.c
 
 # Configuration-dependent QEMU files

arch/x86/src/qemu/qemu_serial.c

@@ -0,0 +1,89 @@
+/****************************************************************************
+ *  arch/x86/src/qemu/qemu_serial.c
+ *
+ *   Copyright (C) 2011 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/arch.h>
+#include "up_internal.h"
+
+#ifdef CONFIG_USE_SERIALDRIVER
+#error "Serial driver support not initialized"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#else /* CONFIG_USE_SERIALDRIVER */
+
+/****************************************************************************
+ * Name: up_putc
+ *
+ * Description:
+ *   Provide priority, low-level access to support OS debug writes
+ *
+ ****************************************************************************/
+
+int up_putc(int ch)
+{
+  /* Check for LF */
+
+  if (ch == '\n')
+    {
+      /* Add CR */
+
+      up_lowputc('\r');
+    }
+
+  up_lowputc(ch);
+  return ch;
+}
+
+#endif /* CONFIG_USE_SERIALDRIVER */

configs/qemu-i486/ostest/defconfig

@@ -86,67 +86,61 @@ CONFIG_ARCH_DMA=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
+# CONFIG_APP_DIR - Identifies the relative path to the directory that builds
-#   that builds the application to link with NuttX.
+#   the application to link with NuttX.
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
-# CONFIG_DEBUG_SYMBOLS - build without optimization and with
+# CONFIG_DEBUG_SYMBOLS - build without optimization and with debug symbols
-#   debug symbols (needed for use with a debugger).
+#  (needed for use with a debugger).
-# CONFIG_MM_REGIONS - If the architecture includes multiple
+# CONFIG_MM_REGIONS - If the architecture includes multiple regions of memory
-#   regions of memory to allocate from, this specifies the
+#   to allocate from, this specifies the number of memory regions that the
-#   number of memory regions that the memory manager must
+#   memory manager must handle and enables the API mm_addregion(start, end);
-#   handle and enables the API mm_addregion(start, end);
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot time console
-# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
+#   output.
-#   time console output
+# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz or TICKS_PER_MSEC=10.
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
+#   This setting may be defined to inform NuttX that the processor hardware is
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+#   providing system timer interrupts at some interrupt interval other than 10
-#   inform NuttX that the processor hardware is providing
+#   msec.
-#   system timer interrupts at some interrupt interval other
+# CONFIG_RR_INTERVAL - The round robin timeslice will be set this number of
-#   than 10 msec.
+#   milliseconds;  Round robin scheduling can be disabled by setting this
-# CONFIG_RR_INTERVAL - The round robin timeslice will be set
+#   value to zero.
-#   this number of milliseconds;  Round robin scheduling can
+# CONFIG_SCHED_INSTRUMENTATION - enables instrumentation in scheduler to
-#   be disabled by setting this value to zero.
+#   monitor system performance
-# CONFIG_SCHED_INSTRUMENTATION - enables instrumentation in 
+# CONFIG_TASK_NAME_SIZE - Spcifies that maximum size of a task name to save in
-#   scheduler to monitor system performance
+#   the TCB.  Useful if scheduler instrumentation is selected.  Set to zero to
-# CONFIG_TASK_NAME_SIZE - Spcifies that maximum size of a
+#   disable.
-#   task name to save in the TCB.  Useful if scheduler
-#   instrumentation is selected.  Set to zero to disable.
 # CONFIG_JULIAN_TIME - Enables Julian time conversions
-# CONFIG_START_YEAR, CONFIG_START_MONTH, CONFIG_START_DAY -
+# CONFIG_START_YEAR, CONFIG_START_MONTH, CONFIG_START_DAY - Used to initialize
-#   Used to initialize the internal time logic.
+#   the internal time logic.
-# CONFIG_DEV_CONSOLE - Set if architecture-specific logic
+# CONFIG_DEV_CONSOLE - Set if architecture-specific logic provides /dev/console.
-#   provides /dev/console.  Enables stdout, stderr, stdin.
+#   Enables stdout, stderr, stdin.
-# CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console
+# CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console driver
-#   driver (minimul support)
+#   (minimal support)
-# CONFIG_MUTEX_TYPES: Set to enable support for recursive and
+# CONFIG_MUTEX_TYPES: Set to enable support for recursive and errorcheck
-#   errorcheck mutexes. Enables pthread_mutexattr_settype().
+#   mutexes. Enables pthread_mutexattr_settype().
-# CONFIG_PRIORITY_INHERITANCE : Set to enable support for priority
+# CONFIG_PRIORITY_INHERITANCE : Set to enable support for priority inheritance
-#   inheritance on mutexes and semaphores.
+#   on mutexes and semaphores.
-# CONFIG_SEM_PREALLOCHOLDERS: This setting is only used if priority
+# CONFIG_SEM_PREALLOCHOLDERS: This setting is only used if priority inheritance
-#   inheritance is enabled.  It defines the maximum number of
+#   is enabled.  It defines the maximum number of different threads (minus one)
-#   different threads (minus one) that can take counts on a
+#   that can take counts on a semaphore with priority inheritance support.
-#   semaphore with priority inheritance support.  This may be 
+#   This may be  set to zero if priority inheritance is disabled OR if you are
-#   set to zero if priority inheritance is disabled OR if you
+#   only using semaphores as mutexes (only one holder) OR if no more than two
-#   are only using semaphores as mutexes (only one holder) OR
+#   threads participate using a counting semaphore.
-#   if no more than two threads participate using a counting
+# CONFIG_SEM_NNESTPRIO.  If priority inheritance is enabled, then this setting
+#   is the maximum number of higher priority threads (minus 1) than can be
+#   waiting for another thread to release a count on a semaphore.  This value
+#   may be set to zero if no more than one thread is expected to wait for a
 #   semaphore.
-# CONFIG_SEM_NNESTPRIO.  If priority inheritance is enabled,
+# CONFIG_FDCLONE_DISABLE. Disable cloning of all file descriptors by task_create()
-#   then this setting is the maximum number of higher priority
+#   when a new task is started.  If set, all files/drivers will appear to be
-#   threads (minus 1) than can be waiting for another thread
+#   closed in the new task.
-#   to release a count on a semaphore.  This value may be set
+# CONFIG_FDCLONE_STDIO. Disable cloning of all but the first three file
-#   to zero if no more than one thread is expected to wait for
+#   descriptors (stdin, stdout, stderr) by task_create() when a new task is
-#   a semaphore.
+#   started. If set, all files/drivers will appear to be closed in the new
-# CONFIG_FDCLONE_DISABLE. Disable cloning of all file descriptors
+#   task except for stdin, stdout, and stderr.
-#   by task_create() when a new task is started.  If set, all
+# CONFIG_SDCLONE_DISABLE. Disable cloning of all socket desciptors by
-#   files/drivers will appear to be closed in the new task.
+#   task_create() when a new task is started. If set, all sockets will appear
-# CONFIG_FDCLONE_STDIO. Disable cloning of all but the first
+#   to be closed in the new task.
-#   three file descriptors (stdin, stdout, stderr) by task_create()
-#   when a new task is started. If set, all files/drivers will
-#   appear to be closed in the new task except for stdin, stdout,
-#   and stderr.
-# CONFIG_SDCLONE_DISABLE. Disable cloning of all socket
-#   desciptors by task_create() when a new task is started. If
-#   set, all sockets will appear to be closed in the new task.
 #
 CONFIG_APP_DIR=examples/ostest
 CONFIG_DEBUG=y
@@ -162,7 +156,7 @@ CONFIG_START_MONTH=3
 CONFIG_START_DAY=3
 CONFIG_JULIAN_TIME=n
 CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
+CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=y
 CONFIG_PRIORITY_INHERITANCE=n
 CONFIG_SEM_PREALLOCHOLDERS=0
@@ -172,19 +166,15 @@ CONFIG_FDCLONE_STDIO=n
 CONFIG_SDCLONE_DISABLE=y
 
 #
-# The following can be used to disable categories of
+# The following can be used to disable categories ofAPIs supported by the OS.
-# APIs supported by the OS.  If the compiler supports
+# If the compiler supports weak functions, then it should not be necessary to
-# weak functions, then it should not be necessary to
+# disable functions unless you want to restrict usage of those APIs.
-# disable functions unless you want to restrict usage
-# of those APIs.
 #
-# There are certain dependency relationships in these
+# There are certain dependency relationships in these features.
-# features.
 #
-# o mq_notify logic depends on signals to awaken tasks
+# o mq_notify logic depends on signals to awaken tasks waiting for queues to
-#   waiting for queues to become full or empty.
+#   become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
+# o pthread_condtimedwait() depends on signals to wake up waiting tasks.
-#   up waiting tasks.
 #
 CONFIG_DISABLE_CLOCK=n
 CONFIG_DISABLE_POSIX_TIMERS=n
@@ -198,16 +188,16 @@ CONFIG_DISABLE_POLL=y
 #
 # Misc libc settings
 #
-# CONFIG_NOPRINTF_FIELDWIDTH - sprintf-related logic is a
+# CONFIG_NOPRINTF_FIELDWIDTH - sprintf-related logic is a little smaller if we
-#   little smaller if we do not support fieldwidthes
+#   do not support fieldwidthes
 #
 CONFIG_NOPRINTF_FIELDWIDTH=n
 
 #
 # Allow for architecture optimized implementations
 #
-# The architecture can provide optimized versions of the
+# The architecture can provide optimized versions of the following to improve
-# following to improve sysem performance
+# system performance
 #
 CONFIG_ARCH_MEMCPY=n
 CONFIG_ARCH_MEMCMP=n
@@ -226,14 +216,14 @@ CONFIG_ARCH_KFREE=n
 ##
 # General build options
 #
-# CONFIG_RRLOAD_BINARY - make the rrload binary format used with
+# CONFIG_RRLOAD_BINARY - make the rrload binary format used with BSPs from
-#   BSPs from www.ridgerun.com using the tools/mkimage.sh script
+#   www.ridgerun.com using the tools/mkimage.sh script
-# CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
+# CONFIG_INTELHEX_BINARY - make the Intel HEX binary format used with many
-#   used with many different loaders using the GNU objcopy program
+#   different loaders using the GNU objcopy program Should not be selected if
-#   Should not be selected if you are not using the GNU toolchain.
+#   you are not using the GNU toolchain.
-# CONFIG_RAW_BINARY - make a raw binary format file used with many
+# CONFIG_RAW_BINARY - make a raw binary format file used with many different
-#   different loaders using the GNU objcopy program.  This option
+#   loaders using the GNU objcopy program.  This option should not be selected
-#   should not be selected if you are not using the GNU toolchain.
+#   if you are not using the GNU toolchain.
 # CONFIG_HAVE_LIBM - toolchain supports libm.a
 #
 CONFIG_RRLOAD_BINARY=n
@@ -244,37 +234,33 @@ CONFIG_HAVE_LIBM=y
 #
 # Sizes of configurable things (0 disables)
 #
-# CONFIG_MAX_TASKS - The maximum number of simultaneously
+# CONFIG_MAX_TASKS - The maximum number of simultaneously active tasks. This
-#   active tasks. This value must be a power of two.
+#   value must be a power of two.
-# CONFIG_MAX_TASK_ARGS - This controls the maximum number of
+# CONFIG_MAX_TASK_ARGS - This controls the maximum number of of parameters
-#   of parameters that a task may receive (i.e., maxmum value
+#   that a task may receive (i.e., maxmum value of 'argc')
-#   of 'argc')
+# CONFIG_NPTHREAD_KEYS - The number of items of thread-specific data that can
-# CONFIG_NPTHREAD_KEYS - The number of items of thread-
+#   be retained
-#   specific data that can be retained
+# CONFIG_NFILE_DESCRIPTORS - The maximum number of file descriptors (one for
-# CONFIG_NFILE_DESCRIPTORS - The maximum number of file
+#   each open)
-#   descriptors (one for each open)
+# CONFIG_NFILE_STREAMS - The maximum number of streams that can be fopen'ed
-# CONFIG_NFILE_STREAMS - The maximum number of streams that
-#   can be fopen'ed
 # CONFIG_NAME_MAX - The maximum size of a file name.
-# CONFIG_STDIO_BUFFER_SIZE - Size of the buffer to allocate
+# CONFIG_STDIO_BUFFER_SIZE - Size of the buffer to allocate on fopen. (Only if
-#   on fopen. (Only if CONFIG_NFILE_STREAMS > 0)
+#   CONFIG_NFILE_STREAMS > 0)
-# CONFIG_NUNGET_CHARS - Number of characters that can be
+# CONFIG_NUNGET_CHARS - Number of characters that can be buffered by ungetc()
-#   buffered by ungetc() (Only if CONFIG_NFILE_STREAMS > 0)
+#   (Only if CONFIG_NFILE_STREAMS > 0)
-# CONFIG_PREALLOC_MQ_MSGS - The number of pre-allocated message
+# CONFIG_PREALLOC_MQ_MSGS - The number of pre-allocated message structures.
-#   structures.  The system manages a pool of preallocated
+#   The system manages a pool of preallocated message structures to minimize
-#   message structures to minimize dynamic allocations
+#   dynamic allocations
-# CONFIG_MQ_MAXMSGSIZE - Message structures are allocated with
+# CONFIG_MQ_MAXMSGSIZE - Message structures are allocated with a fixed payload
-#   a fixed payload size given by this settin (does not include
+#   size given by this settin (does not include other message structure overhead.
-#   other message structure overhead.
+# CONFIG_MAX_WDOGPARMS - Maximum number of parameters that can be passed to a
-# CONFIG_MAX_WDOGPARMS - Maximum number of parameters that
+#   watchdog handler
-#   can be passed to a watchdog handler
+# CONFIG_PREALLOC_WDOGS - The number of pre-allocated watchdog structures.  The
-# CONFIG_PREALLOC_WDOGS - The number of pre-allocated watchdog
+#   system manages a pool of preallocated watchdog structures to minimize
-#   structures.  The system manages a pool of preallocated
+#   dynamic allocations
-#   watchdog structures to minimize dynamic allocations
+# CONFIG_PREALLOC_TIMERS - The number of pre-allocated POSIX timer structures.
-# CONFIG_PREALLOC_TIMERS - The number of pre-allocated POSIX
+#   The system manages a pool of preallocated timer structures to minimize
-#   timer structures.  The system manages a pool of preallocated
+#   dynamic allocations.  Set to zero for all dynamic allocations.
-#   timer structures to minimize dynamic allocations.  Set to
-#   zero for all dynamic allocations.
 #
 CONFIG_MAX_TASKS=64
 CONFIG_MAX_TASK_ARGS=4