--- Gnu-Mach/chips/busses.h	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/chips/busses.h	2020/09/02 04:49:14	1.1.1.3
@@ -73,7 +73,7 @@ struct bus_ctlr {
 	struct bus_driver  *driver;	/* myself, as a device */
 	char		   *name;	/* readability */
 	int		    unit;	/* index in driver */
-	int		  (*intr)();	/* interrupt handler(s) */
+	void		  (*intr)();	/* interrupt handler(s) */
 	vm_offset_t	    address;	/* device virtual address */
 	int		    am;		/* address modifier */
 	vm_offset_t	    phys_address;/* device phys address */
@@ -93,7 +93,7 @@ struct bus_device {
 	struct bus_driver  *driver;	/* autoconf info */
 	char		   *name;	/* my name */
 	int		    unit;
-	int		  (*intr)();
+	void		  (*intr)();
 	vm_offset_t	    address;	/* device address */
 	int		    am;		/* address modifier */
 	vm_offset_t	    phys_address;/* device phys address */
@@ -124,13 +124,13 @@ struct bus_device {
  */
 struct bus_driver {
 	int	(*probe)(		/* see if the driver is there */
-		    /*	vm_offset_t	address,
-			struct bus_ctlr * */ );
+			vm_offset_t	address,
+			struct bus_ctlr *);
 	int	(*slave)(          	/* see if any slave is there */	
-		    /*	struct bus_device *,
-			vm_offset_t	  */ );
+			struct bus_device *,
+			vm_offset_t);
 	void	(*attach)(		/* setup driver after probe */
-		    /*	struct bus_device * */);
+			struct bus_device *);
 	int	(*dgo)();		/* start transfer */
 	vm_offset_t *addr;		/* device csr addresses */
 	char	*dname;			/* name of a device */
@@ -144,10 +144,10 @@ struct bus_driver {
 extern struct bus_ctlr		bus_master_init[];
 extern struct bus_device	bus_device_init[];
 
-extern boolean_t configure_bus_master(char *, vm_offset_t, vm_offset_t,
-				      int, char * );
-extern boolean_t configure_bus_device(char *, vm_offset_t, vm_offset_t,
-				      int, char * );
+extern boolean_t configure_bus_master(const char *, vm_offset_t, vm_offset_t,
+				      int, const char * );
+extern boolean_t configure_bus_device(const char *, vm_offset_t, vm_offset_t,
+				      int, const char * );
 #endif	/* KERNEL */