diff options
author | jhb <jhb@FreeBSD.org> | 2008-10-21 18:30:10 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2008-10-21 18:30:10 +0000 |
commit | 03f7a1b892756cd78ff85f138ffdb94cd4216670 (patch) | |
tree | 7de1b18022c6338570a93ecf78a487c8a9820918 /sys/dev/ppbus/ppbconf.h | |
parent | ddfa987b872f81817a11a48d9b97c719ef1e48d3 (diff) | |
download | FreeBSD-src-03f7a1b892756cd78ff85f138ffdb94cd4216670.zip FreeBSD-src-03f7a1b892756cd78ff85f138ffdb94cd4216670.tar.gz |
Several cleanups to remove the need for explicit unit numbers and a few
other fixes:
- Add pointers back to device_t objects in softc structures instead
of storing the unit and using devclass_get_device().
- Add 'lpbb', 'pcf', 'pps', and 'vpo' child devices to every 'ppbus' device
instead of just the first one.
- Store softc pointers in si_drv1 of character devices instead of
pulling the unit number from the minor number and using
devclass_get_softc() and devclass_get_device().
- Store the LP_BYPASS flag in si_drv2 instead of encoding it in the minor
number.
- Destroy character devices for lpt(4) when detaching the device.
- Use bus_print_child_footer() instead of duplicating it in
ppbus_print_child() and fix ppbus_print_child()'s return value.
- Remove unused AVM ivar from ppbus.
- Don't store the 'mode' ivar in the ppbus ivars since we always fetch it
from the parent anyway.
- Try to detach all the child devices before deleting them in
ppbus_detach().
- Use pause() instead of a tsleep() on a dummy address when polling the
ppbus.
- Use if_printf() and device_printf() instead of explicit names with unit
numbers.
Silence on: current@
Diffstat (limited to 'sys/dev/ppbus/ppbconf.h')
-rw-r--r-- | sys/dev/ppbus/ppbconf.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h index 88e4a1f..2050937 100644 --- a/sys/dev/ppbus/ppbconf.h +++ b/sys/dev/ppbus/ppbconf.h @@ -178,7 +178,6 @@ struct ppb_context { * List of IVARS available to ppb device drivers */ #define PPBUS_IVAR_MODE 0 -#define PPBUS_IVAR_AVM 1 /* other fields are reserved to the ppbus internals */ @@ -186,9 +185,6 @@ struct ppb_device { const char *name; /* name of the device */ - u_short mode; /* current mode of the device */ - u_short avm; /* available IEEE1284 modes of - * the device */ u_int flags; /* flags */ struct ppb_context ctx; /* context of the device */ @@ -205,8 +201,6 @@ struct ppb_device { struct resource *intr_resource; void *intr_cookie; - - void *drv1, *drv2; /* drivers private data */ }; /* EPP standards */ @@ -268,7 +262,6 @@ extern int ppb_write(device_t, char *, int, int); * These are defined as macros for speedup. #define ppb_get_base_addr(dev) ((dev)->ppb->ppb_link->base) #define ppb_get_epp_protocol(dev) ((dev)->ppb->ppb_link->epp_protocol) -#define ppb_get_irq(dev) ((dev)->ppb->ppb_link->id_irq) */ #endif |