summaryrefslogtreecommitdiff
path: root/firmware/target
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2009-10-18 15:50:30 +0000
committerBertrik Sikken <bertrik@sikken.nl>2009-10-18 15:50:30 +0000
commitd24d885aa42b5087d89f12dabad13895051da4e2 (patch)
tree61584fe54660aab9a57bcb67c5a65cb888f4a38b /firmware/target
parent1c64a4d3e0a4ae2f4eb537f00c7dc4372ca5df88 (diff)
downloadrockbox-d24d885aa42b5087d89f12dabad13895051da4e2.tar.gz
rockbox-d24d885aa42b5087d89f12dabad13895051da4e2.zip
Use wrap-safe TIME_BEFORE/TIME_AFTER macros to compare times with current_time, instead of comparing them directly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23246 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/arm/as3525/ata_sd_as3525.c2
-rw-r--r--firmware/target/arm/ipod/adc-ipod-pcf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index 57dc307e7f..ee4b8c015d 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -261,7 +261,7 @@ static int sd_init_card(const int drive)
261 261
262 do { 262 do {
263 /* timeout */ 263 /* timeout */
264 if(current_tick > init_timeout) 264 if(TIME_AFTER(current_tick, init_timeout))
265 return -2; 265 return -2;
266 266
267 /* app_cmd */ 267 /* app_cmd */
diff --git a/firmware/target/arm/ipod/adc-ipod-pcf.c b/firmware/target/arm/ipod/adc-ipod-pcf.c
index 65b25c36a3..e4a54e09f8 100644
--- a/firmware/target/arm/ipod/adc-ipod-pcf.c
+++ b/firmware/target/arm/ipod/adc-ipod-pcf.c
@@ -39,7 +39,7 @@ static struct adc_struct adcdata[NUM_ADC_CHANNELS] IDATA_ATTR;
39 39
40static unsigned short _adc_read(struct adc_struct *adc) 40static unsigned short _adc_read(struct adc_struct *adc)
41{ 41{
42 if (adc->timeout < current_tick) { 42 if (TIME_AFTER(current_tick, adc->timeout)) {
43 unsigned char data[2]; 43 unsigned char data[2];
44 unsigned short value; 44 unsigned short value;
45 45