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 /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 'linux')
| -rw-r--r-- | linux/dev/glue/block.c | 4 | ||||
| -rw-r--r-- | linux/dev/glue/net.c | 3 | ||||
| -rw-r--r-- | linux/pcmcia-cs/glue/ds.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index 48dba7d..c06b5d2 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -60,8 +60,10 @@ #include <device/device_port.h> #include <device/disk_status.h> #include <device/device_reply.user.h> +#include <device/device_emul.h> -#include <linux_emul.h> +/* TODO. This should be fixed to not be i386 specific. */ +#include <i386at/disk.h> #define MACH_INCLUDE #include <linux/fs.h> diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c index 3ba0e0a..1a7a1e6 100644 --- a/linux/dev/glue/net.c +++ b/linux/dev/glue/net.c @@ -83,8 +83,7 @@ #include <device/if_hdr.h> #include <device/net_io.h> #include <device/device_reply.user.h> - -#include <linux_emul.h> +#include <device/device_emul.h> #define MACH_INCLUDE #include <linux/kernel.h> diff --git a/linux/pcmcia-cs/glue/ds.c b/linux/pcmcia-cs/glue/ds.c index 0f4e9a2..d0ecac9 100644 --- a/linux/pcmcia-cs/glue/ds.c +++ b/linux/pcmcia-cs/glue/ds.c @@ -1,7 +1,7 @@ /* * pcmcia-socket `device' driver * - * Copyright (C) 2006 Free Software Foundation, Inc. + * Copyright (C) 2006, 2007 Free Software Foundation, Inc. * Written by Stefan Siegl <stesie@brokenpipe.de>. * * This file is part of GNU Mach. @@ -49,7 +49,7 @@ #include <device/io_req.h> #include <device/ds_routines.h> -#include <i386at/device_emul.h> +#include <device/device_emul.h> #include <device/device_reply.user.h> |