From d35703f70a6c0f89bcec1c97801532ab0d1b945f Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Tue, 27 Mar 2007 22:47:11 +0000
Subject: 2007-03-27 Thomas Schwinge <tschwinge@gnu.org>
Unconditionally use the device driver multiplexing. Suggested by
Gianluca Guida <glguida@gmail.com>.
* i386/i386at/dev_hdr.h: Merge into `device/dev_hdr.h' and remove.
* i386/i386at/device_emul.h: Rename to `device/device_emul.h'. Adapt
all users.
* i386/i386at/i386at_ds_routines.c: Merge into `device/ds_routines.c'
and remove.
* i386/linux/dev/include/linux_emul.h: Remove file.
* Makefrag.am (libkernel_a_SOURCES): Add `device/device_emul.h'.
* i386/Makefrag.am (libkernel_a_SOURCES): Remove
`i386/i386at/dev_hdr.h', `i386/i386at/device_emul.h' and
`i386/i386at/i386at_ds_routines.c'.
* i386/linux/Makefrag.am (liblinux_a_SOURCES): Remove
`i386/linux/dev/include/linux_emul.h'.
* dev/dev_hdr.h: Adapt all users of `i386' as if it were always
defined.
* device/dev_lookup.c: Likewise.
* device/ds_routines.c: Likewise.
* device/device_init.c (ds_init): Rename to `mach_device_init'.
* device/ds_routines.c (ds_init): Likewise.
(ds_trap_init): Rename to `mach_device_trap_init'.
(mach_device_trap_init): Make it `static'.
* linux/dev/glue/block.c: Don't include <linux_emul.h>, but instead
include <device/device_emul.h> and <i386at/disk.h>.
* linux/dev/glue/net.c: Don't include <linux_emul.h>, but instead
include <device/device_emul.h>.
* linux/pcmcia-cs/glue/ds.c: Likewise.
---
device/device_init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'device/device_init.c')
diff --git a/device/device_init.c b/device/device_init.c
index 1208fbf2..4f57fc2a 100644
--- a/device/device_init.c
+++ b/device/device_init.c
@@ -39,7 +39,7 @@
-extern void ds_init();
+extern void mach_device_init();
extern void dev_lookup_init();
extern void net_io_init();
extern void device_pager_init();
@@ -57,7 +57,7 @@ device_service_create()
if (master_device_port == IP_NULL)
panic("can't allocate master device port");
- ds_init();
+ mach_device_init();
dev_lookup_init();
net_io_init();
device_pager_init();
--
cgit v1.2.3