From 4efdef565f9a0ca3468534f97c6ac4aaaf747c9a Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 27 Sep 2008 08:51:18 +0000 Subject: 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 --- sys/dev/ppbus/lpt.c | 12 ++++++------ sys/dev/ppbus/pcfclock.c | 14 +++++++------- sys/dev/ppbus/ppi.c | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'sys/dev/ppbus') 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 */ diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c index 0a65055..c7562fc 100644 --- a/sys/dev/ppbus/pcfclock.c +++ b/sys/dev/ppbus/pcfclock.c @@ -153,7 +153,7 @@ pcfclock_attach(device_t dev) static int pcfclock_open(struct cdev *dev, int flag, int fms, struct thread *td) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct pcfclock_data *sc = UNITOSOFTC(unit); device_t pcfclockdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(pcfclockdev); @@ -174,7 +174,7 @@ pcfclock_open(struct cdev *dev, int flag, int fms, struct thread *td) static int pcfclock_close(struct cdev *dev, int flags, int fmt, struct thread *td) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct pcfclock_data *sc = UNITOSOFTC(unit); device_t pcfclockdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(pcfclockdev); @@ -189,7 +189,7 @@ pcfclock_close(struct cdev *dev, int flags, int fmt, struct thread *td) static void pcfclock_write_cmd(struct cdev *dev, unsigned char command) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); unsigned char ctr = 14; @@ -209,7 +209,7 @@ pcfclock_write_cmd(struct cdev *dev, unsigned char command) static void pcfclock_display_data(struct cdev *dev, char buf[18]) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); #ifdef PCFCLOCK_VERBOSE int year; @@ -233,7 +233,7 @@ pcfclock_display_data(struct cdev *dev, char buf[18]) static int pcfclock_read_data(struct cdev *dev, char *buf, ssize_t bits) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); int i; @@ -272,7 +272,7 @@ pcfclock_read_data(struct cdev *dev, char *buf, ssize_t bits) static int pcfclock_read_dev(struct cdev *dev, char *buf, int maxretries) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); int error = 0; @@ -302,7 +302,7 @@ pcfclock_read_dev(struct cdev *dev, char *buf, int maxretries) static int pcfclock_read(struct cdev *dev, struct uio *uio, int ioflag) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); char buf[18]; int error = 0; diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c index ca8aa04..e3e329f 100644 --- a/sys/dev/ppbus/ppi.c +++ b/sys/dev/ppbus/ppi.c @@ -252,7 +252,7 @@ ppiintr(void *arg) static int ppiopen(struct cdev *dev, int flags, int fmt, struct thread *td) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct ppi_data *ppi = UNITOSOFTC(unit); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); @@ -286,7 +286,7 @@ ppiopen(struct cdev *dev, int flags, int fmt, struct thread *td) static int ppiclose(struct cdev *dev, int flags, int fmt, struct thread *td) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct ppi_data *ppi = UNITOSOFTC(unit); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); @@ -329,7 +329,7 @@ static int ppiread(struct cdev *dev, struct uio *uio, int ioflag) { #ifdef PERIPH_1284 - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct ppi_data *ppi = UNITOSOFTC(unit); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); @@ -413,7 +413,7 @@ static int ppiwrite(struct cdev *dev, struct uio *uio, int ioflag) { #ifdef PERIPH_1284 - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct ppi_data *ppi = UNITOSOFTC(unit); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); @@ -499,7 +499,7 @@ error: static int ppiioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); int error = 0; -- cgit v1.1