diff options
author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-04-19 20:51:16 +0000 |
---|---|---|
committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-04-19 20:51:16 +0000 |
commit | 40580e2d71ac56131a5da7e5f67a0b63450e4f24 (patch) | |
tree | e35583cefe3a40bfdc0cd2456565f273369b4a3f /src/jtag | |
parent | 7989000e0969c1ccf69acbc3ce649a020bc1ee66 (diff) |
Zach Welch <zw@superlucidity.net> fix -Werror warnings
git-svn-id: svn://svn.berlios.de/openocd/trunk@1472 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
-rw-r--r-- | src/jtag/jtag.c | 2 | ||||
-rw-r--r-- | src/jtag/rlink/rlink.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index a9a4b30c..c4a231e1 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -1758,7 +1758,7 @@ static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap) jteap = tap->event_action; /* replace existing? */ while (jteap) { - if (jteap->event == n->value) { + if (jteap->event == (enum jtag_tap_event)n->value) { break; } jteap = jteap->next; diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c index 58067fbe..af3a0f47 100644 --- a/src/jtag/rlink/rlink.c +++ b/src/jtag/rlink/rlink.c @@ -268,7 +268,7 @@ ep1_memory_write( USB_TIMEOUT_MS ); - if(usb_ret < sizeof(usb_buffer)) { + if((size_t)usb_ret < sizeof(usb_buffer)) { break; } @@ -363,7 +363,7 @@ dtc_load_from_buffer( buffer += sizeof(*header); length -= sizeof(*header); - if(length < header->length + 1) { + if(length < (size_t)header->length + 1) { LOG_ERROR("Malformed DTC image\n"); exit(1); } @@ -605,8 +605,8 @@ static struct { dtc_reply_queue_entry_t *rq_head; dtc_reply_queue_entry_t *rq_tail; - int cmd_index; - int reply_index; + u32 cmd_index; + u32 reply_index; u8 cmd_buffer[USB_EP2BANK_SIZE]; } dtc_queue; @@ -617,7 +617,7 @@ struct { static struct { - int length; + u32 length; u32 buffer; } tap_state_queue; |