summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-29 11:55:09 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-29 11:55:09 +0000
commitda767f48da13464b6bd03b08270b529273c995f4 (patch)
tree7ee56c809f892e56d5ebe03c083df1e842401f95 /src/target
parent219b7f30b99c8af9f94fa1b10537bb0e2dc6209f (diff)
downloadopenocd_libswd-da767f48da13464b6bd03b08270b529273c995f4.tar.gz
openocd_libswd-da767f48da13464b6bd03b08270b529273c995f4.tar.bz2
openocd_libswd-da767f48da13464b6bd03b08270b529273c995f4.tar.xz
openocd_libswd-da767f48da13464b6bd03b08270b529273c995f4.zip
remove warnings.
git-svn-id: svn://svn.berlios.de/openocd/trunk@391 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target')
-rw-r--r--src/target/arm11.c14
-rw-r--r--src/target/arm11.h6
-rw-r--r--src/target/arm11_dbgtap.c2
3 files changed, 9 insertions, 13 deletions
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 905a5d77..05b6112e 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -48,8 +48,8 @@
static void arm11_on_enter_debug_state(arm11_common_t * arm11);
-bool arm11_config_memwrite_burst = true;
-bool arm11_config_memwrite_error_fatal = true;
+int arm11_config_memwrite_burst = 1;
+int arm11_config_memwrite_error_fatal = 1;
u32 arm11_vcr = 0;
@@ -727,7 +727,7 @@ int arm11_halt(struct target_s *target)
if (arm11->trst_active)
{
- arm11->halt_requested = true;
+ arm11->halt_requested = 1;
return ERROR_OK;
}
@@ -971,7 +971,7 @@ int arm11_assert_reset(struct target_s *target)
jtag_add_sleep(5000);
arm11_common_t * arm11 = target->arch_info;
- arm11->trst_active = true;
+ arm11->trst_active = 1;
#endif
return ERROR_OK;
@@ -1517,7 +1517,7 @@ void arm11_build_reg_cache(target_t *target)
-int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, bool * var, char * name)
+int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, int * var, char * name)
{
if (argc == 0)
{
@@ -1535,7 +1535,7 @@ int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args,
case 'F':
case 'd': /* disable */
case 'D':
- *var = false;
+ *var = 0;
break;
case '1': /* 1 */
@@ -1543,7 +1543,7 @@ int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args,
case 'T':
case 'e': /* enable */
case 'E':
- *var = true;
+ *var = 1;
break;
}
diff --git a/src/target/arm11.h b/src/target/arm11.h
index 6e3b1d15..9c1bcd06 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -26,10 +26,6 @@
#include "arm_jtag.h"
-#define bool int
-#define true 1
-#define false 0
-
#define asizeof(x) (sizeof(x) / sizeof((x)[0]))
#define NEW(type, variable, items) \
@@ -259,7 +255,7 @@ int arm11_add_ir_scan_vc(int num_fields, scan_field_t *fields, enum tap_state st
*/
typedef struct arm11_sc7_action_s
{
- bool write; /**< Access mode: true for write, false for read. */
+ int write; /**< Access mode: true for write, false for read. */
u8 address; /**< Register address mode. Use enum #arm11_sc7 */
u32 value; /**< If write then set this to value to be written.
In read mode this receives the read value when the
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index eed48bb3..97ec2fba 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -728,7 +728,7 @@ void arm11_sc7_clear_vbw(arm11_common_t * arm11)
{size_t i;
for (i = 0; i < asizeof(clear_bw); i++)
{
- clear_bw[i].write = true;
+ clear_bw[i].write = 1;
clear_bw[i].value = 0;
}}