From patchwork Tue Apr 16 00:32:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 236793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B16DA2C00F3 for ; Tue, 16 Apr 2013 10:35:37 +1000 (EST) Received: from localhost ([::1]:50065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URtrz-0001CN-V3 for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 20:35:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URtrb-00018p-PQ for qemu-devel@nongnu.org; Mon, 15 Apr 2013 20:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URtrZ-0002to-SN for qemu-devel@nongnu.org; Mon, 15 Apr 2013 20:35:11 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:62397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URtrZ-0002tY-LC for qemu-devel@nongnu.org; Mon, 15 Apr 2013 20:35:09 -0400 Received: by mail-pb0-f51.google.com with SMTP id rr4so2772295pbb.24 for ; Mon, 15 Apr 2013 17:35:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=IpLXepheL5QOdNNLizgP+KQdfOb35yL66AOrBkYc7us=; b=k1apXItKmkEAkDwKOm/RTY47EvvEEg+uY4sJrHjxM9HFJGfoKiVvzz6drVzYjfwBbn Ua1AnZrQLHWlKf06cEYBpheQtdJmarFD7Kv7BDzZBCvhuFtONjRKb9GE43dR7mNSX9Nt L0zqCEgEdnZpmQExgaDG0Vah7An+G7E1V8wF9RKrSBL8YOmzlwn/C7+HI/1yImySVp/m eN3NkcVIIxQkxKuK8Q1dJyMJiH6cfNEOC+j4q8Pg0ymhzWdumvRN80JEHf+xuO6rtXtN mYWerd2vzhtT/3j2KF6IebOfnDDYo4pFbZ1+21FAzgH/OAh40R+NSxgWQdXajHOTm71T V6Ug== X-Received: by 10.66.252.6 with SMTP id zo6mr628672pac.100.1366072508837; Mon, 15 Apr 2013 17:35:08 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id ra9sm107844pab.16.2013.04.15.17.35.06 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 17:35:07 -0700 (PDT) From: peter.crosthwaite@xilinx.com To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2013 10:32:53 +1000 Message-Id: <6438a07b209e5e20bbd47e7aaedc86ae7dec2396.1366071713.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: X-Gm-Message-State: ALoCoQneNNgT/UIHdkKPtYuhRH2TdlNgHyoE68hzDHME+8h0QK8W6zuC+TS8ptcdvYC+m11gHTQv X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.51 Cc: qemu-trivial@nongnu.org, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v3 1/4] m25p80: Fix debug messages. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Crosthwaite Some dodgy casts were making a mess of these msgs. Signed-off-by: Peter Crosthwaite --- Remove misleading "k" suffix from erase size message Use PRIxN macros where appropriate (Edgar review) hw/block/m25p80.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index cd560e3..a524bde 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -319,7 +319,7 @@ static void flash_erase(Flash *s, int offset, FlashCMD cmd) DB_PRINT("offset = %#x, len = %d\n", offset, len); if ((s->pi->flags & capa_to_assert) != capa_to_assert) { - hw_error("m25p80: %dk erase size not supported by device\n", len); + hw_error("m25p80: %d erase size not supported by device\n", len); } if (!s->write_enable) { @@ -349,8 +349,8 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data) } if ((prev ^ data) & data) { - DB_PRINT("programming zero to one! addr=%lx %x -> %x\n", - addr, prev, data); + DB_PRINT("programming zero to one! addr=%" PRIx64 " %" PRIx8 + " -> %" PRIx8 "\n", addr, prev, data); } if (s->pi->flags & WR_1) { @@ -538,15 +538,16 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx) switch (s->state) { case STATE_PAGE_PROGRAM: - DB_PRINT("page program cur_addr=%lx data=%x\n", s->cur_addr, - (uint8_t)tx); + DB_PRINT("page program cur_addr=%#" PRIx64 " data=%" PRIx8 "\n", + s->cur_addr, (uint8_t)tx); flash_write8(s, s->cur_addr, (uint8_t)tx); s->cur_addr++; break; case STATE_READ: r = s->storage[s->cur_addr]; - DB_PRINT("READ 0x%lx=%x\n", s->cur_addr, r); + DB_PRINT("READ 0x%" PRIx64 "=%" PRIx8 "\n", s->cur_addr, + (uint8_t)r); s->cur_addr = (s->cur_addr + 1) % s->size; break;