diff options
| -rw-r--r-- | sys/kern/subr_bus.c | 76 | ||||
| -rw-r--r-- | sys/sys/bus_private.h | 108 |
2 files changed, 75 insertions, 109 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 2008aa1..83a402f 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -38,12 +38,86 @@ #include <sys/rman.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/bus_private.h> +#include <sys/bus.h> #include <machine/stdarg.h> #include <vm/uma.h> +/* + * Used to attach drivers to devclasses. + */ +typedef struct driverlink *driverlink_t; +struct driverlink { + driver_t *driver; + TAILQ_ENTRY(driverlink) link; /* list of drivers in devclass */ +}; + +/* + * Forward declarations + */ +typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t; +typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; +typedef TAILQ_HEAD(device_list, device) device_list_t; + +struct devclass { + TAILQ_ENTRY(devclass) link; + driver_list_t drivers; /* bus devclasses store drivers for bus */ + char *name; + device_t *devices; /* array of devices indexed by unit */ + int maxunit; /* size of devices array */ +}; + +/* + * Implementation of device. + */ +struct device { + /* + * A device is a kernel object. The first field must be the + * current ops table for the object. + */ + KOBJ_FIELDS; + + /* + * Device hierarchy. + */ + TAILQ_ENTRY(device) link; /* list of devices in parent */ + TAILQ_ENTRY(device) devlink; /* global device list membership */ + device_t parent; + device_list_t children; /* list of subordinate devices */ + + /* + * Details of this device. + */ + driver_t *driver; + devclass_t devclass; /* device class which we are in */ + int unit; + char* nameunit; /* name+unit e.g. foodev0 */ + char* desc; /* driver specific description */ + int busy; /* count of calls to device_busy() */ + device_state_t state; + u_int32_t devflags; /* api level flags for device_get_flags() */ + u_short flags; +#define DF_ENABLED 1 /* device should be probed/attached */ +#define DF_FIXEDCLASS 2 /* devclass specified at create time */ +#define DF_WILDCARD 4 /* unit was originally wildcard */ +#define DF_DESCMALLOCED 8 /* description was malloced */ +#define DF_QUIET 16 /* don't print verbose attach message */ +#define DF_DONENOMATCH 32 /* don't execute DEVICE_NOMATCH again */ +#define DF_EXTERNALSOFTC 64 /* softc not allocated by us */ + u_char order; /* order from device_add_child_ordered() */ + u_char pad; + void *ivars; + void *softc; +}; + +struct device_op_desc { + unsigned int offset; /* offset in driver ops */ + struct method* method; /* internal method implementation */ + devop_t deflt; /* default implementation */ + const char* name; /* unique name (for registration) */ +}; + static MALLOC_DEFINE(M_BUS, "bus", "Bus data structures"); #ifdef BUS_DEBUG diff --git a/sys/sys/bus_private.h b/sys/sys/bus_private.h deleted file mode 100644 index 2ba550b..0000000 --- a/sys/sys/bus_private.h +++ /dev/null @@ -1,108 +0,0 @@ -/*- - * Copyright (c) 1997,1998 Doug Rabson - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _SYS_BUS_PRIVATE_H_ -#define _SYS_BUS_PRIVATE_H_ - -#include <sys/bus.h> - -/* - * Used to attach drivers to devclasses. - */ -typedef struct driverlink *driverlink_t; -struct driverlink { - driver_t *driver; - TAILQ_ENTRY(driverlink) link; /* list of drivers in devclass */ -}; - -/* - * Forward declarations - */ -typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t; -typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; -typedef TAILQ_HEAD(device_list, device) device_list_t; - -struct devclass { - TAILQ_ENTRY(devclass) link; - driver_list_t drivers; /* bus devclasses store drivers for bus */ - char *name; - device_t *devices; /* array of devices indexed by unit */ - int maxunit; /* size of devices array */ -}; - -/* - * Implementation of device. - */ -struct device { - /* - * A device is a kernel object. The first field must be the - * current ops table for the object. - */ - KOBJ_FIELDS; - - /* - * Device hierarchy. - */ - TAILQ_ENTRY(device) link; /* list of devices in parent */ - TAILQ_ENTRY(device) devlink; /* global device list membership */ - device_t parent; - device_list_t children; /* list of subordinate devices */ - - /* - * Details of this device. - */ - driver_t *driver; - devclass_t devclass; /* device class which we are in */ - int unit; - char* nameunit; /* name+unit e.g. foodev0 */ - char* desc; /* driver specific description */ - int busy; /* count of calls to device_busy() */ - device_state_t state; - u_int32_t devflags; /* api level flags for device_get_flags() */ - u_short flags; -#define DF_ENABLED 1 /* device should be probed/attached */ -#define DF_FIXEDCLASS 2 /* devclass specified at create time */ -#define DF_WILDCARD 4 /* unit was originally wildcard */ -#define DF_DESCMALLOCED 8 /* description was malloced */ -#define DF_QUIET 16 /* don't print verbose attach message */ -#define DF_DONENOMATCH 32 /* don't execute DEVICE_NOMATCH again */ -#define DF_EXTERNALSOFTC 64 /* softc not allocated by us */ - u_char order; /* order from device_add_child_ordered() */ - u_char pad; - void *ivars; - void *softc; -}; - -struct device_op_desc { - unsigned int offset; /* offset in driver ops */ - struct method* method; /* internal method implementation */ - devop_t deflt; /* default implementation */ - const char* name; /* unique name (for registration) */ -}; - -#endif /* !_SYS_BUS_PRIVATE_H_ */ |
