From 89c9c53da05197f657dfe8e0bdda6941a2e9a0d4 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 16 Jun 2004 09:47:26 +0000 Subject: Do the dreaded s/dev_t/struct cdev */ Bump __FreeBSD_version accordingly. --- sys/dev/fb/creatorreg.h | 2 +- sys/dev/fb/gfb.h | 2 +- sys/dev/fb/vga.c | 12 ++++++------ sys/dev/fb/vgareg.h | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'sys/dev/fb') diff --git a/sys/dev/fb/creatorreg.h b/sys/dev/fb/creatorreg.h index 6fa42f731525..b3be9e2ae5d3 100644 --- a/sys/dev/fb/creatorreg.h +++ b/sys/dev/fb/creatorreg.h @@ -142,7 +142,7 @@ struct creator_softc { video_adapter_t sc_va; /* XXX must be first */ - dev_t sc_si; + struct cdev *sc_si; struct resource *sc_reg[FFB_NREG]; bus_space_tag_t sc_bt[FFB_NREG]; diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h index 07ee5c97afb1..470dfc268864 100644 --- a/sys/dev/fb/gfb.h +++ b/sys/dev/fb/gfb.h @@ -166,7 +166,7 @@ typedef struct gfb_softc { int type; int model; struct cdevsw *cdevsw; - dev_t devt; + struct cdev *devt; } *gfb_softc_t; #endif /* _FB_GFB_H_ */ diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 9f128135af4b..3af5fda458dc 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -109,7 +109,7 @@ vga_attach_unit(int unit, vga_softc_t *sc, int flags) #ifdef FB_INSTALL_CDEV int -vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode, struct thread *td) +vga_open(struct cdev *dev, vga_softc_t *sc, int flag, int mode, struct thread *td) { if (sc == NULL) return ENXIO; @@ -120,32 +120,32 @@ vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode, struct thread *td) } int -vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode, struct thread *td) +vga_close(struct cdev *dev, vga_softc_t *sc, int flag, int mode, struct thread *td) { return genfbclose(&sc->gensc, sc->adp, flag, mode, td); } int -vga_read(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag) +vga_read(struct cdev *dev, vga_softc_t *sc, struct uio *uio, int flag) { return genfbread(&sc->gensc, sc->adp, uio, flag); } int -vga_write(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag) +vga_write(struct cdev *dev, vga_softc_t *sc, struct uio *uio, int flag) { return genfbread(&sc->gensc, sc->adp, uio, flag); } int -vga_ioctl(dev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag, +vga_ioctl(struct cdev *dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag, struct thread *td) { return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, td); } int -vga_mmap(dev_t dev, vga_softc_t *sc, vm_offset_t offset, vm_offset_t *paddr, +vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_offset_t offset, vm_offset_t *paddr, int prot) { return genfbmmap(&sc->gensc, sc->adp, offset, paddr, prot); diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h index f3903182a59f..e26c214e21c5 100644 --- a/sys/dev/fb/vgareg.h +++ b/sys/dev/fb/vgareg.h @@ -78,15 +78,15 @@ int vga_probe_unit(int unit, struct video_adapter *adp, int flags); int vga_attach_unit(int unit, vga_softc_t *sc, int flags); #ifdef FB_INSTALL_CDEV -int vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode, +int vga_open(struct cdev *dev, vga_softc_t *sc, int flag, int mode, struct thread *td); -int vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode, +int vga_close(struct cdev *dev, vga_softc_t *sc, int flag, int mode, struct thread *td); -int vga_read(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag); -int vga_write(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag); -int vga_ioctl(dev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg, +int vga_read(struct cdev *dev, vga_softc_t *sc, struct uio *uio, int flag); +int vga_write(struct cdev *dev, vga_softc_t *sc, struct uio *uio, int flag); +int vga_ioctl(struct cdev *dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag, struct thread *td); -int vga_mmap(dev_t dev, vga_softc_t *sc, vm_offset_t offset, +int vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_offset_t offset, vm_offset_t *paddr, int prot); #endif -- cgit v1.3