diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-18 12:24:21 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-18 12:24:21 -0600 |
commit | 7687c6df6ee255c8cd42ebfb7c352d99df33a24d (patch) | |
tree | 1a96c2b1274ec556969163b3c72490626e95aa50 | |
parent | c21414db1d5c437f36fd3cd3b615a3256ad37265 (diff) | |
download | nuttx-7687c6df6ee255c8cd42ebfb7c352d99df33a24d.tar.gz nuttx-7687c6df6ee255c8cd42ebfb7c352d99df33a24d.tar.bz2 nuttx-7687c6df6ee255c8cd42ebfb7c352d99df33a24d.zip |
STM32F429 Discovery: All src/ files renamed to make consistent with current naming conventions
-rw-r--r-- | nuttx/ChangeLog | 3 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/Makefile | 20 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_autoleds.c (renamed from nuttx/configs/stm32f429i-disco/src/up_autoleds.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_boot.c (renamed from nuttx/configs/stm32f429i-disco/src/up_boot.c) | 7 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_buttons.c (renamed from nuttx/configs/stm32f429i-disco/src/up_buttons.c) | 6 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_cxxinitialize.c (renamed from nuttx/configs/stm32f429i-disco/src/up_cxxinitialize.c) | 3 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_extmem.c (renamed from nuttx/configs/stm32f429i-disco/src/up_extmem.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_idle.c (renamed from nuttx/configs/stm32f429i-disco/src/up_idle.c) | 19 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_nsh.c (renamed from nuttx/configs/stm32f429i-disco/src/up_nsh.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_ostest.c (renamed from nuttx/configs/stm32f429i-disco/src/up_ostest.c) | 4 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_spi.c (renamed from nuttx/configs/stm32f429i-disco/src/up_spi.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_usb.c (renamed from nuttx/configs/stm32f429i-disco/src/up_usb.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32_userleds.c (renamed from nuttx/configs/stm32f429i-disco/src/up_userleds.c) | 9 | ||||
-rw-r--r-- | nuttx/configs/stm32f429i-disco/src/stm32f429i-disco.h (renamed from nuttx/configs/stm32f429i-disco/src/stm32f429i-disco-internal.h) | 17 |
14 files changed, 53 insertions, 60 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 59231ad1a..ae0c37b01 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6592,3 +6592,6 @@ David Alessio (2014-2-18). * Other misc changes to support FPU on STM32F429 Discovery from David Alession (2014-2-18) + * stm32f429i-disco/src: Files renamed to make more consistent + with current board file naming conventions (2014-2-18). + diff --git a/nuttx/configs/stm32f429i-disco/src/Makefile b/nuttx/configs/stm32f429i-disco/src/Makefile index db1934310..634f6fb05 100644 --- a/nuttx/configs/stm32f429i-disco/src/Makefile +++ b/nuttx/configs/stm32f429i-disco/src/Makefile @@ -40,40 +40,40 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_spi.c +CSRCS = stm32_boot.c stm32_spi.c ifeq ($(CONFIG_HAVE_CXX),y) -CSRCS += up_cxxinitialize.c +CSRCS += stm32_cxxinitialize.c endif ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_autoleds.c +CSRCS += stm32_autoleds.c else -CSRCS += up_userleds.c +CSRCS += stm32_userleds.c endif ifeq ($(CONFIG_ARCH_BUTTONS),y) -CSRCS += up_buttons.c +CSRCS += stm32_buttons.c endif ifeq ($(CONFIG_NSH_LIBRARY),y) -CSRCS += up_nsh.c +CSRCS += stm32_nsh.c endif ifeq ($(CONFIG_IDLE_CUSTOM),y) -CSRCS += up_idle.c +CSRCS += stm32_idle.c endif ifeq ($(CONFIG_STM32_FSMC),y) -CSRCS += up_extmem.c +CSRCS += stm32_extmem.c endif ifeq ($(CONFIG_STM32_OTGFS2),y) -CSRCS += up_usb.c +CSRCS += stm32_usb.c endif ifeq ($(CONFIG_ARCH_FPU),y) -CSRCS += up_ostest.c +CSRCS += stm32_ostest.c endif COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/stm32f429i-disco/src/up_autoleds.c b/nuttx/configs/stm32f429i-disco/src/stm32_autoleds.c index e93a94969..7ae1edd37 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_autoleds.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_autoleds.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/stm32f429i-disco/src/up_autoleds.c - * arch/arm/src/board/up_autoleds.c + * configs/stm32f429i-disco/src/stm32_autoleds.c * * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -50,7 +49,7 @@ #include "up_arch.h" #include "up_internal.h" #include "stm32.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" #ifdef CONFIG_ARCH_LEDS diff --git a/nuttx/configs/stm32f429i-disco/src/up_boot.c b/nuttx/configs/stm32f429i-disco/src/stm32_boot.c index 1f1d59fb0..9778b5a59 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_boot.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_boot.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm32f429i-disco/src/up_boot.c - * arch/arm/src/board/up_boot.c + * configs/stm32f429i-disco/src/stm32_boot.c * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -45,7 +44,7 @@ #include <arch/board/board.h> #include "up_arch.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" /************************************************************************************ * Definitions @@ -114,7 +113,7 @@ void stm32_boardinitialize(void) * 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_intiialize() is called and just before the + * 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. * diff --git a/nuttx/configs/stm32f429i-disco/src/up_buttons.c b/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c index 12eb45bb7..db259ff63 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_buttons.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/stm32f429i-disco/src/board_buttons.c + * configs/stm32f429i-disco/src/stm32_buttons.c * - * Copyright (C) 2011-2012, 2-14 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include <nuttx/arch.h> #include <arch/board/board.h> -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" #ifdef CONFIG_ARCH_BUTTONS diff --git a/nuttx/configs/stm32f429i-disco/src/up_cxxinitialize.c b/nuttx/configs/stm32f429i-disco/src/stm32_cxxinitialize.c index bb39af736..7e6aa779e 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_cxxinitialize.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_cxxinitialize.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm32f429i-disco/src/up_cxxinitialize.c - * arch/arm/src/board/up_cxxinitialize.c + * configs/stm32f429i-disco/src/stm32_cxxinitialize.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/stm32f429i-disco/src/up_extmem.c b/nuttx/configs/stm32f429i-disco/src/stm32_extmem.c index 2de06ed19..b56341a41 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_extmem.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_extmem.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm32f429i-disco/src/up_extmem.c - * arch/arm/src/board/up_extmem.c + * configs/stm32f429i-disco/src/stm32_extmem.c * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit <pettitkd@gmail.com> @@ -52,7 +51,7 @@ #include "stm32_fsmc.h" #include "stm32_gpio.h" #include "stm32.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/configs/stm32f429i-disco/src/up_idle.c b/nuttx/configs/stm32f429i-disco/src/stm32_idle.c index bd8d00816..d4951f531 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_idle.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_idle.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/stm32f429i-disco/src/up_idle.c - * arch/arm/src/board/up_idle.c + * configs/stm32f429i-disco/src/stm32_idle.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt <gnutt@nuttx.org> @@ -56,7 +55,7 @@ #include "stm32_rcc.h" #include "stm32_exti.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" /**************************************************************************** * Pre-processor Definitions @@ -89,7 +88,7 @@ ****************************************************************************/ #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) -static void up_alarmcb(void); +static void stm32_alarmcb(void); #endif /**************************************************************************** @@ -97,7 +96,7 @@ static void up_alarmcb(void); ****************************************************************************/ /**************************************************************************** - * Name: up_idlepm + * Name: stm32_idlepm * * Description: * Perform IDLE state power management. @@ -105,7 +104,7 @@ static void up_alarmcb(void); ****************************************************************************/ #ifdef CONFIG_PM -static void up_idlepm(void) +static void stm32_idlepm(void) { #ifdef CONFIG_RTC_ALARM struct timespec alarmtime; @@ -218,11 +217,11 @@ errout: } } #else -# define up_idlepm() +# define stm32_idlepm() #endif /************************************************************************************ - * Name: up_alarmcb + * Name: stm32_alarmcb * * Description: * RTC alarm service routine @@ -230,7 +229,7 @@ errout: ************************************************************************************/ #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) -static void up_alarmcb(void) +static void stm32_alarmcb(void) { /* This alarm occurs because there wasn't any EXTI interrupt during the * PM_STANDBY period. So just go to sleep. @@ -270,7 +269,7 @@ void up_idle(void) /* Perform IDLE mode power management */ BEGIN_IDLE(); - up_idlepm(); + stm32_idlepm(); END_IDLE(); #endif } diff --git a/nuttx/configs/stm32f429i-disco/src/up_nsh.c b/nuttx/configs/stm32f429i-disco/src/stm32_nsh.c index fff6da883..3504ed05d 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_nsh.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/stm32f429i-disco/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/stm32f429i-disco/src/stm32_nsh.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -74,7 +73,7 @@ #endif #include "stm32.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/configs/stm32f429i-disco/src/up_ostest.c b/nuttx/configs/stm32f429i-disco/src/stm32_ostest.c index 1b109505c..51911ea54 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_ostest.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_ostest.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/stm32f429i-disco/src/up_ostest.c + * configs/stm32f429i-disco/src/stm32_ostest.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -49,7 +49,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" /************************************************************************************ * Definitions diff --git a/nuttx/configs/stm32f429i-disco/src/up_spi.c b/nuttx/configs/stm32f429i-disco/src/stm32_spi.c index df9e9a3a0..67e6ee02c 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_spi.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm32f429i-disco/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/stm32f429i-disco/src/stm32_spi.c * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -51,7 +50,7 @@ #include "up_arch.h" #include "chip.h" #include "stm32.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) ||\ defined(CONFIG_STM32_SPI4) || defined(CONFIG_STM32_SPI5) diff --git a/nuttx/configs/stm32f429i-disco/src/up_usb.c b/nuttx/configs/stm32f429i-disco/src/stm32_usb.c index 1c0120f8b..11369638e 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_usb.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_usb.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm32f429i-disco/src/up_usbdev.c - * arch/arm/src/board/up_boot.c + * configs/stm32f429i-disco/src/stm32_usbdev.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -54,7 +53,7 @@ #include "up_arch.h" #include "stm32.h" #include "stm32_otgfs.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" #ifdef CONFIG_STM32_OTGFS2 diff --git a/nuttx/configs/stm32f429i-disco/src/up_userleds.c b/nuttx/configs/stm32f429i-disco/src/stm32_userleds.c index c8b5038c4..29ca346ec 100644 --- a/nuttx/configs/stm32f429i-disco/src/up_userleds.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_userleds.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/stm32f429i-disco/src/up_leds.c - * arch/arm/src/board/up_leds.c + * configs/stm32f429i-disco/src/stm32_userleds.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -51,7 +50,7 @@ #include "up_arch.h" #include "up_internal.h" #include "stm32.h" -#include "stm32f429i-disco-internal.h" +#include "stm32f429i-disco.h" #ifndef CONFIG_ARCH_LEDS @@ -223,11 +222,11 @@ void stm32_setleds(uint8_t ledset) } /**************************************************************************** - * Name: up_ledpminitialize + * Name: stm32_ledpminitialize ****************************************************************************/ #ifdef CONFIG_PM -void up_ledpminitialize(void) +void stm32_ledpminitialize(void) { /* Register to receive power management callbacks */ diff --git a/nuttx/configs/stm32f429i-disco/src/stm32f429i-disco-internal.h b/nuttx/configs/stm32f429i-disco/src/stm32f429i-disco.h index 9a0251782..f7246e8fb 100644 --- a/nuttx/configs/stm32f429i-disco/src/stm32f429i-disco-internal.h +++ b/nuttx/configs/stm32f429i-disco/src/stm32f429i-disco.h @@ -1,6 +1,5 @@ /**************************************************************************************************** - * configs/stm32f429i-disco/src/stm32f429i-disco-internal.h - * arch/arm/src/board/stm32f429i-disco-internal.n + * configs/stm32f429i-disco/src/stm32f429i-disco.h * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -34,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __CONFIGS_STM32F429I_DISCO_SRC_STM32F429I_DISCO_INTERNAL_H -#define __CONFIGS_STM32F429I_DISCO_SRC_STM32F429I_DISCO_INTERNAL_H +#ifndef __CONFIGS_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H +#define __CONFIGS_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H /**************************************************************************************************** * Included Files @@ -192,7 +191,7 @@ void stm32_disablefsmc(void); #endif /**************************************************************************************************** - * Name: up_ledpminitialize + * Name: stm32_ledpminitialize * * Description: * Enable logic to use the LEDs on the STM32F429Discovery to support power management testing @@ -200,11 +199,11 @@ void stm32_disablefsmc(void); ****************************************************************************************************/ #ifdef CONFIG_PM -void up_ledpminitialize(void); +void stm32_ledpminitialize(void); #endif /**************************************************************************************************** - * Name: up_pmbuttons + * Name: stm32_pmbuttons * * Description: * Configure the user button of the STM32F429I-DISCO board as EXTI, @@ -213,7 +212,7 @@ void up_ledpminitialize(void); ****************************************************************************************************/ #if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS) -void up_pmbuttons(void); +void stm32_pmbuttons(void); #endif /**************************************************************************** @@ -236,5 +235,5 @@ int nsh_archinitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIGS_STM32F429I_DISCO_SRC_STM32F429I_DISCO_INTERNAL_H */ +#endif /* __CONFIGS_STM32F429I_DISCO_SRC_STM32F429I_DISCO_H */ |