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

Purely cosmetic changes from code review

Browse Source
This commit is contained in:
Gregory Nutt 2015-09-04 16:36:43 -06:00
parent 804570f831
commit 544ed7cdbd
1 changed files with 116 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/src/stm32/chip/stm32_flash.h
View File

@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/stm32/chip/stm32_flash.h
*
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
* David Sidrane <david_s5@uas.net>
*
@ -35,7 +35,7 @@
************************************************************************************/
#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32_FLASH_H
# define __ARCH_ARM_SRC_STM32_CHIP_STM32_FLASH_H
#define __ARCH_ARM_SRC_STM32_CHIP_STM32_FLASH_H
/************************************************************************************
* Pre-processor Definitions
@ -43,7 +43,7 @@
#define _K(x) ((x)*1024)
# if !defined(CONFIG_STM32_FLASH_CONFIG_DEFAULT) && \
#if !defined(CONFIG_STM32_FLASH_CONFIG_DEFAULT) && \
!defined(CONFIG_STM32_FLASH_CONFIG_4) && \
!defined(CONFIG_STM32_FLASH_CONFIG_6) && \
!defined(CONFIG_STM32_FLASH_CONFIG_8) && \
@ -55,9 +55,9 @@
!defined(CONFIG_STM32_FLASH_CONFIG_G) && \
!defined(CONFIG_STM32_FLASH_CONFIG_I)
# define CONFIG_STM32_FLASH_CONFIG_DEFAULT
# endif
#endif
# if defined(CONFIG_STM32_FLASH_CONFIG_DEFAULT)
#if defined(CONFIG_STM32_FLASH_CONFIG_DEFAULT)
# if defined(CONFIG_STM32_STM32L15XX)
/* The STM32 L15xx/L16xx can support up to 384KB of FLASH. (In reality, supported
@ -66,6 +66,7 @@
* 256 bytes each. The sector is the write protection granularity. In total, the
* program memory block contains 1536 pages.
*/
# define STM32_FLASH_NPAGES 1536
# define STM32_FLASH_PAGESIZE 256
@ -103,11 +104,11 @@
# undef STM32_FLASH_PAGESIZE
# endif
# endif /* CONFIG_STM32_FLASH_CONFIG_DEFAULT */
#endif /* CONFIG_STM32_FLASH_CONFIG_DEFAULT */
/* Override of the Flash Has been Chosen */
# if !defined(CONFIG_STM32_FLASH_CONFIG_DEFAULT)
#if !defined(CONFIG_STM32_FLASH_CONFIG_DEFAULT)
/* Define the Valid Configuration the F2 and F4 */
@ -196,11 +197,11 @@
# elif defined(CONFIG_STM32_FLASH_CONFIG_I)
# endif
# endif
# endif
#endif
# ifdef STM32_FLASH_PAGESIZE
#ifdef STM32_FLASH_PAGESIZE
# define STM32_FLASH_SIZE (STM32_FLASH_NPAGES * STM32_FLASH_PAGESIZE)
# endif /* def STM32_FLASH_PAGESIZE */
#endif /* def STM32_FLASH_PAGESIZE */
/* Register Offsets *****************************************************************/
@ -388,4 +389,3 @@ void stm32_flash_lock(void);
void stm32_flash_unlock(void);
#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32_FLASH_H */