Revert "STM32F4x9_Flash_driver.cpp also needs FLASH definition"

mortezag · mortezag · commit 090ec784e295 · 2015-10-06T15:18:00.000-07:00
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Flash/STM32F4_Flash.h b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Flash/STM32F4_Flash.h
@@ -19,10 +19,6 @@
 
 //--//
 
-#ifndef FLASH
-#define FLASH               ((FLASH_TypeDef *) FLASH_R_BASE)
-#endif
-
 struct STM32F4_Flash_Driver
 {
 
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Flash/STM32F4_Flash_driver.cpp b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Flash/STM32F4_Flash_driver.cpp
@@ -18,6 +18,10 @@
 #include "..\stm32f4xx.h"
 #else
 #include "..\stm32f2xx.h"
+#endif
+
+#ifndef FLASH
+#define FLASH               ((FLASH_TypeDef *) FLASH_R_BASE)
 #endif
 
     typedef UINT16 CHIP_WORD;

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,6 @@`
`19`	`19`
`20`	`20`	`//--//`
`21`	`21`
`22`		`-#ifndef FLASH`
`23`		`-#define FLASH ((FLASH_TypeDef *) FLASH_R_BASE)`
`24`		`-#endif`
`25`		`-`
`26`	`22`	`struct STM32F4_Flash_Driver`
`27`	`23`	`{`
`28`	`24`