split NOR and NAND flash headers

Moves common flash errors to <flash/common.h> to decouple these two
mostly unrelated trees of code.

diff --git a/src/flash/common.h b/src/flash/common.h
index e0dcdb3b206599e1ad48430afca85e241aa7c595..4098873dab360a4247b17bb719468a0258ddd720 100644 (file)
--- 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 5e31c48bcecb5775a35b5e193360db463f8b0fb2..1e1be85ec2f1945ebae24c3c01296d9ca67b60b0 100644 (file)
--- 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 230cf508056459a96dd15ff6927ed9bf6caa45f8..f91dedaf3e01f0b3f85d113a51e8da2aae41a17b 100644 (file)
--- 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 0ae0d19f3537bdb87217790db09ab69944a9c406..b6dc010e5844f3f27a4239ce19d3a7390db62db9 100644 (file)
--- 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>