diff --git a/sys/arch/cobalt/stand/boot/Makefile b/sys/arch/cobalt/stand/boot/Makefile index 238033cdaaab..eb7d54a3898a 100644 --- a/sys/arch/cobalt/stand/boot/Makefile +++ b/sys/arch/cobalt/stand/boot/Makefile @@ -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 @@ AFLAGS+= -D_LOCORE -D_KERNEL -DASSEMBLER -mno-abicalls # -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} diff --git a/sys/arch/cobalt/stand/boot/tlp.c b/sys/arch/cobalt/stand/boot/tlp.c index 3038f04740f6..14256e98690f 100644 --- a/sys/arch/cobalt/stand/boot/tlp.c +++ b/sys/arch/cobalt/stand/boot/tlp.c @@ -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 @@ tlp_init(void *cookie) 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]; diff --git a/sys/arch/cobalt/stand/boot/wd.c b/sys/arch/cobalt/stand/boot/wd.c index 7a86cc8936a8..160038dfedf8 100644 --- a/sys/arch/cobalt/stand/boot/wd.c +++ b/sys/arch/cobalt/stand/boot/wd.c @@ -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_get_params(struct wd_softc *wd) 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; } diff --git a/sys/arch/cobalt/stand/boot/wdc.c b/sys/arch/cobalt/stand/boot/wdc.c index 3efa9aa03524..9b9641543909 100644 --- a/sys/arch/cobalt/stand/boot/wdc.c +++ b/sys/arch/cobalt/stand/boot/wdc.c @@ -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 #include +#include #include #include "boot.h" @@ -259,9 +260,9 @@ wdccommandext(struct wd_softc *wd, struct wdc_command *wd_c) 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. */