summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2003-07-09 16:46:46 +0000
committerBjörn Stenberg <bjorn@haxx.se>2003-07-09 16:46:46 +0000
commitefd2f356c7a41e8e375da7dbc7c34f4cc58f5c17 (patch)
tree97442d73b0e3219e5617db0cce199f3a3a701668
parentbbfaf26e11d837b1fc8923281acb40161ca9e074 (diff)
downloadrockbox-efd2f356c7a41e8e375da7dbc7c34f4cc58f5c17.zip
rockbox-efd2f356c7a41e8e375da7dbc7c34f4cc58f5c17.tar.gz
rockbox-efd2f356c7a41e8e375da7dbc7c34f4cc58f5c17.tar.bz2
rockbox-efd2f356c7a41e8e375da7dbc7c34f4cc58f5c17.tar.xz
Removed warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3821 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/ata.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index fb60ae3..9331cd6 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -824,10 +824,12 @@ int ata_init(void)
return -2;
}
- if (rc = master_slave_detect())
+ rc = master_slave_detect();
+ if (rc)
return -10 + rc;
-
- if (rc = io_address_detect())
+
+ rc = io_address_detect();
+ if (rc)
return -20 + rc;
/* symptom fix: else check_registers() below may fail */
@@ -836,13 +838,16 @@ int ata_init(void)
return -29;
}
- if (rc = check_registers())
+ rc = check_registers();
+ if (rc)
return -30 + rc;
-
- if (rc = freeze_lock())
+
+ rc = freeze_lock();
+ if (rc)
return -40 + rc;
- if (rc = identify())
+ rc = identify();
+ if (rc)
return -50 + rc;
multisectors = identify_info[47] & 0xff;
DEBUGF("ata: %d sectors per ata request\n",multisectors);
@@ -852,7 +857,8 @@ int ata_init(void)
sizeof(ata_stack), ata_thread_name);
initialized = true;
}
- if (rc = set_multiple_mode(multisectors))
+ rc = set_multiple_mode(multisectors);
+ if (rc)
return -60 + rc;
return 0;