From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 18 Aug 2010 18:51:10 +0000 (+0000)
Subject: Silent nightlytest warning.
X-Git-Tag: 2.6.0~199
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f5b88e684870201a83c4f21299dccc16007ab928;p=bertos.git

Silent nightlytest warning.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4191 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/cpu/arm/drv/flash_lpc2.c b/bertos/cpu/arm/drv/flash_lpc2.c
index 7e0013ca..21c514f7 100644
--- a/bertos/cpu/arm/drv/flash_lpc2.c
+++ b/bertos/cpu/arm/drv/flash_lpc2.c
@@ -35,7 +35,7 @@
  *
  * \brief NPX lpc23xx embedded flash read/write driver.
  *
- * notest: arm
+ * notest:arm
  */
 
 #include "flash_lpc2.h"
@@ -60,6 +60,29 @@
 
 #include <string.h>
 
+/* Embedded flash programming defines. */
+#define IAP_ADDRESS 0x7ffffff1
+
+typedef enum IapCommands
+{
+	PREPARE_SECTOR_FOR_WRITE = 50,
+	COPY_RAM_TO_FLASH = 51,
+	ERASE_SECTOR = 52,
+	BLANK_CHECK_SECTOR = 53,
+	READ_PART_ID = 54,
+	READ_BOOT_VER = 55,
+	COMPARE = 56,
+	REINVOKE_ISP = 57,
+} IapCommands;
+
+#if CPU_ARM_LPC2378
+	#define FLASH_MEM_SIZE         (504 * 1024L)
+	#define FLASH_PAGE_SIZE_BYTES   4096
+	#define FLASH_PAGE_4K_CNT         14
+#else
+	#error Unknown CPU
+#endif
+
 #define CMD_SUCCESS 0
 
 struct FlashHardware
diff --git a/bertos/cpu/arm/io/lpc23xx.h b/bertos/cpu/arm/io/lpc23xx.h
index 32b87fc4..605211c5 100644
--- a/bertos/cpu/arm/io/lpc23xx.h
+++ b/bertos/cpu/arm/io/lpc23xx.h
@@ -41,31 +41,6 @@
 #include <cfg/compiler.h>
 
 #include <cpu/detect.h>
-
-
-/* Embedded flash programming defines. */
-#define IAP_ADDRESS 0x7ffffff1
-
-typedef enum IapCommands
-{
-	PREPARE_SECTOR_FOR_WRITE = 50,
-	COPY_RAM_TO_FLASH = 51,
-	ERASE_SECTOR = 52,
-	BLANK_CHECK_SECTOR = 53,
-	READ_PART_ID = 54,
-	READ_BOOT_VER = 55,
-	COMPARE = 56,
-	REINVOKE_ISP = 57,
-} IapCommands;
-
-#if CPU_ARM_LPC2378
-	#define FLASH_MEM_SIZE         (504 * 1024L)
-	#define FLASH_PAGE_SIZE_BYTES   4096
-	#define FLASH_PAGE_4K_CNT         14
-#else
-	#error Unknown CPU
-#endif
-
 /* Vectored Interrupt Controller (VIC) */
 #define VIC_BASE_ADDR	0xFFFFF000
 #define VICIRQStatus   (*(reg32_t *)(VIC_BASE_ADDR + 0x000))