Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

4 files changed, 30 insertions, 30 deletions

diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index dc6668a..a8ed556 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -379,7 +379,7 @@ struct fd_data {
 	struct	callout_handle toffhandle;
 	struct	callout_handle tohandle;
 	struct	devstat *device_stats;
-	dev_t	masterdev;
+	struct cdev *masterdev;
 	device_t dev;
 	fdu_t	fdu;
 #ifdef PC98
@@ -532,11 +532,11 @@ static timeout_t fd_iotimeout;
 static timeout_t fd_pseudointr;
 static driver_intr_t fdc_intr;
 static int fdcpio(fdc_p, long, caddr_t, u_int);
-static int fdautoselect(dev_t);
+static int fdautoselect(struct cdev *);
 static int fdstate(struct fdc_data *);
 static int retrier(struct fdc_data *);
 static void fdbiodone(struct bio *);
-static int fdmisccmd(dev_t, u_int, void *);
+static int fdmisccmd(struct cdev *, u_int, void *);
 static	d_ioctl_t	fdioctl;
 
 static int fifo_threshold = 8;	/* XXX: should be accessible via sysctl */
@@ -1881,7 +1881,7 @@ out_fdc(struct fdc_data *fdc, int x)
  * auxiliary functions).
  */
 static int
-fdopen(dev_t dev, int flags, int mode, struct thread *td)
+fdopen(struct cdev *dev, int flags, int mode, struct thread *td)
 {
 	fd_p	fd;
 	fdc_p	fdc;
@@ -1985,7 +1985,7 @@ fdopen(dev_t dev, int flags, int mode, struct thread *td)
 }
 
 static int
-fdclose(dev_t dev, int flags, int mode, struct thread *td)
+fdclose(struct cdev *dev, int flags, int mode, struct thread *td)
 {
 	struct fd_data *fd;
 
@@ -2184,7 +2184,7 @@ fdcpio(fdc_p fdc, long flags, caddr_t addr, u_int count)
  * Try figuring out the density of the media present in our device.
  */
 static int
-fdautoselect(dev_t dev)
+fdautoselect(struct cdev *dev)
 {
  	fd_p fd;
 	struct fd_type *fdtp;
@@ -2993,7 +2993,7 @@ fdbiodone(struct bio *bp)
 }
 
 static int
-fdmisccmd(dev_t dev, u_int cmd, void *data)
+fdmisccmd(struct cdev *dev, u_int cmd, void *data)
 {
  	fdu_t fdu;
  	fd_p fd;
@@ -3044,7 +3044,7 @@ fdmisccmd(dev_t dev, u_int cmd, void *data)
 }
 
 static int
-fdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+fdioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
  	fdu_t fdu;
  	fd_p fd;
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index eca0454..a22ad99 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -346,7 +346,7 @@ gdc_release_resource(device_t dev)
 #ifdef FB_INSTALL_CDEV
 
 static int
-gdcopen(dev_t dev, int flag, int mode, struct thread *td)
+gdcopen(struct cdev *dev, int flag, int mode, struct thread *td)
 {
     gdc_softc_t *sc;
 
@@ -360,7 +360,7 @@ gdcopen(dev_t dev, int flag, int mode, struct thread *td)
 }
 
 static int
-gdcclose(dev_t dev, int flag, int mode, struct thread *td)
+gdcclose(struct cdev *dev, int flag, int mode, struct thread *td)
 {
     gdc_softc_t *sc;
 
@@ -369,7 +369,7 @@ gdcclose(dev_t dev, int flag, int mode, struct thread *td)
 }
 
 static int
-gdcread(dev_t dev, struct uio *uio, int flag)
+gdcread(struct cdev *dev, struct uio *uio, int flag)
 {
     gdc_softc_t *sc;
 
@@ -378,7 +378,7 @@ gdcread(dev_t dev, struct uio *uio, int flag)
 }
 
 static int
-gdcwrite(dev_t dev, struct uio *uio, int flag)
+gdcwrite(struct cdev *dev, struct uio *uio, int flag)
 {
     gdc_softc_t *sc;
 
@@ -387,7 +387,7 @@ gdcwrite(dev_t dev, struct uio *uio, int flag)
 }
 
 static int
-gdcioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
+gdcioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 {
     gdc_softc_t *sc;
 
@@ -396,7 +396,7 @@ gdcioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 }
 
 static int
-gdcmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
+gdcmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
 {
     gdc_softc_t *sc;
 
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 49e78e0..dc523db 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -466,7 +466,7 @@ lpt_attach(device_t dev)
  */
 
 static	int
-lptopen (dev_t dev, int flags, int fmt, struct thread *td)
+lptopen (struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	struct lpt_softc *sc;
 	int s;
@@ -605,7 +605,7 @@ lptout (void *arg)
  */
 
 static	int
-lptclose(dev_t dev, int flags, int fmt, struct thread *td)
+lptclose(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	struct lpt_softc *sc;
 #ifndef PC98
@@ -718,7 +718,7 @@ pushbytes(struct lpt_softc * sc)
  */
 
 static	int
-lptwrite(dev_t dev, struct uio * uio, int ioflag)
+lptwrite(struct cdev *dev, struct uio * uio, int ioflag)
 {
 	register unsigned n;
 	int pl, err;
@@ -776,7 +776,7 @@ lpt_intr(void *arg)
 }
 
 static	int
-lptioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
+lptioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 {
 	int	error = 0;
         struct	lpt_softc *sc;
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 708c4a7..9a98b65 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -351,7 +351,7 @@ struct com_s {
 	struct resource *ioportres;
 	int	ioportrid;
 	void	*cookie;
-	dev_t	devs[6];
+	struct cdev *devs[6];
 
 	/*
 	 * Data area for output buffers.  Someday we should build the output
@@ -452,13 +452,13 @@ static	int	sysclock;
 #define IS_8251(if_type)		(!(if_type & 0x10))
 #define COM1_EXT_CLOCK			0x40000
 
-static	void	commint(dev_t dev);
+static	void	commint(struct cdev *dev);
 static	void	com_tiocm_set(struct com_s *com, int msr);
 static	void	com_tiocm_bis(struct com_s *com, int msr);
 static	void	com_tiocm_bic(struct com_s *com, int msr);
 static	int	com_tiocm_get(struct com_s *com);
 static	int	com_tiocm_get_delta(struct com_s *com);
-static	void	pc98_msrint_start(dev_t dev);
+static	void	pc98_msrint_start(struct cdev *dev);
 static	void	com_cflag_and_speed_set(struct com_s *com, int cflag, int speed);
 static	int	pc98_ttspeedtab(struct com_s *com, int speed, u_int *divisor);
 static	int	pc98_get_modem_status(struct com_s *com);
@@ -1847,7 +1847,7 @@ determined_type: ;
 
 static int
 sioopen(dev, flag, mode, td)
-	dev_t		dev;
+	struct cdev *dev;
 	int		flag;
 	int		mode;
 	struct thread	*td;
@@ -2080,7 +2080,7 @@ out:
 
 static int
 sioclose(dev, flag, mode, td)
-	dev_t		dev;
+	struct cdev *dev;
 	int		flag;
 	int		mode;
 	struct thread	*td;
@@ -2221,7 +2221,7 @@ comhardclose(com)
 
 static int
 sioread(dev, uio, flag)
-	dev_t		dev;
+	struct cdev *dev;
 	struct uio	*uio;
 	int		flag;
 {
@@ -2239,7 +2239,7 @@ sioread(dev, uio, flag)
 
 static int
 siowrite(dev, uio, flag)
-	dev_t		dev;
+	struct cdev *dev;
 	struct uio	*uio;
 	int		flag;
 {
@@ -2934,7 +2934,7 @@ txrdy:
 
 static int
 sioioctl(dev, cmd, data, flag, td)
-	dev_t		dev;
+	struct cdev *dev;
 	u_long		cmd;
 	caddr_t		data;
 	int		flag;
@@ -3861,7 +3861,7 @@ comwakeup(chan)
 #ifdef PC98
 /* commint is called when modem control line changes */
 static void
-commint(dev_t dev)
+commint(struct cdev *dev)
 {
 	register struct tty *tp;
 	int	stat,delta;
@@ -4551,9 +4551,9 @@ pc98_check_msr(void* chan)
 	struct	com_s *com;
 	int	mynor;
 	int	unit;
-	dev_t	dev;
+	struct cdev *dev;
 
-	dev=(dev_t)chan;
+	dev=(struct cdev *)chan;
 	mynor = minor(dev);
 	unit = MINOR_TO_UNIT(mynor);
 	com = com_addr(unit);
@@ -4591,7 +4591,7 @@ pc98_check_msr(void* chan)
 }
 
 static void
-pc98_msrint_start(dev_t dev)
+pc98_msrint_start(struct cdev *dev)
 {
 	struct	com_s *com;
 	int	mynor;