Module Name: src
Committed By: andvar
Date: Sat Sep 23 12:29:25 UTC 2023
Modified Files:
src/sys/arch/mac68k/dev: zs.c
src/sys/arch/macppc/dev: zs.c
Log Message:
change zsprintf to printf. It was defined as printf in include/z8530var.h
up to rev 1.4, then removed with conversion to MI 8530 SCC driver back in 1997.
Fixes build with ZSMACDEBUG option enabled for mac68k and macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mac68k/dev/zs.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/macppc/dev/zs.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/mac68k/dev/zs.c
diff -u src/sys/arch/mac68k/dev/zs.c:1.61 src/sys/arch/mac68k/dev/zs.c:1.62
--- src/sys/arch/mac68k/dev/zs.c:1.61 Sat Sep 11 20:28:04 2021
+++ src/sys/arch/mac68k/dev/zs.c Sat Sep 23 12:29:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.61 2021/09/11 20:28:04 andvar Exp $ */
+/* $NetBSD: zs.c,v 1.62 2023/09/23 12:29:25 andvar Exp $ */
/*
* Copyright (c) 1996-1998 Bill Studenmund
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.61 2021/09/11 20:28:04 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.62 2023/09/23 12:29:25 andvar Exp $");
#include "opt_ddb.h"
#include "opt_mac68k.h"
@@ -575,7 +575,7 @@ zs_set_speed(struct zs_chanstate *cs, in
}
}
#ifdef ZSMACDEBUG
- zsprintf("Checking for rate %d. Found source #%d.\n",bps, src);
+ printf("Checking for rate %d. Found source #%d.\n",bps, src);
#endif
if (src == -1)
return (EINVAL); /* no can do */
@@ -624,9 +624,9 @@ zs_set_speed(struct zs_chanstate *cs, in
splx(s);
#ifdef ZSMACDEBUG
- zsprintf("Rate is %7d, tc is %7d, source no. %2d, flags %4x\n", \
+ printf("Rate is %7d, tc is %7d, source no. %2d, flags %4x\n", \
bps, tc, src, sf);
- zsprintf("Registers are: 4 %x, 11 %x, 14 %x\n\n",
+ printf("Registers are: 4 %x, 11 %x, 14 %x\n\n",
cs->cs_preg[4], cs->cs_preg[11], cs->cs_preg[14]);
#endif
Index: src/sys/arch/macppc/dev/zs.c
diff -u src/sys/arch/macppc/dev/zs.c:1.56 src/sys/arch/macppc/dev/zs.c:1.57
--- src/sys/arch/macppc/dev/zs.c:1.56 Wed Feb 16 23:49:26 2022
+++ src/sys/arch/macppc/dev/zs.c Sat Sep 23 12:29:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.56 2022/02/16 23:49:26 riastradh Exp $ */
+/* $NetBSD: zs.c,v 1.57 2023/09/23 12:29:24 andvar Exp $ */
/*
* Copyright (c) 1996, 1998 Bill Studenmund
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.56 2022/02/16 23:49:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.57 2023/09/23 12:29:24 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -639,7 +639,7 @@ zs_set_speed(struct zs_chanstate *cs, in
}
}
#ifdef ZSMACDEBUG
- zsprintf("Checking for rate %d. Found source #%d.\n",bps, src);
+ printf("Checking for rate %d. Found source #%d.\n",bps, src);
#endif
if (src == -1)
return (EINVAL); /* no can do */
@@ -688,9 +688,9 @@ zs_set_speed(struct zs_chanstate *cs, in
splx(s);
#ifdef ZSMACDEBUG
- zsprintf("Rate is %7d, tc is %7d, source no. %2d, flags %4x\n", \
+ printf("Rate is %7d, tc is %7d, source no. %2d, flags %4x\n", \
bps, tc, src, sf);
- zsprintf("Registers are: 4 %x, 11 %x, 14 %x\n\n",
+ printf("Registers are: 4 %x, 11 %x, 14 %x\n\n",
cs->cs_preg[4], cs->cs_preg[11], cs->cs_preg[14]);
#endif
