From 7c9b9d22c6dc3c786b3507ce4c21c852e995dc60 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 29 Jun 2017 18:27:28 -0700 Subject: [PATCH] Create uraid.h to declare functions defined in uraid.c. Update files that depend on these uraid functions to include uraid.h. Add dependencies to makefile. modified: bin/makefile-tail new file: inc/uraid.h modified: src/common.c modified: src/truecolor.c modified: src/unwind.c modified: src/uraid.c modified: src/uutils.c --- bin/makefile-tail | 8 ++++---- inc/uraid.h | 6 ++++++ src/common.c | 1 + src/truecolor.c | 1 + src/unwind.c | 1 + src/uraid.c | 9 ++++++--- src/uutils.c | 1 + 7 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 inc/uraid.h diff --git a/bin/makefile-tail b/bin/makefile-tail index febcf74..288fad9 100755 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -387,7 +387,7 @@ $(OBJECTDIR)lineblt8.o : $(SRCDIR)lineblt8.c $(REQUIRED-INCS) $(INCDIR)lispemu $(OBJECTDIR)common.o : $(SRCDIR)common.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \ - $(INCDIR)emlglob.h + $(INCDIR)emlglob.h $(INCDIR)uraid.h $(CC) $(RFLAGS) $(SRCDIR)common.c $(INLINE) -o $(OBJECTDIR)common$(OEXT) $(OBJECTDIR)conspage.o : $(SRCDIR)conspage.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -448,7 +448,7 @@ $(OBJECTDIR)ubf3.o : $(SRCDIR)ubf3.c $(REQUIRED-INCS) \ $(CC) $(RFLAGS) $(SRCDIR)ubf3.c $(INLINE) -o $(OBJECTDIR)ubf3$(OEXT) $(OBJECTDIR)uutils.o : $(SRCDIR)uutils.c $(REQUIRED-INCS) \ - $(INCDIR)lsptypes.h $(INCDIR)keyboard.h + $(INCDIR)lsptypes.h $(INCDIR)keyboard.h $(INCDIR)uraid.h $(CC) $(RFLAGS) $(SRCDIR)uutils.c $(INLINE) -o $(OBJECTDIR)uutils$(OEXT) $(OBJECTDIR)dspsubrs.o : $(SRCDIR)dspsubrs.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -765,7 +765,7 @@ $(OBJECTDIR)uraid.o : $(SRCDIR)uraid.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)emlglob.h \ $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h \ - $(INCDIR)debug.h + $(INCDIR)debug.h $(INCDIR)uraid.h $(CC) $(RFLAGS) $(SRCDIR)uraid.c $(INLINE) -o $(OBJECTDIR)uraid$(OEXT) $(OBJECTDIR)rpc.o : $(SRCDIR)rpc.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -778,7 +778,7 @@ $(OBJECTDIR)rpc.o : $(SRCDIR)rpc.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(OBJECTDIR)unwind.o : $(SRCDIR)unwind.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \ - $(INCDIR)emlglob.h $(INCDIR)lspglob.h + $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)uraid.h $(CC) $(RFLAGS) $(SRCDIR)unwind.c $(INLINE) -o $(OBJECTDIR)unwind$(OEXT) $(OBJECTDIR)vars3.o : $(SRCDIR)vars3.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ diff --git a/inc/uraid.h b/inc/uraid.h new file mode 100644 index 0000000..838597e --- /dev/null +++ b/inc/uraid.h @@ -0,0 +1,6 @@ +LispPTR parse_atomstring(char *string); +void uraid_commclear(); +void copy_region(short *src, short *dst, int width, int h); +LispPTR uraid_commands(); +int device_before_raid(); +int device_after_raid(); diff --git a/src/common.c b/src/common.c index 2191a42..8133bd5 100644 --- a/src/common.c +++ b/src/common.c @@ -28,6 +28,7 @@ static char *id = "$Id: common.c,v 1.2 1999/01/03 02:06:52 sybalsky Exp $ Copyri #include "emlglob.h" #include "stack.h" #include "dbprint.h" +#include "uraid.h" #ifndef NOPIXRECT #include diff --git a/src/truecolor.c b/src/truecolor.c index 7b979f5..1219e68 100644 --- a/src/truecolor.c +++ b/src/truecolor.c @@ -27,6 +27,7 @@ static char *id = "$Id: truecolor.c,v 1.2 1999/01/03 02:07:38 sybalsky Exp $ Cop #include "adr68k.h" #include "arith.h" #include "devconf.h" +#include "uraid.h" #include "picture.h" diff --git a/src/unwind.c b/src/unwind.c index 242930b..fb3d44a 100644 --- a/src/unwind.c +++ b/src/unwind.c @@ -31,6 +31,7 @@ static char *id = "$Id: unwind.c,v 1.3 1999/05/31 23:35:46 sybalsky Exp $ Copyri #include "emlglob.h" #include "stack.h" #include "lspglob.h" +#include "uraid.h" UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep) { register int num; /* number of UNBOUND slot */ diff --git a/src/uraid.c b/src/uraid.c index 3d7037a..7aeca53 100644 --- a/src/uraid.c +++ b/src/uraid.c @@ -87,6 +87,7 @@ extern int Win_security_p; #include "display.h" #include "bitblt.h" +#include "uraid.h" #ifdef DOS #define vfork() printf("No forking around here.\n") @@ -858,7 +859,7 @@ int device_before_raid() { int size; int munmapstat; struct pixrect *fb; - extern char *alloc_hideDISP(); + /* extern char *alloc_hideDISP(); */ #ifdef SUNDISPLAY union wait status; #endif /* SUNDISPLAY */ @@ -1052,6 +1053,8 @@ char *alloc_hideDISP(int size) */ #define KB_ALLUP 0xffff +static int re_init_display(int, int); + int device_after_raid() { extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K; extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K; @@ -1128,7 +1131,7 @@ int device_after_raid() { /***********************************************************************/ #ifndef COLOR -int re_init_display(int lisp_display_addr, int display_max) +static int re_init_display(int lisp_display_addr, int display_max) { int mmapstat, size; struct pixrect *ColorFb; @@ -1238,7 +1241,7 @@ int re_init_display(int lisp_display_addr, int display_max) #else /* COLOR */ -int re_init_display(int lisp_display_addr, int display_max) +static int re_init_display(int lisp_display_addr, int display_max) { int mmapstat, size; struct pixrect *ColorFb; diff --git a/src/uutils.c b/src/uutils.c index 3e450c7..60dd3bc 100644 --- a/src/uutils.c +++ b/src/uutils.c @@ -48,6 +48,7 @@ static char *id = "$Id: uutils.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyri #include "lspglob.h" #include "osmsg.h" #include "keyboard.h" +#include "uraid.h" #ifdef OS5 #define gethostid() 0