From 6cb2d6dd7ae6049dce47dfb0b7c389dcf606119f Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Wed, 23 Jun 2010 00:53:17 +0800 Subject: [PATCH] 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 --- src/flash/common.h | 16 ++++++++-------- src/target/trace.h | 4 ++-- src/target/xscale.h | 2 +- 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 */ -- 2.39.5