[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Gnumach Cleanup 13
From: |
Barry deFreese |
Subject: |
Gnumach Cleanup 13 |
Date: |
Tue, 11 Nov 2008 10:19:33 -0500 |
User-agent: |
Thunderbird 2.0.0.17 (Windows/20080914) |
Hi,
For kicks I did some more cleanup of warnings in gnumach. The majority
of the fixes are for "initialization of incompatible pointer.." errors.
Here is a changelog:
2008-07-19 Barry deFreese <bdefreese@debian.org>
* device/device_emul.h (struct device_emulation_ops): Takes
mach_device_t not 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 (struct dev_ops): Pass nomap instead of nulldev
for map parameter.
* i386/i386at/pic_isa.c: Add type for external function
declarations. (Type defaults to int, make void).
Thanks,
Barry deFreese
Index: device/device_emul.h
===================================================================
RCS file: /sources/hurd/gnumach/device/Attic/device_emul.h,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 device_emul.h
--- device/device_emul.h 27 Mar 2007 22:47:09 -0000 1.1.2.1
+++ device/device_emul.h 11 Nov 2008 02:05:02 -0000
@@ -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);
};
Index: i386/i386at/autoconf.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386at/Attic/autoconf.c,v
retrieving revision 1.2.2.13
diff -u -p -r1.2.2.13 autoconf.c
--- i386/i386at/autoconf.c 9 Nov 2006 23:33:44 -0000 1.2.2.13
+++ i386/i386at/autoconf.c 11 Nov 2008 02:05:02 -0000
@@ -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}
};
/*
Index: i386/i386at/conf.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386at/Attic/conf.c,v
retrieving revision 1.4.2.15
diff -u -p -r1.4.2.15 conf.c
--- i386/i386at/conf.c 1 Apr 2007 22:10:40 -0000 1.4.2.15
+++ i386/i386at/conf.c 11 Nov 2008 02:05:02 -0000
@@ -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 },
Index: i386/i386at/pic_isa.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386at/pic_isa.c,v
retrieving revision 1.1.1.1.4.2
diff -u -p -r1.1.1.1.4.2 pic_isa.c
--- i386/i386at/pic_isa.c 22 Jul 2008 22:28:07 -0000 1.1.1.1.4.2
+++ i386/i386at/pic_isa.c 11 Nov 2008 02:05:02 -0000
@@ -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 */
- Gnumach Cleanup 13,
Barry deFreese <=