Module Name: src
Committed By: mrg
Date: Tue Feb 23 07:13:53 UTC 2021
Modified Files:
src/sys/arch/aarch64/aarch64: db_machdep.c
src/sys/arch/alpha/alpha: db_interface.c
src/sys/arch/amd64/amd64: db_interface.c
src/sys/arch/arm/arm32: db_machdep.c
src/sys/arch/hppa/hppa: db_machdep.c
src/sys/arch/i386/i386: db_interface.c
src/sys/arch/ia64/ia64: db_interface.c
src/sys/arch/mips/mips: db_interface.c
src/sys/arch/powerpc/powerpc: db_interface.c
src/sys/arch/sh3/sh3: db_interface.c
src/sys/arch/sparc/sparc: db_interface.c db_machdep.c
src/sys/arch/sparc64/sparc64: db_interface.c db_machdep.c
src/sys/arch/sun3/sun3: db_machdep.c
src/sys/arch/vax/vax: db_machdep.c
src/sys/ddb: db_command.c db_command.h
src/sys/dev/sbus: esp_sbus.c
src/sys/dev/usb: usb.c
src/sys/modules/examples/ddbping: ddbping.c
Log Message:
introduce DDB_END_CMD and replace more than 20 copies of the same
list of NULLs and 0. idea from rillig@.
all touched ports built, several booted.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/aarch64/aarch64/db_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/alpha/alpha/db_interface.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amd64/amd64/db_interface.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/arm32/db_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/hppa/db_machdep.c
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/i386/i386/db_interface.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/ia64/db_interface.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/mips/mips/db_interface.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/powerpc/db_interface.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sh3/sh3/db_interface.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/sparc/sparc/db_interface.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc/sparc/db_machdep.c
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/sparc64/sparc64/db_interface.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/sparc64/db_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sun3/sun3/db_machdep.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/vax/vax/db_machdep.c
cvs rdiff -u -r1.175 -r1.176 src/sys/ddb/db_command.c
cvs rdiff -u -r1.40 -r1.41 src/sys/ddb/db_command.h
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/sbus/esp_sbus.c
cvs rdiff -u -r1.190 -r1.191 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/examples/ddbping/ddbping.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/aarch64/aarch64/db_machdep.c
diff -u src/sys/arch/aarch64/aarch64/db_machdep.c:1.33 src/sys/arch/aarch64/aarch64/db_machdep.c:1.34
--- src/sys/arch/aarch64/aarch64/db_machdep.c:1.33 Fri Feb 5 21:44:34 2021
+++ src/sys/arch/aarch64/aarch64/db_machdep.c Tue Feb 23 07:13:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.33 2021/02/05 21:44:34 joerg Exp $ */
+/* $NetBSD: db_machdep.c,v 1.34 2021/02/23 07:13:51 mrg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.33 2021/02/05 21:44:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.34 2021/02/23 07:13:51 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd32.h"
@@ -163,10 +163,8 @@ const struct db_command db_machine_comma
},
#endif
{
- DDB_ADD_CMD(NULL, NULL, 0,
- NULL,
- NULL, NULL)
- }
+ DDB_END_CMD
+ },
};
const struct db_variable db_regs[] = {
Index: src/sys/arch/alpha/alpha/db_interface.c
diff -u src/sys/arch/alpha/alpha/db_interface.c:1.35 src/sys/arch/alpha/alpha/db_interface.c:1.36
--- src/sys/arch/alpha/alpha/db_interface.c:1.35 Fri Sep 18 00:02:43 2020
+++ src/sys/arch/alpha/alpha/db_interface.c Tue Feb 23 07:13:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.35 2020/09/18 00:02:43 thorpej Exp $ */
+/* $NetBSD: db_interface.c,v 1.36 2021/02/23 07:13:51 mrg Exp $ */
/*
* Mach Operating System
@@ -52,7 +52,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.35 2020/09/18 00:02:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.36 2021/02/23 07:13:51 mrg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -95,7 +95,7 @@ const struct db_command db_machine_comma
{ DDB_ADD_CMD("cpu", db_mach_cpu, 0,
"switch to another cpu", "cpu-no", NULL) },
#endif
- { DDB_ADD_CMD(NULL, NULL, 0,NULL,NULL,NULL) },
+ { DDB_END_CMD },
};
static int db_alpha_regop(const struct db_variable *, db_expr_t *, int);
Index: src/sys/arch/amd64/amd64/db_interface.c
diff -u src/sys/arch/amd64/amd64/db_interface.c:1.38 src/sys/arch/amd64/amd64/db_interface.c:1.39
--- src/sys/arch/amd64/amd64/db_interface.c:1.38 Tue Jul 14 00:45:52 2020
+++ src/sys/arch/amd64/amd64/db_interface.c Tue Feb 23 07:13:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.38 2020/07/14 00:45:52 yamaguchi Exp $ */
+/* $NetBSD: db_interface.c,v 1.39 2021/02/23 07:13:51 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.38 2020/07/14 00:45:52 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.39 2021/02/23 07:13:51 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -85,7 +85,7 @@ const struct db_command db_machine_comma
{ DDB_ADD_CMD("cpu", db_mach_cpu, 0,
"switch to another cpu", "cpu-no", NULL) },
#endif
- { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) },
+ { DDB_END_CMD },
};
void kdbprinttrap(int, int);
Index: src/sys/arch/arm/arm32/db_machdep.c
diff -u src/sys/arch/arm/arm32/db_machdep.c:1.38 src/sys/arch/arm/arm32/db_machdep.c:1.39
--- src/sys/arch/arm/arm32/db_machdep.c:1.38 Thu Dec 3 10:23:45 2020
+++ src/sys/arch/arm/arm32/db_machdep.c Tue Feb 23 07:13:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.38 2020/12/03 10:23:45 rin Exp $ */
+/* $NetBSD: db_machdep.c,v 1.39 2021/02/23 07:13:51 mrg Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.38 2020/12/03 10:23:45 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.39 2021/02/23 07:13:51 mrg Exp $");
#include <sys/param.h>
@@ -142,7 +142,7 @@ const struct db_command db_machine_comma
#endif
#endif /* _KERNEL */
- { DDB_ADD_CMD(NULL, NULL, 0,NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
void
Index: src/sys/arch/hppa/hppa/db_machdep.c
diff -u src/sys/arch/hppa/hppa/db_machdep.c:1.8 src/sys/arch/hppa/hppa/db_machdep.c:1.9
--- src/sys/arch/hppa/hppa/db_machdep.c:1.8 Mon Apr 15 20:45:08 2019
+++ src/sys/arch/hppa/hppa/db_machdep.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
- /* $NetBSD: db_machdep.c,v 1.8 2019/04/15 20:45:08 skrll Exp $ */
+ /* $NetBSD: db_machdep.c,v 1.9 2021/02/23 07:13:52 mrg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.8 2019/04/15 20:45:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.9 2021/02/23 07:13:52 mrg Exp $");
#include <sys/param.h>
#include <sys/lwp.h>
@@ -125,7 +125,7 @@ const struct db_command db_machine_comma
"[/l] [addr]",
" addr:\tdisplay this trap frame (current kernel frame otherwise)\n"
" /l:\tdisplay the trap frame from lwp") },
- { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) }
+ { DDB_END_CMD },
};
void
Index: src/sys/arch/i386/i386/db_interface.c
diff -u src/sys/arch/i386/i386/db_interface.c:1.85 src/sys/arch/i386/i386/db_interface.c:1.86
--- src/sys/arch/i386/i386/db_interface.c:1.85 Tue Jul 14 00:45:52 2020
+++ src/sys/arch/i386/i386/db_interface.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.85 2020/07/14 00:45:52 yamaguchi Exp $ */
+/* $NetBSD: db_interface.c,v 1.86 2021/02/23 07:13:52 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.85 2020/07/14 00:45:52 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.86 2021/02/23 07:13:52 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -86,7 +86,7 @@ const struct db_command db_machine_comma
{ DDB_ADD_CMD("cpu", db_mach_cpu, 0,
"switch to another cpu", "cpu-no", NULL) },
#endif
- { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) },
+ { DDB_END_CMD },
};
void kdbprinttrap(int, int);
Index: src/sys/arch/ia64/ia64/db_interface.c
diff -u src/sys/arch/ia64/ia64/db_interface.c:1.8 src/sys/arch/ia64/ia64/db_interface.c:1.9
--- src/sys/arch/ia64/ia64/db_interface.c:1.8 Thu Apr 3 17:05:58 2014
+++ src/sys/arch/ia64/ia64/db_interface.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.8 2014/04/03 17:05:58 martin Exp $ */
+/* $NetBSD: db_interface.c,v 1.9 2021/02/23 07:13:52 mrg Exp $ */
/*-
* Copyright (c) 2003-2005 Marcel Moolenaar
@@ -80,7 +80,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.8 2014/04/03 17:05:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.9 2021/02/23 07:13:52 mrg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -118,7 +118,7 @@ const struct db_command db_machine_comma
"[vector]",
" vector:\tthe vector to show (all vectors otherwise)") },
- { DDB_ADD_CMD(NULL, NULL, 0, NULL,NULL,NULL) },
+ { DDB_END_CMD },
};
static int
Index: src/sys/arch/mips/mips/db_interface.c
diff -u src/sys/arch/mips/mips/db_interface.c:1.91 src/sys/arch/mips/mips/db_interface.c:1.92
--- src/sys/arch/mips/mips/db_interface.c:1.91 Sun Aug 23 03:21:57 2020
+++ src/sys/arch/mips/mips/db_interface.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.91 2020/08/23 03:21:57 simonb Exp $ */
+/* $NetBSD: db_interface.c,v 1.92 2021/02/23 07:13:52 mrg Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.91 2020/08/23 03:21:57 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.92 2021/02/23 07:13:52 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
@@ -827,7 +827,7 @@ const struct db_command db_machine_comma
"delete cp0 watchpoint",
"address", NULL) },
#endif /* (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0 */
- { DDB_ADD_CMD(NULL, NULL, 0, NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
#endif /* !KGDB */
Index: src/sys/arch/powerpc/powerpc/db_interface.c
diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.54 src/sys/arch/powerpc/powerpc/db_interface.c:1.55
--- src/sys/arch/powerpc/powerpc/db_interface.c:1.54 Mon Jul 6 09:34:18 2020
+++ src/sys/arch/powerpc/powerpc/db_interface.c Tue Feb 23 07:13:52 2021
@@ -1,8 +1,8 @@
-/* $NetBSD: db_interface.c,v 1.54 2020/07/06 09:34:18 rin Exp $ */
+/* $NetBSD: db_interface.c,v 1.55 2021/02/23 07:13:52 mrg Exp $ */
/* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.54 2020/07/06 09:34:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.55 2021/02/23 07:13:52 mrg Exp $");
#define USERACC
@@ -156,8 +156,7 @@ const struct db_command db_machine_comma
"switch to another cpu", "cpu-no", NULL) },
#endif /* MULTIPROCESSOR */
- { DDB_ADD_CMD(NULL, NULL, 0,
- NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
void
Index: src/sys/arch/sh3/sh3/db_interface.c
diff -u src/sys/arch/sh3/sh3/db_interface.c:1.65 src/sys/arch/sh3/sh3/db_interface.c:1.66
--- src/sys/arch/sh3/sh3/db_interface.c:1.65 Mon Aug 3 21:53:25 2020
+++ src/sys/arch/sh3/sh3/db_interface.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.65 2020/08/03 21:53:25 uwe Exp $ */
+/* $NetBSD: db_interface.c,v 1.66 2021/02/23 07:13:52 mrg Exp $ */
/*-
* Copyright (C) 2002 UCHIYAMA Yasushi. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.65 2020/08/03 21:53:25 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.66 2021/02/23 07:13:52 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -120,7 +120,7 @@ const struct db_command db_machine_comma
"Dump TLB contents.",
NULL, NULL) },
- { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL,NULL) }
+ { DDB_END_CMD },
};
int db_active;
Index: src/sys/arch/sparc/sparc/db_interface.c
diff -u src/sys/arch/sparc/sparc/db_interface.c:1.95 src/sys/arch/sparc/sparc/db_interface.c:1.96
--- src/sys/arch/sparc/sparc/db_interface.c:1.95 Sun Jan 24 07:36:54 2021
+++ src/sys/arch/sparc/sparc/db_interface.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.95 2021/01/24 07:36:54 mrg Exp $ */
+/* $NetBSD: db_interface.c,v 1.96 2021/02/23 07:13:52 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.95 2021/01/24 07:36:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.96 2021/02/23 07:13:52 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -453,7 +453,7 @@ const struct db_command db_machine_comma
{ DDB_ADD_CMD("xcall", db_xcall_cmd, 0,
"show xcall information on all cpus", NULL, NULL) },
#endif
- { DDB_ADD_CMD(NULL, NULL, 0, NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
#endif /* DDB */
Index: src/sys/arch/sparc/sparc/db_machdep.c
diff -u src/sys/arch/sparc/sparc/db_machdep.c:1.1 src/sys/arch/sparc/sparc/db_machdep.c:1.2
--- src/sys/arch/sparc/sparc/db_machdep.c:1.1 Fri Jul 21 20:56:10 2017
+++ src/sys/arch/sparc/sparc/db_machdep.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.1 2017/07/21 20:56:10 nakayama Exp $ */
+/* $NetBSD: db_machdep.c,v 1.2 2021/02/23 07:13:52 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.1 2017/07/21 20:56:10 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.2 2021/02/23 07:13:52 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -123,6 +123,6 @@ db_sparc_regop(const struct db_variable
#ifndef DDB
const struct db_command db_machine_command_table[] = {
- { DDB_ADD_CMD(NULL, NULL, 0, NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
#endif /* DDB */
Index: src/sys/arch/sparc64/sparc64/db_interface.c
diff -u src/sys/arch/sparc64/sparc64/db_interface.c:1.135 src/sys/arch/sparc64/sparc64/db_interface.c:1.136
--- src/sys/arch/sparc64/sparc64/db_interface.c:1.135 Mon Apr 1 06:12:51 2019
+++ src/sys/arch/sparc64/sparc64/db_interface.c Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.135 2019/04/01 06:12:51 msaitoh Exp $ */
+/* $NetBSD: db_interface.c,v 1.136 2021/02/23 07:13:53 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.135 2019/04/01 06:12:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.136 2021/02/23 07:13:53 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1129,7 +1129,7 @@ const struct db_command db_machine_comma
{ DDB_ADD_CMD("window", db_dump_window, 0,
"Print register window information",
"[no]", " no:\tstack frame number (0, i.e. top, if missing)") },
- { DDB_ADD_CMD(NULL, NULL, 0, NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
#endif /* DDB */
Index: src/sys/arch/sparc64/sparc64/db_machdep.c
diff -u src/sys/arch/sparc64/sparc64/db_machdep.c:1.2 src/sys/arch/sparc64/sparc64/db_machdep.c:1.3
--- src/sys/arch/sparc64/sparc64/db_machdep.c:1.2 Tue Mar 10 15:54:52 2020
+++ src/sys/arch/sparc64/sparc64/db_machdep.c Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.2 2020/03/10 15:54:52 christos Exp $ */
+/* $NetBSD: db_machdep.c,v 1.3 2021/02/23 07:13:53 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.2 2020/03/10 15:54:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.3 2021/02/23 07:13:53 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -225,6 +225,6 @@ const struct db_variable * const db_ereg
#ifndef DDB
const struct db_command db_machine_command_table[] = {
- { DDB_ADD_CMD(NULL, NULL, 0, NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
#endif /* DDB */
Index: src/sys/arch/sun3/sun3/db_machdep.c
diff -u src/sys/arch/sun3/sun3/db_machdep.c:1.28 src/sys/arch/sun3/sun3/db_machdep.c:1.29
--- src/sys/arch/sun3/sun3/db_machdep.c:1.28 Sat Sep 7 15:56:11 2013
+++ src/sys/arch/sun3/sun3/db_machdep.c Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.28 2013/09/07 15:56:11 tsutsui Exp $ */
+/* $NetBSD: db_machdep.c,v 1.29 2021/02/23 07:13:53 mrg Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.28 2013/09/07 15:56:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.29 2021/02/23 07:13:53 mrg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -65,7 +65,7 @@ const struct db_command db_machine_comma
"Prints the PTE and segmap values", "virtual-address", NULL) },
{ DDB_ADD_CMD("reboot", db_mach_reboot, 0,
"Calls prom_boot()", NULL, NULL) },
- { DDB_ADD_CMD(NULL,NULL,0,NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
/*
Index: src/sys/arch/vax/vax/db_machdep.c
diff -u src/sys/arch/vax/vax/db_machdep.c:1.58 src/sys/arch/vax/vax/db_machdep.c:1.59
--- src/sys/arch/vax/vax/db_machdep.c:1.58 Sun Jul 3 02:18:21 2011
+++ src/sys/arch/vax/vax/db_machdep.c Tue Feb 23 07:13:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.58 2011/07/03 02:18:21 matt Exp $ */
+/* $NetBSD: db_machdep.c,v 1.59 2021/02/23 07:13:52 mrg Exp $ */
/*
* :set tabs=4
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.58 2011/07/03 02:18:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.59 2021/02/23 07:13:52 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -634,5 +634,5 @@ const struct db_command db_machine_comma
{ DDB_ADD_CMD("cpu", db_mach_cpu, 0,
"switch to another cpu", "cpu-no", NULL) },
#endif
- { DDB_ADD_CMD(NULL,NULL,0,NULL,NULL,NULL) },
+ { DDB_END_CMD },
};
Index: src/sys/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.175 src/sys/ddb/db_command.c:1.176
--- src/sys/ddb/db_command.c:1.175 Fri Oct 30 16:29:49 2020
+++ src/sys/ddb/db_command.c Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.175 2020/10/30 16:29:49 skrll Exp $ */
+/* $NetBSD: db_command.c,v 1.176 2021/02/23 07:13:53 mrg Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009, 2019
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.175 2020/10/30 16:29:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.176 2021/02/23 07:13:53 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -328,7 +328,7 @@ static const struct db_command db_show_c
{ DDB_ADD_CMD("watches", db_listwatch_cmd, 0,
"Display all watchpoints.", NULL,NULL) },
#endif
- { DDB_ADD_CMD(NULL, NULL, 0,NULL,NULL,NULL) }
+ { DDB_END_CMD },
};
static const struct db_command db_command_table[] = {
@@ -421,7 +421,7 @@ static const struct db_command db_comman
{ DDB_ADD_CMD("x", db_examine_cmd, CS_SET_DOT,
"Display the address locations.",
"[/modifier] address[,count]",NULL) },
- { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) }
+ { DDB_END_CMD },
};
static const struct db_command *db_last_command = NULL;
Index: src/sys/ddb/db_command.h
diff -u src/sys/ddb/db_command.h:1.40 src/sys/ddb/db_command.h:1.41
--- src/sys/ddb/db_command.h:1.40 Fri Oct 30 06:59:43 2020
+++ src/sys/ddb/db_command.h Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.h,v 1.40 2020/10/30 06:59:43 skrll Exp $ */
+/* $NetBSD: db_command.h,v 1.41 2021/02/23 07:13:53 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -89,6 +89,8 @@ struct db_command;
name,funct,type
#endif
+/* End of list for ddb command arrays. */
+#define DDB_END_CMD DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL)
/*
Index: src/sys/dev/sbus/esp_sbus.c
diff -u src/sys/dev/sbus/esp_sbus.c:1.55 src/sys/dev/sbus/esp_sbus.c:1.56
--- src/sys/dev/sbus/esp_sbus.c:1.55 Sun Nov 10 21:16:37 2019
+++ src/sys/dev/sbus/esp_sbus.c Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.55 2019/11/10 21:16:37 chs Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.56 2021/02/23 07:13:53 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.55 2019/11/10 21:16:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.56 2021/02/23 07:13:53 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -687,7 +687,7 @@ const struct db_command db_esp_command_t
{ DDB_ADD_CMD("esp", db_esp, 0,
"display status of all esp SCSI controllers and their devices",
NULL, NULL) },
- { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) }
+ { DDB_END_CMD },
};
static void
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.190 src/sys/dev/usb/usb.c:1.191
--- src/sys/dev/usb/usb.c:1.190 Mon Feb 22 20:45:28 2021
+++ src/sys/dev/usb/usb.c Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.190 2021/02/22 20:45:28 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.191 2021/02/23 07:13:53 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.190 2021/02/22 20:45:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.191 2021/02/23 07:13:53 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -381,7 +381,7 @@ static const struct db_command db_usb_co
{ DDB_ADD_CMD("usbxferlist", db_usb_xferlist, 0,
"display a USB xfer structure given pipe",
NULL, NULL) },
- { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) }
+ { DDB_END_CMD },
};
static void
Index: src/sys/modules/examples/ddbping/ddbping.c
diff -u src/sys/modules/examples/ddbping/ddbping.c:1.1 src/sys/modules/examples/ddbping/ddbping.c:1.2
--- src/sys/modules/examples/ddbping/ddbping.c:1.1 Mon Jun 1 03:37:40 2020
+++ src/sys/modules/examples/ddbping/ddbping.c Tue Feb 23 07:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ddbping.c,v 1.1 2020/06/01 03:37:40 uwe Exp $ */
+/* $NetBSD: ddbping.c,v 1.2 2021/02/23 07:13:53 mrg Exp $ */
/*
* Copyright (c) 2020 Valery Ushakov
* All rights reserved.
@@ -28,43 +28,19 @@
* Example of a kernel module that registers DDB commands.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddbping.c,v 1.1 2020/06/01 03:37:40 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddbping.c,v 1.2 2021/02/23 07:13:53 mrg Exp $");
#include <sys/param.h>
#include <sys/module.h>
#include <ddb/ddb.h>
-/* XXX: db_command.h should provide something like these */
-#define DB_CMD_TBL_END { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) }
-typedef void db_cmdfn_t(db_expr_t, bool, db_expr_t, const char *);
-
-
-static db_cmdfn_t db_ping;
-static db_cmdfn_t db_show_ping;
-
-
-static const struct db_command db_ping_base_tbl[] = {
- { DDB_ADD_CMD("ping", db_ping, 0,
- "Example command",
- NULL, NULL) },
- DB_CMD_TBL_END
-};
-
-static const struct db_command db_ping_show_tbl[] = {
- { DDB_ADD_CMD("ping", db_show_ping, 0,
- "Example command stats",
- NULL, NULL) },
- DB_CMD_TBL_END
-};
-
static unsigned int ping_count;
static unsigned int ping_count_modif;
static unsigned int ping_count_addr;
static unsigned int ping_count_count;
-
static void
db_ping(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
@@ -99,6 +75,19 @@ db_show_ping(db_expr_t addr, bool have_a
db_printf("with count\t%u\n", ping_count_count);
}
+static const struct db_command db_ping_base_tbl[] = {
+ { DDB_ADD_CMD("ping", db_ping, 0,
+ "Example command",
+ NULL, NULL) },
+ { DDB_END_CMD },
+};
+
+static const struct db_command db_ping_show_tbl[] = {
+ { DDB_ADD_CMD("ping", db_show_ping, 0,
+ "Example command stats",
+ NULL, NULL) },
+ { DDB_END_CMD },
+};
MODULE(MODULE_CLASS_MISC, ddbping, NULL);
