summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-12-04 13:42:09 -0800
committerZachary T Welch <zw@superlucidity.net>2009-12-04 16:56:23 -0800
commit1527272fb21beee7839335ea5587e879163d2ed1 (patch)
treecb0a4818ddaced7e5202a0631e50628676774268 /src/flash
parent5fdee60fd4d38e59c7b5f7aca5ad50b90e7d61ee (diff)
downloadopenocd_libswd-1527272fb21beee7839335ea5587e879163d2ed1.tar.gz
openocd_libswd-1527272fb21beee7839335ea5587e879163d2ed1.tar.bz2
openocd_libswd-1527272fb21beee7839335ea5587e879163d2ed1.tar.xz
openocd_libswd-1527272fb21beee7839335ea5587e879163d2ed1.zip
split NOR and NAND flash headers
Moves common flash errors to <flash/common.h> to decouple these two mostly unrelated trees of code.
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/common.h11
-rw-r--r--src/flash/flash.h11
-rw-r--r--src/flash/nand.h4
3 files changed, 14 insertions, 12 deletions
diff --git a/src/flash/common.h b/src/flash/common.h
index e0dcdb3b..4098873d 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 5e31c48b..1e1be85e 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 230cf508..f91dedaf 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;