From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBd-0000R3-UT for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobBV-00019b-HQ for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:37 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:52259) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBV-000193-A5 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:29 -0400 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:07:48 +0200 Message-Id: <1312376904-16115-10-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 09/45] ide/atapi: Clean up misleading name in cmd_start_stop_unit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de "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 --- 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 fe2fb0b..17fbef8 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -892,11 +892,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; - if (eject) { + if (loej) { err = bdrv_eject(s->bs, !start); } -- 1.7.6