Module Name: src
Committed By: tsutsui
Date: Sun Jun 12 03:29:34 UTC 2011
Modified Files:
src/sys/arch/emips/ebus: flash_ebus.c icap_ebus.c
Log Message:
Fix printf formats in DEBUG case.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/ebus/flash_ebus.c \
src/sys/arch/emips/ebus/icap_ebus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.1 src/sys/arch/emips/ebus/flash_ebus.c:1.2
--- src/sys/arch/emips/ebus/flash_ebus.c:1.1 Wed Jan 26 01:18:50 2011
+++ src/sys/arch/emips/ebus/flash_ebus.c Sun Jun 12 03:29:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.1 2011/01/26 01:18:50 pooka Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.2 2011/06/12 03:29:33 tsutsui Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.1 2011/01/26 01:18:50 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.2 2011/06/12 03:29:33 tsutsui Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -1209,7 +1209,7 @@
error = ioaccess((vaddr_t)sc->sc_sector,
secstart + sc->sc_base,
secsize);
- DBGME(DEBUG_FUNCS,printf("%s: mapped %p %zx -> %lx %d\n",
+ DBGME(DEBUG_FUNCS,printf("%s: mapped %p %zx -> %zx %d\n",
device_xname(sc->sc_dev),
sc->sc_sector, secsize, secstart + sc->sc_base,error));
if (error) return error;
@@ -1306,7 +1306,7 @@
/* Rest of code lifted with mods from the dev\ata\wd.c driver
*/
-/* $NetBSD: flash_ebus.c,v 1.1 2011/01/26 01:18:50 pooka Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.2 2011/06/12 03:29:33 tsutsui Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -1870,7 +1870,7 @@
struct eflash_softc *sc;
int part, error;
- DEBUG_PRINT(("eflashopen %zx\n", dev), DEBUG_FUNCS);
+ DEBUG_PRINT(("eflashopen %" PRIx64 "\n", dev), DEBUG_FUNCS);
sc = device_lookup_private(&eflash_cd, EFLASHUNIT(dev));
if (sc == NULL)
return (ENXIO);
@@ -1945,7 +1945,7 @@
struct eflash_softc *sc = device_lookup_private(&eflash_cd, EFLASHUNIT(dev));
int part = EFLASHPART(dev);
- DEBUG_PRINT(("eflashclose %zx\n", dev), DEBUG_FUNCS);
+ DEBUG_PRINT(("eflashclose %" PRIx64 "\n", dev), DEBUG_FUNCS);
mutex_enter(&sc->sc_dk.dk_openlock);
Index: src/sys/arch/emips/ebus/icap_ebus.c
diff -u src/sys/arch/emips/ebus/icap_ebus.c:1.1 src/sys/arch/emips/ebus/icap_ebus.c:1.2
--- src/sys/arch/emips/ebus/icap_ebus.c:1.1 Wed Jan 26 01:18:50 2011
+++ src/sys/arch/emips/ebus/icap_ebus.c Sun Jun 12 03:29:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: icap_ebus.c,v 1.1 2011/01/26 01:18:50 pooka Exp $ */
+/* $NetBSD: icap_ebus.c,v 1.2 2011/06/12 03:29:33 tsutsui Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.1 2011/01/26 01:18:50 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.2 2011/06/12 03:29:33 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,7 +234,7 @@
/* Do we know you. */
sc = device_lookup_private(&icap_cd, minor(bp->b_dev));
if (sc == NULL) {
- DEBUG_PRINT(("icapstrategy: nodev %x\n",bp->b_dev),
+ DEBUG_PRINT(("icapstrategy: nodev %" PRIx64 "\n",bp->b_dev),
DEBUG_ERRORS);
bp->b_error = ENXIO;
biodone(bp);
@@ -335,7 +335,7 @@
/* Ship it
*/
- DEBUG_PRINT(("icapship %lx %d\n",phys,count), DEBUG_XFERS);
+ DEBUG_PRINT(("icapship %" PRIxPADDR " %d\n",phys,count), DEBUG_XFERS);
sc->sc_dp->SizeAndFlags = fl | count;
sc->sc_dp->BufferAddressHi32 = 0; /* BUGBUG 64bit */
sc->sc_dp->BufferAddressLo32 = phys; /* this pushes the fifo */
