From d35703f70a6c0f89bcec1c97801532ab0d1b945f Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 27 Mar 2007 22:47:11 +0000 Subject: 2007-03-27 Thomas Schwinge Unconditionally use the device driver multiplexing. Suggested by Gianluca Guida . * 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 , but instead include and . * linux/dev/glue/net.c: Don't include , but instead include . * linux/pcmcia-cs/glue/ds.c: Likewise. --- device/dev_hdr.h | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) (limited to 'device/dev_hdr.h') diff --git a/device/dev_hdr.h b/device/dev_hdr.h index b976caf9..50e2977f 100644 --- a/device/dev_hdr.h +++ b/device/dev_hdr.h @@ -28,6 +28,31 @@ * Date: 3/89 */ +/* + * Mach device emulation definitions (i386at version). + * + * Copyright (c) 1996 The University of Utah and + * the Computer Systems Laboratory at the University of Utah (CSL). + * All rights reserved. + * + * Permission to use, copy, modify and distribute this software is hereby + * granted provided that (1) source code retains these copyright, permission, + * and disclaimer notices, and (2) redistributions including binaries + * reproduce the notices in supporting documentation, and (3) all advertising + * materials mentioning features or use of this software display the following + * acknowledgement: ``This product includes software developed by the + * Computer Systems Laboratory at the University of Utah.'' + * + * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS + * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF + * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * CSL requests users of this software to return to csl-dist@cs.utah.edu any + * improvements that they make and grant CSL redistribution rights. + * + * Author: Shantanu Goel, University of Utah CSL + */ + #ifndef _DEVICE_DEV_HDR_H_ #define _DEVICE_DEV_HDR_H_ @@ -37,16 +62,17 @@ #include -#ifdef i386 -#include -#else -#define mach_device device -#define mach_device_t device_t -#define MACH_DEVICE_NULL DEVICE_NULL -#define mach_device_reference device_reference -#define mach_device_deallocate device_deallocate -#define mach_convert_device_to_port convert_device_to_port -#endif +/* This structure is associated with each open device port. + The port representing the device points to this structure. */ +struct device +{ + struct device_emulation_ops *emul_ops; + void *emul_data; +}; + +typedef struct device *device_t; + +#define DEVICE_NULL ((device_t) 0) /* * Generic device header. May be allocated with the device, @@ -72,9 +98,7 @@ struct mach_device { int dev_number; /* device number */ int bsize; /* replacement for DEV_BSIZE */ struct dev_ops *dev_ops; /* and operations vector */ -#ifdef i386 struct device dev; /* the real device structure */ -#endif }; typedef struct mach_device *mach_device_t; #define MACH_DEVICE_NULL ((mach_device_t)0) -- cgit v1.2.3