diff options
| author | ed <ed@FreeBSD.org> | 2008-09-27 08:51:18 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2008-09-27 08:51:18 +0000 |
| commit | 4efdef565f9a0ca3468534f97c6ac4aaaf747c9a (patch) | |
| tree | dd0035910760a440d495b23940f57a42ed24ca85 /sys/dev/ppbus/lpt.c | |
| parent | d720932e5974ce75bf983cc61010a6eb70f94b86 (diff) | |
| download | FreeBSD-src-4efdef565f9a0ca3468534f97c6ac4aaaf747c9a.zip FreeBSD-src-4efdef565f9a0ca3468534f97c6ac4aaaf747c9a.tar.gz | |
Replace all calls to minor() with dev2unit().
After I removed all the unit2minor()/minor2unit() calls from the kernel
yesterday, I realised calling minor() everywhere is quite confusing.
Character devices now only have the ability to store a unit number, not
a minor number. Remove the confusion by using dev2unit() everywhere.
This commit could also be considered as a bug fix. A lot of drivers call
minor(), while they should actually be calling dev2unit(). In -CURRENT
this isn't a problem, but it turns out we never had any problem reports
related to that issue in the past. I suspect not many people connect
more than 256 pieces of the same hardware.
Reviewed by: kib
Diffstat (limited to 'sys/dev/ppbus/lpt.c')
| -rw-r--r-- | sys/dev/ppbus/lpt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index d507f14..c3253a2 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -461,7 +461,7 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td) { int s; int trys, err; - u_int unit = LPTUNIT(minor(dev)); + u_int unit = LPTUNIT(dev2unit(dev)); struct lpt_data *sc = UNITOSOFTC(unit); device_t lptdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(lptdev); @@ -475,7 +475,7 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td) } else sc->sc_state |= LPTINIT; - 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) { @@ -579,7 +579,7 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td) static int lptclose(struct cdev *dev, int flags, int fmt, struct thread *td) { - u_int unit = LPTUNIT(minor(dev)); + u_int unit = LPTUNIT(dev2unit(dev)); struct lpt_data *sc = UNITOSOFTC(unit); device_t lptdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(lptdev); @@ -688,7 +688,7 @@ lpt_pushbytes(device_t dev) static int lptread(struct cdev *dev, struct uio *uio, int ioflag) { - u_int unit = LPTUNIT(minor(dev)); + u_int unit = LPTUNIT(dev2unit(dev)); struct lpt_data *sc = UNITOSOFTC(unit); device_t lptdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(lptdev); @@ -735,7 +735,7 @@ lptwrite(struct cdev *dev, struct uio *uio, int ioflag) { register unsigned n; int err; - u_int unit = LPTUNIT(minor(dev)); + u_int unit = LPTUNIT(dev2unit(dev)); struct lpt_data *sc = UNITOSOFTC(unit); device_t lptdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(lptdev); @@ -902,7 +902,7 @@ static int lptioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { int error = 0; - u_int unit = LPTUNIT(minor(dev)); + u_int unit = LPTUNIT(dev2unit(dev)); struct lpt_data *sc = UNITOSOFTC(unit); u_char old_sc_irq; /* old printer IRQ status */ |
