From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruA-0004qs-ID for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKru8-0004FU-EU for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKru8-0004FL-7S for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:56 -0400 From: Kevin Wolf Date: Mon, 31 Oct 2011 14:29:56 +0100 Message-Id: <1320067830-12093-22-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 21/55] atapi: cleanup/fix mode sense results 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: Paolo Bonzini The first two bytes (after the 8-byte ATAPI header) are the mode page number and the number of bytes after the length field itself. Make this clear in the code. The AUDIO_CTL page was filled with wrong values. It is not anymore in MMC, but at least keep the values sane. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/ide/atapi.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 347c38d..e898da2 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -711,8 +711,8 @@ static void cmd_mode_sense(IDEState *s, uint8_t *buf) buf[6] = 0; buf[7] = 0; - buf[8] = 0x01; - buf[9] = 0x06; + buf[8] = MODE_PAGE_R_W_ERROR; + buf[9] = 16 - 10; buf[10] = 0x00; buf[11] = 0x05; buf[12] = 0x00; @@ -730,6 +730,8 @@ static void cmd_mode_sense(IDEState *s, uint8_t *buf) buf[6] = 0; buf[7] = 0; + buf[8] = MODE_PAGE_AUDIO_CTL; + buf[9] = 24 - 10; /* Fill with CDROM audio volume */ buf[17] = 0; buf[19] = 0; @@ -747,8 +749,8 @@ static void cmd_mode_sense(IDEState *s, uint8_t *buf) buf[6] = 0; buf[7] = 0; - buf[8] = 0x2a; - buf[9] = 0x12; + buf[8] = MODE_PAGE_CAPABILITIES; + buf[9] = 28 - 10; buf[10] = 0x00; buf[11] = 0x00; -- 1.7.6.4