From 648a15f1a987412d4d47ebd8bb81cbfa58d54847 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 6 Sep 2011 18:58:37 +0200 Subject: [PATCH] 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 Signed-off-by: Kevin Wolf --- hw/ide/atapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index f38d289..cb0cdac 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); } -- 2.7.4