[PATCH 14/68] device/device_init.c: remove forward declarations

[Marin Ramesa]

* device/dev_lookup.c: Include device/ds_routines.h.
* device/device_init.c: Include device/ds_routines.h.
Include device/net_io.h.
(mach_device_init, dev_lookup_init, net_io_init, device_pager_init, 
io_done_thread, net_thread): Remove forward declarations.
* device/ds_routines.h (mach_device_init, dev_lookup_init, device_pager_init, 
io_done_thread): Add prototypes.
* device/net_io.h (net_io_init, net_thread): Add prototypes.

---
 device/dev_lookup.c  |  1 +
 device/device_init.c | 11 +++--------
 device/ds_routines.h |  6 ++++++
 device/net_io.h      |  3 +++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/device/dev_lookup.c b/device/dev_lookup.c
index 01317b9..e257ae9 100644
--- a/device/dev_lookup.c
+++ b/device/dev_lookup.c
@@ -43,6 +43,7 @@
 #include <kern/ipc_kobject.h>
 
 #include <device/device_emul.h>
+#include <device/ds_routines.h>
 
 /*
  * Device structure routines: reference counting, port->device.
diff --git a/device/device_init.c b/device/device_init.c
index e43a2a9..fb98e31 100644
--- a/device/device_init.c
+++ b/device/device_init.c
@@ -38,15 +38,10 @@
 #include <device/device_types.h>
 #include <device/device_port.h>
 #include <device/tty.h>
+#include <device/ds_routines.h>
+#include <device/net_io.h>
 
-
-extern void    mach_device_init();
-extern void    dev_lookup_init();
-extern void    net_io_init();
-extern void    device_pager_init();
-
-extern void    io_done_thread();
-extern void    net_thread();
+ 
 
 ipc_port_t     master_device_port;
 
diff --git a/device/ds_routines.h b/device/ds_routines.h
index c4333f4..6d5b61c 100644
--- a/device/ds_routines.h
+++ b/device/ds_routines.h
@@ -65,4 +65,10 @@ kern_return_t        device_pager_setup(
        vm_size_t       size,
        mach_port_t     *pager);
 
+extern void mach_device_init(void);
+extern void dev_lookup_init(void);
+extern void device_pager_init(void);
+extern void io_done_thread(void);
+
+
 #endif /* DS_ROUTINES_H */
diff --git a/device/net_io.h b/device/net_io.h
index 5b3a55c..cbf6845 100644
--- a/device/net_io.h
+++ b/device/net_io.h
@@ -80,6 +80,9 @@ extern vm_size_t net_kmsg_size;
 
 extern void net_kmsg_collect (void);
 
+extern void net_io_init(void);
+extern void net_thread(void);
+
 #define net_kmsg_alloc()       ((ipc_kmsg_t) kalloc(net_kmsg_size))
 #define net_kmsg_free(kmsg)    kfree((vm_offset_t) (kmsg), net_kmsg_size)
 
-- 
1.8.1.4