From aeecd10dfebb30bf89bc6a1ba01303ec33069123 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 30 Sep 2014 14:41:23 -0600 Subject: [PATCH] Restore up_internal.h. Changes its name was a bad idea... at least for now --- arch/sim/src/up_allocateheap.c | 2 +- arch/sim/src/up_blockdevice.c | 2 +- arch/sim/src/up_blocktask.c | 2 +- arch/sim/src/up_createstack.c | 2 +- arch/sim/src/up_devconsole.c | 2 +- arch/sim/src/up_deviceimage.c | 2 +- arch/sim/src/up_exit.c | 2 +- arch/sim/src/up_framebuffer.c | 2 +- arch/sim/src/up_idle.c | 2 +- arch/sim/src/up_initialize.c | 2 +- arch/sim/src/up_initialstate.c | 2 +- arch/sim/src/{sim.h => up_internal.h} | 10 +++++----- arch/sim/src/up_interruptcontext.c | 2 +- arch/sim/src/up_netdriver.c | 2 +- arch/sim/src/up_releasepending.c | 2 +- arch/sim/src/up_releasestack.c | 2 +- arch/sim/src/up_reprioritizertr.c | 2 +- arch/sim/src/up_schedulesigaction.c | 2 +- arch/sim/src/up_setjmp.S | 2 +- arch/sim/src/up_simuart.c | 2 +- arch/sim/src/up_spiflash.c | 2 +- arch/sim/src/up_stackframe.c | 2 +- arch/sim/src/up_touchscreen.c | 2 +- arch/sim/src/up_uartwait.c | 2 +- arch/sim/src/up_unblocktask.c | 2 +- arch/sim/src/up_usestack.c | 2 +- 26 files changed, 30 insertions(+), 30 deletions(-) rename arch/sim/src/{sim.h => up_internal.h} (97%) diff --git a/arch/sim/src/up_allocateheap.c b/arch/sim/src/up_allocateheap.c index e6641805e6..61fb6cf6b3 100644 --- a/arch/sim/src/up_allocateheap.c +++ b/arch/sim/src/up_allocateheap.c @@ -46,7 +46,7 @@ #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_blockdevice.c b/arch/sim/src/up_blockdevice.c index 41a66b7e2f..5173d9b0bf 100644 --- a/arch/sim/src/up_blockdevice.c +++ b/arch/sim/src/up_blockdevice.c @@ -46,7 +46,7 @@ #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_blocktask.c b/arch/sim/src/up_blocktask.c index b708fd80d2..58ec931076 100644 --- a/arch/sim/src/up_blocktask.c +++ b/arch/sim/src/up_blocktask.c @@ -46,7 +46,7 @@ #include #include "sched/sched.h" -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_createstack.c b/arch/sim/src/up_createstack.c index 9fbe1bc49e..b74c04c450 100644 --- a/arch/sim/src/up_createstack.c +++ b/arch/sim/src/up_createstack.c @@ -45,7 +45,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_devconsole.c b/arch/sim/src/up_devconsole.c index 545e823197..a817493071 100644 --- a/arch/sim/src/up_devconsole.c +++ b/arch/sim/src/up_devconsole.c @@ -45,7 +45,7 @@ #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_deviceimage.c b/arch/sim/src/up_deviceimage.c index 4dfe726ffc..346adb3a24 100644 --- a/arch/sim/src/up_deviceimage.c +++ b/arch/sim/src/up_deviceimage.c @@ -50,7 +50,7 @@ # include -# include "sim.h" +# include "up_internal.h" #endif /**************************************************************************** diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/up_exit.c index 7b6161da7e..f82c51caf7 100644 --- a/arch/sim/src/up_exit.c +++ b/arch/sim/src/up_exit.c @@ -46,7 +46,7 @@ #include "task/task.h" #include "sched/sched.h" -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/up_framebuffer.c index 86b4b65d74..0bf9bd14c4 100644 --- a/arch/sim/src/up_framebuffer.c +++ b/arch/sim/src/up_framebuffer.c @@ -45,7 +45,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_idle.c b/arch/sim/src/up_idle.c index eaea6d7fe2..0106c29597 100644 --- a/arch/sim/src/up_idle.c +++ b/arch/sim/src/up_idle.c @@ -44,7 +44,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c index 07c140a4c8..0ab1add7ff 100644 --- a/arch/sim/src/up_initialize.c +++ b/arch/sim/src/up_initialize.c @@ -47,7 +47,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_initialstate.c b/arch/sim/src/up_initialstate.c index ff4898a912..3362f84244 100644 --- a/arch/sim/src/up_initialstate.c +++ b/arch/sim/src/up_initialstate.c @@ -44,7 +44,7 @@ #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/sim.h b/arch/sim/src/up_internal.h similarity index 97% rename from arch/sim/src/sim.h rename to arch/sim/src/up_internal.h index 9fdace1c93..b6b24c1eee 100644 --- a/arch/sim/src/sim.h +++ b/arch/sim/src/up_internal.h @@ -1,7 +1,7 @@ /************************************************************************** - * arch/sim/src/sim.h + * arch/sim/src/up_internal.h * - * Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2011-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * **************************************************************************/ -#ifndef __ARCH_SIM_SRC_SIM_H -#define __ARCH_SIM_SRC_SIM_H +#ifndef __ARCH_SIM_SRC_UP_INTERNAL_H +#define __ARCH_SIM_SRC_UP_INTERNAL_H /************************************************************************** * Included Files @@ -248,4 +248,4 @@ struct spi_dev_s *up_spiflashinitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_SIM_SRC_SIM_H */ +#endif /* __ARCH_SIM_SRC_UP_INTERNAL_H */ diff --git a/arch/sim/src/up_interruptcontext.c b/arch/sim/src/up_interruptcontext.c index 6dda092aac..d74510887b 100644 --- a/arch/sim/src/up_interruptcontext.c +++ b/arch/sim/src/up_interruptcontext.c @@ -41,7 +41,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/up_netdriver.c index 8d40d7d30e..c6636a0454 100644 --- a/arch/sim/src/up_netdriver.c +++ b/arch/sim/src/up_netdriver.c @@ -56,7 +56,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_releasepending.c b/arch/sim/src/up_releasepending.c index fb324bab17..21c1a1f855 100644 --- a/arch/sim/src/up_releasepending.c +++ b/arch/sim/src/up_releasepending.c @@ -44,7 +44,7 @@ #include #include "sched/sched.h" -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_releasestack.c b/arch/sim/src/up_releasestack.c index dde67a0f1b..c785c5a4af 100644 --- a/arch/sim/src/up_releasestack.c +++ b/arch/sim/src/up_releasestack.c @@ -44,7 +44,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_reprioritizertr.c b/arch/sim/src/up_reprioritizertr.c index 5bea181140..125542a71f 100644 --- a/arch/sim/src/up_reprioritizertr.c +++ b/arch/sim/src/up_reprioritizertr.c @@ -47,7 +47,7 @@ #include #include "sched/sched.h" -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_schedulesigaction.c b/arch/sim/src/up_schedulesigaction.c index d1ea0a5703..c93bb6d672 100644 --- a/arch/sim/src/up_schedulesigaction.c +++ b/arch/sim/src/up_schedulesigaction.c @@ -45,7 +45,7 @@ #include #include "sched/sched.h" -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_setjmp.S b/arch/sim/src/up_setjmp.S index 23cdda4df4..3c61d3720c 100644 --- a/arch/sim/src/up_setjmp.S +++ b/arch/sim/src/up_setjmp.S @@ -37,7 +37,7 @@ * Included Files **************************************************************************/ -#include "sim.h" +#include "up_internal.h" /************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_simuart.c b/arch/sim/src/up_simuart.c index 239e5bd790..d3bd202b73 100644 --- a/arch/sim/src/up_simuart.c +++ b/arch/sim/src/up_simuart.c @@ -46,7 +46,7 @@ ****************************************************************************/ /* Simulated console UART input buffer size */ -/* Must match the defintion in sim.h */ +/* Must match the defintion in up_internal.h */ #define SIMUART_BUFSIZE 256 diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c index 04329dcb42..0118dd7638 100644 --- a/arch/sim/src/up_spiflash.c +++ b/arch/sim/src/up_spiflash.c @@ -50,7 +50,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" #if defined(CONFIG_SIM_SPIFLASH) diff --git a/arch/sim/src/up_stackframe.c b/arch/sim/src/up_stackframe.c index 648e94a841..ef64985983 100644 --- a/arch/sim/src/up_stackframe.c +++ b/arch/sim/src/up_stackframe.c @@ -47,7 +47,7 @@ #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Macros diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c index 95cae2e33a..9ee99cbe92 100644 --- a/arch/sim/src/up_touchscreen.c +++ b/arch/sim/src/up_touchscreen.c @@ -59,7 +59,7 @@ #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_uartwait.c b/arch/sim/src/up_uartwait.c index 35d4dbd2c7..3abe70008c 100644 --- a/arch/sim/src/up_uartwait.c +++ b/arch/sim/src/up_uartwait.c @@ -39,7 +39,7 @@ #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_unblocktask.c b/arch/sim/src/up_unblocktask.c index 2d6e6fc91a..86edecbb52 100644 --- a/arch/sim/src/up_unblocktask.c +++ b/arch/sim/src/up_unblocktask.c @@ -45,7 +45,7 @@ #include "clock/clock.h" #include "sched/sched.h" -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/sim/src/up_usestack.c b/arch/sim/src/up_usestack.c index 7fcc3c9d1c..3121b59bd0 100644 --- a/arch/sim/src/up_usestack.c +++ b/arch/sim/src/up_usestack.c @@ -41,7 +41,7 @@ #include #include #include -#include "sim.h" +#include "up_internal.h" /**************************************************************************** * Pre-processor Definitions