diff options
| author | Thomas Schwinge <tschwinge@gnu.org> | 2007-03-27 22:47:11 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:07 +0200 |
| commit | d35703f70a6c0f89bcec1c97801532ab0d1b945f (patch) | |
| tree | a7c20e38b9e65384a4637ca1d535d1c5cafb431d /i386/linux | |
| parent | 211fe231c99b8cf1aa3f91c97b1f00c73b857865 (diff) | |
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.
Diffstat (limited to 'i386/linux')
| -rw-r--r-- | i386/linux/Makefrag.am | 1 | ||||
| -rw-r--r-- | i386/linux/dev/include/linux_emul.h | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/i386/linux/Makefrag.am b/i386/linux/Makefrag.am index c280309b..87b1ae20 100644 --- a/i386/linux/Makefrag.am +++ b/i386/linux/Makefrag.am @@ -22,5 +22,4 @@ liblinux_a_SOURCES += \ i386/linux/dev/include/linux/autoconf.h \ - i386/linux/dev/include/linux_emul.h \ linux/src/arch/i386/lib/semaphore.S diff --git a/i386/linux/dev/include/linux_emul.h b/i386/linux/dev/include/linux_emul.h deleted file mode 100644 index 50bf73de..00000000 --- a/i386/linux/dev/include/linux_emul.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _LINUX_EMUL_H_ -#define _LINUX_EMUL_H_ - -#include <i386at/dev_hdr.h> -#include <i386at/device_emul.h> -#include <i386at/disk.h> - -#endif |