From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qcv4n-00062s-AC for qemu-devel@nongnu.org; Sat, 02 Jul 2011 03:57:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qcv4l-0006S8-KJ for qemu-devel@nongnu.org; Sat, 02 Jul 2011 03:57:17 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qcv4k-0006RD-J9 for qemu-devel@nongnu.org; Sat, 02 Jul 2011 03:57:15 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 2 Jul 2011 09:57:02 +0200 Message-Id: <1309593423-17073-3-git-send-email-hpoussin@reactos.org> In-Reply-To: <1309593423-17073-1-git-send-email-hpoussin@reactos.org> References: <1309593423-17073-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCHv2 2/3] ds1225y: use trace framework List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/ds1225y.c | 16 +++++----------- trace-events | 4 ++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/ds1225y.c b/hw/ds1225y.c index 1fd7010..5105b9b 100644 --- a/hw/ds1225y.c +++ b/hw/ds1225y.c @@ -24,9 +24,7 @@ =20 #include "hw.h" #include "mips.h" -#include "nvram.h" - -//#define DEBUG_NVRAM +#include "trace.h" =20 typedef struct ds1225y_t { @@ -42,10 +40,7 @@ static uint32_t nvram_readb (void *opaque, target_phys= _addr_t addr) uint32_t val; =20 val =3D s->contents[addr]; - -#ifdef DEBUG_NVRAM - printf("nvram: read 0x%x at " TARGET_FMT_lx "\n", val, addr); -#endif + trace_nvram_read(addr, val); return val; } =20 @@ -71,11 +66,10 @@ static void nvram_writeb (void *opaque, target_phys_a= ddr_t addr, uint32_t val) { ds1225y_t *s =3D opaque; =20 -#ifdef DEBUG_NVRAM - printf("nvram: write 0x%x at " TARGET_FMT_lx "\n", val, addr); -#endif + val &=3D 0xff; + trace_nvram_write(addr, s->contents[addr], val); =20 - s->contents[addr] =3D val & 0xff; + s->contents[addr] =3D val; if (s->file) { qemu_fseek(s->file, addr, SEEK_SET); qemu_put_byte(s->file, (int)val); diff --git a/trace-events b/trace-events index bebf612..a8cac32 100644 --- a/trace-events +++ b/trace-events @@ -92,6 +92,10 @@ disable cs4231_mem_readl_reg(uint32_t reg, uint32_t re= t) "read reg %d: 0x%08x" disable cs4231_mem_writel_reg(uint32_t reg, uint32_t old, uint32_t val) = "write reg %d: 0x%08x -> 0x%08x" disable cs4231_mem_writel_dreg(uint32_t reg, uint32_t old, uint32_t val)= "write dreg %d: 0x%02x -> 0x%02x" =20 +# hw/ds1225y.c +disable nvram_read(uint32_t addr, uint32_t ret) "read addr %d: 0x%02x" +disable nvram_write(uint32_t addr, uint32_t old, uint32_t val) "write ad= dr %d: 0x%02x -> 0x%02x" + # hw/eccmemctl.c disable ecc_mem_writel_mer(uint32_t val) "Write memory enable %08x" disable ecc_mem_writel_mdr(uint32_t val) "Write memory delay %08x" --=20 1.7.5.4