Module Name: src
Committed By: andvar
Date: Sun Nov 5 21:54:27 UTC 2023
Modified Files:
src/sys/arch/playstation2/ee: sif.c
src/sys/arch/playstation2/playstation2: clock.c
Log Message:
Fix format specifiers for debug code.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/playstation2/ee/sif.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/playstation2/playstation2/clock.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/playstation2/ee/sif.c
diff -u src/sys/arch/playstation2/ee/sif.c:1.12 src/sys/arch/playstation2/ee/sif.c:1.13
--- src/sys/arch/playstation2/ee/sif.c:1.12 Sat Apr 16 17:35:57 2022
+++ src/sys/arch/playstation2/ee/sif.c Sun Nov 5 21:54:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sif.c,v 1.12 2022/04/16 17:35:57 andvar Exp $ */
+/* $NetBSD: sif.c,v 1.13 2023/11/05 21:54:27 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sif.c,v 1.12 2022/04/16 17:35:57 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sif.c,v 1.13 2023/11/05 21:54:27 andvar Exp $");
#include "debug_playstation2.h"
+#include <sys/intr.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -110,7 +111,7 @@ iopdma_allocate_buffer(struct iopdma_seg
if (seg->iop_paddr == 0) {
printf("%s: can't allocate IOP memory.\n", __func__);
- DPRINTF("request = %d byte, current total = %#x\n",
+ DPRINTF("request = %lu byte, current total = %#x\n",
size, __spd_total_alloc);
return (1);
}
@@ -120,7 +121,7 @@ iopdma_allocate_buffer(struct iopdma_seg
#ifdef SIF_DEBUG
__spd_total_alloc += size;
#endif
- DPRINTF("0x%08lx+%#x (total=%#x)\n", seg->iop_paddr, size,
+ DPRINTF("0x%08x+%#lx (total=%#x)\n", seg->iop_paddr, size,
__spd_total_alloc);
KDASSERT((seg->ee_vaddr & 63) == 0);
@@ -137,6 +138,6 @@ iopdma_free_buffer(struct iopdma_segment
#ifdef SIF_DEBUG
__spd_total_alloc -= seg->size;
#endif
- DPRINTF("0x%08lx (total=%#x, result=%d)\n", seg->iop_paddr,
+ DPRINTF("0x%08x (total=%#x, result=%d)\n", seg->iop_paddr,
__spd_total_alloc, ret);
}
Index: src/sys/arch/playstation2/playstation2/clock.c
diff -u src/sys/arch/playstation2/playstation2/clock.c:1.11 src/sys/arch/playstation2/playstation2/clock.c:1.12
--- src/sys/arch/playstation2/playstation2/clock.c:1.11 Thu Nov 20 16:34:25 2014
+++ src/sys/arch/playstation2/playstation2/clock.c Sun Nov 5 21:54:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.11 2014/11/20 16:34:25 christos Exp $ */
+/* $NetBSD: clock.c,v 1.12 2023/11/05 21:54:27 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.11 2014/11/20 16:34:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.12 2023/11/05 21:54:27 andvar Exp $");
#include "debug_playstation2.h"
@@ -93,7 +93,7 @@ get_bootinfo_tod(todr_chip_handle_t tch,
utc = clock_ymdhms_to_secs(dt) - 9*60*60;
clock_secs_to_ymdhms(utc, dt);
#ifdef DEBUG
- printf("bootinfo: %d/%d/%d/%d/%d/%d rtc_offset %d\n", dt->dt_year,
+ printf("bootinfo: %lld/%d/%d/%d/%d/%d rtc_offset %d\n", dt->dt_year,
dt->dt_mon, dt->dt_day, dt->dt_hour, dt->dt_min, dt->dt_sec,
rtc_offset);
#endif
