Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/arm32 Remove OFW hooks. Allow ports to add the...



details:   https://anonhg.NetBSD.org/src/rev/e0e6b6dc3b64
branches:  trunk
changeset: 504499:e0e6b6dc3b64
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Mar 04 05:40:03 2001 +0000

description:
Remove OFW hooks.  Allow ports to add there own hooks via
ARM_EXTRA_DB_COMMANDS.

diffstat:

 sys/arch/arm/arm32/db_interface.c |  22 +++++---------------
 sys/arch/arm/arm32/db_machdep.c   |  40 +--------------------------------------
 2 files changed, 7 insertions(+), 55 deletions(-)

diffs (108 lines):

diff -r ac9a12723710 -r e0e6b6dc3b64 sys/arch/arm/arm32/db_interface.c
--- a/sys/arch/arm/arm32/db_interface.c Sun Mar 04 05:38:19 2001 +0000
+++ b/sys/arch/arm/arm32/db_interface.c Sun Mar 04 05:40:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.1 2001/03/04 05:11:41 matt Exp $    */
+/*     $NetBSD: db_interface.c,v 1.2 2001/03/04 05:40:03 matt Exp $    */
 
 /* 
  * Copyright (c) 1996 Scott K. Stevens
@@ -305,22 +305,15 @@
 void db_show_intrchain_cmd     __P((db_expr_t addr, int have_addr, db_expr_t count, char *modif));
 void db_show_panic_cmd __P((db_expr_t addr, int have_addr, db_expr_t count, char *modif));
 void db_show_frame_cmd __P((db_expr_t addr, int have_addr, db_expr_t count, char *modif));
-#ifdef OFW
-void db_of_boot_cmd    __P((db_expr_t addr, int have_addr, db_expr_t count, char *modif));
-void db_of_enter_cmd   __P((db_expr_t addr, int have_addr, db_expr_t count, char *modif));
-void db_of_exit_cmd    __P((db_expr_t addr, int have_addr, db_expr_t count, char *modif));
-#endif
 
 const struct db_command db_machine_command_table[] = {
        { "frame",      db_show_frame_cmd,      0, NULL },
        { "intrchain",  db_show_intrchain_cmd,  0, NULL },
-#ifdef OFW
-       { "ofboot",     db_of_boot_cmd,         0, NULL },
-       { "ofenter",    db_of_enter_cmd,        0, NULL },
-       { "ofexit",     db_of_exit_cmd,         0, NULL },
-#endif
        { "panic",      db_show_panic_cmd,      0, NULL },
        { "vmstat",     db_show_vmstat_cmd,     0, NULL },
+#ifdef ARM32_DB_COMMANDS
+       ARM32_DB_COMMANDS,
+#endif
        { NULL,         NULL,                   0, NULL }
 };
 
@@ -359,12 +352,9 @@
        if (kernexec->a_syms == 0) {
                printf("[No symbol table]\n");
        } else {
-#if (!defined(SHARK) && !defined(OFWGENCFG)) || 1
+               /* cover the symbols themselves (what is the int for?? XXX) */
                esym = (int)&end + kernexec->a_syms + sizeof(int);
-#else
-               /* cover the symbols themselves */
-               esym = (int)&end + kernexec->a_syms;
-#endif
+
                /*
                 * and the string table.  (int containing size of string
                 * table is included in string table size).
diff -r ac9a12723710 -r e0e6b6dc3b64 sys/arch/arm/arm32/db_machdep.c
--- a/sys/arch/arm/arm32/db_machdep.c   Sun Mar 04 05:38:19 2001 +0000
+++ b/sys/arch/arm/arm32/db_machdep.c   Sun Mar 04 05:40:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_machdep.c,v 1.1 2001/03/04 05:11:41 matt Exp $      */
+/*     $NetBSD: db_machdep.c,v 1.2 2001/03/04 05:40:03 matt Exp $      */
 
 /* 
  * Copyright (c) 1996 Mark Brinicombe
@@ -41,10 +41,6 @@
 
 #include <machine/irqhandler.h>
 
-#ifdef OFW
-#include <dev/ofw/openfirm.h>
-#endif
-
 void
 db_show_vmstat_cmd(addr, have_addr, count, modif)
        db_expr_t       addr;
@@ -175,37 +171,3 @@
            frame->tf_r12, frame->tf_usr_sp, frame->tf_usr_lr, frame->tf_pc);
        db_printf("slr=%08x\n", frame->tf_svc_lr);
 }
-
-#ifdef OFW
-void
-db_of_boot_cmd(addr, have_addr, count, modif)
-       db_expr_t       addr;
-       int             have_addr;
-       db_expr_t       count;
-       char            *modif;
-{
-       OF_boot("");
-}
-
-
-void
-db_of_enter_cmd(addr, have_addr, count, modif)
-       db_expr_t       addr;
-       int             have_addr;
-       db_expr_t       count;
-       char            *modif;
-{
-       OF_enter();
-}
-
-
-void
-db_of_exit_cmd(addr, have_addr, count, modif)
-       db_expr_t       addr;
-       int             have_addr;
-       db_expr_t       count;
-       char            *modif;
-{
-       OF_exit();
-}
-#endif /* OFW */



Home | Main Index | Thread Index | Old Index