Module Name: src Committed By: tsutsui Date: Tue Jan 19 15:28:52 UTC 2010
Modified Files: src/sys/arch/cobalt/stand/boot: Makefile tlp.c wd.c wdc.c Log Message: Use -DLIBSA_PRINTF_LONGLONG_SUPPORT -DLIBSA_PRINTF_WIDTH_SUPPORT in debug printf()s. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cobalt/stand/boot/Makefile cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cobalt/stand/boot/tlp.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cobalt/stand/boot/wd.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cobalt/stand/boot/wdc.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/cobalt/stand/boot/Makefile diff -u src/sys/arch/cobalt/stand/boot/Makefile:1.19 src/sys/arch/cobalt/stand/boot/Makefile:1.20 --- src/sys/arch/cobalt/stand/boot/Makefile:1.19 Sun Mar 15 10:47:59 2009 +++ src/sys/arch/cobalt/stand/boot/Makefile Tue Jan 19 15:28:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/03/15 10:47:59 tsutsui Exp $ +# $NetBSD: Makefile,v 1.20 2010/01/19 15:28:51 tsutsui Exp $ NOMAN= # defined @@ -41,7 +41,8 @@ # -I${.CURDIR}/../.. done by Makefile.inc CPPFLAGS+= -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES -# CPPFLAGS+= -D_DEBUG +#CPPFLAGS+= -D_DEBUG \ +# -DLIBSA_PRINTF_LONGLONG_SUPPORT -DLIBSA_PRINTF_WIDTH_SUPPORT CPPFLAGS+= -I${.OBJDIR} -I${S} -I${S}/arch -I${LIBSADIR} CPPFLAGS+= -DCONS_SERIAL -DCOMPORT=${COMPORT} CPPFLAGS+= -DCOMSPEED=${COMSPEED} -DCOMPROBE=${COMPROBE} Index: src/sys/arch/cobalt/stand/boot/tlp.c diff -u src/sys/arch/cobalt/stand/boot/tlp.c:1.8 src/sys/arch/cobalt/stand/boot/tlp.c:1.9 --- src/sys/arch/cobalt/stand/boot/tlp.c:1.8 Mon Apr 28 20:23:16 2008 +++ src/sys/arch/cobalt/stand/boot/tlp.c Tue Jan 19 15:28:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: tlp.c,v 1.8 2008/04/28 20:23:16 martin Exp $ */ +/* $NetBSD: tlp.c,v 1.9 2010/01/19 15:28:52 tsutsui Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -238,7 +238,7 @@ en[4] = val; en[5] = val >> 8; - DPRINTF(("tlp: MAC address %x:%x:%x:%x:%x:%x\n", + DPRINTF(("tlp: MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", en[0], en[1], en[2], en[3], en[4], en[5])); rxd = &l->rxd[0]; Index: src/sys/arch/cobalt/stand/boot/wd.c diff -u src/sys/arch/cobalt/stand/boot/wd.c:1.11 src/sys/arch/cobalt/stand/boot/wd.c:1.12 --- src/sys/arch/cobalt/stand/boot/wd.c:1.11 Sun Jan 10 16:20:45 2010 +++ src/sys/arch/cobalt/stand/boot/wd.c Tue Jan 19 15:28:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.11 2010/01/10 16:20:45 tsutsui Exp $ */ +/* $NetBSD: wd.c,v 1.12 2010/01/19 15:28:52 tsutsui Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -98,8 +98,8 @@ wd->sc_params.atap_heads * wd->sc_params.atap_sectors; } - DPRINTF(("wd->sc_capacity = %ld, wd->sc_capacity28 = %d.\n", - (u_long)wd->sc_capacity, wd->sc_capacity28)); + DPRINTF(("wd->sc_capacity = %" PRId64 ", wd->sc_capacity28 = %d.\n", + wd->sc_capacity, wd->sc_capacity28)); return 0; } Index: src/sys/arch/cobalt/stand/boot/wdc.c diff -u src/sys/arch/cobalt/stand/boot/wdc.c:1.12 src/sys/arch/cobalt/stand/boot/wdc.c:1.13 --- src/sys/arch/cobalt/stand/boot/wdc.c:1.12 Sun Jan 10 16:20:45 2010 +++ src/sys/arch/cobalt/stand/boot/wdc.c Tue Jan 19 15:28:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: wdc.c,v 1.12 2010/01/10 16:20:45 tsutsui Exp $ */ +/* $NetBSD: wdc.c,v 1.13 2010/01/19 15:28:52 tsutsui Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -34,6 +34,7 @@ #include <sys/bootblock.h> #include <lib/libsa/stand.h> +#include <lib/libkern/libkern.h> #include <machine/param.h> #include "boot.h" @@ -259,9 +260,9 @@ struct wdc_channel *chp = &wd->sc_channel; #if 0 - DPRINTF(("%s(%d, %x, %ld, %d)\n", __func__, + DPRINTF(("%s(%d, %x, %" PRId64 ", %d)\n", __func__, wd_c->drive, wd_c->r_command, - (u_long)wd_c->r_blkno, wd_c->r_count)); + wd_c->r_blkno, wd_c->r_count)); #endif /* Select drive, head, and addressing mode. */