diff options
| author | phk <phk@FreeBSD.org> | 2004-06-16 09:47:26 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-06-16 09:47:26 +0000 |
| commit | dfd1f7fd50fffaf75541921fcf86454cd8eb3614 (patch) | |
| tree | 624c885995e84df6decddd3291c60a15e50e3c85 /sys/pccard | |
| parent | cafb94bcea1cdf048e81b7eb2d24808e1a8c5280 (diff) | |
| download | FreeBSD-src-dfd1f7fd50fffaf75541921fcf86454cd8eb3614.zip FreeBSD-src-dfd1f7fd50fffaf75541921fcf86454cd8eb3614.tar.gz | |
Do the dreaded s/dev_t/struct cdev */
Bump __FreeBSD_version accordingly.
Diffstat (limited to 'sys/pccard')
| -rw-r--r-- | sys/pccard/pccard.c | 12 | ||||
| -rw-r--r-- | sys/pccard/slot.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index b4d15ff..876c241 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -349,7 +349,7 @@ pccard_event(struct slot *slt, enum card_event event) * Device driver interface. */ static int -crdopen(dev_t dev, int oflags, int devtype, d_thread_t *td) +crdopen(struct cdev *dev, int oflags, int devtype, d_thread_t *td) { struct slot *slt = PCCARD_DEV2SOFTC(dev); @@ -365,7 +365,7 @@ crdopen(dev_t dev, int oflags, int devtype, d_thread_t *td) * slots may be assigned to drivers already. */ static int -crdclose(dev_t dev, int fflag, int devtype, d_thread_t *td) +crdclose(struct cdev *dev, int fflag, int devtype, d_thread_t *td) { return (0); } @@ -375,7 +375,7 @@ crdclose(dev_t dev, int fflag, int devtype, d_thread_t *td) * then transfer to user space. */ static int -crdread(dev_t dev, struct uio *uio, int ioflag) +crdread(struct cdev *dev, struct uio *uio, int ioflag) { struct slot *slt = PCCARD_DEV2SOFTC(dev); struct mem_desc *mp, oldmap; @@ -421,7 +421,7 @@ crdread(dev_t dev, struct uio *uio, int ioflag) * window is used. */ static int -crdwrite(dev_t dev, struct uio *uio, int ioflag) +crdwrite(struct cdev *dev, struct uio *uio, int ioflag) { struct slot *slt = PCCARD_DEV2SOFTC(dev); struct mem_desc *mp, oldmap; @@ -466,7 +466,7 @@ crdwrite(dev_t dev, struct uio *uio, int ioflag) * descriptors, and assignment of drivers. */ static int -crdioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, d_thread_t *td) +crdioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, d_thread_t *td) { u_int32_t addr; int err; @@ -667,7 +667,7 @@ crdioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, d_thread_t *td) * when a change in card status occurs. */ static int -crdpoll(dev_t dev, int events, d_thread_t *td) +crdpoll(struct cdev *dev, int events, d_thread_t *td) { int revents = 0; int s; diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h index ff248ae..a910983 100644 --- a/sys/pccard/slot.h +++ b/sys/pccard/slot.h @@ -125,7 +125,7 @@ struct slot { void *cdata; /* Controller specific data */ int pwr_off_pending;/* Power status of slot */ device_t dev; /* Config system device. */ - dev_t d; /* fs device */ + struct cdev *d; /* fs device */ }; #define PCCARD_DEVICE2SOFTC(d) ((struct slot *) device_get_softc(d)) |
