STM32F429 Discovery: All src/ files renamed to make consistent with current naming conventions
This commit is contained in:
parent
06e7e5dfa1
commit
705fc64e95
14 changed files with 53 additions and 60 deletions
|
|
@ -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).
|
||||
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -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.
|
||||
*
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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 */
|
||||
|
||||
|
|
@ -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 */
|
||||
|
||||
Loading…
Add table
Reference in a new issue