From a383432958ee5352b37a8219863aabb7c537c9b4 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 13 Nov 2008 23:41:13 +0000
Subject: 2008-07-19  Barry deFreese  <bdefreese@debian.org>

* device/device_emul.h (struct device_emulation_ops): Make members
	reference, dealloc, dev_to_port, write_trap, and writev_trap take
	mach_device_t parameter instead of void *.
	* i386/i386at/autoconf.c: Make forward declarations for comintr()
	and lprintr() match prototype. Add brackets around initialization
	members for bus_ctlr and bus_device structs.
	* i386/i386at/conf.c (dev_name_list): Pass nomap instead of nulldev
	for map field.
	* i386/i386at/pic_isa.c (intnull, fpintr, hardclock, kdintr,
	prtnull): Declare the type of the value returned by functions to void.
---
 i386/i386at/autoconf.c | 8 ++++----
 i386/i386at/conf.c     | 2 +-
 i386/i386at/pic_isa.c  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'i386')

diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index 48e1278..05988a6 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -49,12 +49,12 @@
 
 #if NCOM > 0
 extern	struct	bus_driver	comdriver;
-extern int			comintr();
+extern void			comintr();
 #endif /* NCOM */
 
 #if NLPR > 0
 extern	struct	bus_driver	lprdriver;
-extern int			lprintr();
+extern void			lprintr();
 #endif /* NLPR */
 
 struct	bus_ctlr	bus_master_init[] = {
@@ -62,7 +62,7 @@ struct	bus_ctlr	bus_master_init[] = {
 /* driver    name unit intr    address        len phys_address
      adaptor alive flags spl    pic				 */
 
-  0
+  {0}
 };
 
 
@@ -91,7 +91,7 @@ struct	bus_device	bus_device_init[] = {
 #endif /* NLPR > 0 */
 #endif /* MACH_LPR */
 
-  0
+  {0}
 };
 
 /*
diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c
index eee218a..23c2a6f 100644
--- a/i386/i386at/conf.c
+++ b/i386/i386at/conf.c
@@ -75,7 +75,7 @@ struct dev_ops	dev_name_list[] =
 	   cninit() we stick something appropriate here through the
 	   indirect list */
 	{ "cn",		nulldev,	nulldev,	nulldev,
-	  nulldev,	nulldev,	nulldev,	nulldev,
+	  nulldev,	nulldev,	nulldev,	nomap,
 	  nodev,	nulldev,	nulldev,	0,
 	  nodev },
 
diff --git a/i386/i386at/pic_isa.c b/i386/i386at/pic_isa.c
index 07b48a7..811ee1c 100644
--- a/i386/i386at/pic_isa.c
+++ b/i386/i386at/pic_isa.c
@@ -30,8 +30,8 @@
 
 
 /* These interrupts are always present */
-extern intnull(), fpintr(), hardclock(), kdintr();
-extern prtnull();
+extern void intnull(), fpintr(), hardclock(), kdintr();
+extern void prtnull();
 
 void (*ivect[NINTR])() = {
 	/* 00 */	hardclock,	/* always */
-- 
cgit v1.2.3