summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2010-06-23 00:53:17 +0800
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-23 07:55:43 +0200
commit6cb2d6dd7ae6049dce47dfb0b7c389dcf606119f (patch)
tree9896165b64c4489fab4ad79ac4fce60d552b4b13
parent4fa3cc7746d661f048f39a53c39b692369426e24 (diff)
downloadopenocd+libswd-6cb2d6dd7ae6049dce47dfb0b7c389dcf606119f.tar.gz
openocd+libswd-6cb2d6dd7ae6049dce47dfb0b7c389dcf606119f.tar.bz2
openocd+libswd-6cb2d6dd7ae6049dce47dfb0b7c389dcf606119f.tar.xz
openocd+libswd-6cb2d6dd7ae6049dce47dfb0b7c389dcf606119f.zip
error number: review
Review allocation of error numbers in openocd to avoid overlap. Put brackets around negative numbers to avoid issues during macro expansion. Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
-rw-r--r--src/flash/common.h16
-rw-r--r--src/target/trace.h4
-rw-r--r--src/target/xscale.h2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/flash/common.h b/src/flash/common.h
index 4098873d..c78f24ce 100644
--- a/src/flash/common.h
+++ b/src/flash/common.h
@@ -36,13 +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
+#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/target/trace.h b/src/target/trace.h
index 5fbedc4b..53502d4d 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -59,7 +59,7 @@ typedef enum trace_status
int trace_point(struct target *target, uint32_t number);
int trace_register_commands(struct command_context *cmd_ctx);
-#define ERROR_TRACE_IMAGE_UNAVAILABLE -(1500)
-#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE -(1501)
+#define ERROR_TRACE_IMAGE_UNAVAILABLE (-1500)
+#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE (-1501)
#endif /* TRACE_H */
diff --git a/src/target/xscale.h b/src/target/xscale.h
index 82f4e379..d429336e 100644
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -176,6 +176,6 @@ enum
XSCALE_TXRXCTRL,
};
-#define ERROR_XSCALE_NO_TRACE_DATA (-1500)
+#define ERROR_XSCALE_NO_TRACE_DATA (-700)
#endif /* XSCALE_H */