From efd2f356c7a41e8e375da7dbc7c34f4cc58f5c17 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Wed, 9 Jul 2003 16:46:46 +0000 Subject: Removed warnings git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3821 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/ata.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'firmware/drivers/ata.c') diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index fb60ae3895..9331cd60d9 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; -- cgit v1.2.3