sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32F4 Discovery: Rename most everything in the board source directory to conform with the ever evolving naming standard

Browse Source
This commit is contained in:
Gregory Nutt 2014-02-03 17:19:30 -06:00
parent ef899c5115
commit 76c982583d
23 changed files with 178 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6538,4 +6538,6 @@
* arch/arm/src/lm/lm_serial.c: Fix cut'n'paste error that prevented
UARTS2-7 from being used with the LM4F120 Launchpad (2014-02-03).
* configs/stm32f4discovery/src: Almost everything renamed to confgorm
to the ever-evolving naming standard (2014-02-03).

2
Documentation/NuttShell.html
View File

@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1>
<p>Last Updated: January 18, 2014</p>
<p>Last Updated: February 3, 2014</p>
</td>
</tr>
</table>

107
configs/stm32f4discovery/nsh/defconfig
View File

@ -43,7 +43,13 @@ CONFIG_RAW_BINARY=y
# Debug Options
#
# CONFIG_DEBUG is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
# CONFIG_DEBUG_SYMBOLS is not set
CONFIG_ARCH_HAVE_CUSTOMOPT=y
# CONFIG_DEBUG_NOOPT is not set
# CONFIG_DEBUG_CUSTOMOPT is not set
CONFIG_DEBUG_FULLOPT=y
#
# System Type
@ -64,6 +70,7 @@ CONFIG_ARCH="arm"
#
# ARM Options
#
# CONFIG_ARCH_CHIP_A1X is not set
# CONFIG_ARCH_CHIP_C5471 is not set
# CONFIG_ARCH_CHIP_CALYPSO is not set
# CONFIG_ARCH_CHIP_DM320 is not set
@ -88,6 +95,7 @@ CONFIG_ARCH_CHIP_STM32=y
# CONFIG_ARCH_CORTEXM3 is not set
CONFIG_ARCH_CORTEXM4=y
# CONFIG_ARCH_CORTEXA5 is not set
# CONFIG_ARCH_CORTEXA8 is not set
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="stm32"
# CONFIG_ARMV7M_USEBASEPRI is not set
@ -146,6 +154,13 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_ARCH_CHIP_STM32F100VE is not set
# CONFIG_ARCH_CHIP_STM32F103C4 is not set
# CONFIG_ARCH_CHIP_STM32F103C8 is not set
# CONFIG_ARCH_CHIP_STM32F103T8 is not set
# CONFIG_ARCH_CHIP_STM32F103TB is not set
# CONFIG_ARCH_CHIP_STM32F103CB is not set
# CONFIG_ARCH_CHIP_STM32F103R8 is not set
# CONFIG_ARCH_CHIP_STM32F103RB is not set
# CONFIG_ARCH_CHIP_STM32F103V8 is not set
# CONFIG_ARCH_CHIP_STM32F103VB is not set
# CONFIG_ARCH_CHIP_STM32F103RET6 is not set
# CONFIG_ARCH_CHIP_STM32F103VCT6 is not set
# CONFIG_ARCH_CHIP_STM32F103VET6 is not set
@ -153,6 +168,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_ARCH_CHIP_STM32F105VBT7 is not set
# CONFIG_ARCH_CHIP_STM32F107VC is not set
# CONFIG_ARCH_CHIP_STM32F207IG is not set
# CONFIG_ARCH_CHIP_STM32F207ZE is not set
# CONFIG_ARCH_CHIP_STM32F302CB is not set
# CONFIG_ARCH_CHIP_STM32F302CC is not set
# CONFIG_ARCH_CHIP_STM32F302RB is not set
@ -177,6 +193,11 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
# CONFIG_ARCH_CHIP_STM32F427V is not set
# CONFIG_ARCH_CHIP_STM32F427Z is not set
# CONFIG_ARCH_CHIP_STM32F427I is not set
# CONFIG_ARCH_CHIP_STM32F429V is not set
# CONFIG_ARCH_CHIP_STM32F429Z is not set
# CONFIG_ARCH_CHIP_STM32F429I is not set
# CONFIG_ARCH_CHIP_STM32F429B is not set
# CONFIG_ARCH_CHIP_STM32F429N is not set
# CONFIG_STM32_STM32L15XX is not set
# CONFIG_STM32_ENERGYLITE is not set
# CONFIG_STM32_STM32F10XX is not set
@ -194,6 +215,8 @@ CONFIG_STM32_STM32F40XX=y
#
# STM32 Peripheral Support
#
# CONFIG_STM32_HAVE_USBDEV is not set
CONFIG_STM32_HAVE_OTGFS=y
# CONFIG_STM32_ADC1 is not set
# CONFIG_STM32_ADC2 is not set
# CONFIG_STM32_ADC3 is not set
@ -288,10 +311,13 @@ CONFIG_STM32_USART=y
# CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set
# CONFIG_ARCH_DMA is not set
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_HAVE_IRQPRIO=y
# CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y
# CONFIG_ARCH_HAVE_MMU is not set
# CONFIG_ARCH_NAND_HWECC is not set
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_STACKDUMP=y
# CONFIG_ENDIAN_BIG is not set
# CONFIG_ARCH_HAVE_RAMFUNCS is not set
@ -303,8 +329,14 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
#
CONFIG_BOARD_LOOPSPERMSEC=16717
# CONFIG_ARCH_CALIBRATION is not set
#
# Interrupt options
#
CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
# CONFIG_ARCH_HIPRI_INTERRUPT is not set
#
# Boot options
@ -320,6 +352,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
#
CONFIG_RAM_START=0x20000000
CONFIG_RAM_SIZE=114688
# CONFIG_ARCH_HAVE_SDRAM is not set
#
# Board Selection
@ -349,6 +382,7 @@ CONFIG_NSH_MMCSDMINOR=0
#
# CONFIG_BOARD_INITIALIZE is not set
CONFIG_MSEC_PER_TICK=10
# CONFIG_SYSTEM_TIME64 is not set
CONFIG_RR_INTERVAL=200
# CONFIG_SCHED_INSTRUMENTATION is not set
CONFIG_TASK_NAME_SIZE=0
@ -416,18 +450,21 @@ CONFIG_DEV_NULL=y
# CONFIG_LOOP is not set
# CONFIG_RAMDISK is not set
# CONFIG_CAN is not set
# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
# CONFIG_PWM is not set
# CONFIG_I2C is not set
CONFIG_ARCH_HAVE_I2CRESET=y
# CONFIG_I2C is not set
CONFIG_SPI=y
# CONFIG_SPI_OWNBUS is not set
CONFIG_SPI_EXCHANGE=y
# CONFIG_SPI_CMDDATA is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_I2S is not set
# CONFIG_RTC is not set
# CONFIG_WATCHDOG is not set
# CONFIG_ANALOG is not set
# CONFIG_AUDIO_DEVICES is not set
# CONFIG_VIDEO_DEVICES is not set
# CONFIG_BCH is not set
# CONFIG_INPUT is not set
# CONFIG_LCD is not set
@ -437,6 +474,7 @@ CONFIG_SPI_EXCHANGE=y
# CONFIG_PM is not set
# CONFIG_POWER is not set
# CONFIG_SENSORS is not set
# CONFIG_SERCOMM_CONSOLE is not set
CONFIG_SERIAL=y
# CONFIG_DEV_LOWCONSOLE is not set
# CONFIG_16550_UART is not set
@ -480,6 +518,8 @@ CONFIG_USART2_2STOP=0
#
# Networking Support
#
# CONFIG_ARCH_HAVE_NET is not set
# CONFIG_ARCH_HAVE_PHY is not set
# CONFIG_NET is not set
#
@ -490,12 +530,15 @@ CONFIG_USART2_2STOP=0
# File system configuration
#
# CONFIG_DISABLE_MOUNTPOINT is not set
# CONFIG_FS_READABLE is not set
# CONFIG_FS_WRITABLE is not set
# CONFIG_FS_RAMMAP is not set
# CONFIG_FS_FAT is not set
# CONFIG_FS_NXFFS is not set
# CONFIG_FS_ROMFS is not set
# CONFIG_FS_SMARTFS is not set
# CONFIG_FS_BINFS is not set
# CONFIG_FS_PROCFS is not set
#
# System Logging
@ -514,6 +557,7 @@ CONFIG_USART2_2STOP=0
# CONFIG_MM_MULTIHEAP is not set
# CONFIG_MM_SMALL is not set
CONFIG_MM_REGIONS=2
# CONFIG_ARCH_HAVE_HEAP2 is not set
# CONFIG_GRAN is not set
#
@ -595,7 +639,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
#
# CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CONFIGDATA is not set
# CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set
@ -643,7 +687,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_EXAMPLES_UDP is not set
# CONFIG_EXAMPLES_UIP is not set
# CONFIG_EXAMPLES_USBSERIAL is not set
# CONFIG_SYSTEM_USBMSC is not set
# CONFIG_EXAMPLES_USBTERM is not set
# CONFIG_EXAMPLES_WATCHDOG is not set
@ -666,14 +709,11 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# Networking Utilities
#
# CONFIG_NETUTILS_CODECS is not set
# CONFIG_NETUTILS_DHCPC is not set
# CONFIG_NETUTILS_DHCPD is not set
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
# CONFIG_NETUTILS_RESOLV is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
# CONFIG_NETUTILS_THTTPD is not set
# CONFIG_NETUTILS_UIPLIB is not set
@ -688,16 +728,20 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# NSH Library
#
CONFIG_NSH_LIBRARY=y
CONFIG_NSH_READLINE=y
# CONFIG_NSH_CLE is not set
CONFIG_NSH_BUILTIN_APPS=y
#
# Disable Individual commands
#
# CONFIG_NSH_DISABLE_ADDROUTE is not set
# CONFIG_NSH_DISABLE_CAT is not set
# CONFIG_NSH_DISABLE_CD is not set
# CONFIG_NSH_DISABLE_CP is not set
# CONFIG_NSH_DISABLE_CMP is not set
# CONFIG_NSH_DISABLE_DD is not set
# CONFIG_NSH_DISABLE_DELROUTE is not set
# CONFIG_NSH_DISABLE_ECHO is not set
# CONFIG_NSH_DISABLE_EXEC is not set
# CONFIG_NSH_DISABLE_EXIT is not set
@ -739,11 +783,17 @@ CONFIG_NSH_BUILTIN_APPS=y
#
# CONFIG_NSH_CMDOPT_DF_H is not set
CONFIG_NSH_CODECS_BUFSIZE=128
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
# CONFIG_NSH_DISABLE_SEMICOLON is not set
# CONFIG_NSH_CMDPARMS is not set
CONFIG_NSH_MAXARGUMENTS=6
# CONFIG_NSH_ARGCAT is not set
CONFIG_NSH_NESTDEPTH=3
# CONFIG_NSH_DISABLESCRIPT is not set
# CONFIG_NSH_DISABLE_ITEF is not set
# CONFIG_NSH_DISABLE_LOOPS is not set
# CONFIG_NSH_DISABLEBG is not set
CONFIG_NSH_CONSOLE=y
@ -758,7 +808,20 @@ CONFIG_NSH_CONSOLE=y
#
#
# System NSH Add-Ons
# Platform-specific Support
#
# CONFIG_PLATFORM_CONFIGDATA is not set
#
# System Libraries and NSH Add-Ons
#
#
# USB CDC/ACM Device Commands
#
#
# USB Composite Device Commands
#
#
@ -770,6 +833,11 @@ CONFIG_NSH_CONSOLE=y
# I2C tool
#
#
# INI File Parser
#
# CONFIG_SYSTEM_INIFILE is not set
#
# FLASH Program Installation
#
@ -779,6 +847,11 @@ CONFIG_NSH_CONSOLE=y
# FLASH Erase-all Command
#
#
# NxPlayer media player library / command Line
#
# CONFIG_SYSTEM_NXPLAYER is not set
#
# RAM test
#
@ -814,6 +887,24 @@ CONFIG_READLINE_ECHO=y
# USB Monitor
#
#
# EMACS-like Command Line Editor
#
# CONFIG_SYSTEM_CLE is not set
#
# VI Work-Alike Editor
#
# CONFIG_SYSTEM_VI is not set
#
# Stack Monitor
#
#
# USB Mass Storage Device Commands
#
#
# Zmodem Commands
#

34
configs/stm32f4discovery/src/Makefile
View File

@ -40,68 +40,68 @@ 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_STM32_OTGFS),y)
CSRCS += up_usb.c
CSRCS += stm32_usb.c
endif
ifeq ($(CONFIG_PWM),y)
CSRCS += up_pwm.c
CSRCS += stm32_psm.c
endif
ifeq ($(CONFIG_QENCODER),y)
CSRCS += up_qencoder.c
CSRCS += stm32_qencoder.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += up_watchdog.c
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_NSH_LIBRARY),y)
CSRCS += up_nsh.c
CSRCS += stm32_nsh.c
endif
ifeq ($(CONFIG_PM_CUSTOMINIT),y)
CSRCS += up_pm.c
CSRCS += stm32_pm.c
endif
ifeq ($(CONFIG_PM_BUTTONS),y)
CSRCS += up_pmbuttons.c
CSRCS += stm32_pm_buttons.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
ifeq ($(CONFIG_LCD_SSD1289),y)
CSRCS += up_ssd1289.c
CSRCS += stm32_ssd1289.c
endif
endif
ifeq ($(CONFIG_LCD_UG2864AMBAG01),y)
CSRCS += up_ug2864ambag01.c
CSRCS += stm32_ug2864ambag01.c
endif
ifeq ($(CONFIG_LCD_UG2864HSWEG01),y)
CSRCS += up_ug2864hsweg01.c
CSRCS += stm32_ug2864hsweg01.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))

5
configs/stm32f4discovery/src/up_autoleds.c → configs/stm32f4discovery/src/stm32_autoleds.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* configs/stm32f4discovery/src/up_autoleds.c
* arch/arm/src/board/up_autoleds.c
* configs/stm32f4discovery/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 "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_ARCH_LEDS

7
configs/stm32f4discovery/src/up_boot.c → configs/stm32f4discovery/src/stm32_boot.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_boot.c
* arch/arm/src/board/up_boot.c
* configs/stm32f4discovery/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 "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
/************************************************************************************
* Definitions
@ -109,7 +108,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.
*

4
configs/stm32f4discovery/src/up_buttons.c → configs/stm32f4discovery/src/stm32_buttons.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f4discovery/src/board_buttons.c
* configs/stm32f4discovery/src/stm32_buttons.c
*
* Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_ARCH_BUTTONS

3
configs/stm32f4discovery/src/up_cxxinitialize.c → configs/stm32f4discovery/src/stm32_cxxinitialize.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_cxxinitialize.c
* arch/arm/src/board/up_cxxinitialize.c
* configs/stm32f4discovery/src/stm32_cxxinitialize.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

5
configs/stm32f4discovery/src/up_extmem.c → configs/stm32f4discovery/src/stm32_extmem.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4disovery/src/up_extmem.c
* arch/arm/src/board/up_extmem.c
* configs/stm32f4disovery/src/stm32_extmem.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -52,7 +51,7 @@
#include "stm32_fsmc.h"
#include "stm32_gpio.h"
#include "stm32.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
/************************************************************************************
* Pre-processor Definitions

13
configs/stm32f4discovery/src/up_idle.c → configs/stm32f4discovery/src/stm32_idle.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* configs/stm32f4discovery/src/up_idle.c
* arch/arm/src/board/up_idle.c
* configs/stm32f4discovery/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 "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
/****************************************************************************
* Pre-processor Definitions
@ -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,7 +217,7 @@ errout:
}
}
#else
# define up_idlepm()
# define stm32_idlepm()
#endif
/************************************************************************************
@ -270,7 +269,7 @@ void up_idle(void)
/* Perform IDLE mode power management */
BEGIN_IDLE();
up_idlepm();
stm32_idlepm();
END_IDLE();
#endif
}

5
configs/stm32f4discovery/src/up_nsh.c → configs/stm32f4discovery/src/stm32_nsh.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* config/stm32f4discovery/src/up_nsh.c
* arch/arm/src/board/up_nsh.c
* config/stm32f4discovery/src/stm32_nsh.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -59,7 +58,7 @@
#endif
#include "stm32.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
/****************************************************************************
* Pre-Processor Definitions

13
configs/stm32f4discovery/src/up_pm.c → configs/stm32f4discovery/src/stm32_pm.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* configs/stm32f4discovery/src/up_pm.c
* arch/arm/src/board/up_pm.c
* configs/stm32f4discovery/src/stm32_pm.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +44,7 @@
#include "up_internal.h"
#include "stm32_pm.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_PM
@ -70,7 +69,7 @@
****************************************************************************/
/****************************************************************************
* Name: up_pminitialize
* Name: stm32_pminitialize
*
* Description:
* This function is called by MCU-specific logic at power-on reset in
@ -87,7 +86,7 @@
*
****************************************************************************/
void up_pminitialize(void)
void stm32_pminitialize(void)
{
/* Then initialize the NuttX power management subsystem proper */
@ -96,12 +95,12 @@ void up_pminitialize(void)
#if defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
/* Initialize the buttons to wake up the system from low power modes */
up_pmbuttons();
stm32_pm_buttons();
#endif
/* Initialize the LED PM */
up_ledpminitialize();
stm32_led_pminitialize();
}
#endif /* CONFIG_PM */

9
configs/stm32f4discovery/src/up_pmbuttons.c → configs/stm32f4discovery/src/stm32_pmbuttons.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* configs/stm32f4discovery/src/up_pmbuttons.c
* arch/arm/src/board/up_pmbuttons.c
* configs/stm32f4discovery/src/stm32_pm_buttons.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@ -51,7 +50,7 @@
#include "nvic.h"
#include "stm32_pwr.h"
#include "stm32_pm.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
@ -120,7 +119,7 @@ static int button_handler(int irq, FAR void *context)
****************************************************************************/
/****************************************************************************
* Name: up_pmbuttons
* Name: stm32_pm_buttons
*
* Description:
* Configure the user button of the STM32f4discovery board as EXTI,
@ -128,7 +127,7 @@ static int button_handler(int irq, FAR void *context)
*
****************************************************************************/
void up_pmbuttons(void)
void stm32_pm_buttons(void)
{
/* Initialize the button GPIOs */

5
configs/stm32f4discovery/src/up_pwm.c → configs/stm32f4discovery/src/stm32_pwm.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_pwm.c
* arch/arm/src/board/up_pwm.c
* configs/stm32f4discovery/src/stm32_psm.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -49,7 +48,7 @@
#include "chip.h"
#include "up_arch.h"
#include "stm32_pwm.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
/************************************************************************************
* Definitions

5
configs/stm32f4discovery/src/up_qencoder.c → configs/stm32f4discovery/src/stm32_qencoder.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_qencoder.c
* arch/arm/src/board/up_qencoder.c
* configs/stm32f4discovery/src/stm32_qencoder.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -49,7 +48,7 @@
#include "chip.h"
#include "up_arch.h"
#include "stm32_qencoder.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
/************************************************************************************
* Definitions

5
configs/stm32f4discovery/src/up_spi.c → configs/stm32f4discovery/src/stm32_spi.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_spi.c
* arch/arm/src/board/up_spi.c
* configs/stm32f4discovery/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 "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

5
configs/stm32f4discovery/src/up_ssd1289.c → configs/stm32f4discovery/src/stm32_ssd1289.c
View File

@ -1,6 +1,5 @@
/**************************************************************************************
* configs/stm32fdiscover/src/up_ssd1289.c
* arch/arm/src/board/up_ssd1289.c
* configs/stm32fdiscover/src/stm32_ssd1289.c
*
* This logic supports the connection of an SSD1289-based LCD to the STM32F4Discovery
* board.
@ -59,7 +58,7 @@
#include "up_arch.h"
#include "stm32.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_LCD_SSD1289

9
configs/stm32f4discovery/src/up_ug2864ambag01.c → configs/stm32f4discovery/src/stm32_ug2864ambag01.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* config/stm32f4discovery/src/up_ug2864ambag01.c
* arch/arm/src/board/up_ug2864ambag01.c
* config/stm32f4discovery/src/stm32_ug2864ambag01.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -47,7 +46,7 @@
#include <nuttx/lcd/ug-2864ambag01.h>
#include "stm32_gpio.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_LCD_UG2864AMBAG01
@ -85,11 +84,11 @@
* 10 GND | 20 GND | P2 GND
* --------------+-----------+----------------------------------------------
* (1) Required because of on-board MEMS
* (2) Note that the OLED CS and A0 are managed in the up_spi.c file.
* (2) Note that the OLED CS and A0 are managed in the stm32_spi.c file.
* -------------------------------------------------------------------------
*/
/* Definitions in stm32f4discovery-internal.h */
/* Definitions in stm32f4discovery.h */
/* Debug ********************************************************************/

9
configs/stm32f4discovery/src/up_ug2864hsweg01.c → configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* config/stm32f4discovery/src/up_ug2864hsweg01.c
* arch/arm/src/board/up_ug2864hsweg01.c
* config/stm32f4discovery/src/stm32_ug2864hsweg01.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -47,7 +46,7 @@
#include <nuttx/lcd/ssd1306.h>
#include "stm32_gpio.h"
#include "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_LCD_UG2864HSWEG01
@ -85,11 +84,11 @@
* 10 GND | 20 GND | P2 GND
* --------------+-----------+----------------------------------------------
* (1) Required because of on-board MEMS
* (2) Note that the OLED CS and D/C are managed in the up_spi.c file.
* (2) Note that the OLED CS and D/C are managed in the stm32_spi.c file.
* -------------------------------------------------------------------------
*/
/* Definitions in stm32f4discovery-internal.h */
/* Definitions in stm32f4discovery.h */
/* Debug ********************************************************************/

5
configs/stm32f4discovery/src/up_usb.c → configs/stm32f4discovery/src/stm32_usb.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_usbdev.c
* arch/arm/src/board/up_boot.c
* configs/stm32f4discovery/src/stm32_usb.c
*
* Copyright (C) 2012-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 "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_STM32_OTGFS

9
configs/stm32f4discovery/src/up_userleds.c → configs/stm32f4discovery/src/stm32_userleds.c
View File

@ -1,6 +1,5 @@
/****************************************************************************
* configs/stm32f4discovery/src/up_leds.c
* arch/arm/src/board/up_leds.c
* configs/stm32f4discovery/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 "stm32f4discovery-internal.h"
#include "stm32f4discovery.h"
#ifndef CONFIG_ARCH_LEDS
@ -227,11 +226,11 @@ void stm32_setleds(uint8_t ledset)
}
/****************************************************************************
* Name: up_ledpminitialize
* Name: stm32_led_pminitialize
****************************************************************************/
#ifdef CONFIG_PM
void up_ledpminitialize(void)
void stm32_led_pminitialize(void)
{
/* Register to receive power management callbacks */

3
configs/stm32f4discovery/src/up_watchdog.c → configs/stm32f4discovery/src/stm32_watchdog.c
View File

@ -1,6 +1,5 @@
/************************************************************************************
* configs/stm32f4discovery/src/up_watchdog.c
* arch/arm/src/board/up_watchdog.c
* configs/stm32f4discovery/src/stm32_watchdog.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

17
configs/stm32f4discovery/src/stm32f4discovery-internal.h → configs/stm32f4discovery/src/stm32f4discovery.h
View File

@ -1,6 +1,5 @@
/****************************************************************************************************
* configs/stm32f4discovery/src/stm32f4discovery-internal.h
* arch/arm/src/board/stm32f4discovery-internal.n
* configs/stm32f4discovery/src/stm32f4discovery.h
*
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -34,8 +33,8 @@
*
****************************************************************************************************/
#ifndef __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_INTERNAL_H
#define __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_INTERNAL_H
#ifndef __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H
#define __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H
/****************************************************************************************************
* Included Files
@ -256,7 +255,7 @@ void stm32_disablefsmc(void);
#endif
/****************************************************************************************************
* Name: up_ledpminitialize
* Name: stm32_led_pminitialize
*
* Description:
* Enable logic to use the LEDs on the STM32F4Discovery to support power management testing
@ -264,11 +263,11 @@ void stm32_disablefsmc(void);
****************************************************************************************************/
#ifdef CONFIG_PM
void up_ledpminitialize(void);
void stm32_led_pminitialize(void);
#endif
/****************************************************************************************************
* Name: up_pmbuttons
* Name: stm32_pm_buttons
*
* Description:
* Configure the user button of the STM32f4discovery board as EXTI,
@ -277,7 +276,7 @@ void up_ledpminitialize(void);
****************************************************************************************************/
#if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
void up_pmbuttons(void);
void stm32_pm_buttons(void);
#endif
/****************************************************************************
@ -300,5 +299,5 @@ int nsh_archinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_INTERNAL_H */
#endif /* __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H */