From 29d8eb786a1d17a03fbe6a15f588c669b39fec01 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 27 Feb 2015 20:02:03 -0600 Subject: Move board_ prototypes from arch.h to board.h --- nuttx/configs/avr32dev1/src/up_buttons.c | 5 +- nuttx/configs/cloudctrl/src/up_buttons.c | 5 +- nuttx/configs/demo9s12ne64/src/up_buttons.c | 5 +- nuttx/configs/dk-tm4c129x/src/tm4c_boot.c | 1 + nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c | 5 +- nuttx/configs/ea3131/src/up_buttons.c | 5 +- nuttx/configs/ea3152/src/up_buttons.c | 5 +- nuttx/configs/efm32-g8xx-stk/src/efm32_boot.c | 2 + nuttx/configs/ez80f910200zco/src/ez80_buttons.c | 5 +- nuttx/configs/fire-stm32v2/src/up_buttons.c | 5 +- .../configs/freedom-kl25z/src/kl_boardinitialize.c | 3 +- .../configs/freedom-kl26z/src/kl_boardinitialize.c | 1 + nuttx/configs/hymini-stm32v/src/up_buttons.c | 5 +- nuttx/configs/kwikstik-k40/src/up_buttons.c | 5 +- nuttx/configs/lincoln60/src/up_buttons.c | 5 +- nuttx/configs/lpc4330-xplorer/src/up_buttons.c | 5 +- nuttx/configs/lpc4357-evb/src/lpc43_buttons.c | 3 +- nuttx/configs/ne64badge/src/up_buttons.c | 5 +- nuttx/configs/nucleo-f4x1re/src/stm32_buttons.c | 5 +- .../olimex-efm32g880f128-stk/src/efm32_boot.c | 4 +- .../olimex-efm32g880f128-stk/src/efm32_buttons.c | 5 +- .../configs/olimex-lpc1766stk/src/lpc17_buttons.c | 5 +- .../configs/olimex-stm32-h405/src/stm32_buttons.c | 3 +- nuttx/configs/olimex-stm32-p207/src/up_buttons.c | 3 +- nuttx/configs/olimex-strp711/src/up_buttons.c | 5 +- nuttx/configs/open1788/src/lpc17_buttons.c | 5 +- nuttx/configs/pcduino-a10/src/a1x_boot.c | 2 + nuttx/configs/pcduino-a10/src/a1x_buttons.c | 5 +- .../configs/pic32mz-starterkit/src/pic32mz_boot.c | 1 + nuttx/configs/sam3u-ek/src/up_buttons.c | 5 +- nuttx/configs/sam4e-ek/src/sam_buttons.c | 5 +- nuttx/configs/sam4l-xplained/src/sam_buttons.c | 3 +- nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c | 5 +- nuttx/configs/sam4s-xplained/src/sam_buttons.c | 5 +- nuttx/configs/sama5d3-xplained/src/sam_buttons.c | 5 +- nuttx/configs/sama5d3x-ek/src/sam_buttons.c | 5 +- nuttx/configs/sama5d4-ek/src/sam_buttons.c | 3 +- nuttx/configs/samd20-xplained/src/sam_buttons.c | 5 +- nuttx/configs/shenzhou/src/up_buttons.c | 5 +- nuttx/configs/sim/src/sim_boot.c | 3 +- nuttx/configs/skp16c26/src/up_buttons.c | 7 +- nuttx/configs/spark/src/up_buttons.c | 5 +- nuttx/configs/stm3210e-eval/src/stm32_buttons.c | 3 +- nuttx/configs/stm3210e-eval/src/stm32_pmbuttons.c | 4 +- nuttx/configs/stm3220g-eval/src/up_buttons.c | 5 +- nuttx/configs/stm3240g-eval/src/stm32_boot.c | 4 +- nuttx/configs/stm3240g-eval/src/stm32_buttons.c | 5 +- nuttx/configs/stm32f3discovery/src/up_buttons.c | 5 +- nuttx/configs/stm32f429i-disco/src/stm32_buttons.c | 5 +- nuttx/configs/stm32f4discovery/src/stm32_buttons.c | 5 +- .../configs/stm32f4discovery/src/stm32_pmbuttons.c | 4 +- nuttx/configs/stm32ldiscovery/src/stm32_buttons.c | 5 +- nuttx/configs/stm32vldiscovery/src/stm32_buttons.c | 3 +- nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c | 5 +- nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c | 3 +- .../configs/tm4c123g-launchpad/src/tm4c_buttons.c | 1 + nuttx/configs/tm4c1294-launchpad/src/tm4c_boot.c | 3 +- .../configs/tm4c1294-launchpad/src/tm4c_buttons.c | 3 +- nuttx/configs/twr-k60n512/src/up_buttons.c | 5 +- nuttx/configs/ubw32/src/up_buttons.c | 5 +- .../configs/viewtool-stm32f107/src/stm32_buttons.c | 5 +- nuttx/configs/vsn/src/buttons.c | 1 + nuttx/configs/zkit-arm-1769/src/up_buttons.c | 5 +- nuttx/include/nuttx/arch.h | 82 +----------- nuttx/include/nuttx/board.h | 140 +++++++++++++++++++++ nuttx/sched/init/os_bringup.c | 1 + 66 files changed, 313 insertions(+), 173 deletions(-) diff --git a/nuttx/configs/avr32dev1/src/up_buttons.c b/nuttx/configs/avr32dev1/src/up_buttons.c index 3415973cd..9d26e7f9a 100644 --- a/nuttx/configs/avr32dev1/src/up_buttons.c +++ b/nuttx/configs/avr32dev1/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sam3u-ek/src/up_leds.c * - * Copyright (C) 2010-2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,7 @@ #include #include +#include #include #include @@ -55,7 +56,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/cloudctrl/src/up_buttons.c b/nuttx/configs/cloudctrl/src/up_buttons.c index d823d28fc..5b43dd159 100644 --- a/nuttx/configs/cloudctrl/src/up_buttons.c +++ b/nuttx/configs/cloudctrl/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/cloudctrl/src/board_buttons.c * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * Darcy Gong * @@ -43,6 +43,7 @@ #include #include +#include #include #include "cloudctrl-internal.h" @@ -50,7 +51,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/demo9s12ne64/src/up_buttons.c b/nuttx/configs/demo9s12ne64/src/up_buttons.c index 107848b10..a666cec35 100644 --- a/nuttx/configs/demo9s12ne64/src/up_buttons.c +++ b/nuttx/configs/demo9s12ne64/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/demo9s12ne64/src/up_leds.c * - * Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "demo9s12ne64.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c b/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c index 0da8dcc8d..0e2f48fbe 100644 --- a/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c +++ b/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c @@ -41,6 +41,7 @@ #include +#include #include #include "up_arch.h" diff --git a/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c b/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c index 479de4758..b91fd5ac2 100644 --- a/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c +++ b/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/dk-tm4c/src/tm4c_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -51,7 +52,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/ea3131/src/up_buttons.c b/nuttx/configs/ea3131/src/up_buttons.c index 170526590..1f0e107cb 100644 --- a/nuttx/configs/ea3131/src/up_buttons.c +++ b/nuttx/configs/ea3131/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/ea3131/src/up_leds.c * - * Copyright (C) 2009-2010, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2010, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "ea3131_internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/ea3152/src/up_buttons.c b/nuttx/configs/ea3152/src/up_buttons.c index 808118535..970ae548e 100644 --- a/nuttx/configs/ea3152/src/up_buttons.c +++ b/nuttx/configs/ea3152/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/ea3152/src/up_leds.c * - * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "ea3152_internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/efm32-g8xx-stk/src/efm32_boot.c b/nuttx/configs/efm32-g8xx-stk/src/efm32_boot.c index 771842b04..1871c0e2b 100644 --- a/nuttx/configs/efm32-g8xx-stk/src/efm32_boot.c +++ b/nuttx/configs/efm32-g8xx-stk/src/efm32_boot.c @@ -39,6 +39,8 @@ #include +#include + #include "efm32_gpio.h" #include "efm32_start.h" #include "efm32-g8xx-stk.h" diff --git a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c index f43192f15..1fbfdcf2a 100644 --- a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c +++ b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/ez80f910200zco/src/ez80_leds.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,13 +42,14 @@ #include #include +#include #include "chip.h" #include "up_arch.h" #include "up_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/fire-stm32v2/src/up_buttons.c b/nuttx/configs/fire-stm32v2/src/up_buttons.c index 0150e2331..e63149465 100644 --- a/nuttx/configs/fire-stm32v2/src/up_buttons.c +++ b/nuttx/configs/fire-stm32v2/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/fire-stm32v2/src/board_buttons.c * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "fire-internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/freedom-kl25z/src/kl_boardinitialize.c b/nuttx/configs/freedom-kl25z/src/kl_boardinitialize.c index 0bd41c641..abe1f0114 100644 --- a/nuttx/configs/freedom-kl25z/src/kl_boardinitialize.c +++ b/nuttx/configs/freedom-kl25z/src/kl_boardinitialize.c @@ -42,13 +42,14 @@ #include +#include #include #include "up_arch.h" #include "freedom-kl25z.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/nuttx/configs/freedom-kl26z/src/kl_boardinitialize.c b/nuttx/configs/freedom-kl26z/src/kl_boardinitialize.c index c3e176f7a..a57c04b55 100644 --- a/nuttx/configs/freedom-kl26z/src/kl_boardinitialize.c +++ b/nuttx/configs/freedom-kl26z/src/kl_boardinitialize.c @@ -41,6 +41,7 @@ #include +#include #include #include "up_arch.h" diff --git a/nuttx/configs/hymini-stm32v/src/up_buttons.c b/nuttx/configs/hymini-stm32v/src/up_buttons.c index 1175a0fe3..096715dfa 100644 --- a/nuttx/configs/hymini-stm32v/src/up_buttons.c +++ b/nuttx/configs/hymini-stm32v/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/hymini-stm32v/src/board_buttons.c * - * Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "hymini_stm32v-internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/kwikstik-k40/src/up_buttons.c b/nuttx/configs/kwikstik-k40/src/up_buttons.c index a82d55ca2..e9b8e3e0d 100644 --- a/nuttx/configs/kwikstik-k40/src/up_buttons.c +++ b/nuttx/configs/kwikstik-k40/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/kwikstik-k40/src/board_buttons.c * - * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "kwikstik-internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/lincoln60/src/up_buttons.c b/nuttx/configs/lincoln60/src/up_buttons.c index 0d37b05a4..610e2cab0 100644 --- a/nuttx/configs/lincoln60/src/up_buttons.c +++ b/nuttx/configs/lincoln60/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/lincoln60/src/board_buttons.c * - * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -53,7 +54,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/lpc4330-xplorer/src/up_buttons.c b/nuttx/configs/lpc4330-xplorer/src/up_buttons.c index ea054cdc7..9eaec68fa 100644 --- a/nuttx/configs/lpc4330-xplorer/src/up_buttons.c +++ b/nuttx/configs/lpc4330-xplorer/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/lpc4330-xplorer/src/board_buttons.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -52,7 +53,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/lpc4357-evb/src/lpc43_buttons.c b/nuttx/configs/lpc4357-evb/src/lpc43_buttons.c index ae66f8bc7..3d0640fcc 100644 --- a/nuttx/configs/lpc4357-evb/src/lpc43_buttons.c +++ b/nuttx/configs/lpc4357-evb/src/lpc43_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/lpc4357-evb/src/board_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include diff --git a/nuttx/configs/ne64badge/src/up_buttons.c b/nuttx/configs/ne64badge/src/up_buttons.c index af72aab8d..3de13c8bd 100644 --- a/nuttx/configs/ne64badge/src/up_buttons.c +++ b/nuttx/configs/ne64badge/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/ne64badge/src/board_buttons.c * - * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "ne64badge_internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG with diff --git a/nuttx/configs/nucleo-f4x1re/src/stm32_buttons.c b/nuttx/configs/nucleo-f4x1re/src/stm32_buttons.c index 4375d23d0..2960344c6 100644 --- a/nuttx/configs/nucleo-f4x1re/src/stm32_buttons.c +++ b/nuttx/configs/nucleo-f4x1re/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/nucleo-f4x1re/src/stm32_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "nucleo-f4x1re.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_boot.c b/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_boot.c index fe340505d..ce9b4beaf 100644 --- a/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_boot.c +++ b/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_boot.c @@ -1,7 +1,7 @@ /***************************************************************************** * configs/olimex-efm32g880f128-stk/src/efm32_boot.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 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 "efm32_start.h" #include "efm32g880f128-stk.h" diff --git a/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c b/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c index 178bc2b9f..542d1d604 100644 --- a/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c +++ b/nuttx/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-efm32g880f128-stk/src/efm32_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ #include #include +#include #include #include @@ -66,7 +67,7 @@ #if CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/olimex-lpc1766stk/src/lpc17_buttons.c b/nuttx/configs/olimex-lpc1766stk/src/lpc17_buttons.c index 1d4c2da12..653e221ef 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/lpc17_buttons.c +++ b/nuttx/configs/olimex-lpc1766stk/src/lpc17_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-lpc1766stk/src/lpc17_buttons.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -53,7 +54,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/olimex-stm32-h405/src/stm32_buttons.c b/nuttx/configs/olimex-stm32-h405/src/stm32_buttons.c index 164635ce2..b9f3e174a 100644 --- a/nuttx/configs/olimex-stm32-h405/src/stm32_buttons.c +++ b/nuttx/configs/olimex-stm32-h405/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-stm32-h405/src/stm32_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "olimex-stm32-h405.h" diff --git a/nuttx/configs/olimex-stm32-p207/src/up_buttons.c b/nuttx/configs/olimex-stm32-p207/src/up_buttons.c index 390141b06..ce47a9a81 100644 --- a/nuttx/configs/olimex-stm32-p207/src/up_buttons.c +++ b/nuttx/configs/olimex-stm32-p207/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-stm32-p207/src/board_buttons.c * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "olimex-stm32-p207.h" diff --git a/nuttx/configs/olimex-strp711/src/up_buttons.c b/nuttx/configs/olimex-strp711/src/up_buttons.c index 130904888..3b15c0b1f 100644 --- a/nuttx/configs/olimex-strp711/src/up_buttons.c +++ b/nuttx/configs/olimex-strp711/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-strp711/src/up_leds.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,6 +40,7 @@ #include #include +#include #include #include "chip.h" @@ -47,7 +48,7 @@ #include "up_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* The Olimex board has two buttons, one labled "BUT" and the other "WAKEUP" diff --git a/nuttx/configs/open1788/src/lpc17_buttons.c b/nuttx/configs/open1788/src/lpc17_buttons.c index df4ef7b92..de2eff484 100644 --- a/nuttx/configs/open1788/src/lpc17_buttons.c +++ b/nuttx/configs/open1788/src/lpc17_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/open1788/src/lpc17_buttons.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -53,7 +54,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/pcduino-a10/src/a1x_boot.c b/nuttx/configs/pcduino-a10/src/a1x_boot.c index 6cffafad9..a8dceb6e9 100644 --- a/nuttx/configs/pcduino-a10/src/a1x_boot.c +++ b/nuttx/configs/pcduino-a10/src/a1x_boot.c @@ -41,6 +41,8 @@ #include +#include + #include "pcduino_a10.h" /************************************************************************************ diff --git a/nuttx/configs/pcduino-a10/src/a1x_buttons.c b/nuttx/configs/pcduino-a10/src/a1x_buttons.c index 5ea4359b3..3fad67ff3 100644 --- a/nuttx/configs/pcduino-a10/src/a1x_buttons.c +++ b/nuttx/configs/pcduino-a10/src/a1x_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/pcduino-a10/src/a1x_buttons.c * - * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -52,7 +53,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c b/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c index f13e92432..0212eca53 100644 --- a/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c +++ b/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c @@ -42,6 +42,7 @@ #include #include +#include #include "pic32mz-starterkit.h" diff --git a/nuttx/configs/sam3u-ek/src/up_buttons.c b/nuttx/configs/sam3u-ek/src/up_buttons.c index fb9f9b08e..f3c977dd3 100644 --- a/nuttx/configs/sam3u-ek/src/up_buttons.c +++ b/nuttx/configs/sam3u-ek/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sam3u-ek/src/up_leds.c * - * Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -53,7 +54,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/sam4e-ek/src/sam_buttons.c b/nuttx/configs/sam4e-ek/src/sam_buttons.c index 2a88250b1..6b73acf50 100644 --- a/nuttx/configs/sam4e-ek/src/sam_buttons.c +++ b/nuttx/configs/sam4e-ek/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sam4e-ek/src/sam_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -53,7 +54,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/sam4l-xplained/src/sam_buttons.c b/nuttx/configs/sam4l-xplained/src/sam_buttons.c index 2cefec40b..594d6b2fc 100644 --- a/nuttx/configs/sam4l-xplained/src/sam_buttons.c +++ b/nuttx/configs/sam4l-xplained/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sam4l-xplained/src/sam_buttons.c * - * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c b/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c index f76a86cda..781911324 100644 --- a/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c +++ b/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sam4s-xplained-pro/src/sam_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * Bob Doiron * @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -54,7 +55,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/sam4s-xplained/src/sam_buttons.c b/nuttx/configs/sam4s-xplained/src/sam_buttons.c index e69d60182..79a279e81 100644 --- a/nuttx/configs/sam4s-xplained/src/sam_buttons.c +++ b/nuttx/configs/sam4s-xplained/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sam4s-xplained/src/sam_buttons.c * - * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -53,7 +54,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/sama5d3-xplained/src/sam_buttons.c b/nuttx/configs/sama5d3-xplained/src/sam_buttons.c index 9e66cf3d9..0f4b728c7 100644 --- a/nuttx/configs/sama5d3-xplained/src/sam_buttons.c +++ b/nuttx/configs/sama5d3-xplained/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sama5d3-xplained/src/sam_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -57,6 +57,7 @@ #include #include +#include #include #include @@ -68,7 +69,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/sama5d3x-ek/src/sam_buttons.c b/nuttx/configs/sama5d3x-ek/src/sam_buttons.c index a76696847..393e1ca72 100644 --- a/nuttx/configs/sama5d3x-ek/src/sam_buttons.c +++ b/nuttx/configs/sama5d3x-ek/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sama5d3x-ek/src/sam_buttons.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -57,6 +57,7 @@ #include #include +#include #include #include @@ -68,7 +69,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/sama5d4-ek/src/sam_buttons.c b/nuttx/configs/sama5d4-ek/src/sam_buttons.c index 082a31965..fdf20942f 100644 --- a/nuttx/configs/sama5d4-ek/src/sam_buttons.c +++ b/nuttx/configs/sama5d4-ek/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sama5d4-ek/src/sam_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -53,6 +53,7 @@ #include #include +#include #include #include diff --git a/nuttx/configs/samd20-xplained/src/sam_buttons.c b/nuttx/configs/samd20-xplained/src/sam_buttons.c index 659f56e47..9b7fe3db2 100644 --- a/nuttx/configs/samd20-xplained/src/sam_buttons.c +++ b/nuttx/configs/samd20-xplained/src/sam_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/samd20-xplained/src/sam_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -53,7 +54,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/shenzhou/src/up_buttons.c b/nuttx/configs/shenzhou/src/up_buttons.c index ec84824c6..6bdae91e3 100644 --- a/nuttx/configs/shenzhou/src/up_buttons.c +++ b/nuttx/configs/shenzhou/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/shenzhou/src/board_buttons.c * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "shenzhou-internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/sim/src/sim_boot.c b/nuttx/configs/sim/src/sim_boot.c index e4e282c78..4b581ef52 100644 --- a/nuttx/configs/sim/src/sim_boot.c +++ b/nuttx/configs/sim/src/sim_boot.c @@ -1,7 +1,7 @@ /**************************************************************************** * config/sim/src/sim_boot.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -39,6 +39,7 @@ #include #include +#include #include "up_internal.h" diff --git a/nuttx/configs/skp16c26/src/up_buttons.c b/nuttx/configs/skp16c26/src/up_buttons.c index f006589a3..8ecb05046 100644 --- a/nuttx/configs/skp16c26/src/up_buttons.c +++ b/nuttx/configs/skp16c26/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/skp16c26/src/board_buttons.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -38,14 +38,17 @@ ****************************************************************************/ #include + #include +#include + #include "chip.h" #include "up_arch.h" #include "up_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* The SKP62C26 has 3 buttons control by bits 1, 2, and 3 in port 8. */ diff --git a/nuttx/configs/spark/src/up_buttons.c b/nuttx/configs/spark/src/up_buttons.c index 48ffbc549..11bcbf8ae 100644 --- a/nuttx/configs/spark/src/up_buttons.c +++ b/nuttx/configs/spark/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/spark/src/board_buttons.c * - * Copyright (C) 2011-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "spark.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/stm3210e-eval/src/stm32_buttons.c b/nuttx/configs/stm3210e-eval/src/stm32_buttons.c index 2ebdc8351..8502fbb82 100644 --- a/nuttx/configs/stm3210e-eval/src/stm32_buttons.c +++ b/nuttx/configs/stm3210e-eval/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm3210e-eval/src/stm32_buttons.c * - * Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "stm3210e-eval.h" diff --git a/nuttx/configs/stm3210e-eval/src/stm32_pmbuttons.c b/nuttx/configs/stm3210e-eval/src/stm32_pmbuttons.c index 6b7677aca..3bee2438d 100644 --- a/nuttx/configs/stm3210e-eval/src/stm32_pmbuttons.c +++ b/nuttx/configs/stm3210e-eval/src/stm32_pmbuttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm3210e-eval/src/stm32_pmbuttons.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * Diego Sanchez * @@ -41,8 +41,10 @@ #include #include +#include #include #include + #include #include diff --git a/nuttx/configs/stm3220g-eval/src/up_buttons.c b/nuttx/configs/stm3220g-eval/src/up_buttons.c index e7aa92e7b..4b65e6f34 100644 --- a/nuttx/configs/stm3220g-eval/src/up_buttons.c +++ b/nuttx/configs/stm3220g-eval/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm3220g-eval/src/board_buttons.c * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "stm3220g-internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/stm3240g-eval/src/stm32_boot.c b/nuttx/configs/stm3240g-eval/src/stm32_boot.c index df899ba9d..47515d64e 100644 --- a/nuttx/configs/stm3240g-eval/src/stm32_boot.c +++ b/nuttx/configs/stm3240g-eval/src/stm32_boot.c @@ -1,7 +1,7 @@ /************************************************************************************ * configs/stm3240g-eval/src/stm32_boot.c * - * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -41,6 +41,8 @@ #include +#include + #include "stm3240g-eval.h" /************************************************************************************ diff --git a/nuttx/configs/stm3240g-eval/src/stm32_buttons.c b/nuttx/configs/stm3240g-eval/src/stm32_buttons.c index 09d37c0bb..deca2e8e1 100644 --- a/nuttx/configs/stm3240g-eval/src/stm32_buttons.c +++ b/nuttx/configs/stm3240g-eval/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm3240g-eval/src/stm32_buttons.c * - * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "stm3240g-eval.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/stm32f3discovery/src/up_buttons.c b/nuttx/configs/stm32f3discovery/src/up_buttons.c index 6a3323586..854c3a17e 100644 --- a/nuttx/configs/stm32f3discovery/src/up_buttons.c +++ b/nuttx/configs/stm32f3discovery/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm32f3discovery/src/board_buttons.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "stm32f3discovery-internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c b/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c index 9b8cd91cc..f93be0f3f 100644 --- a/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm32f429i-disco/src/stm32_buttons.c * - * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "stm32f429i-disco.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/stm32f4discovery/src/stm32_buttons.c b/nuttx/configs/stm32f4discovery/src/stm32_buttons.c index f6164bb91..28ed94ae7 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_buttons.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm32f4discovery/src/stm32_buttons.c * - * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014=2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "stm32f4discovery.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/stm32f4discovery/src/stm32_pmbuttons.c b/nuttx/configs/stm32f4discovery/src/stm32_pmbuttons.c index b060e9a55..d6b7dfbda 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_pmbuttons.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_pmbuttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm32f4discovery/src/stm32_pm_buttons.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * Diego Sanchez * @@ -41,8 +41,10 @@ #include #include +#include #include #include + #include #include diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c b/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c index 6c4df02cd..32a95ab6c 100644 --- a/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c +++ b/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm32ldiscovery/src/board_buttons.c * - * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "stm32ldiscovery.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c b/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c index 20c863572..87442c115 100644 --- a/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c +++ b/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/stm32vldiscovery/src/stm32_buttons.c * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * Freddie Chopin * @@ -43,6 +43,7 @@ #include #include +#include #include #include "stm32vldiscovery.h" diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c b/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c index b29bb73fa..03d2daa23 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/sure-pic32mx/src/pic32mx_buttons.c * - * Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include "chip.h" @@ -56,7 +57,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* The Sure DB_DP11215 PIC32 Storage Demo Board has three buttons. * diff --git a/nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c b/nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c index d76dddab7..e06ae9d84 100644 --- a/nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c +++ b/nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c @@ -1,7 +1,7 @@ /************************************************************************************ * configs/tm4c123g-launchpad/src/tm4c_boot.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -41,6 +41,7 @@ #include +#include #include #include "up_arch.h" diff --git a/nuttx/configs/tm4c123g-launchpad/src/tm4c_buttons.c b/nuttx/configs/tm4c123g-launchpad/src/tm4c_buttons.c index 498a714e3..78f1b6733 100644 --- a/nuttx/configs/tm4c123g-launchpad/src/tm4c_buttons.c +++ b/nuttx/configs/tm4c123g-launchpad/src/tm4c_buttons.c @@ -40,6 +40,7 @@ #include #include +#include #include #include diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_boot.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_boot.c index fa0973944..878f12cfa 100644 --- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_boot.c +++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_boot.c @@ -1,7 +1,7 @@ /************************************************************************************ * configs/tm4c1294xl/src/tm4c_boot.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -41,6 +41,7 @@ #include +#include #include #include "tm4c1294-launchpad.h" diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c index 1ce04a4d9..17d83c81f 100644 --- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c +++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -51,7 +52,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/twr-k60n512/src/up_buttons.c b/nuttx/configs/twr-k60n512/src/up_buttons.c index 7e1459d8a..dabc17b0a 100644 --- a/nuttx/configs/twr-k60n512/src/up_buttons.c +++ b/nuttx/configs/twr-k60n512/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/twr-k60n512/src/board_buttons.c * - * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "twrk60-internal.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* The TWR-K60N512 has user buttons (plus a reset button): * diff --git a/nuttx/configs/ubw32/src/up_buttons.c b/nuttx/configs/ubw32/src/up_buttons.c index c1fa1125b..9ddab03b4 100644 --- a/nuttx/configs/ubw32/src/up_buttons.c +++ b/nuttx/configs/ubw32/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/ubw32/src/board_buttons.c * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include "chip.h" @@ -54,7 +55,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* The UBW32 board has three buttons. * diff --git a/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c b/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c index 1e4766af5..643ea0d82 100644 --- a/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c +++ b/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/viewtool-stm32f107/src/stm32_buttons.c * - * Copyright (C) 2013, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include "viewtool_stm32f107.h" @@ -49,7 +50,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/configs/vsn/src/buttons.c b/nuttx/configs/vsn/src/buttons.c index 9c4ad37b5..1df2e44d6 100644 --- a/nuttx/configs/vsn/src/buttons.c +++ b/nuttx/configs/vsn/src/buttons.c @@ -43,6 +43,7 @@ #include #include +#include #include #include "vsn.h" diff --git a/nuttx/configs/zkit-arm-1769/src/up_buttons.c b/nuttx/configs/zkit-arm-1769/src/up_buttons.c index 90658428a..fa6959a0b 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_buttons.c +++ b/nuttx/configs/zkit-arm-1769/src/up_buttons.c @@ -44,10 +44,13 @@ ****************************************************************************/ #include + #include #include + #include #include +#include #include #include @@ -59,7 +62,7 @@ #ifdef CONFIG_ARCH_BUTTONS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/include/nuttx/arch.h b/nuttx/include/nuttx/arch.h index ceb1c9b98..155adbb45 100644 --- a/nuttx/include/nuttx/arch.h +++ b/nuttx/include/nuttx/arch.h @@ -50,6 +50,8 @@ * definitions provide the common interface between NuttX and the * architecture-specific implementation in arch/ * + * This chip related declarations are retained in this header file. + * * NOTE: up_ is supposed to stand for microprocessor; the u is like the * Greek letter micron: µ. So it would be µP which is a common shortening * of the word microprocessor. @@ -74,6 +76,8 @@ * board_ definitions provide the interface between the board-level * logic and the architecture-specific logic. * + * Board related declarations are retained the file include/nuttx/board.h. + * * There is also a configs//include/board.h header file that * can be used to communicate other board-specific information between * the architecture logic and even application logic. Any definitions @@ -184,23 +188,6 @@ EXTERN volatile bool g_rtc_enabled; void up_initialize(void); -/**************************************************************************** - * Name: board_initialize - * - * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional - * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be - * called immediately after up_initialize() is called and just before the - * initial application is started. This additional initialization phase - * may be used, for example, to initialize board-specific device drivers. - * - ****************************************************************************/ - -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void); -#endif - /**************************************************************************** * Name: up_idle * @@ -1777,67 +1764,6 @@ size_t up_check_intstack_remain(void); * Board-specific button interfaces exported by the board-specific logic ****************************************************************************/ -/**************************************************************************** - * Name: board_button_initialize - * - * Description: - * board_button_initialize() must be called to initialize button resources. - * After that, board_buttons() may be called to collect the current state of - * all buttons or board_button_irq() may be called to register button interrupt - * handlers. - * - * NOTE: This interface may or may not be supported by board-specific - * logic. If the board supports button interfaces, then CONFIG_ARCH_BUTTONS - * will be defined. - * - ****************************************************************************/ - -#ifdef CONFIG_ARCH_BUTTONS -void board_button_initialize(void); -#endif - -/**************************************************************************** - * Name: board_buttons - * - * Description: - * After board_button_initialize() has been called, board_buttons() may be - * called to collect the state of all buttons. board_buttons() returns an - * 8-bit bit set with each bit associated with a button. A bit set to - * "1" means that the button is depressed; a bit set to "0" means that - * the button is released. The correspondence of the each button bit - * and physical buttons is board-specific. - * - * NOTE: This interface may or may not be supported by board-specific - * logic. If the board supports button interfaces, then - * CONFIG_ARCH_BUTTONS will be defined - * - ****************************************************************************/ - -#ifdef CONFIG_ARCH_BUTTONS -uint8_t board_buttons(void); -#endif - -/**************************************************************************** - * Name: board_button_irq - * - * Description: - * This function may be called to register an interrupt handler that will - * be called when a button is depressed or released. The ID value is a - * button enumeration value that uniquely identifies a button resource. - * The previous interrupt handler address is returned (so that it may - * restored, if so desired). - * - * NOTE: This interface may or may not be supported by board-specific - * logic. If the board supports any button interfaces, then - * CONFIG_ARCH_BUTTONS will be defined; If the board supports interrupt - * buttons, then CONFIG_ARCH_IRQBUTTONS will also be defined. - * - ****************************************************************************/ - -#ifdef CONFIG_ARCH_IRQBUTTONS -xcpt_t board_button_irq(int id, xcpt_t irqhandler); -#endif - /**************************************************************************** * Name: up_rtcinitialize * diff --git a/nuttx/include/nuttx/board.h b/nuttx/include/nuttx/board.h index e196233f7..c923445ac 100644 --- a/nuttx/include/nuttx/board.h +++ b/nuttx/include/nuttx/board.h @@ -32,6 +32,64 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ +/* This header file contains function prototypes for the interfaces between + * (1) the nuttx core-code, (2) the microprocessor specific logic that + * resides under the arch/ sub-directory, and (3) the board-specific logic + * that resides under configs/ + * + * Naming conventions: + * + * 1. Common Microprocessor Interfaces. + * + * Any interface that is common across all microprocessors should be + * prefixed with up_ and prototyped in this header file. These + * definitions provide the common interface between NuttX and the + * architecture-specific implementation in arch/ + * + * These definitions are retained in the the header file nuttx/include/arch.h + * + * NOTE: up_ is supposed to stand for microprocessor; the u is like the + * Greek letter micron: µ. So it would be µP which is a common shortening + * of the word microprocessor. + * + * 2. Microprocessor-Specific Interfaces. + * + * An interface which is unique to a certain microprocessor should be + * prefixed with the name of the microprocessor, for example stm32_, + * and be prototyped in some header file in the arch/ directories. + * + * There is also a arch//include//chip.h header file + * that can be used to communicate other microprocessor-specific + * information between the board logic and even application logic. + * Application logic may, for example, need to know specific capabilities + * of the chip. Prototypes in that chip.h header file should follow the + * microprocessor specific naming convention. + * + * 3. Common Board Interfaces. + * + * Any interface that is common across all boards should be prefixed + * with board_ and should be prototyped in this header file. These + * board_ definitions provide the interface between the board-level + * logic and the architecture-specific logic. + * + * Board related declarations are retained in this header file. + * + * There is also a configs//include/board.h header file that + * can be used to communicate other board-specific information between + * the architecture logic and even application logic. Any definitions + * which are common between a single architecture and several boards + * should go in this board.h header file; this file is reserved for + * board-related definitions common to all architectures. + * + * 4. Board-Specific Interfaces. + * + * Any interface which is unique to a board should be prefixed with + * the board name, for example stm32f4discovery_. Sometimes the board + * name is too long so stm32_ would be okay too. These should be + * prototyped in configs//src/.h and should not be used + * outside of that board directory since board-specific definitions + * have no meaning outside of the board directory. + */ #ifndef __INCLUDE_NUTTX_BOARD_H #define __INCLUDE_NUTTX_BOARD_H @@ -42,6 +100,10 @@ #include +#ifdef CONFIG_ARCH_IRQBUTTONS +# include +#endif + /**************************************************************************** * Public Function Prototypes * @@ -51,6 +113,23 @@ * ****************************************************************************/ +/**************************************************************************** + * Name: board_initialize + * + * Description: + * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * initialization call will be performed in the boot-up sequence to a + * function called board_initialize(). board_initialize() will be + * called immediately after up_initialize() is called and just before the + * initial application is started. This additional initialization phase + * may be used, for example, to initialize board-specific device drivers. + * + ****************************************************************************/ + +#ifdef CONFIG_BOARD_INITIALIZE +void board_initialize(void); +#endif + /**************************************************************************** * Name: board_led_initialize * @@ -144,4 +223,65 @@ void board_led_off(int led); # define board_led_off(led) #endif +/**************************************************************************** + * Name: board_button_initialize + * + * Description: + * board_button_initialize() must be called to initialize button resources. + * After that, board_buttons() may be called to collect the current state of + * all buttons or board_button_irq() may be called to register button interrupt + * handlers. + * + * NOTE: This interface may or may not be supported by board-specific + * logic. If the board supports button interfaces, then CONFIG_ARCH_BUTTONS + * will be defined. + * + ****************************************************************************/ + +#ifdef CONFIG_ARCH_BUTTONS +void board_button_initialize(void); +#endif + +/**************************************************************************** + * Name: board_buttons + * + * Description: + * After board_button_initialize() has been called, board_buttons() may be + * called to collect the state of all buttons. board_buttons() returns an + * 8-bit bit set with each bit associated with a button. A bit set to + * "1" means that the button is depressed; a bit set to "0" means that + * the button is released. The correspondence of the each button bit + * and physical buttons is board-specific. + * + * NOTE: This interface may or may not be supported by board-specific + * logic. If the board supports button interfaces, then + * CONFIG_ARCH_BUTTONS will be defined + * + ****************************************************************************/ + +#ifdef CONFIG_ARCH_BUTTONS +uint8_t board_buttons(void); +#endif + +/**************************************************************************** + * Name: board_button_irq + * + * Description: + * This function may be called to register an interrupt handler that will + * be called when a button is depressed or released. The ID value is a + * button enumeration value that uniquely identifies a button resource. + * The previous interrupt handler address is returned (so that it may + * restored, if so desired). + * + * NOTE: This interface may or may not be supported by board-specific + * logic. If the board supports any button interfaces, then + * CONFIG_ARCH_BUTTONS will be defined; If the board supports interrupt + * buttons, then CONFIG_ARCH_IRQBUTTONS will also be defined. + * + ****************************************************************************/ + +#ifdef CONFIG_ARCH_IRQBUTTONS +xcpt_t board_button_irq(int id, xcpt_t irqhandler); +#endif + #endif /* __INCLUDE_NUTTX_BOARD_H */ diff --git a/nuttx/sched/init/os_bringup.c b/nuttx/sched/init/os_bringup.c index f3918ec88..405b93d0a 100644 --- a/nuttx/sched/init/os_bringup.c +++ b/nuttx/sched/init/os_bringup.c @@ -48,6 +48,7 @@ #include #include +#include #include #include #include -- cgit v1.2.3