--- Gnu-Mach/ddb/db_access.c	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/ddb/db_access.c	2020/09/02 04:45:46	1.1.1.3
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -27,11 +27,12 @@
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
-#include "mach_kdb.h"
+
 #if MACH_KDB
 
 #include <mach/boolean.h>
 #include <machine/db_machdep.h>		/* type definitions */
+#include <machine/db_interface.h>	/* function definitions */
 #include <machine/setjmp.h>
 #include <kern/task.h>
 #include <ddb/db_access.h>
@@ -43,9 +44,6 @@
  * boundaries.
  */
 
-extern void	db_read_bytes();	/* machine-dependent */
-extern void	db_write_bytes();	/* machine-dependent */
-
 int db_access_level = DB_ACCESS_LEVEL;
 
 /*
@@ -74,7 +72,7 @@ db_get_task_value(addr, size, is_signed,
 	register db_expr_t value;
 	register int	i;
 
-	db_read_bytes((void*)addr, size, data, task);
+	db_read_bytes(addr, size, data, task);
 
 	value = 0;
 #if	BYTE_MSF
@@ -85,7 +83,7 @@ db_get_task_value(addr, size, is_signed,
 	{
 	    value = (value << 8) + (data[i] & 0xFF);
 	}
-	    
+
 	if (size <= sizeof(int)) {
 	    if (is_signed && (value & db_extend[size]) != 0)
 		value |= db_extend[size];
@@ -113,7 +111,7 @@ db_put_task_value(addr, size, value, tas
 	    value >>= 8;
 	}
 
-	db_write_bytes((void*)addr, size, data, task);
+	db_write_bytes(addr, size, data, task);
 }
 
 db_expr_t
@@ -134,4 +132,4 @@ db_put_value(addr, size, value)
 	db_put_task_value(addr, size, value, TASK_NULL);
 }
 
-#endif MACH_KDB
+#endif /* MACH_KDB */