diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2008-09-27 08:51:18 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2008-09-27 08:51:18 +0000 |
| commit | 6bfa9a2d66dd0e00182017d6741d44e54d0b2cca (patch) | |
| tree | dd0035910760a440d495b23940f57a42ed24ca85 /sys/pc98/cbus | |
| parent | 45cfb1dc538113eab50616b88da908b1bb728561 (diff) | |
| download | src-6bfa9a2d66dd0e00182017d6741d44e54d0b2cca.tar.gz src-6bfa9a2d66dd0e00182017d6741d44e54d0b2cca.zip | |
Notes
Diffstat (limited to 'sys/pc98/cbus')
| -rw-r--r-- | sys/pc98/cbus/gdc.c | 2 | ||||
| -rw-r--r-- | sys/pc98/cbus/olpt.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index 9f990b26b18c..3fb6c82d689c 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -69,7 +69,7 @@ /* cdev driver declaration */ -#define GDC_UNIT(dev) minor(dev) +#define GDC_UNIT(dev) dev2unit(dev) #define GDC_MKMINOR(unit) (unit) typedef struct gdc_softc { diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c index f0d0da7e3e98..f86cf1296db8 100644 --- a/sys/pc98/cbus/olpt.c +++ b/sys/pc98/cbus/olpt.c @@ -381,7 +381,7 @@ lptopen (struct cdev *dev, int flags, int fmt, struct thread *td) int s; int port; - sc = devclass_get_softc(olpt_devclass, LPTUNIT(minor(dev))); + sc = devclass_get_softc(olpt_devclass, LPTUNIT(dev2unit(dev))); if (sc->sc_port == 0) return (ENXIO); @@ -391,7 +391,7 @@ lptopen (struct cdev *dev, int flags, int fmt, struct thread *td) } else sc->sc_state |= INIT; - sc->sc_flags = LPTFLAGS(minor(dev)); + sc->sc_flags = LPTFLAGS(dev2unit(dev)); /* Check for open with BYPASS flag set. */ if (sc->sc_flags & LP_BYPASS) { @@ -469,7 +469,7 @@ lptclose(struct cdev *dev, int flags, int fmt, struct thread *td) { struct lpt_softc *sc; - sc = devclass_get_softc(olpt_devclass, LPTUNIT(minor(dev))); + sc = devclass_get_softc(olpt_devclass, LPTUNIT(dev2unit(dev))); if(sc->sc_flags & LP_BYPASS) goto end_close; @@ -558,7 +558,7 @@ lptwrite(struct cdev *dev, struct uio * uio, int ioflag) int pl, err; struct lpt_softc *sc; - sc = devclass_get_softc(olpt_devclass, LPTUNIT(minor(dev))); + sc = devclass_get_softc(olpt_devclass, LPTUNIT(dev2unit(dev))); if(sc->sc_flags & LP_BYPASS) { /* we can't do writes in bypass mode */ return(EPERM); @@ -614,7 +614,7 @@ lptioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t { int error = 0; struct lpt_softc *sc; - u_int unit = LPTUNIT(minor(dev)); + u_int unit = LPTUNIT(dev2unit(dev)); u_char old_sc_irq; /* old printer IRQ status */ sc = devclass_get_softc(olpt_devclass, unit); |