aboutsummaryrefslogtreecommitdiff
path: root/hw/ide
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-09-06 18:58:37 +0200
committerKevin Wolf <kwolf@redhat.com>2011-09-12 15:17:19 +0200
commitf0776564182c37362f070b84b5fc63c2a944df6e (patch)
treee8253303db8b11870f64f93faff2859839789fdb /hw/ide
parent3cfc22692ec3a60affbd8e39da75fa449cefe234 (diff)
ide/atapi: Clean up misleading name in cmd_start_stop_unit()
"eject" is misleading; it means "eject" when start is clear, but "load" when start is set. Rename to loej, because that's how MMC-5 calls it, in section 6.40. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide')
-rw-r--r--hw/ide/atapi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index f38d2896ae..cb0cdac42e 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -903,11 +903,11 @@ static void cmd_seek(IDEState *s, uint8_t* buf)
static void cmd_start_stop_unit(IDEState *s, uint8_t* buf)
{
- int start, eject, sense, err = 0;
- start = buf[4] & 1;
- eject = (buf[4] >> 1) & 1;
+ int sense, err = 0;
+ bool start = buf[4] & 1;
+ bool loej = buf[4] & 2; /* load on start, eject on !start */
- if (eject) {
+ if (loej) {
err = bdrv_eject(s->bs, !start);
}