Module Name: src
Committed By: andvar
Date: Tue Dec 26 09:56:45 UTC 2023
Modified Files:
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
Log Message:
Replace %ld/%lx format specifiers with PRIx{SIZE,ADDR} for better portability.
>From Nick Hudson.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/armadillo/armadillo9_machdep.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/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.54 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.55
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.54 Sat Dec 23 23:00:09 2023
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Tue Dec 26 09:56:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -407,8 +407,9 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %"PRIxPSIZE" pages at "
+ "0x%08"PRIxPADDR" -> 0x%08"PRIxPADDR"\n",
+ physmem, physical_start, physical_end - 1);
#endif
/*
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.39 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.40
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.39 Sun Dec 24 11:42:35 2023
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Tue Dec 26 09:56:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -544,8 +544,9 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %"PRIxPSIZE" pages at "
+ "0x%08"PRIxPADDR" -> 0x%08"PRIxPADDR"\n",
+ physmem, physical_start, physical_end - 1);
#endif
/*