From 40aa5d392d3676b4f3556dd30647c98367a73b53 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 30 Jan 2021 10:56:07 +0700 Subject: [PATCH] Remove SwitchDisplay and colordsp. (#317) --- inc/dspifdefs.h | 1 - src/dspif.c | 18 +----------------- src/initdsp.c | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/inc/dspifdefs.h b/inc/dspifdefs.h index 9643b40..9661daa 100644 --- a/inc/dspifdefs.h +++ b/inc/dspifdefs.h @@ -4,6 +4,5 @@ void make_dsp_instance(DspInterface dsp, char *lispbitmap, int width_hint, int height_hint, int depth_hint); unsigned long GenericReturnT(void); void GenericPanic(DspInterface dsp); -LispPTR SwitchDisplay(LispPTR display); void describedsp(DspInterface dsp); #endif diff --git a/src/dspif.c b/src/dspif.c index 63fbec7..41fada7 100644 --- a/src/dspif.c +++ b/src/dspif.c @@ -20,10 +20,9 @@ #include "dspifdefs.h" #include "xinitdefs.h" -DspInterfaceRec _curdsp, _coldsp; +DspInterfaceRec _curdsp; DspInterface currentdsp = &_curdsp; -DspInterface colordsp = &_coldsp; #ifdef XWINDOW extern int LispDisplayRequestedWidth; @@ -95,26 +94,11 @@ void GenericPanic(DspInterface dsp) { exit(0); } -LispPTR SwitchDisplay(LispPTR display) { - DspInterface tmp; /* Switch-a-roo! */ - - TPRINT(("Enter SwitchDisplay\n")); - tmp = currentdsp; - currentdsp = colordsp; - colordsp = tmp; - TPRINT(("Exit SwitchDisplay\n")); - return (display); -} - void describedsp(DspInterface dsp) { if (dsp == 0) { printf("describedsp: Not a dsp!\n"); return; } - if (dsp == &_curdsp) - printf("dsp is B/W display\n"); - else - printf("dsp is COLOR display\n"); printf("\n"); printf("width= %d\n", dsp->Display.width); diff --git a/src/initdsp.c b/src/initdsp.c index 8018f1b..1a32a15 100644 --- a/src/initdsp.c +++ b/src/initdsp.c @@ -69,7 +69,6 @@ DLword *DisplayRegion68k_end_addr; extern DspInterface currentdsp; int DisplayWidth8; -extern DspInterfaceRec _curdsp, _coldsp; #endif /* DOS */ /* from /usr/include/sun/fbio.h some machines don't have following def. */