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/joy | |
| 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/joy')
| -rw-r--r-- | sys/dev/joy/joy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 472985b..762cfd7 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$"); * wait until the corresponding bit returns to 0. */ -#define joypart(d) (minor(d)&1) -#define UNIT(d) ((minor(d)>>1)&3) +#define joypart(d) (dev2unit(d)&1) +#define UNIT(d) ((dev2unit(d)>>1)&3) #ifndef JOY_TIMEOUT #define JOY_TIMEOUT 2000 /* 2 milliseconds */ #endif |
