Source-Changes-HG archive

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

[src/trunk]: src/sys Remove esp specific function from ddb when esp @ sbus is...



details:   https://anonhg.NetBSD.org/src/rev/d0acac0aa96d
branches:  trunk
changeset: 500221:d0acac0aa96d
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Dec 08 17:29:12 2000 +0000

description:
Remove esp specific function from ddb when esp @ sbus is not included
in the kernel config. Makes compiling sbus-less kernels possible again.

diffstat:

 sys/arch/sparc64/sparc64/db_interface.c |  9 +++++++--
 sys/dev/sbus/files.sbus                 |  4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 88ebfd9a3a3c -r d0acac0aa96d sys/arch/sparc64/sparc64/db_interface.c
--- a/sys/arch/sparc64/sparc64/db_interface.c   Fri Dec 08 16:43:48 2000 +0000
+++ b/sys/arch/sparc64/sparc64/db_interface.c   Fri Dec 08 17:29:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.49 2000/12/07 01:03:17 eeh Exp $ */
+/*     $NetBSD: db_interface.c,v 1.50 2000/12/08 17:29:12 martin Exp $ */
 
 /*
  * Mach Operating System
@@ -59,6 +59,7 @@
 #include <machine/pmap.h>
 
 #include "fb.h"
+#include "esp_sbus.h"
 
 extern void OF_enter __P((void));
 
@@ -657,7 +658,7 @@
                pcb = (struct pcb*) addr;
 
        db_printf("pcb@%p sp:%p pc:%p cwp:%d pil:%d nsaved:%x onfault:%p\nlastcall:%s\nfull windows:\n",
-                 pcb, pcb->pcb_sp, pcb->pcb_pc, pcb->pcb_cwp,
+                 pcb, (void*)pcb->pcb_sp, (void*)pcb->pcb_pc, pcb->pcb_cwp,
                  pcb->pcb_pil, pcb->pcb_nsaved, (void *)pcb->pcb_onfault,
                  (pcb->lastcall)?pcb->lastcall:"Null");
        
@@ -858,13 +859,17 @@
        uvmhist_dump(uvm_histories.lh_first);
 }
 
+#if NESP_SBUS
 extern void db_esp(db_expr_t, int, db_expr_t, char*);
+#endif
 
 struct db_command sparc_db_command_table[] = {
        { "ctx",        db_ctx_cmd,     0,      0 },
        { "dtlb",       db_dump_dtlb,   0,      0 },
        { "dtsb",       db_dump_dtsb,   0,      0 },
+#if NESP_SBUS
        { "esp",        db_esp,         0,      0 },
+#endif
        { "kmap",       db_pmap_kernel, 0,      0 },
        { "lock",       db_lock,        0,      0 },
        { "pcb",        db_dump_pcb,    0,      0 },
diff -r 88ebfd9a3a3c -r d0acac0aa96d sys/dev/sbus/files.sbus
--- a/sys/dev/sbus/files.sbus   Fri Dec 08 16:43:48 2000 +0000
+++ b/sys/dev/sbus/files.sbus   Fri Dec 08 17:29:12 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sbus,v 1.15 2000/08/22 21:31:16 pk Exp $
+#      $NetBSD: files.sbus,v 1.16 2000/12/08 17:29:12 martin Exp $
 #
 # Config file and device description for machine-independent SBUS code.
 # Included by ports that need it.
@@ -38,7 +38,7 @@
 
 attach esp at sbus with esp_sbus
 attach esp at dma with esp_dma
-file   dev/sbus/esp_sbus.c             esp_sbus | esp_dma
+file   dev/sbus/esp_sbus.c             esp_sbus | esp_dma      needs-flag
 
 # LSI64854 based bi-directional parallel port
 device bpp {}: lsi64854



Home | Main Index | Thread Index | Old Index