summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--device/device_emul.h10
-rw-r--r--i386/i386at/autoconf.c8
-rw-r--r--i386/i386at/conf.c2
-rw-r--r--i386/i386at/pic_isa.c4
5 files changed, 25 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index aeba559..73ff3d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
2008-11-13 Thomas Schwinge <tschwinge@gnu.org>
[task #8135 -- PAE for GNU Mach]
diff --git a/device/device_emul.h b/device/device_emul.h
index 957bd50..879736c 100644
--- a/device/device_emul.h
+++ b/device/device_emul.h
@@ -32,9 +32,9 @@
/* Each emulation layer provides these operations. */
struct device_emulation_ops
{
- void (*reference) (void *);
- void (*dealloc) (void *);
- ipc_port_t (*dev_to_port) (void *);
+ void (*reference) (mach_device_t);
+ void (*dealloc) (mach_device_t);
+ ipc_port_t (*dev_to_port) (mach_device_t);
io_return_t (*open) (ipc_port_t, mach_msg_type_name_t,
dev_mode_t, char *, device_t *);
io_return_t (*close) (void *);
@@ -55,9 +55,9 @@ struct device_emulation_ops
io_return_t (*map) (void *, vm_prot_t, vm_offset_t,
vm_size_t, ipc_port_t *, boolean_t);
void (*no_senders) (mach_no_senders_notification_t *);
- io_return_t (*write_trap) (void *, dev_mode_t,
+ io_return_t (*write_trap) (mach_device_t, dev_mode_t,
recnum_t, vm_offset_t, vm_size_t);
- io_return_t (*writev_trap) (void *, dev_mode_t,
+ io_return_t (*writev_trap) (mach_device_t, dev_mode_t,
recnum_t, io_buf_vec_t *, vm_size_t);
};
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 */