From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37JZ-0000XB-2v for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37JW-0006hy-V0 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37JW-0006hi-Jc for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:46 -0400 From: Kevin Wolf Date: Mon, 12 Sep 2011 16:19:04 +0200 Message-Id: <1315837174-15327-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1315837174-15327-1-git-send-email-kwolf@redhat.com> References: <1315837174-15327-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 05/35] ide/atapi: Clean up misleading name in cmd_start_stop_unit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster "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 files 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); } -- 1.7.6