diff options
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_flash.h')
-rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_flash.h | 62 |
1 files changed, 4 insertions, 58 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_flash.h b/nuttx/arch/arm/src/stm32/stm32_flash.h index 1203d777e..6f286bf2c 100755 --- a/nuttx/arch/arm/src/stm32/stm32_flash.h +++ b/nuttx/arch/arm/src/stm32/stm32_flash.h @@ -1,8 +1,8 @@ /************************************************************************************ * arch/arm/src/stm32/stm32_flash.h * - * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2011 Uros Platise. All rights reserved. + * Author: Uros Platise <uros.platise@isotel.eu> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -36,64 +36,10 @@ #ifndef __ARCH_ARM_SRC_STM32_STM32_FLASH_H #define __ARCH_ARM_SRC_STM32_STM32_FLASH_H -/************************************************************************************ - * Included Files - ************************************************************************************/ - #include <nuttx/config.h> +#include <nuttx/progmem.h> #include "chip.h" - -/************************************************************************************ - * Pre-processor Definitions - ************************************************************************************/ - -/* Register Offsets *****************************************************************/ - -#define STM32_FLASH_ACR_OFFSET 0x0000 -#define STM32_FLASH_KEYR_OFFSET 0x0004 -#define STM32_FLASH_OPTKEYR_OFFSET 0x0008 -#define STM32_FLASH_SR_OFFSET 0x000c -#define STM32_FLASH_CR_OFFSET 0x0010 -#define STM32_FLASH_AR_OFFSET 0x0014 -#define STM32_FLASH_OBR_OFFSET 0x001c -#define STM32_FLASH_WRPR_OFFSET 0x0020 - -/* Register Addresses ***************************************************************/ - -#define STM32_FLASH_ACR (STM32_FLASHIF_BASE+STM32_FLASH_ACR_OFFSET) -#define STM32_FLASH_KEYR (STM32_FLASHIF_BASE+STM32_FLASH_KEYR_OFFSET) -#define STM32_FLASH_OPTKEYR (STM32_FLASHIF_BASE+STM32_FLASH_OPTKEYR_OFFSET) -#define STM32_FLASH_SR (STM32_FLASHIF_BASE+STM32_FLASH_SR_OFFSET) -#define STM32_FLASH_CR (STM32_FLASHIF_BASE+STM32_FLASH_CR_OFFSET) -#define STM32_FLASH_AR (STM32_FLASHIF_BASE+STM32_FLASH_AR_OFFSET) -#define STM32_FLASH_OBR (STM32_FLASHIF_BASE+STM32_FLASH_OBR_OFFSET) -#define STM32_FLASH_WRPR (STM32_FLASHIF_BASE+STM32_FLASH_WRPR_OFFSET) - -/* Register Bitfield Definitions ****************************************************/ -/* TODO: FLASH details from the STM32F10xxx Flash programming manual. */ - -/* Flash Access Control Register (ACR) */ - -#define ACR_LATENCY_SHIFT (0) -#define ACR_LATENCY_MASK (7 << ACR_LATENCY_SHIFT) -# define ACR_LATENCY_0 (0 << ACR_LATENCY_SHIFT) /* FLASH Zero Latency cycle */ -# define ACR_LATENCY_1 (1 << ACR_LATENCY_SHIFT) /* FLASH One Latency cycle */ -# define ACR_LATENCY_2 (2 << ACR_LATENCY_SHIFT) /* FLASH Two Latency cycles */ -#define ACR_HLFCYA (1 << 3) /* FLASH half cycle access */ -#define ACR_PRTFBE (1 << 4) /* FLASH prefetch enable */ - -/************************************************************************************ - * Public Types - ************************************************************************************/ - -/************************************************************************************ - * Public Data - ************************************************************************************/ - -/************************************************************************************ - * Public Functions - ************************************************************************************/ +#include "chip/stm32_flash.h" #endif /* __ARCH_ARM_SRC_STM32_STM32_FLASH_H */ - |