From a8662c70db7b0e42836b29ab96f5ddfb205145d7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 16 Oct 2016 07:57:16 -0600 Subject: [PATCH] Xtensa: Keep task state in TCB (unless you want to redesign signal handling). Lots of cosmetic clean-up. --- arch/xtensa/include/irq.h | 4 +- arch/xtensa/src/common/xtensa.h | 51 +++++++++------ arch/xtensa/src/common/xtensa_allocateheap.c | 15 +---- .../common/{up_arch.h => xtensa_copystate.c} | 62 +++++++------------ arch/xtensa/src/common/xtensa_createstack.c | 3 +- arch/xtensa/src/common/xtensa_etherstub.c | 18 +----- arch/xtensa/src/common/xtensa_exit.c | 9 ++- arch/xtensa/src/common/xtensa_idle.c | 2 +- arch/xtensa/src/common/xtensa_initialize.c | 15 +++-- .../src/common/xtensa_interruptcontext.c | 10 +-- arch/xtensa/src/common/xtensa_lowputs.c | 14 +---- arch/xtensa/src/common/xtensa_mdelay.c | 22 +------ arch/xtensa/src/common/xtensa_modifyreg16.c | 16 +---- arch/xtensa/src/common/xtensa_modifyreg32.c | 16 +---- arch/xtensa/src/common/xtensa_modifyreg8.c | 16 +---- arch/xtensa/src/common/xtensa_puts.c | 14 +---- arch/xtensa/src/common/xtensa_releasestack.c | 10 +-- arch/xtensa/src/common/xtensa_stackframe.c | 2 +- arch/xtensa/src/common/xtensa_udelay.c | 18 +----- arch/xtensa/src/common/xtensa_usestack.c | 2 +- 20 files changed, 87 insertions(+), 232 deletions(-) rename arch/xtensa/src/common/{up_arch.h => xtensa_copystate.c} (62%) diff --git a/arch/xtensa/include/irq.h b/arch/xtensa/include/irq.h index 7e47291618..101cda03fb 100644 --- a/arch/xtensa/include/irq.h +++ b/arch/xtensa/include/irq.h @@ -159,9 +159,9 @@ struct xcptcontext uint32_t saved_cpsr; #endif - /* Pointer to the register save area on the stack*/ + /* Register save area */ - uint32_t *regs; + uint32_t regs[XCPTCONTEXT_REGS]; #ifdef CONFIG_LIB_SYSCALL /* The following array holds the return address and the exc_return value diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h index 01a3ed9e06..849500863c 100644 --- a/arch/xtensa/src/common/xtensa.h +++ b/arch/xtensa/src/common/xtensa.h @@ -104,19 +104,28 @@ # define CONFIG_ARCH_INTERRUPTSTACK 0 #endif -/* In the XTENSA model, only a pointer to register state on the stack is - * saved in the TCB. +/* In the XTENSA model, the state is copied from the stack to the TCB, but + * only a referenced is passed to get the state from the TCB. */ -#define up_savestate(regs) do { reg = g_current_regs; } while (0) -#define up_restorestate(regs) do { g_current_regs = regs; } while (0) +#define xtensa_savestate(regs) xtensa_copystate(regs, (uint32_t*)g_current_regs) +#define xtensa_restorestate(regs) do { g_current_regs = regs; } while (0) + +/* Register access macros */ + +# define getreg8(a) (*(volatile uint8_t *)(a)) +# define putreg8(v,a) (*(volatile uint8_t *)(a) = (v)) +# define getreg16(a) (*(volatile uint16_t *)(a)) +# define putreg16(v,a) (*(volatile uint16_t *)(a) = (v)) +# define getreg32(a) (*(volatile uint32_t *)(a)) +# define putreg32(v,a) (*(volatile uint32_t *)(a) = (v)) /**************************************************************************** * Public Types ****************************************************************************/ #ifndef __ASSEMBLY__ -typedef void (*up_vector_t)(void); +typedef void (*xtensa_vector_t)(void); #endif /**************************************************************************** @@ -130,7 +139,7 @@ typedef void (*up_vector_t)(void); extern volatile uint32_t *g_current_regs; -/* This is the beginning of heap as provided from up_head.S. This is the +/* This is the beginning of heap as provided from *_head.S. This is the * first address in DRAM after the loaded program+bss+idle stack. The end * of the heap is CONFIG_RAM_END */ @@ -183,14 +192,20 @@ extern uint32_t _bmxdupba_address; /* BMX register setting */ #ifndef __ASSEMBLY__ /* Common Functions *********************************************************/ -/* Common functions define in arch/mips/src/common. These may be replaced +/* Common functions defined in arch/mips/src/common. These may be replaced * with chip-specific functions of the same name if needed. See also * functions prototyped in include/nuttx/arch.h. */ +/* Atomic modification of registers */ + +void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits); +void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits); +void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits); + /* Context switching */ -void up_copystate(uint32_t *dest, uint32_t *src); +void xtensa_copystate(uint32_t *dest, uint32_t *src); /* Serial output */ @@ -208,36 +223,36 @@ void lowconsole_init(void); /* Debug */ #ifdef CONFIG_ARCH_STACKDUMP -void up_dumpstate(void); +void xtensa_dumpstate(void); #else -# define up_dumpstate() +# define xtensa_dumpstate() #endif /* Common XTENSA functions */ /* IRQs */ -uint32_t *up_doirq(int irq, uint32_t *regs); +uint32_t *xtensa_doirq(int irq, uint32_t *regs); /* Software interrupt handler */ -int up_swint(int irq, FAR void *context); +int xtensa_swint(int irq, FAR void *context); /* Signals */ -void up_sigdeliver(void); +void xtensa_sigdeliver(void); /* Chip-specific functions **************************************************/ /* Chip specific functions defined in arch/mips/src/ */ /* IRQs */ -void up_irqinitialize(void); -bool up_pending_irq(int irq); -void up_clrpend_irq(int irq); +void xtensa_irq_initialize(void); +bool xtensa_pending_irq(int irq); +void xtensa_clrpend_irq(int irq); /* DMA */ #ifdef CONFIG_ARCH_DMA -void weak_function up_dmainitialize(void); +void weak_function xtensa_dma_initialize(void); #endif /* Memory management */ @@ -261,7 +276,7 @@ void up_serialinit(void); /* System timer */ -void up_timer_initialize(void); +void xtensa_timer_initialize(void); /* Network */ diff --git a/arch/xtensa/src/common/xtensa_allocateheap.c b/arch/xtensa/src/common/xtensa_allocateheap.c index b821eb4e34..692624bece 100644 --- a/arch/xtensa/src/common/xtensa_allocateheap.c +++ b/arch/xtensa/src/common/xtensa_allocateheap.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_allocateheap.c * - * Copyright (C) 2010, 2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,21 +46,8 @@ #include #include -#include "up_arch.h" #include "xtensa.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/up_arch.h b/arch/xtensa/src/common/xtensa_copystate.c similarity index 62% rename from arch/xtensa/src/common/up_arch.h rename to arch/xtensa/src/common/xtensa_copystate.c index 4fd625bf7a..ade771715d 100644 --- a/arch/xtensa/src/common/up_arch.h +++ b/arch/xtensa/src/common/xtensa_copystate.c @@ -1,7 +1,7 @@ /**************************************************************************** - * arch/xtensa/src/common/xtensa_arch.h + * arch/xtensa/src/common/xtensa_copystate.c * - * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,58 +33,42 @@ * ****************************************************************************/ -#ifndef ___ARCH_XTENSA_SRC_COMMON_XTENSA_ARCH_H -#define ___ARCH_XTENSA_SRC_COMMON_XTENSA_ARCH_H - /**************************************************************************** * Included Files ****************************************************************************/ #include -#ifndef __ASSEMBLY__ -# include -#endif + +#include +#include + +#include "xtensa.h" /**************************************************************************** - * Pre-processor Definitions + * Public Functions ****************************************************************************/ /**************************************************************************** - * Inline Functions + * Name: up_copystate ****************************************************************************/ -#ifndef __ASSEMBLY__ +/* A little faster than most memcpy's */ -# define getreg8(a) (*(volatile uint8_t *)(a)) -# define putreg8(v,a) (*(volatile uint8_t *)(a) = (v)) -# define getreg16(a) (*(volatile uint16_t *)(a)) -# define putreg16(v,a) (*(volatile uint16_t *)(a) = (v)) -# define getreg32(a) (*(volatile uint32_t *)(a)) -# define putreg32(v,a) (*(volatile uint32_t *)(a) = (v)) - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -#undef EXTERN -#if defined(__cplusplus) -#define EXTERN extern "C" -extern "C" +void xtensa_copystate(uint32_t *dest, uint32_t *src) { -#else -#define EXTERN extern -#endif + int i; -/* Atomic modification of registers */ + /* In the XTENSA model, the state is copied from the stack to the TCB, + * but only a reference is passed to get the state from the TCB. So the + * following check avoids copying the TCB save area onto itself: + */ -void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits); -void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits); -void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits); - -#undef EXTERN -#if defined(__cplusplus) + if (src != dest) + { + for (i = 0; i < XCPTCONTEXT_REGS; i++) + { + *dest++ = *src++; + } + } } -#endif -#endif /* __ASSEMBLY__ */ -#endif /* ___ARCH_XTENSA_SRC_COMMON_XTENSA_ARCH_H */ diff --git a/arch/xtensa/src/common/xtensa_createstack.c b/arch/xtensa/src/common/xtensa_createstack.c index f895f47a50..d4769f33d0 100644 --- a/arch/xtensa/src/common/xtensa_createstack.c +++ b/arch/xtensa/src/common/xtensa_createstack.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_createstack.c * - * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -49,7 +49,6 @@ #include #include -#include "up_arch.h" #include "xtensa.h" /**************************************************************************** diff --git a/arch/xtensa/src/common/xtensa_etherstub.c b/arch/xtensa/src/common/xtensa_etherstub.c index b41b7bf6d4..9174a0e6d6 100644 --- a/arch/xtensa/src/common/xtensa_etherstub.c +++ b/arch/xtensa/src/common/xtensa_etherstub.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_etherstub.c * - * Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -41,22 +41,6 @@ #include "xtensa.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_exit.c b/arch/xtensa/src/common/xtensa_exit.c index 4f451539d2..0bc6da54d8 100644 --- a/arch/xtensa/src/common/xtensa_exit.c +++ b/arch/xtensa/src/common/xtensa_exit.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_exit.c * - * Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -67,7 +67,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: _up_dumponexit + * Name: _xtensa_dumponexit * * Description: * Dump the state of all tasks whenever on task exits. This is debug @@ -77,7 +77,7 @@ ****************************************************************************/ #ifdef CONFIG_DUMP_ON_EXIT -static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) +static void _xtensa_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) { #if CONFIG_NFILE_DESCRIPTORS > 0 FAR struct filelist *filelist; @@ -152,7 +152,7 @@ void _exit(int status) #ifdef CONFIG_DUMP_ON_EXIT sinfo("Other tasks:\n"); - sched_foreach(_up_dumponexit, NULL); + sched_foreach(_xtensa_dumponexit, NULL); #endif /* Destroy the task at the head of the ready to run list. */ @@ -185,4 +185,3 @@ void _exit(int status) PANIC(); } - diff --git a/arch/xtensa/src/common/xtensa_idle.c b/arch/xtensa/src/common/xtensa_idle.c index 672a0fae1c..894cdb606b 100644 --- a/arch/xtensa/src/common/xtensa_idle.c +++ b/arch/xtensa/src/common/xtensa_idle.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_idle.c * - * Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c index 46de907db4..a66c3b8ecd 100644 --- a/arch/xtensa/src/common/xtensa_initialize.c +++ b/arch/xtensa/src/common/xtensa_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_initialize.c * - * Copyright (C) 2011-2013, 2015-2016 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -57,7 +57,6 @@ #include -#include "up_arch.h" #include "xtensa.h" /**************************************************************************** @@ -128,7 +127,7 @@ void up_initialize(void) /* Initialize the interrupt subsystem */ - up_irqinitialize(); + xtensa_irq_initialize(); #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function @@ -141,22 +140,22 @@ void up_initialize(void) #endif #ifdef CONFIG_ARCH_DMA - /* Initialize the DMA subsystem if the weak function up_dmainitialize has been - * brought into the build + /* Initialize the DMA subsystem if the weak function xtensa_dma_initialize + * has been brought into the build */ #ifdef CONFIG_HAVE_WEAKFUNCTIONS - if (up_dmainitialize) + if (xtensa_dma_initialize) #endif { - up_dmainitialize(); + xtensa_dma_initialize(); } #endif /* Initialize the system timer interrupt */ #if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - up_timer_initialize(); + xtensa_timer_initialize(); #endif /* Register devices */ diff --git a/arch/xtensa/src/common/xtensa_interruptcontext.c b/arch/xtensa/src/common/xtensa_interruptcontext.c index 8b6bf802ec..db03c5c19d 100644 --- a/arch/xtensa/src/common/xtensa_interruptcontext.c +++ b/arch/xtensa/src/common/xtensa_interruptcontext.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_interruptcontext.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,14 +45,6 @@ #include "xtensa.h" -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_lowputs.c b/arch/xtensa/src/common/xtensa_lowputs.c index f1acb1059d..3daeadc3ef 100644 --- a/arch/xtensa/src/common/xtensa_lowputs.c +++ b/arch/xtensa/src/common/xtensa_lowputs.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_lowputs.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -41,18 +41,6 @@ #include "xtensa.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_mdelay.c b/arch/xtensa/src/common/xtensa_mdelay.c index f6b728bcc6..094ba97a79 100644 --- a/arch/xtensa/src/common/xtensa_mdelay.c +++ b/arch/xtensa/src/common/xtensa_mdelay.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_mdelay.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,26 +40,6 @@ #include #include -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_modifyreg16.c b/arch/xtensa/src/common/xtensa_modifyreg16.c index 98a51c86ba..8554fda46f 100644 --- a/arch/xtensa/src/common/xtensa_modifyreg16.c +++ b/arch/xtensa/src/common/xtensa_modifyreg16.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_modifyreg16.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,19 +45,7 @@ #include #include -#include "up_arch.h" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ +#include "xtensa.h" /**************************************************************************** * Public Functions diff --git a/arch/xtensa/src/common/xtensa_modifyreg32.c b/arch/xtensa/src/common/xtensa_modifyreg32.c index 5619e6f272..599e39db4b 100644 --- a/arch/xtensa/src/common/xtensa_modifyreg32.c +++ b/arch/xtensa/src/common/xtensa_modifyreg32.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_modifyreg32.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,19 +45,7 @@ #include #include -#include "up_arch.h" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ +#include "xtensa.h" /**************************************************************************** * Public Functions diff --git a/arch/xtensa/src/common/xtensa_modifyreg8.c b/arch/xtensa/src/common/xtensa_modifyreg8.c index e3bc73843e..24201b5e97 100644 --- a/arch/xtensa/src/common/xtensa_modifyreg8.c +++ b/arch/xtensa/src/common/xtensa_modifyreg8.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_modifyreg8.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,19 +45,7 @@ #include #include -#include "up_arch.h" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ +#include "xtensa.h" /**************************************************************************** * Public Functions diff --git a/arch/xtensa/src/common/xtensa_puts.c b/arch/xtensa/src/common/xtensa_puts.c index 3eaa3078a4..d9449f7ffd 100644 --- a/arch/xtensa/src/common/xtensa_puts.c +++ b/arch/xtensa/src/common/xtensa_puts.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_puts.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,18 +42,6 @@ #include "xtensa.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_releasestack.c b/arch/xtensa/src/common/xtensa_releasestack.c index 40b5bd7571..94bb2d8cd8 100644 --- a/arch/xtensa/src/common/xtensa_releasestack.c +++ b/arch/xtensa/src/common/xtensa_releasestack.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_releasestack.c * - * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -47,14 +47,6 @@ #include "xtensa.h" -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_stackframe.c b/arch/xtensa/src/common/xtensa_stackframe.c index 6c1adc992b..19f61a1508 100644 --- a/arch/xtensa/src/common/xtensa_stackframe.c +++ b/arch/xtensa/src/common/xtensa_stackframe.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_stackframe.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/arch/xtensa/src/common/xtensa_udelay.c b/arch/xtensa/src/common/xtensa_udelay.c index f18be5b891..09d16d5d4d 100644 --- a/arch/xtensa/src/common/xtensa_udelay.c +++ b/arch/xtensa/src/common/xtensa_udelay.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_udelay.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -49,22 +49,6 @@ #define CONFIG_BOARD_LOOPSPER10USEC ((CONFIG_BOARD_LOOPSPERMSEC+50)/100) #define CONFIG_BOARD_LOOPSPERUSEC ((CONFIG_BOARD_LOOPSPERMSEC+500)/1000) -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_usestack.c b/arch/xtensa/src/common/xtensa_usestack.c index 83daf2729c..679deffb1f 100644 --- a/arch/xtensa/src/common/xtensa_usestack.c +++ b/arch/xtensa/src/common/xtensa_usestack.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/src/common/xtensa_usestack.c * - * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without