Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

4 files changed, 22 insertions, 22 deletions

diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 7855e36..f3f2c1d 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -455,7 +455,7 @@ lptout(void *arg)
  */
 
 static	int
-lptopen(dev_t dev, int flags, int fmt, struct thread *td)
+lptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	int s;
 	int trys, err;
@@ -575,7 +575,7 @@ lptopen(dev_t dev, int flags, int fmt, struct thread *td)
  */
 
 static	int
-lptclose(dev_t dev, int flags, int fmt, struct thread *td)
+lptclose(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	u_int unit = LPTUNIT(minor(dev));
 	struct lpt_data *sc = UNITOSOFTC(unit);
@@ -684,7 +684,7 @@ lpt_pushbytes(device_t dev)
  */
 
 static int
-lptread(dev_t dev, struct uio *uio, int ioflag)
+lptread(struct cdev *dev, struct uio *uio, int ioflag)
 {
         u_int	unit = LPTUNIT(minor(dev));
 	struct lpt_data *sc = UNITOSOFTC(unit);
@@ -729,7 +729,7 @@ error:
  */
 
 static	int
-lptwrite(dev_t dev, struct uio *uio, int ioflag)
+lptwrite(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	register unsigned n;
 	int err;
@@ -897,7 +897,7 @@ lptintr(device_t dev)
 }
 
 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;
         u_int	unit = LPTUNIT(minor(dev));
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 599d255..0219220 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -152,7 +152,7 @@ pcfclock_attach(device_t dev)
 }
 
 static int 
-pcfclock_open(dev_t dev, int flag, int fms, struct thread *td)
+pcfclock_open(struct cdev *dev, int flag, int fms, struct thread *td)
 {
 	u_int unit = minor(dev);
 	struct pcfclock_data *sc = UNITOSOFTC(unit);
@@ -173,7 +173,7 @@ pcfclock_open(dev_t dev, int flag, int fms, struct thread *td)
 }
 
 static int
-pcfclock_close(dev_t dev, int flags, int fmt, struct thread *td)
+pcfclock_close(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	u_int unit = minor(dev);
 	struct pcfclock_data *sc = UNITOSOFTC(unit);
@@ -188,7 +188,7 @@ pcfclock_close(dev_t dev, int flags, int fmt, struct thread *td)
 }
 
 static void
-pcfclock_write_cmd(dev_t dev, unsigned char command)
+pcfclock_write_cmd(struct cdev *dev, unsigned char command)
 {
 	u_int unit = minor(dev);
 	device_t ppidev = UNITODEVICE(unit);
@@ -208,7 +208,7 @@ pcfclock_write_cmd(dev_t dev, unsigned char command)
 }
 
 static void
-pcfclock_display_data(dev_t dev, char buf[18]) 
+pcfclock_display_data(struct cdev *dev, char buf[18]) 
 {
 	u_int unit = minor(dev);
 #ifdef PCFCLOCK_VERBOSE
@@ -232,7 +232,7 @@ pcfclock_display_data(dev_t dev, char buf[18])
 }
 
 static int 
-pcfclock_read_data(dev_t dev, char *buf, ssize_t bits)
+pcfclock_read_data(struct cdev *dev, char *buf, ssize_t bits)
 {
 	u_int unit = minor(dev);
 	device_t ppidev = UNITODEVICE(unit);
@@ -271,7 +271,7 @@ pcfclock_read_data(dev_t dev, char *buf, ssize_t bits)
 }
 
 static int 
-pcfclock_read_dev(dev_t dev, char *buf, int maxretries) 
+pcfclock_read_dev(struct cdev *dev, char *buf, int maxretries) 
 {
 	u_int unit = minor(dev);
 	device_t ppidev = UNITODEVICE(unit);
@@ -301,7 +301,7 @@ pcfclock_read_dev(dev_t dev, char *buf, int maxretries)
 }
 
 static int
-pcfclock_read(dev_t dev, struct uio *uio, int ioflag)
+pcfclock_read(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	u_int unit = minor(dev);
 	char buf[18];
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 113448d..b537c88 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -255,7 +255,7 @@ ppiintr(void *arg)
 #endif /* PERIPH_1284 */
 
 static int
-ppiopen(dev_t dev, int flags, int fmt, struct thread *td)
+ppiopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	u_int unit = minor(dev);
 	struct ppi_data *ppi = UNITOSOFTC(unit);
@@ -288,7 +288,7 @@ ppiopen(dev_t dev, int flags, int fmt, struct thread *td)
 }
 
 static int
-ppiclose(dev_t dev, int flags, int fmt, struct thread *td)
+ppiclose(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	u_int unit = minor(dev);
 	struct ppi_data *ppi = UNITOSOFTC(unit);
@@ -330,7 +330,7 @@ ppiclose(dev_t dev, int flags, int fmt, struct thread *td)
  * If no data is available, wait for it otherwise transfer as much as possible
  */
 static int
-ppiread(dev_t dev, struct uio *uio, int ioflag)
+ppiread(struct cdev *dev, struct uio *uio, int ioflag)
 {
 #ifdef PERIPH_1284
 	u_int unit = minor(dev);
@@ -414,7 +414,7 @@ error:
  * Once negotiation done, transfer data
  */
 static int
-ppiwrite(dev_t dev, struct uio *uio, int ioflag)
+ppiwrite(struct cdev *dev, struct uio *uio, int ioflag)
 {
 #ifdef PERIPH_1284
 	u_int unit = minor(dev);
@@ -501,7 +501,7 @@ error:
 }
 
 static int
-ppiioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
+ppiioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 {
 	u_int unit = minor(dev);
 	device_t ppidev = UNITODEVICE(unit);
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index fef6157..2b86cd7 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 struct pps_data {
 	struct	ppb_device pps_dev;	
 	struct	pps_state pps[9];
-	dev_t	devs[9];
+	struct cdev *devs[9];
 	device_t ppsdev;
 	device_t ppbus;
 	int	busy;
@@ -106,7 +106,7 @@ ppsattach(device_t dev)
 {
 	struct pps_data *sc = DEVTOSOFTC(dev);
 	device_t ppbus = device_get_parent(dev);
-	dev_t d;
+	struct cdev *d;
 	intptr_t irq;
 	int i, unit, zero = 0;
 
@@ -191,7 +191,7 @@ ppsattach(device_t dev)
 }
 
 static	int
-ppsopen(dev_t dev, int flags, int fmt, struct thread *td)
+ppsopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	struct pps_data *sc = dev->si_drv1;
 	int subdev = (intptr_t)dev->si_drv2;
@@ -227,7 +227,7 @@ ppsopen(dev_t dev, int flags, int fmt, struct thread *td)
 }
 
 static	int
-ppsclose(dev_t dev, int flags, int fmt, struct thread *td)
+ppsclose(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	struct pps_data *sc = dev->si_drv1;
 	int subdev = (intptr_t)dev->si_drv2;
@@ -293,7 +293,7 @@ ppsintr(void *arg)
 }
 
 static int
-ppsioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
+ppsioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 {
 	struct pps_data *sc = dev->si_drv1;
 	int subdev = (intptr_t)dev->si_drv2;