From 1527272fb21beee7839335ea5587e879163d2ed1 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 4 Dec 2009 13:42:09 -0800
Subject: [PATCH] split NOR and NAND flash headers

Moves common flash errors to <flash/common.h> to decouple these two
mostly unrelated trees of code.
---
 src/flash/common.h | 11 ++++++++++-
 src/flash/flash.h  | 11 +----------
 src/flash/nand.h   |  4 +++-
 src/openocd.c      |  1 +
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/flash/common.h b/src/flash/common.h
index e0dcdb3b2..4098873da 100644
--- a/src/flash/common.h
+++ b/src/flash/common.h
@@ -19,7 +19,7 @@
 #ifndef FLASH_COMMON_H
 #define FLASH_COMMON_H
 
-#include <helper/types.h>
+#include <helper/log.h>
 
 /**
  * Parses the optional '.index' portion of a flash bank identifier.
@@ -36,4 +36,13 @@ unsigned get_flash_name_index(const char *name);
  */
 bool flash_driver_name_matches(const char *name, const char *expected);
 
+#define ERROR_FLASH_BANK_INVALID -900
+#define ERROR_FLASH_SECTOR_INVALID -901
+#define ERROR_FLASH_OPERATION_FAILED -902
+#define ERROR_FLASH_DST_OUT_OF_BANK -903
+#define ERROR_FLASH_DST_BREAKS_ALIGNMENT -904
+#define ERROR_FLASH_BUSY -905
+#define ERROR_FLASH_SECTOR_NOT_ERASED -906
+#define ERROR_FLASH_BANK_NOT_PROBED -907
+
 #endif // FLASH_COMMON_H
diff --git a/src/flash/flash.h b/src/flash/flash.h
index 5e31c48bc..1e1be85ec 100644
--- a/src/flash/flash.h
+++ b/src/flash/flash.h
@@ -26,8 +26,8 @@
 #ifndef FLASH_H
 #define FLASH_H
 
+#include <flash/common.h>
 #include <target/target.h>
-#include <helper/log.h>
 
 struct image;
 
@@ -349,13 +349,4 @@ struct flash_bank *get_flash_bank_by_num_noprobe(int num);
  */
 struct flash_bank *get_flash_bank_by_addr(struct target *target, uint32_t addr);
 
-#define ERROR_FLASH_BANK_INVALID			(-900)
-#define ERROR_FLASH_SECTOR_INVALID			(-901)
-#define ERROR_FLASH_OPERATION_FAILED		(-902)
-#define ERROR_FLASH_DST_OUT_OF_BANK			(-903)
-#define ERROR_FLASH_DST_BREAKS_ALIGNMENT	(-904)
-#define ERROR_FLASH_BUSY					(-905)
-#define ERROR_FLASH_SECTOR_NOT_ERASED		(-906)
-#define ERROR_FLASH_BANK_NOT_PROBED			(-907)
-
 #endif /* FLASH_H */
diff --git a/src/flash/nand.h b/src/flash/nand.h
index 230cf5080..f91dedaf3 100644
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -25,7 +25,9 @@
 #ifndef NAND_H
 #define NAND_H
 
-#include <flash/flash.h>
+#include <flash/common.h>
+// to be removed later
+#include <target/target.h>
 
 struct nand_device;
 
diff --git a/src/openocd.c b/src/openocd.c
index 0ae0d19f3..b6dc010e5 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -34,6 +34,7 @@
 #include <helper/configuration.h>
 #include <xsvf/xsvf.h>
 #include <svf/svf.h>
+#include <flash/flash.h>
 #include <flash/nand.h>
 #include <pld/pld.h>
 #include <flash/mflash.h>