summaryrefslogtreecommitdiff
path: root/src/target/embeddedice.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-19 20:51:16 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-19 20:51:16 +0000
commit40580e2d71ac56131a5da7e5f67a0b63450e4f24 (patch)
treee35583cefe3a40bfdc0cd2456565f273369b4a3f /src/target/embeddedice.c
parent7989000e0969c1ccf69acbc3ce649a020bc1ee66 (diff)
downloadopenocd+libswd-40580e2d71ac56131a5da7e5f67a0b63450e4f24.tar.gz
openocd+libswd-40580e2d71ac56131a5da7e5f67a0b63450e4f24.tar.bz2
openocd+libswd-40580e2d71ac56131a5da7e5f67a0b63450e4f24.tar.xz
openocd+libswd-40580e2d71ac56131a5da7e5f67a0b63450e4f24.zip
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/target/embeddedice.c')
-rw-r--r--src/target/embeddedice.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index aa9e8f9a..6a1cf054 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -484,7 +484,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout)
u8 field1_out[1];
u8 field2_out[1];
int retval;
- int hsact;
+ u32 hsact;
struct timeval lap;
struct timeval now;
@@ -544,7 +544,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout)
gettimeofday(&now, NULL);
}
- while ((now.tv_sec-lap.tv_sec)*1000 + (now.tv_usec-lap.tv_usec)/1000 <= timeout);
+ while ((u32)((now.tv_sec-lap.tv_sec)*1000 + (now.tv_usec-lap.tv_usec)/1000) <= timeout);
return ERROR_TARGET_TIMEOUT;
}