diff --git a/arch/z16/include/z16f/arch.h b/arch/z16/include/z16f/arch.h index 52f77228a2e..c79ce0cf865 100644 --- a/arch/z16/include/z16f/arch.h +++ b/arch/z16/include/z16f/arch.h @@ -1,6 +1,5 @@ /**************************************************************************** - * arch/z26f/arch.h - * arch/chip/arch.h + * arch/z16/include/z16f/arch.h * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +37,8 @@ * only indirectly through nuttx/arch.h (via arch/arch.h) */ -#ifndef __ARCH_Z16F_ARCH_H -#define __ARCH_Z16F_ARCH_H +#ifndef __ARCH_Z16_INCLUDE_Z16F_IRQ_H +#define __ARCH_Z16_INCLUDE_Z16F_IRQ_H /**************************************************************************** * Included Files @@ -73,5 +72,5 @@ extern "C" { } #endif -#endif /* __ARCH_Z16F_ARCH_H */ +#endif /* __ARCH_Z16_INCLUDE_Z16F_IRQ_H */ diff --git a/arch/z16/include/z16f/chip.h b/arch/z16/include/z16f/chip.h new file mode 100644 index 00000000000..376c3b06067 --- /dev/null +++ b/arch/z16/include/z16f/chip.h @@ -0,0 +1,71 @@ +/**************************************************************************** + * arch/z16f/chip.h + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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. + * + ****************************************************************************/ + +#ifndef __ARCH_Z16_INCLUDE_Z16F_CHIP_H +#define __ARCH_Z16_INCLUDE_Z16F_CHIP_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +/**************************************************************************** + * Public Variables + ****************************************************************************/ + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* __ARCH_Z16_INCLUDE_Z16F_CHIP_H */ diff --git a/arch/z16/include/z16f/irq.h b/arch/z16/include/z16f/irq.h index e470ddfcb45..ccb0561bc7c 100644 --- a/arch/z16/include/z16f/irq.h +++ b/arch/z16/include/z16f/irq.h @@ -1,6 +1,5 @@ /**************************************************************************** - * arch/z16f/irq.h - * arch/chip/irq.h + * arch/z16/include/z16f/irq.h * * Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +37,8 @@ * only indirectly through nuttx/irq.h (via arch/irq.h) */ -#ifndef __ARCH_Z16F_IRQ_H -#define __ARCH_Z16F_IRQ_H +#ifndef __ARCH_Z16_INCLUDE_Z16F_IRQ_H +#define __ARCH_Z16_INCLUDE_Z16F_IRQ_H /**************************************************************************** * Included Files @@ -50,7 +49,7 @@ #endif /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* Interrupt Vectors (excluding reset and sysexec which are handled differently) */ @@ -245,5 +244,5 @@ EXTERN void irqrestore(irqstate_t flags); #endif #endif -#endif /* __ARCH_Z16F_IRQ_H */ +#endif /* __ARCH_Z16_INCLUDE_Z16F_IRQ_H */ diff --git a/arch/z16/src/common/up_arch.h b/arch/z16/src/common/up_arch.h new file mode 100644 index 00000000000..be1f77d67de --- /dev/null +++ b/arch/z16/src/common/up_arch.h @@ -0,0 +1,52 @@ +/************************************************************************************ + * common/up_arch.h + * + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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. + * + ************************************************************************************/ + +#ifndef __ARCH_Z16_SRC_COMMON_UP_ARCH_H +#define __ARCH_Z16_SRC_COMMON_UP_ARCH_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include + +#include +#include "chip/chip.h" + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +#endif /* __ARCH_Z16_SRC_COMMON_UP_ARCH_H */ diff --git a/arch/z16/src/z16f/z16f_irq.c b/arch/z16/src/z16f/z16f_irq.c index 5c089d654d3..667f0a97685 100644 --- a/arch/z16/src/z16f/z16f_irq.c +++ b/arch/z16/src/z16f/z16f_irq.c @@ -1,7 +1,7 @@ /**************************************************************************** - * z16f/z16f_irq.c + * arch/z16/src/z16f/z16f_irq.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -39,6 +39,8 @@ #include +#include + #include #include @@ -207,8 +209,10 @@ void up_maskack_irq(int irq) * ****************************************************************************/ -void up_prioritize_irq(int irq, int priority) +int up_prioritize_irq(int irq, int priority) { /* To be provided */ + + return -ENOSYS; } diff --git a/arch/z80/src/common/up_arch.h b/arch/z80/src/common/up_arch.h index 43c750e4e1c..dc7206da744 100644 --- a/arch/z80/src/common/up_arch.h +++ b/arch/z80/src/common/up_arch.h @@ -1,7 +1,7 @@ /************************************************************************************ - * common/up_arch.h + * arch/z80/src/common/up_arch.h * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ #include "chip/chip.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ #endif /* __ARCH_Z80_SRC_COMMON_UP_ARCH_H */ diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs index 01d90bda976..5d8e964ef62 100644 --- a/configs/z16f2800100zcog/ostest/Make.defs +++ b/configs/z16f2800100zcog/ostest/Make.defs @@ -176,7 +176,7 @@ endef define MOVEOBJ $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") - $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") + @#$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") endef define ARCHIVE @@ -211,7 +211,7 @@ endef define MOVEOBJ $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") - $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") + @#$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") endef define ARCHIVE diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index ff19e30ef69..a5e62a55bca 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -221,7 +221,7 @@ typedef struct msgq_s msgq_t; /* struct child_status_s *********************************************************/ /* This structure is used to maintin information about child tasks. - * pthreads work differently, they have join information. This is + * pthreads work differently, they have join information. This is * only for child tasks. */ diff --git a/sched/task_setup.c b/sched/task_setup.c index bed45275976..21a82586ac0 100644 --- a/sched/task_setup.c +++ b/sched/task_setup.c @@ -191,7 +191,7 @@ static inline void task_saveparent(FAR struct tcb_s *tcb, uint8_t ttype) /* This is a new task in a new task group, we have to copy the ID from * the parent's task group structure to child's task group. */ - + tcb->group->tg_pgid = rtcb->group->tg_gid; } @@ -509,7 +509,7 @@ static int task_tcbargsetup(FAR struct task_tcb_s *tcb, ****************************************************************************/ #if !defined(CONFIG_CUSTOM_STACK) && defined(CONFIG_NUTTX_KERNEL) -static int task_stackargsetup(FAR struct task_tcb_s *tcb, +static int task_stackargsetup(FAR struct task_tcb_s *tcb, FAR char * const argv[]) { FAR char **stackargv; @@ -575,7 +575,7 @@ static int task_stackargsetup(FAR struct task_tcb_s *tcb, */ str = (FAR char *)stackargv + argvlen; - + /* Copy the task name. Increment str to skip over the task name and its * NUL terminator in the string buffer. */