Module Name: src
Committed By: andvar
Date: Tue Oct 24 19:05:07 UTC 2023
Modified Files:
src/sys/arch/mac68k/dev: zs_kgdb.c
src/sys/arch/macppc/dev: zs_kgdb.c
src/sys/arch/mipsco/obio: zs_kgdb.c
src/sys/arch/sgimips/dev: zs_kgdb.c
src/sys/arch/sparc/dev: zs_kgdb.c
src/sys/arch/sun2/dev: zs_kgdb.c
src/sys/arch/sun3/dev: zs_kgdb.c
Log Message:
apply similar changes between different archs/machines for zs_kgdb.c:
1) adjust zs_kgdb_init tty attachment message for kgdb_dev type change.
(one arch uses cast to int instead, but kept one approach for consistency)
2) remove unused rr0 declaration and assignment in zs_kgdb_txint()
3) adjust kgdb_dev format specifier to %llx/d if needed.
4) add const for zs_kgdb_devname declaration (macppc only).
should fix zs_kgdb.c build for all these ports.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mac68k/dev/zs_kgdb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/macppc/dev/zs_kgdb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mipsco/obio/zs_kgdb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/dev/zs_kgdb.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/dev/zs_kgdb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sun2/dev/zs_kgdb.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sun3/dev/zs_kgdb.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_kgdb.c
diff -u src/sys/arch/mac68k/dev/zs_kgdb.c:1.11 src/sys/arch/mac68k/dev/zs_kgdb.c:1.12
--- src/sys/arch/mac68k/dev/zs_kgdb.c:1.11 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mac68k/dev/zs_kgdb.c Tue Oct 24 19:05:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.11 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.12 2023/10/24 19:05:07 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.11 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.12 2023/10/24 19:05:07 andvar Exp $");
#include "opt_kgdb.h"
#include <sys/param.h>
@@ -148,8 +148,8 @@ zs_kgdb_init(void)
/* Note: (ttya,ttyb) on zsc1, and (ttyc,ttyd) on zsc0 */
channel = kgdb_dev & 1;
- printf("zs_kgdb_init: attaching tty0%c at %d baud\n",
- '0' + (kgdb_dev & 3), kgdb_rate);
+ printf("zs_kgdb_init: attaching Serial(%lld) at %d baud\n",
+ (kgdb_dev & 3), kgdb_rate);
if (!zsinited)
zs_init();
@@ -254,9 +254,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(struct zs_chanstate *cs)
{
- int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
Index: src/sys/arch/macppc/dev/zs_kgdb.c
diff -u src/sys/arch/macppc/dev/zs_kgdb.c:1.14 src/sys/arch/macppc/dev/zs_kgdb.c:1.15
--- src/sys/arch/macppc/dev/zs_kgdb.c:1.14 Mon Oct 26 19:16:57 2009
+++ src/sys/arch/macppc/dev/zs_kgdb.c Tue Oct 24 19:05:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.14 2009/10/26 19:16:57 cegger Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.15 2023/10/24 19:05:07 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.14 2009/10/26 19:16:57 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.15 2023/10/24 19:05:07 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,7 +109,7 @@ zs_setparam(struct zs_chanstate *cs, int
#ifndef KGDB_DEVNAME
#define KGDB_DEVNAME "scca"
#endif
-char *zs_kgdb_devname = KGDB_DEVNAME;
+const char *zs_kgdb_devname = KGDB_DEVNAME;
/*
* Set up for kgdb; called at boot time before configuration.
* KGDB interrupts will be enabled later when zs0 is configured.
@@ -252,9 +252,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(register struct zs_chanstate *cs)
{
- register int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
Index: src/sys/arch/mipsco/obio/zs_kgdb.c
diff -u src/sys/arch/mipsco/obio/zs_kgdb.c:1.10 src/sys/arch/mipsco/obio/zs_kgdb.c:1.11
--- src/sys/arch/mipsco/obio/zs_kgdb.c:1.10 Wed Mar 18 10:22:32 2009
+++ src/sys/arch/mipsco/obio/zs_kgdb.c Tue Oct 24 19:05:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.10 2009/03/18 10:22:32 cegger Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.11 2023/10/24 19:05:07 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.10 2009/03/18 10:22:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.11 2023/10/24 19:05:07 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,7 +136,7 @@ zs_kgdb_init(void)
unit = (kgdb_dev & 2) ? 2 : 0;
channel = kgdb_dev & 1;
- printf("zs_kgdb_init: attaching serial%d at %d baud\n",
+ printf("zs_kgdb_init: attaching Serial(%lld) at %d baud\n",
(kgdb_dev & 3), kgdb_rate);
zc = zs_get_chan_addr(unit, channel);
@@ -231,9 +231,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(register struct zs_chanstate *cs)
{
- register int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
Index: src/sys/arch/sgimips/dev/zs_kgdb.c
diff -u src/sys/arch/sgimips/dev/zs_kgdb.c:1.15 src/sys/arch/sgimips/dev/zs_kgdb.c:1.16
--- src/sys/arch/sgimips/dev/zs_kgdb.c:1.15 Wed Mar 18 10:22:35 2009
+++ src/sys/arch/sgimips/dev/zs_kgdb.c Tue Oct 24 19:05:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.15 2009/03/18 10:22:35 cegger Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.16 2023/10/24 19:05:07 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.15 2009/03/18 10:22:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.16 2023/10/24 19:05:07 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,7 +136,7 @@ zs_kgdb_init(void)
unit = (kgdb_dev & 2) ? 1 : 0; /* XXX ??? */
channel = kgdb_dev & 1;
- printf("zs_kgdb_init: attaching to Serial(%d) at %d baud\n",
+ printf("zs_kgdb_init: attaching to Serial(%lld) at %d baud\n",
(kgdb_dev & 3), kgdb_rate);
zc = zs_get_chan_addr(unit, channel);
@@ -231,9 +231,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(register struct zs_chanstate *cs)
{
- register int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
Index: src/sys/arch/sparc/dev/zs_kgdb.c
diff -u src/sys/arch/sparc/dev/zs_kgdb.c:1.21 src/sys/arch/sparc/dev/zs_kgdb.c:1.22
--- src/sys/arch/sparc/dev/zs_kgdb.c:1.21 Sat May 16 16:55:24 2009
+++ src/sys/arch/sparc/dev/zs_kgdb.c Tue Oct 24 19:05:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.21 2009/05/16 16:55:24 cegger Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.22 2023/10/24 19:05:07 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.21 2009/05/16 16:55:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.22 2023/10/24 19:05:07 andvar Exp $");
#include "opt_kgdb.h"
@@ -149,8 +149,8 @@ zs_kgdb_init(void)
/* Note: (ttya,ttyb) on zs0, and (ttyc,ttyd) on zs2 */
promzs_unit = (kgdb_dev & 2) ? 2 : 0;
channel = kgdb_dev & 1;
- printf("zs_kgdb_init: attaching tty%c at %d baud\n",
- 'a' + (kgdb_dev & 3), kgdb_rate);
+ printf("zs_kgdb_init: attaching Serial(%lld) at %d baud\n",
+ (kgdb_dev & 3), kgdb_rate);
/* Setup temporary chanstate. */
memset((void *)&cs, 0, sizeof(cs));
@@ -252,9 +252,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(struct zs_chanstate *cs)
{
- register int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
Index: src/sys/arch/sun2/dev/zs_kgdb.c
diff -u src/sys/arch/sun2/dev/zs_kgdb.c:1.10 src/sys/arch/sun2/dev/zs_kgdb.c:1.11
--- src/sys/arch/sun2/dev/zs_kgdb.c:1.10 Mon Apr 28 20:23:37 2008
+++ src/sys/arch/sun2/dev/zs_kgdb.c Tue Oct 24 19:05:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.10 2008/04/28 20:23:37 martin Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.11 2023/10/24 19:05:07 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.10 2008/04/28 20:23:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.11 2023/10/24 19:05:07 andvar Exp $");
#include "opt_kgdb.h"
@@ -132,15 +132,15 @@ zs_kgdb_init(void)
int channel, promzs_unit;
extern const struct cdevsw zstty_cdevsw;
- /* printf("zs_kgdb_init: kgdb_dev=0x%x\n", kgdb_dev); */
+ /* printf("zs_kgdb_init: kgdb_dev=0x%llx\n", kgdb_dev); */
if (cdevsw_lookup(kgdb_dev) != &zstty_cdevsw)
return;
/* Note: (ttya,ttyb) on zs0, and (ttyc,ttyd) on zs2 */
promzs_unit = (kgdb_dev & 2) ? 2 : 0;
channel = kgdb_dev & 1;
- printf("zs_kgdb_init: attaching tty%c at %d baud\n",
- 'a' + (kgdb_dev & 3), kgdb_rate);
+ printf("zs_kgdb_init: attaching Serial(%lld) at %d baud\n",
+ (kgdb_dev & 3), kgdb_rate);
/* Setup temporary chanstate. */
memset((void *)&cs, 0, sizeof(cs));
@@ -242,9 +242,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(struct zs_chanstate *cs)
{
- int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
Index: src/sys/arch/sun3/dev/zs_kgdb.c
diff -u src/sys/arch/sun3/dev/zs_kgdb.c:1.26 src/sys/arch/sun3/dev/zs_kgdb.c:1.27
--- src/sys/arch/sun3/dev/zs_kgdb.c:1.26 Sat Oct 13 06:35:54 2012
+++ src/sys/arch/sun3/dev/zs_kgdb.c Tue Oct 24 19:05:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.26 2012/10/13 06:35:54 tsutsui Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.27 2023/10/24 19:05:06 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.26 2012/10/13 06:35:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.27 2023/10/24 19:05:06 andvar Exp $");
#include "opt_kgdb.h"
@@ -245,9 +245,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(struct zs_chanstate *cs)
{
- int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
