Merge branch 'master' of github.com:PDP-10/klh10

src/Makefile.mk

@@ -193,7 +193,7 @@ OFILES_KS = klh10.o prmstr.o fecmd.o feload.o wfio.o osdsup.o \
 	vmtape.o dvtm03.o	\
 	dvlhdh.o dvdz11.o dvch11.o \
 	dpsup.o \
-	dvhost.o dvlites.o
+	dvhost.o #dvlites.o is NOT needed for the KS-10
 
 # Device Processes (DPs) built concurrently with KN10
 

src/klh10.c

@@ -2733,13 +2733,13 @@ fc_dump(struct cmd_s *cm)
 }
 
 
+#if KLH10_DEV_LITES
 /* FC_LIGHTS - Sets console lights I/O base address
 ** Currently only allow LPT1 and LPT2 ports on PC.
 */
 static void
 fc_lights(struct cmd_s *cm)
 {
-#if KLH10_DEV_LITES		/* Moby conditional for entire file */
     unsigned long port = 0;
     int c;
     char *sloc = cm->cmd_arglin;
@@ -2758,8 +2758,8 @@ fc_lights(struct cmd_s *cm)
 	}
     }
     printf("?Bad address\n");
-#endif /* KLH10_DEV_LITES */
 }
+#endif /* KLH10_DEV_LITES */
 
 /* Instruction printing routines */
 

src/kn10pag.c

@@ -32,7 +32,9 @@
 #include "osdsup.h"
 #include "kn10def.h"
 #include "kn10ops.h"
+#if KLH10_DEV_LITES
 #include "dvlites.h"
+#endif
 #include "klh10exp.h"
 #include "kn10cpu.h"
 
@@ -1492,7 +1494,10 @@ ioinsdef(io_do_pi)
     register w10_t w;
     w = vm_read(e);		/* get lights data */
 
+#if KLH10_DEV_LITES
     lights_pgmlites(LHGET(w), RHGET(w));
+#endif
+
     return PCINC_1;
 }