diff options
| -rw-r--r-- | nuttx/TODO | 1 | ||||
| -rw-r--r-- | nuttx/arch/z80/src/common/up_exit.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/z80/src/common/up_internal.h | 3 | ||||
| -rw-r--r-- | nuttx/arch/z80/src/common/up_sigdeliver.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/README.txt | 31 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/defconfig | 21 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/include/board.h | 14 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/nshconfig | 302 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/src/z80_lowputc.c | 3 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/src/z80_serial.c | 60 | ||||
| -rw-r--r-- | nuttx/drivers/serial.c | 6 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh.h | 10 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_fscmds.c | 14 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_main.c | 8 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_proccmds.c | 34 | ||||
| -rw-r--r-- | nuttx/fs/fs_inodefind.c | 42 | ||||
| -rw-r--r-- | nuttx/fs/fs_internal.h | 4 | ||||
| -rw-r--r-- | nuttx/fs/fs_mount.c | 6 | ||||
| -rw-r--r-- | nuttx/fs/fs_opendir.c | 32 | ||||
| -rw-r--r-- | nuttx/include/dirent.h | 4 | ||||
| -rw-r--r-- | nuttx/lib/lib_libfwrite.c | 57 | ||||
| -rw-r--r-- | nuttx/sched/sched_addreadytorun.c | 42 | ||||
| -rw-r--r-- | nuttx/sched/sched_removereadytorun.c | 44 |
23 files changed, 572 insertions, 172 deletions
diff --git a/nuttx/TODO b/nuttx/TODO index 67d4828a0..9e19e4272 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -303,6 +303,7 @@ o pjrc-8052 / MCS51 (arch/pjrc-8051/) sched/pthread_create.c at 330 examples/ostest/barrier.c around lines 53 and 74 examples/ostest/sighand.c at 225 and 244 + driver/serial.c in usleep calls around 347 and 354 Status: Open Priority: Medium diff --git a/nuttx/arch/z80/src/common/up_exit.c b/nuttx/arch/z80/src/common/up_exit.c index 4a4dba532..b7f5e6243 100644 --- a/nuttx/arch/z80/src/common/up_exit.c +++ b/nuttx/arch/z80/src/common/up_exit.c @@ -114,9 +114,13 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg) struct file_struct *filep = &tcb->streams->sl_streams[i]; if (filep->fs_filedes >= 0) { +#if CONFIG_STDIO_BUFFER_SIZE > 0 lldbg(" fd=%d nbytes=%d\n", filep->fs_filedes, filep->fs_bufpos - filep->fs_bufstart); +#else + lldbg(" fd=%d\n", filep->fs_filedes); +#endif } } } diff --git a/nuttx/arch/z80/src/common/up_internal.h b/nuttx/arch/z80/src/common/up_internal.h index 5e4db68da..d340a5631 100644 --- a/nuttx/arch/z80/src/common/up_internal.h +++ b/nuttx/arch/z80/src/common/up_internal.h @@ -56,7 +56,7 @@ #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_DUMP_ON_EXIT /* Dump task state on exit */ /* Macros for portability */ @@ -112,6 +112,7 @@ extern FAR chipreg_t *up_decodeirq(uint8 rstno, FAR chipreg_t *regs); extern void up_irqinitialize(void); extern int up_timerisr(int irq, FAR chipreg_t *regs); extern void up_lowputc(char ch) __naked; +extern char up_lowgetc(void) __naked; /* Defined in up_doirq.c */ diff --git a/nuttx/arch/z80/src/common/up_sigdeliver.c b/nuttx/arch/z80/src/common/up_sigdeliver.c index adbc894cb..e9ade9964 100644 --- a/nuttx/arch/z80/src/common/up_sigdeliver.c +++ b/nuttx/arch/z80/src/common/up_sigdeliver.c @@ -140,4 +140,4 @@ void up_sigdeliver(void) #endif } -#endif /* CONFIG_DISABLE_SIGNALS */
\ No newline at end of file +#endif /* CONFIG_DISABLE_SIGNALS */ diff --git a/nuttx/configs/z80sim/README.txt b/nuttx/configs/z80sim/README.txt index ff9754c04..4988dc34e 100644 --- a/nuttx/configs/z80sim/README.txt +++ b/nuttx/configs/z80sim/README.txt @@ -1,11 +1,36 @@ -pjrc-8051 README -^^^^^^^^^^^^^^^^ +z80sim README +^^^^^^^^^^^^^ -This port uses a primitive, simulated Z80 and the SDCC toolchain. +This port uses a primitive, emulated Z80 and the SDCC toolchain. +The instruction set emulator can be found in the NuttX CVS at +http://nuttx.cvs.sourceforge.net/nuttx/misc/sims/z80sim The SDCC toolchain is available from http://sdcc.sourceforge.net/. All testing has been performed using verison 2.6.0 of the SDDC toolchain. +Configuring NuttX +^^^^^^^^^^^^^^^^^ + + defconfig + The default configuration file, defconfig, performs a simple, + minimal OS test using examples/ostest. This can be + configurated as follows: + + cd tools + ./configure.sh z80sim + cd - + . ./setenv.sh + + + nshconfig + This configuration file builds NSH (examples/nsh). + + This alternative configurations can be selected by: + + (Seleted the default configuration as show above) + cp config/z80sim/nshconfig .config + + Building the SDCC toolchain ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/nuttx/configs/z80sim/defconfig b/nuttx/configs/z80sim/defconfig index 0008e8add..e52913f7d 100644 --- a/nuttx/configs/z80sim/defconfig +++ b/nuttx/configs/z80sim/defconfig @@ -1,5 +1,5 @@ ############################################################ -# defconfig +# configs/z80/defconfig # # Copyright (C) 2007 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -37,8 +37,9 @@ # # CONFIG_ARCH - identifies the arch subdirectory and, hence, the # processor architecture. -# CONFIG_ARCH_8051 - Set if processor is 8051 family -# CONFIG_ARCH_8052 = Set if processor is 8052 family +# CONFIG_ARCH_Z80 - Set if processor is Z80 +# CONFIG_ARCH_CHIP - Identifies the specific chip +# CONFIG_ARCH_CHIP_Z80 - Set if this the class Z80 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence, # the board that supports the particular chip or SoC. # CONFIG_ARCH_BOARD_name - for use in C code @@ -47,11 +48,23 @@ CONFIG_ARCH=z80 CONFIG_ARCH_Z80=y CONFIG_ARCH_CHIP=z80 -CONFIG_ARCH_CHIP_Z80=1 +CONFIG_ARCH_CHIP_Z80=y CONFIG_ARCH_BOARD=z80sim +CONFIG_ARCH_BOARD_Z80SIM=y CONFIG_DRAM_SIZE=65536 # +# Z80sim specific device driver settings +# +# CONFIG_UART_RXBUFSIZE - Characters are buffered as received. +# This specific the size of the receive buffer +# CONFIG_UART_TXBUFSIZE - Characters are buffered before +# being sent. This specific the size of the transmit buffer +# +CONFIG_UART_RXBUFSIZE=0 +CONFIG_UART_TXBUFSIZE=0 + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples diff --git a/nuttx/configs/z80sim/include/board.h b/nuttx/configs/z80sim/include/board.h index 85edae22c..eb7aa3685 100644 --- a/nuttx/configs/z80sim/include/board.h +++ b/nuttx/configs/z80sim/include/board.h @@ -45,7 +45,19 @@ ************************************************************/ /************************************************************ - * Inline Functions + * Public Functions ************************************************************/ +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +#undef EXTERN +#if defined(__cplusplus) +} +#endif #endif /* __ARCH_BOARD_BOARD_H */ diff --git a/nuttx/configs/z80sim/nshconfig b/nuttx/configs/z80sim/nshconfig new file mode 100644 index 000000000..b14b09362 --- /dev/null +++ b/nuttx/configs/z80sim/nshconfig @@ -0,0 +1,302 @@ +############################################################ +# defconfig +# +# Copyright (C) 2007 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 Gregory Nutt 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. +# +############################################################ +# +# Architecture selection +# +# CONFIG_ARCH - identifies the arch subdirectory and, hence, the +# processor architecture. +# CONFIG_ARCH_Z80 - Set if processor is Z80 +# CONFIG_ARCH_CHIP - Identifies the specific chip +# CONFIG_ARCH_CHIP_Z80 - Set if this the class Z80 +# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence, +# the board that supports the particular chip or SoC. +# CONFIG_ARCH_BOARD_name - for use in C code +# CONFIG_DRAM_SIZE - Describes the installed DRAM. +# +CONFIG_ARCH=z80 +CONFIG_ARCH_Z80=y +CONFIG_ARCH_CHIP=z80 +CONFIG_ARCH_CHIP_Z80=y +CONFIG_ARCH_BOARD=z80sim +CONFIG_ARCH_BOARD_Z80SIM=y +CONFIG_DRAM_SIZE=65536 + +# +# Z80sim specific device driver settings +# +# CONFIG_UART_RXBUFSIZE - Characters are buffered as received. +# This specific the size of the receive buffer +# CONFIG_UART_TXBUFSIZE - Characters are buffered before +# being sent. This specific the size of the transmit buffer +# +CONFIG_UART_RXBUFSIZE=64 +CONFIG_UART_TXBUFSIZE=64 + +# +# General OS setup +# +# CONFIG_EXAMPLE - identifies the subdirectory in examples +# that will be used in the build +# CONFIG_DEBUG - enables built-in debug options +# CONFIG_DEBUG_VERBOSE - enables verbose debug output +# CONFIG_MM_REGIONS - If the architecture includes multiple +# regions of memory to allocate from, this specifies the +# number of memory regions that the memory manager must +# handle and enables the API mm_addregion(start, end); +# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot +# time console output +# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz +# or TICKS_PER_MSEC=10. This setting may be defined to +# inform NuttX that the processor hardware is providing +# system timer interrupts at some interrupt interval other +# than 10 msec. +# CONFIG_RR_INTERVAL - The round robin timeslice will be set +# this number of milliseconds; Round robin scheduling can +# be disabled by setting this value to zero. +# CONFIG_SCHED_INSTRUMENTATION - enables instrumentation in +# scheduler to monitor system performance +# CONFIG_TASK_NAME_SIZE - Spcifies that maximum size of a +# 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 - +# Used to initialize the internal time logic. +# CONFIG_DEV_CONSOLE - Set if architecture-specific logic +# provides /dev/console. Enables stdout, stderr, stdin. +# +CONFIG_EXAMPLE=nsh +CONFIG_DEBUG=n +CONFIG_DEBUG_VERBOSE=n +CONFIG_MM_REGIONS=1 +CONFIG_ARCH_LOWPUTC=y +CONFIG_RR_INTERVAL=0 +CONFIG_SCHED_INSTRUMENTATION=n +CONFIG_TASK_NAME_SIZE=0 +CONFIG_START_YEAR=2007 +CONFIG_START_MONTH=2 +CONFIG_START_DAY=21 +CONFIG_JULIAN_TIME=n +CONFIG_DEV_CONSOLE=y + +# +# The following can be used to disable categories of +# APIs supported by the OS. If the compiler supports +# weak functions, then it should not be necessary to +# disable functions unless you want to restrict usage +# of those APIs. +# +# There are certain dependency relationships in these +# features. +# +# o mq_notify logic depends on signals to awaken tasks +# waiting for queues to become full or empty. +# o pthread_condtimedwait() depends on signals to wake +# up waiting tasks. +# +CONFIG_DISABLE_CLOCK=n +CONFIG_DISABLE_POSIX_TIMERS=y +CONFIG_DISABLE_PTHREAD=y +CONFIG_DISABLE_SIGNALS=n +CONFIG_DISABLE_MQUEUE=y +CONFIG_DISABLE_MOUNTPOINT=n +CONFIG_DISABLE_ENVIRON=y + +# +# Misc libc settings +# +# CONFIG_NOPRINTF_FIELDWIDTH - sprintf-related logic is a +# little smaller if we do not support fieldwidthes +# +CONFIG_NOPRINTF_FIELDWIDTH=y + +# +# Allow for architecture optimized implementations +# +# The architecture can provide optimized versions of the +# following to improve sysem performance +# +CONFIG_ARCH_MEMCPY=n +CONFIG_ARCH_MEMCMP=n +CONFIG_ARCH_MEMMOVE=n +CONFIG_ARCH_MEMSET=n +CONFIG_ARCH_STRCMP=n +CONFIG_ARCH_STRCPY=n +CONFIG_ARCH_STRNCPY=n +CONFIG_ARCH_STRLEN=n +CONFIG_ARCH_BZERO=n +CONFIG_ARCH_KMALLOC=n +CONFIG_ARCH_KZMALLOC=n +CONFIG_ARCH_KFREE=n + +# +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# +CONFIG_RRLOAD_BINARY=n + +# +# Sizes of configurable things (0 disables) +# +# CONFIG_MAX_TASKS - The maximum number of simultaneously +# actived tasks. This value must be a power of two. +# CONFIG_MAX_TASK_ARGS - This controls the maximum number of +# of parameters that a task may receive (i.e., maxmum value +# of 'argc') +# CONFIG_NPTHREAD_KEYS - The number of items of thread- +# specific data that can be retained +# CONFIG_NFILE_DESCRIPTORS - The maximum number of file +# descriptors (one for each open) +# 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 +# on fopen. (Only if CONFIG_NFILE_STREAMS > 0) +# CONFIG_NUNGET_CHARS - Number of characters that can be +# buffered by ungetc() (Only if CONFIG_NFILE_STREAMS > 0) +# CONFIG_PREALLOC_MQ_MSGS - The number of pre-allocated message +# structures. The system manages a pool of preallocated +# message structures to minimize dynamic allocations +# CONFIG_MQ_MAXMSGSIZE - Message structures are allocated with +# a fixed payload size given by this settin (does not include +# other message structure overhead. +# CONFIG_MAX_WDOGPARMS - Maximum number of parameters that +# can be passed to a watchdog handler +# CONFIG_PREALLOC_WDOGS - The number of pre-allocated watchdog +# structures. The system manages a pool of preallocated +# watchdog structures to minimize dynamic allocations +# CONFIG_PREALLOC_TIMERS - The number of pre-allocated POSIX +# timer structures. The system manages a pool of preallocated +# timer structures to minimize dynamic allocations. Set to +# zero for all dynamic allocations. +# +CONFIG_MAX_TASKS=8 +CONFIG_MAX_TASK_ARGS=4 +CONFIG_NPTHREAD_KEYS=0 +CONFIG_NFILE_DESCRIPTORS=6 +CONFIG_NFILE_STREAMS=6 +CONFIG_NAME_MAX=32 +CONFIG_STDIO_BUFFER_SIZE=0 +CONFIG_NUNGET_CHARS=0 +CONFIG_PREALLOC_MQ_MSGS=0 +CONFIG_MQ_MAXMSGSIZE=0 +CONFIG_MAX_WDOGPARMS=2 +CONFIG_PREALLOC_WDOGS=4 +CONFIG_PREALLOC_TIMERS=0 + +# +# TCP/IP and UDP support via uIP +# CONFIG_NET - Enable or disable all network features +# CONFIG_NET_IPv6 - Build in support for IPv6 +# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread. +# CONFIG_NET_SOCKOPTS - Enable or disable support for socket options +# CONFIG_NET_BUFSIZE - uIP buffer size +# CONFIG_NET_TCP - TCP support on or off +# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks) +# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers +# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero) +# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks) +# CONFIG_NET_UDP - UDP support on or off +# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off +# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections +# CONFIG_NET_ICMP - ICMP ping support on or off +# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address +# CONFIG_NET_STATISTICS - uIP statistics on or off +# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window +# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table +# CONFIG_NET_BROADCAST - Broadcast support +# CONFIG_NET_LLH_LEN - The link level header length +# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +CONFIG_NET=n +CONFIG_NET_IPv6=n +CONFIG_NSOCKET_DESCRIPTORS=0 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_BUFSIZE=420 +CONFIG_NET_TCP=n +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_UDP=n +CONFIG_NET_UDP_CHECKSUMS=y +#CONFIG_NET_UDP_CONNS=10 +CONFIG_NET_ICMP=n +#CONFIG_NET_PINGADDRCONF=0 +CONFIG_NET_STATISTICS=y +#CONFIG_NET_RECEIVE_WINDOW= +#CONFIG_NET_ARPTAB_SIZE=8 +CONFIG_NET_BROADCAST=n +#CONFIG_NET_LLH_LEN=14 +#CONFIG_NET_FWCACHE_SIZE=2 + +# +# UIP Network Utilities +# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP +# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries +CONFIG_NET_DHCP_LIGHT=n +CONFIG_NET_RESOLV_ENTRIES=4 + +# +# Settings for examples/nsh +CONFIG_EXAMPLES_NSH_TELNET=n +CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 +CONFIG_EXAMPLES_NSH_CMD_SIZE=40 +CONFIG_EXAMPLES_NSH_STACKSIZE=1024 +CONFIG_EXAMPLES_NSH_DHCPC=n +CONFIG_EXAMPLES_NSH_NOMAC=n +CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0) + +# +# Stack and heap information +# +# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP +# operation from FLASH. +# CONFIG_CUSTOM_STACK - The up_ implementation will handle +# all stack operations outside of the nuttx model. +# CONFIG_STACK_POINTER - The initial stack pointer +# CONFIG_PROC_STACK_SIZE - The size of the initial stack +# CONFIG_PTHREAD_STACK_MIN - Minimum pthread stack size +# CONFIG_PTHREAD_STACK_DEFAULT - Default pthread stack size +# CONFIG_HEAP_BASE - The beginning of the heap +# CONFIG_HEAP_SIZE - The size of the heap +# +CONFIG_BOOT_FROM_FLASH=n +CONFIG_CUSTOM_STACK=n +CONFIG_PROC_STACK_SIZE=1024 +CONFIG_PTHREAD_STACK_MIN=256 +CONFIG_PTHREAD_STACK_DEFAULT=1024 +CONFIG_HEAP_SIZE= +CONFIG_HEAP_BASE= diff --git a/nuttx/configs/z80sim/src/z80_lowputc.c b/nuttx/configs/z80sim/src/z80_lowputc.c index ead9aa455..4996272f9 100644 --- a/nuttx/configs/z80sim/src/z80_lowputc.c +++ b/nuttx/configs/z80sim/src/z80_lowputc.c @@ -38,12 +38,13 @@ ********************************************************************************/ #include <nuttx/config.h> + #include <sys/types.h> #include <nuttx/irq.h> #include <nuttx/arch.h> #include <assert.h> #include <debug.h> -#include "up_arch.h" + #include "os_internal.h" #include "up_internal.h" diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c index dbca1b78e..9a8fa0f89 100644 --- a/nuttx/configs/z80sim/src/z80_serial.c +++ b/nuttx/configs/z80sim/src/z80_serial.c @@ -86,41 +86,52 @@ static boolean up_txfifoempty(struct uart_dev_s *dev); struct uart_ops_s g_uart_ops = { - .setup = up_setup, - .shutdown = up_shutdown, - .handler = up_interrupt, - .ioctl = up_ioctl, - .receive = up_receive, - .rxint = up_rxint, - .rxfifonotempty = up_rxfifonotempty, - .send = up_send, - .txint = up_txint, - .txfifonotfull = up_txfifonotfull, - .txfifoempty = up_txfifoempty, + up_setup, /* setup */ + up_shutdown, /* shutdown */ + up_interrupt, /* handler */ + up_ioctl, /* ioctl */ + up_receive, /* receive */ + up_rxint, /* rxint */ + up_rxfifonotempty, /* rxfifonotempty */ + up_send, /* send */ + up_txint, /* txint */ + up_txfifonotfull, /* txfifonotfull */ + up_txfifoempty, /* txfifoempty */ }; /* I/O buffers */ -static char g_uartrxbuffer[CONFIG_UART0_RXBUFSIZE]; -static char g_uarttxbuffer[CONFIG_UART0_TXBUFSIZE]; +static char g_uartrxbuffer[CONFIG_UART_RXBUFSIZE]; +static char g_uarttxbuffer[CONFIG_UART_TXBUFSIZE]; /* This describes the state of the fake UART port. */ static uart_dev_t g_uartport = { - .irq = DM320_IRQ_UART0, - .recv = - { - .size = CONFIG_UART0_RXBUFSIZE, - .buffer = g_uart0rxbuffer, + 0, /* open_count */ + 0, /* irq */ + FALSE, /* xmitwaiting */ + FALSE, /* recvwaiting */ + TRUE, /* isconsole */ + { 1 }, /* closesem */ + { 0 }, /* xmitsem */ + { 0 }, /* recvsem */ + { /* xmit */ + { 1 }, /* sem */ + 0, /* head */ + 0, /* tail */ + CONFIG_UART_TXBUFSIZE, /* size */ + g_uarttxbuffer, /* buffer */ }, - .xmit = - { - .size = CONFIG_UART0_TXBUFSIZE, - .buffer = g_uart0txbuffer, + { /* recv */ + { 1 }, /* sem */ + 0, /* head */ + 0, /* tail */ + CONFIG_UART_RXBUFSIZE, /* size */ + g_uartrxbuffer, /* buffer */ }, - .ops = &g_uart_ops, - .priv = NULL, + &g_uart_ops, /* ops */ + NULL, /* priv */ }; /**************************************************************************** @@ -326,6 +337,7 @@ void up_serialinit(void) int up_putc(int ch) { up_lowputc(ch); + return 0; } diff --git a/nuttx/drivers/serial.c b/nuttx/drivers/serial.c index e525b067e..7c8f454d3 100644 --- a/nuttx/drivers/serial.c +++ b/nuttx/drivers/serial.c @@ -1,7 +1,7 @@ /************************************************************************************ - * serial.c + * drivers/serial.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. * diff --git a/nuttx/examples/nsh/nsh.h b/nuttx/examples/nsh/nsh.h index 39514656a..659a59d17 100644 --- a/nuttx/examples/nsh/nsh.h +++ b/nuttx/examples/nsh/nsh.h @@ -1,7 +1,7 @@ /**************************************************************************** - * nsh.h + * examples/nsh/nsh.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. * @@ -118,8 +118,10 @@ extern void cmd_ls(FAR void *handle, int argc, char **argv); #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 extern void cmd_mkdir(FAR void *handle, int argc, char **argv); +#ifdef CONFIG_FS_FAT /* Need at least one filesytem in configuration */ extern void cmd_mount(FAR void *handle, int argc, char **argv); #endif +#endif extern void cmd_ps(FAR void *handle, int argc, char **argv); #ifndef CONFIG_DISABLE_ENVIRON extern void cmd_set(FAR void *handle, int argc, char **argv); @@ -127,8 +129,10 @@ extern void cmd_set(FAR void *handle, int argc, char **argv); #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 extern void cmd_rm(FAR void *handle, int argc, char **argv); extern void cmd_rmdir(FAR void *handle, int argc, char **argv); +#ifdef CONFIG_FS_FAT /* Need at least one filesytem in configuration */ extern void cmd_umount(FAR void *handle, int argc, char **argv); #endif +#endif #ifndef CONFIG_DISABLE_ENVIRON extern void cmd_unset(FAR void *handle, int argc, char **argv); #endif diff --git a/nuttx/examples/nsh/nsh_fscmds.c b/nuttx/examples/nsh/nsh_fscmds.c index 6f7a38a50..d5dc1c947 100644 --- a/nuttx/examples/nsh/nsh_fscmds.c +++ b/nuttx/examples/nsh/nsh_fscmds.c @@ -1,7 +1,7 @@ /**************************************************************************** - * nsh_fscmds.c + * examples/nsh/nsh_fscmds.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. * @@ -45,7 +45,9 @@ # include <fcntl.h> #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 -# include <sys/mount.h> +# ifdef CONFIG_FS_FAT /* Need at least one filesytem in configuration */ +# include <sys/mount.h> +# endif #endif #include <stdio.h> @@ -636,6 +638,7 @@ void cmd_mkdir(FAR void *handle, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 +#ifdef CONFIG_FS_FAT /* Need at least one filesytem in configuration */ void cmd_mount(FAR void *handle, int argc, char **argv) { char *filesystem = 0; @@ -684,6 +687,7 @@ void cmd_mount(FAR void *handle, int argc, char **argv) } } #endif +#endif /**************************************************************************** * Name: cmd_rm @@ -718,6 +722,7 @@ void cmd_rmdir(FAR void *handle, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 +#ifdef CONFIG_FS_FAT /* Need at least one filesytem in configuration */ void cmd_umount(FAR void *handle, int argc, char **argv) { /* Perform the umount */ @@ -728,3 +733,4 @@ void cmd_umount(FAR void *handle, int argc, char **argv) } } #endif +#endif diff --git a/nuttx/examples/nsh/nsh_main.c b/nuttx/examples/nsh/nsh_main.c index 72bd175a1..3bf3044ea 100644 --- a/nuttx/examples/nsh/nsh_main.c +++ b/nuttx/examples/nsh/nsh_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * nsh_main.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. * @@ -100,8 +100,10 @@ static const struct cmdmap_s g_cmdmap[] = #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 { "mkdir", cmd_mkdir, 2, 2, "<path>" }, +#ifdef CONFIG_FS_FAT /* Need at least one filesytem in configuration */ { "mount", cmd_mount, 4, 5, "-t <fstype> <block-device> <dir-path>" }, #endif +#endif { "ps", cmd_ps, 1, 1, NULL }, #ifndef CONFIG_DISABLE_ENVIRON { "set", cmd_set, 3, 3, "<name> <value>" }, @@ -109,8 +111,10 @@ static const struct cmdmap_s g_cmdmap[] = #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 { "rm", cmd_rm, 2, 2, "<file-path>" }, { "rmdir", cmd_rmdir, 2, 2, "<dir-path>" }, +# ifdef CONFIG_FS_FAT /* Need at least one filesytem in configuration */ { "umount", cmd_umount, 2, 2, "<dir-path>" }, #endif +#endif #ifndef CONFIG_DISABLE_ENVIRON { "unset", cmd_unset, 2, 2, "<name>" }, #endif diff --git a/nuttx/examples/nsh/nsh_proccmds.c b/nuttx/examples/nsh/nsh_proccmds.c index 70a5add0c..d7cf37e1b 100644 --- a/nuttx/examples/nsh/nsh_proccmds.c +++ b/nuttx/examples/nsh/nsh_proccmds.c @@ -1,7 +1,7 @@ /**************************************************************************** - * nsh_proccmds.c + * examples/nsh/nsh_proccmds.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. * @@ -97,6 +97,9 @@ static void ps_task(FAR _TCB *tcb, FAR void *arg) { boolean needcomma = FALSE; int i; + + /* Show task status */ + nsh_output(arg, "%5d %3d %4s %7s%c%c %8s ", tcb->pid, tcb->sched_priority, tcb->flags & TCB_FLAG_ROUND_ROBIN ? "RR " : "FIFO", @@ -105,18 +108,25 @@ static void ps_task(FAR _TCB *tcb, FAR void *arg) tcb->flags & TCB_FLAG_CANCEL_PENDING ? 'P' : ' ', g_statenames[tcb->task_state]); + /* Show task name and arguments */ + nsh_output(arg, "%s(", tcb->argv[0]); - for (i = 1; i < CONFIG_MAX_TASK_ARGS+1 && tcb->argv[i]; i++) + + /* Special case 1st argument (no comma) */ + + if (tcb->argv[1]) { - if (needcomma) - { - nsh_output(arg, ", %p", tcb->argv[i]); - } - else - { - nsh_output(arg, "%p", tcb->argv[i]); - } + nsh_output(arg, "%p", tcb->argv[1]); + } + + /* Then any additional arguments */ + +#if CONFIG_MAX_TASK_ARGS > 2 + for (i = 2; i <= CONFIG_MAX_TASK_ARGS && tcb->argv[i]; i++) + { + nsh_output(arg, ", %p", tcb->argv[i]); } +#endif nsh_output(arg, ")\n"); } diff --git a/nuttx/fs/fs_inodefind.c b/nuttx/fs/fs_inodefind.c index 4f525f83c..f9fb1d58f 100644 --- a/nuttx/fs/fs_inodefind.c +++ b/nuttx/fs/fs_inodefind.c @@ -1,7 +1,7 @@ -/************************************************************ - * fs_inodefind.c +/**************************************************************************** + * fs/fs_inodefind.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> @@ -43,36 +43,36 @@ #include <nuttx/fs.h> #include "fs_internal.h" -/************************************************************ +/**************************************************************************** * Definitions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Name: inode_find * * Description: * This is called from the open() logic to get a reference * to the inode associated with a path. * - ************************************************************/ + ****************************************************************************/ -FAR struct inode *inode_find(const char *path, const char **relpath) +FAR struct inode *inode_find(FAR const char *path, FAR const char **relpath) { FAR struct inode *node; @@ -86,7 +86,7 @@ FAR struct inode *inode_find(const char *path, const char **relpath) */ inode_semtake(); - node = inode_search(&path, (FAR void*)NULL, (FAR void*)NULL, relpath); + node = inode_search(&path, (FAR struct inode**)NULL, (FAR struct inode**)NULL, relpath); if (node) { node->i_crefs++; diff --git a/nuttx/fs/fs_internal.h b/nuttx/fs/fs_internal.h index 79c4ab9d7..b20843d2f 100644 --- a/nuttx/fs/fs_internal.h +++ b/nuttx/fs/fs_internal.h @@ -178,10 +178,10 @@ extern "C" { EXTERN void inode_semtake(void); EXTERN void inode_semgive(void); -EXTERN FAR struct inode *inode_search(const char **path, +EXTERN FAR struct inode *inode_search(FAR const char **path, FAR struct inode **peer, FAR struct inode **parent, - const char **relpath); + FAR const char **relpath); EXTERN void inode_free(FAR struct inode *node); EXTERN const char *inode_nextname(const char *name); diff --git a/nuttx/fs/fs_mount.c b/nuttx/fs/fs_mount.c index 8a3bd73ae..98f8a0421 100644 --- a/nuttx/fs/fs_mount.c +++ b/nuttx/fs/fs_mount.c @@ -1,7 +1,7 @@ /**************************************************************************** - * fs_mount.c + * fs/fs_mount.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. * diff --git a/nuttx/fs/fs_opendir.c b/nuttx/fs/fs_opendir.c index 3d174a640..2de8107d7 100644 --- a/nuttx/fs/fs_opendir.c +++ b/nuttx/fs/fs_opendir.c @@ -1,7 +1,7 @@ -/************************************************************ - * fs_opendir.c +/**************************************************************************** + * fs/fs_opendir.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,15 +46,15 @@ #include <nuttx/fs.h> #include "fs_internal.h" -/************************************************************ +/**************************************************************************** * Private Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Name: opendir * * Description: @@ -80,13 +80,13 @@ * ENOMEM - Insufficient memory to complete the operation. * ENOTDIR - 'path' is not a directory. * - ************************************************************/ + ****************************************************************************/ -FAR DIR *opendir(const char *path) +FAR DIR *opendir(FAR const char *path) { FAR struct inode *inode = NULL; FAR struct internal_dir_s *dir; - const char *relpath; + FAR const char *relpath; boolean isroot = FALSE; int ret; @@ -112,7 +112,7 @@ FAR DIR *opendir(const char *path) /* Find the node matching the path. */ - inode = inode_search(&path, (FAR void*)NULL, (FAR void*)NULL, &relpath); + inode = inode_search(&path, (FAR struct inode**)NULL, (FAR struct inode**)NULL, &relpath); } /* Did we get an inode? */ diff --git a/nuttx/include/dirent.h b/nuttx/include/dirent.h index e28990cd2..f7e87844c 100644 --- a/nuttx/include/dirent.h +++ b/nuttx/include/dirent.h @@ -99,8 +99,8 @@ extern "C" { /* POSIX-like File System Interfaces */ -EXTERN int closedir(DIR *dirp); -EXTERN FAR DIR *opendir(const char *path); +EXTERN int closedir(FAR DIR *dirp); +EXTERN FAR DIR *opendir(FAR const char *path); EXTERN FAR struct dirent *readdir(FAR DIR *dirp); EXTERN int readdir_r(FAR DIR *dirp, FAR struct dirent *entry, FAR struct dirent **result); diff --git a/nuttx/lib/lib_libfwrite.c b/nuttx/lib/lib_libfwrite.c index 20accc9e9..361d88127 100644 --- a/nuttx/lib/lib_libfwrite.c +++ b/nuttx/lib/lib_libfwrite.c @@ -1,7 +1,7 @@ -/************************************************************ - * lib_libfwrite.c +/**************************************************************************** + * lib/lib_libfwrite.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,57 +31,60 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Compilation Switches - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include <nuttx/config.h> /* for CONFIG_STDIO_BUFFER_SIZE */ + #include <stdio.h> +#include <unistd.h> #include <fcntl.h> #include <errno.h> + #include "lib_internal.h" -/************************************************************ +/**************************************************************************** * Definitions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Type Declarations - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Function Prototypes - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Global Constant Data - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Global Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Constant Data - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Global Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * lib_fwrite - ************************************************************/ + ****************************************************************************/ ssize_t lib_fwrite(const void *ptr, size_t count, FILE *stream) #if CONFIG_STDIO_BUFFER_SIZE > 0 diff --git a/nuttx/sched/sched_addreadytorun.c b/nuttx/sched/sched_addreadytorun.c index cb53aa65e..be33daa2e 100644 --- a/nuttx/sched/sched_addreadytorun.c +++ b/nuttx/sched/sched_addreadytorun.c @@ -1,7 +1,7 @@ -/************************************************************ - * sched_addreadytorun.c +/**************************************************************************** + * sched/sched_addreadytorun.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,42 +31,42 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include <sys/types.h> #include <queue.h> #include <assert.h> #include "os_internal.h" -/************************************************************ +/**************************************************************************** * Definitions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Type Declarations - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Global Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Function Prototypes - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Name: sched_addreadytorun * * Description: @@ -93,7 +93,7 @@ * - The caller handles the condition that occurs if the * the head of the g_readytorun list is changed. * - ************************************************************/ + ****************************************************************************/ boolean sched_addreadytorun(FAR _TCB *btcb) { diff --git a/nuttx/sched/sched_removereadytorun.c b/nuttx/sched/sched_removereadytorun.c index 2c3c8352d..ee848e8f0 100644 --- a/nuttx/sched/sched_removereadytorun.c +++ b/nuttx/sched/sched_removereadytorun.c @@ -1,7 +1,7 @@ -/************************************************************ - * sched_removereadytorun.c +/**************************************************************************** + * shced/sched_removereadytorun.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,42 +31,42 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include <sys/types.h> #include <queue.h> #include <assert.h> #include "os_internal.h" -/************************************************************ +/**************************************************************************** * Definitions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Type Declarations - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Global Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Function Prototypes - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Name: sched_removereadytorun * * Description: @@ -85,7 +85,7 @@ * a good idea -- use irqsave()). * - The caller handles the condition that occurs if the * the head of the g_readytorun list is changed. - ************************************************************/ + ****************************************************************************/ boolean sched_removereadytorun(FAR _TCB *rtcb) { @@ -98,6 +98,8 @@ boolean sched_removereadytorun(FAR _TCB *rtcb) if (!rtcb->blink) { + /* There must always be at least one task in the list (the idle task) */ + ASSERT(rtcb->flink != NULL); /* Inform the instrumentation layer that we are switching tasks */ |