From 18f1e34ea67aa551b54cfc006fe7f0370964afc4 Mon Sep 17 00:00:00 2001
From: Olaf Seibert <rhialto@falu.nl>
Date: Wed, 17 Feb 2016 20:44:40 +0100
Subject: [PATCH] Move some extern declarations to header files.

---
 src/dvcty.c   |  4 +---
 src/dvuba.c   |  4 +---
 src/injrst.c  |  6 +-----
 src/klh10.c   | 17 ++---------------
 src/kn10cpu.c | 13 +------------
 src/kn10dev.c |  4 +---
 src/kn10pag.c | 18 ++++--------------
 7 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/src/dvcty.c b/src/dvcty.c
index ef0fc5d..5c29423 100644
--- a/src/dvcty.c
+++ b/src/dvcty.c
@@ -32,14 +32,12 @@
 #include "kn10ops.h"
 #include "fecmd.h"
 #include "dvcty.h"	/* Exported functions, etc */
+#include "dvdte.h"
 
 #ifdef RCSID
  RCSID(dvcty_c,"$Id: dvcty.c,v 2.4 2002/03/21 09:47:52 klh Exp $")
 #endif
 
-/* Imported functions */
-extern int dte_ctysin(int);
-
 /* Local functions & data */
 #if KLH10_CPU_KS
 static int cty_sin(int cnt);
diff --git a/src/dvuba.c b/src/dvuba.c
index 5a6709e..071118d 100644
--- a/src/dvuba.c
+++ b/src/dvuba.c
@@ -53,15 +53,13 @@ static int decosfcclossage;
 #include "kn10def.h"
 #include "kn10ops.h"
 #include "kn10dev.h"
+#include "kn10cpu.h"
 #include "dvuba.h"
 
 #ifdef RCSID
  RCSID(dvuba_c,"$Id: dvuba.c,v 2.4 2002/05/21 09:44:52 klh Exp $")
 #endif
 
-/* Imported functions */
-extern void pi_devupd(void);
-
 /* Pre-declarations */
 static void ubasta_write(struct ubctl *, h10_t);
 static uint32 ubapag_read(struct ubctl *, dvuadr_t);
diff --git a/src/injrst.c b/src/injrst.c
index ec6afa9..164e2bb 100644
--- a/src/injrst.c
+++ b/src/injrst.c
@@ -31,17 +31,13 @@
 #include "klh10.h"
 #include "kn10def.h"
 #include "kn10ops.h"
+#include "klh10exp.h"
 #include <stdio.h>	/* For debug output */
 
 #ifdef RCSID
  RCSID(injrst_c,"$Id: injrst.c,v 2.4 2002/03/21 09:50:55 klh Exp $")
 #endif
 
-/* Imported functions */
-
-extern void pishow(FILE *);
-extern void pcfshow(FILE *, h10_t flags);
-
 
 
 insdef(i_jffo)			/* JFFO */
diff --git a/src/klh10.c b/src/klh10.c
index 4a34e90..36bea9e 100644
--- a/src/klh10.c
+++ b/src/klh10.c
@@ -52,6 +52,7 @@
 #include "kn10def.h"
 #include "kn10dev.h"
 #include "kn10ops.h"
+#include "kn10cpu.h"
 #include "wfio.h"
 #include "fecmd.h"
 #include "feload.h"
@@ -71,21 +72,7 @@
 #endif
 
 /* Exported functions */
-void klh10_main(int argc, char **argv);
-void fe_aprcont(int, int, vaddr_t, int);
-void fe_shutdown(void);
-void fe_traceprint(w10_t, vaddr_t);
-void fe_begpcfdbg(FILE *f);
-void fe_endpcfdbg(FILE *f);
-void pishow(FILE *);
-void pcfshow(FILE *, h10_t);
-void insprint(FILE *, int);
-/* void panic(char *, ...); */	/* Declared in kn10def.h */
-
-/* Imported functions */
-extern void apr_init(void);
-extern void apr_init_aprid(void);
-extern int apr_run(void);
+#include "klh10exp.h"
 
 /* Local function kept external for easier debug access  */
 void errpt(void);
diff --git a/src/kn10cpu.c b/src/kn10cpu.c
index 2ac3a61..1f434c5 100644
--- a/src/kn10cpu.c
+++ b/src/kn10cpu.c
@@ -54,18 +54,7 @@
 #endif
 
 /* Exported functions */
-void apr_init(void);
-void apr_init_aprid(void);
-int apr_run(void);
-void pi_devupd(void);
-void apr_check(void);
-void pxct_undo(void);	/* Stuff needed by KN10PAG for page fail trap */
-void trap_undo(void);
-#if KLH10_ITS_1PROC
-void a1pr_undo(void);
-#elif KLH10_CPU_KI || KLH10_CPU_KL
-void afi_undo(void);
-#endif
+#include "kn10cpu.h"
 
 /* Pre-declarations */
 static void trap_xct(void);
diff --git a/src/kn10dev.c b/src/kn10dev.c
index 57f494a..7021c3e 100644
--- a/src/kn10dev.c
+++ b/src/kn10dev.c
@@ -38,6 +38,7 @@
 #include "kn10dev.h"
 #include "kn10ops.h"
 #include "prmstr.h"
+#include "kn10cpu.h"
 
 #if KLH10_CPU_KS && KLH10_DEV_TM03
 # include "dvtm03.h"	/* For setting up FECOM_BOOTP with magtape params */
@@ -47,9 +48,6 @@
  RCSID(kn10dev_c,"$Id: kn10dev.c,v 2.4 2001/11/10 21:28:59 klh Exp $")
 #endif
 
-/* Imported functions */
-extern void pi_devupd(void);
-
 /* NULL device routines, for handling non-existent device. */
 
 static void  dvnull_v(struct device *d) { }
diff --git a/src/kn10pag.c b/src/kn10pag.c
index 806d201..1c94d8b 100644
--- a/src/kn10pag.c
+++ b/src/kn10pag.c
@@ -33,25 +33,15 @@
 #include "kn10def.h"
 #include "kn10ops.h"
 #include "dvlites.h"
+#include "klh10exp.h"
+#include "kn10cpu.h"
 
 #ifdef RCSID
  RCSID(kn10pag_c,"$Id: kn10pag.c,v 2.4 2002/04/26 05:22:21 klh Exp $")
 #endif
 
-/* Exported functions - see kn10pag.h */
-
-/* Imported functions */
-extern void pishow(FILE *f);
-extern void pcfshow(FILE *f, h10_t flags);
-extern void insprint(FILE *, int);
-
-extern void pxct_undo(void);	/* KN10CPU stuff needed for page fail trap */
-extern void trap_undo(void);
-#if KLH10_ITS_1PROC
-extern void a1pr_undo(void);
-#elif KLH10_CPU_KI || KLH10_CPU_KL
-extern void afi_undo(void);
-#endif
+/* Exported functions */
+#include "kn10pag.h"
 
 /* Local Pre-declarations */
 static void acblk_set(unsigned, unsigned);