diff options
author | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-06-16 09:47:26 +0000 |
---|---|---|
committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-06-16 09:47:26 +0000 |
commit | 89c9c53da05197f657dfe8e0bdda6941a2e9a0d4 (patch) | |
tree | 624c885995e84df6decddd3291c60a15e50e3c85 /sys/isa | |
parent | d420fcda27350a7e2d3d8f3b2c9de6aa74df2e30 (diff) | |
download | src-89c9c53da05197f657dfe8e0bdda6941a2e9a0d4.tar.gz src-89c9c53da05197f657dfe8e0bdda6941a2e9a0d4.zip |
Do the dreaded s/dev_t/struct cdev */
Bump __FreeBSD_version accordingly.
Notes
Notes:
svn path=/head/; revision=130585
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/psm.c | 14 | ||||
-rw-r--r-- | sys/isa/vga_isa.c | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/isa/psm.c b/sys/isa/psm.c index 376c0dcfe17d..2d30d657670e 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -176,8 +176,8 @@ struct psm_softc { /* Driver status information */ int watchdog; /* watchdog timer flag */ struct callout_handle callout; /* watchdog timer call out */ struct callout_handle softcallout; /* buffer timer call out */ - dev_t dev; - dev_t bdev; + struct cdev *dev; + struct cdev *bdev; int lasterr; int cmdcount; }; @@ -1307,7 +1307,7 @@ psmdetach(device_t dev) } static int -psmopen(dev_t dev, int flag, int fmt, struct thread *td) +psmopen(struct cdev *dev, int flag, int fmt, struct thread *td) { int unit = PSM_UNIT(dev); struct psm_softc *sc; @@ -1391,7 +1391,7 @@ psmopen(dev_t dev, int flag, int fmt, struct thread *td) } static int -psmclose(dev_t dev, int flag, int fmt, struct thread *td) +psmclose(struct cdev *dev, int flag, int fmt, struct thread *td) { int unit = PSM_UNIT(dev); struct psm_softc *sc = PSM_SOFTC(unit); @@ -1533,7 +1533,7 @@ tame_mouse(struct psm_softc *sc, packetbuf_t *pb, mousestatus_t *status, unsigne } static int -psmread(dev_t dev, struct uio *uio, int flag) +psmread(struct cdev *dev, struct uio *uio, int flag) { register struct psm_softc *sc = PSM_SOFTC(PSM_UNIT(dev)); unsigned char buf[PSM_SMALLBUFSIZE]; @@ -1681,7 +1681,7 @@ unblock_mouse_data(struct psm_softc *sc, int c) } static int -psmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) +psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td) { struct psm_softc *sc = PSM_SOFTC(PSM_UNIT(dev)); mousemode_t mode; @@ -2506,7 +2506,7 @@ psmsoftintr(void *arg) } static int -psmpoll(dev_t dev, int events, struct thread *td) +psmpoll(struct cdev *dev, int events, struct thread *td) { struct psm_softc *sc = PSM_SOFTC(PSM_UNIT(dev)); int s; diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c index fb6520416221..e1538f810e1a 100644 --- a/sys/isa/vga_isa.c +++ b/sys/isa/vga_isa.c @@ -163,37 +163,37 @@ isavga_attach(device_t dev) #ifdef FB_INSTALL_CDEV static int -isavga_open(dev_t dev, int flag, int mode, struct thread *td) +isavga_open(struct cdev *dev, int flag, int mode, struct thread *td) { return vga_open(dev, VGA_SOFTC(VGA_UNIT(dev)), flag, mode, td); } static int -isavga_close(dev_t dev, int flag, int mode, struct thread *td) +isavga_close(struct cdev *dev, int flag, int mode, struct thread *td) { return vga_close(dev, VGA_SOFTC(VGA_UNIT(dev)), flag, mode, td); } static int -isavga_read(dev_t dev, struct uio *uio, int flag) +isavga_read(struct cdev *dev, struct uio *uio, int flag) { return vga_read(dev, VGA_SOFTC(VGA_UNIT(dev)), uio, flag); } static int -isavga_write(dev_t dev, struct uio *uio, int flag) +isavga_write(struct cdev *dev, struct uio *uio, int flag) { return vga_write(dev, VGA_SOFTC(VGA_UNIT(dev)), uio, flag); } static int -isavga_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td) +isavga_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct thread *td) { return vga_ioctl(dev, VGA_SOFTC(VGA_UNIT(dev)), cmd, arg, flag, td); } static int -isavga_mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +isavga_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { return vga_mmap(dev, VGA_SOFTC(VGA_UNIT(dev)), offset, paddr, prot); } |