Module Name: src
Committed By: isaki
Date: Sat May 25 04:41:53 UTC 2019
Modified Files:
src/sys/arch/sgimips/hpc: haltwo.c
src/sys/dev/bluetooth: btsco.c
Log Message:
Make it compilable even with debug option.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sgimips/hpc/haltwo.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/bluetooth/btsco.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/sgimips/hpc/haltwo.c
diff -u src/sys/arch/sgimips/hpc/haltwo.c:1.25 src/sys/arch/sgimips/hpc/haltwo.c:1.26
--- src/sys/arch/sgimips/hpc/haltwo.c:1.25 Wed May 8 13:40:16 2019
+++ src/sys/arch/sgimips/hpc/haltwo.c Sat May 25 04:41:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: haltwo.c,v 1.25 2019/05/08 13:40:16 isaki Exp $ */
+/* $NetBSD: haltwo.c,v 1.26 2019/05/25 04:41:53 isaki Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.25 2019/05/08 13:40:16 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.26 2019/05/25 04:41:53 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -695,7 +695,7 @@ haltwo_trigger_output(void *v, void *sta
fifoend = (param->channels * 8) >> 3;
DPRINTF(("haltwo_trigger_output: hw_channels = %d highwater = %d"
- " fifobeg = %d fifoend = %d\n", param->hw_channels, highwater,
+ " fifobeg = %d fifoend = %d\n", param->channels, highwater,
fifobeg, fifoend));
ctrl = HPC3_PBUS_DMACTL_RT
Index: src/sys/dev/bluetooth/btsco.c
diff -u src/sys/dev/bluetooth/btsco.c:1.39 src/sys/dev/bluetooth/btsco.c:1.40
--- src/sys/dev/bluetooth/btsco.c:1.39 Wed May 8 13:40:17 2019
+++ src/sys/dev/bluetooth/btsco.c Sat May 25 04:41:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.39 2019/05/08 13:40:17 isaki Exp $ */
+/* $NetBSD: btsco.c,v 1.40 2019/05/25 04:41:53 isaki Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.39 2019/05/08 13:40:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.40 2019/05/25 04:41:53 isaki Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -961,7 +961,7 @@ btsco_allocm(void *hdl, int direction, s
struct btsco_softc *sc = hdl;
void *addr;
- DPRINTF("%s: size %d direction %d\n", sc->sc_name, size, direction);
+ DPRINTF("%s: size %zd direction %d\n", sc->sc_name, size, direction);
addr = kmem_alloc(size, KM_SLEEP);
