--- Gnu-Mach/kern/machine.c	2020/09/02 04:42:45	1.1.1.2
+++ Gnu-Mach/kern/machine.c	2020/09/02 04:45:16	1.1.1.3
@@ -34,16 +34,14 @@
  *	Support for machine independent machine abstraction.
  */
 
-#include <norma_ether.h>
-#include <cpus.h>
-#include <mach_host.h>
-
+#include <string.h>
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
 #include <mach/mach_types.h>
 #include <mach/machine.h>
 #include <mach/host_info.h>
 #include <kern/counters.h>
+#include <kern/debug.h>
 #include <kern/ipc_host.h>
 #include <kern/host.h>
 #include <kern/lock.h>
@@ -53,6 +51,7 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <machine/machspl.h>	/* for splsched */
+#include <machine/model_dep.h>
 #include <sys/reboot.h>
 
 
@@ -68,60 +67,6 @@ queue_head_t	action_queue;	/* assign/shu
 decl_simple_lock_data(,action_lock);
 
 /*
- *	xxx_host_info:
- *
- *	Return the host_info structure.  This routine is exported to the
- *	user level.
- */
-kern_return_t xxx_host_info(task, info)
-	task_t		task;
-	machine_info_t	info;
-{
-#ifdef	lint
-	task++;
-#endif	/* lint */
-	*info = machine_info;
-	return(KERN_SUCCESS);
-}
-
-/*
- *	xxx_slot_info:
- *
- *	Return the slot_info structure for the specified slot.  This routine
- *	is exported to the user level.
- */
-kern_return_t xxx_slot_info(task, slot, info)
-	task_t		task;
-	int		slot;
-	machine_slot_t	info;
-{
-#ifdef	lint
-	task++;
-#endif	/* lint */
-	if ((slot < 0) || (slot >= NCPUS))
-		return(KERN_INVALID_ARGUMENT);
-	*info = machine_slot[slot];
-	return(KERN_SUCCESS);
-}
-
-/*
- *	xxx_cpu_control:
- *
- *	Support for user control of cpus.  The user indicates which cpu
- *	he is interested in, and whether or not that cpu should be running.
- */
-kern_return_t xxx_cpu_control(task, cpu, runnable)
-	task_t		task;
-	int		cpu;
-	boolean_t	runnable;
-{
-#ifdef	lint
-	task++; cpu++; runnable++;
-#endif	/* lint */
-	return(KERN_FAILURE);
-}
-
-/*
  *	cpu_up:
  *
  *	Flag specified cpu as up and running.  Called when a processor comes
@@ -188,7 +133,6 @@ host_reboot(host, options)
 		return (KERN_INVALID_HOST);
 
 	if (options & RB_DEBUGGER) {
-		extern void Debugger();
 		Debugger("Debugger");
 	} else {
 #ifdef parisc
@@ -690,10 +634,6 @@ Restart_pset:
  */
 
 #ifdef __GNUC__
-extern __volatile__ void halt_cpu();
-#endif
-
-#ifdef __GNUC__
 __volatile__
 #endif
 void processor_doshutdown(processor)
@@ -747,19 +687,6 @@ host_get_boot_info(priv_host, boot_info)
 		return KERN_INVALID_HOST;
 	}
 
-#if	NORMA_ETHER
-{
-	extern char *norma_ether_boot_info();
-	src = norma_ether_boot_info();
-}
-#endif	/* NORMA_ETHER */
-#if	defined(iPSC386) || defined(iPSC860)
-{
-	extern char *ipsc_boot_environ();
-	src = ipsc_boot_environ();
-}
-#endif	/* defined(iPSC386) || defined(iPSC860) */
-
 	(void) strncpy(boot_info, src, KERNEL_BOOT_INFO_MAX);
 	return KERN_SUCCESS;
 }