From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIws-00060S-1l for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRIwo-0008Np-SR for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:45 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:59356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIwo-0008Mu-K8 for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:42 -0500 From: marcin.krzeminski@nokia.com Date: Thu, 4 Feb 2016 13:23:22 +0100 Message-Id: <1454588606-14094-8-git-send-email-marcin.krzeminski@nokia.com> In-Reply-To: <1454588606-14094-1-git-send-email-marcin.krzeminski@nokia.com> References: <1454588606-14094-1-git-send-email-marcin.krzeminski@nokia.com> Subject: [Qemu-devel] [PATCH v2 07/11] block: m25p80: Dummy cycles for N25Q256/512 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com From: Marcin Krzeminski This patch handles dummy cycles. Signed-off-by: Marcin Krzeminski --- hw/block/m25p80.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index a213587..df1f829 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -531,6 +531,10 @@ static void decode_new_cmd(Flash *s, uint32_t value) case DOR: case QOR: s->needed_bytes = get_cmd_length(s); + if ( ((s->pi->jedec >> 16) & 0xFF) == JEDEC_NUMONYX ) { + /* Dummy cycles - modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg,4,4); + } s->pos = 0; s->len = 0; s->state = STATE_COLLECTING_DATA; @@ -544,6 +548,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case JEDEC_NUMONYX: s->needed_bytes = get_cmd_length(s); + s->needed_bytes += extract32(s->volatile_cfg,4,4); break; default: s->needed_bytes = 5; @@ -561,6 +566,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case JEDEC_NUMONYX: s->needed_bytes = get_cmd_length(s); + s->needed_bytes += extract32(s->volatile_cfg,4,4); break; default: s->needed_bytes = 8; -- 2.5.0