Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

5 files changed, 26 insertions, 26 deletions

diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index 630c064..4ba3e05 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -84,7 +84,7 @@ i4bctlattach(void *dummy)
  *	i4bctlopen - device driver open routine
  *---------------------------------------------------------------------------*/
 static int
-i4bctlopen(dev_t dev, int flag, int fmt, struct thread *td)
+i4bctlopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	if(minor(dev))
 		return (ENXIO);
@@ -101,7 +101,7 @@ i4bctlopen(dev_t dev, int flag, int fmt, struct thread *td)
  *	i4bctlclose - device driver close routine
  *---------------------------------------------------------------------------*/
 static int
-i4bctlclose(dev_t dev, int flag, int fmt, struct thread *td)
+i4bctlclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	openflag = 0;
 	return (0);
@@ -111,7 +111,7 @@ i4bctlclose(dev_t dev, int flag, int fmt, struct thread *td)
  *	i4bctlioctl - device driver ioctl routine
  *---------------------------------------------------------------------------*/
 static int
-i4bctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+i4bctlioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
 #if DO_I4B_DEBUG
 	ctl_debug_t *cdbg;	
@@ -206,7 +206,7 @@ i4bctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
  *	i4bctlpoll - device driver poll routine
  *---------------------------------------------------------------------------*/
 static int
-i4bctlpoll (dev_t dev, int events, struct thread *td)
+i4bctlpoll (struct cdev *dev, int events, struct thread *td)
 {
 	return (ENODEV);
 }
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 5738335..f44dcaf 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -166,7 +166,7 @@ i4brbchattach(void *dummy)
  *	open rbch device
  *---------------------------------------------------------------------------*/
 static int
-i4brbchopen(dev_t dev, int flag, int fmt, struct thread *td)
+i4brbchopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int unit = minor(dev);
 	
@@ -191,7 +191,7 @@ i4brbchopen(dev_t dev, int flag, int fmt, struct thread *td)
  *	close rbch device
  *---------------------------------------------------------------------------*/
 static int
-i4brbchclose(dev_t dev, int flag, int fmt, struct thread *td)
+i4brbchclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int unit = minor(dev);
 	struct rbch_softc *sc = &rbch_softc[unit];
@@ -212,7 +212,7 @@ i4brbchclose(dev_t dev, int flag, int fmt, struct thread *td)
  *	read from rbch device
  *---------------------------------------------------------------------------*/
 static int
-i4brbchread(dev_t dev, struct uio *uio, int ioflag)
+i4brbchread(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	struct mbuf *m;
 	int error = 0;
@@ -314,7 +314,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag)
  *	write to rbch device
  *---------------------------------------------------------------------------*/
 static int
-i4brbchwrite(dev_t dev, struct uio * uio, int ioflag)
+i4brbchwrite(struct cdev *dev, struct uio * uio, int ioflag)
 {
 	struct mbuf *m;
 	int error = 0;
@@ -432,7 +432,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag)
  *	rbch device ioctl handlibg
  *---------------------------------------------------------------------------*/
 static int
-i4brbchioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+i4brbchioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
 	int error = 0;
 	int unit = minor(dev);
@@ -529,7 +529,7 @@ i4brbchioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
  *	device driver poll
  *---------------------------------------------------------------------------*/
 static int
-i4brbchpoll(dev_t dev, int events, struct thread *td)
+i4brbchpoll(struct cdev *dev, int events, struct thread *td)
 {
 	int revents = 0;	/* Events we found */
 	int s;
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 703bfc1..c4fc0e3 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -196,7 +196,7 @@ i4btelattach(void *dummy)
  *	open tel device
  *---------------------------------------------------------------------------*/
 static int
-i4btelopen(dev_t dev, int flag, int fmt, struct thread *td)
+i4btelopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int unit = UNIT(dev);
 	int func = FUNC(dev);
@@ -225,7 +225,7 @@ i4btelopen(dev_t dev, int flag, int fmt, struct thread *td)
  *	close tel device
  *---------------------------------------------------------------------------*/
 static int
-i4btelclose(dev_t dev, int flag, int fmt, struct thread *td)
+i4btelclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int unit = UNIT(dev);
 	int func = FUNC(dev);
@@ -268,7 +268,7 @@ i4btelclose(dev_t dev, int flag, int fmt, struct thread *td)
  *	i4btelioctl - device driver ioctl routine
  *---------------------------------------------------------------------------*/
 static int
-i4btelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+i4btelioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
 	int unit = UNIT(dev);
 	int func = FUNC(dev);
@@ -390,7 +390,7 @@ i4btelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
  *	read from tel device
  *---------------------------------------------------------------------------*/
 static int
-i4btelread(dev_t dev, struct uio *uio, int ioflag)
+i4btelread(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	int unit = UNIT(dev);
 	int func = FUNC(dev);
@@ -523,7 +523,7 @@ i4btelread(dev_t dev, struct uio *uio, int ioflag)
  *	write to tel device
  *---------------------------------------------------------------------------*/
 static int
-i4btelwrite(dev_t dev, struct uio * uio, int ioflag)
+i4btelwrite(struct cdev *dev, struct uio * uio, int ioflag)
 {
 	int unit = UNIT(dev);
 	int func = FUNC(dev);
@@ -683,7 +683,7 @@ tel_tone(tel_sc_t *sc)
  *	device driver poll
  *---------------------------------------------------------------------------*/
 static int
-i4btelpoll(dev_t dev, int events, struct thread *td)
+i4btelpoll(struct cdev *dev, int events, struct thread *td)
 {
 	int revents = 0;	/* Events we found */
 	int s;
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index c5c3832..e165d96 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -223,7 +223,7 @@ get_trace_data_from_l1(i4b_trace_hdr_t *hdr, int len, char *buf)
  *	open trace device
  *---------------------------------------------------------------------------*/
 static int
-i4btrcopen(dev_t dev, int flag, int fmt, struct thread *td)
+i4btrcopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int x;
 	int unit = minor(dev);
@@ -250,7 +250,7 @@ i4btrcopen(dev_t dev, int flag, int fmt, struct thread *td)
  *	close trace device
  *---------------------------------------------------------------------------*/
 static int
-i4btrcclose(dev_t dev, int flag, int fmt, struct thread *td)
+i4btrcclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int unit = minor(dev);
 	int i, x;
@@ -296,7 +296,7 @@ i4btrcclose(dev_t dev, int flag, int fmt, struct thread *td)
  *	read from trace device
  *---------------------------------------------------------------------------*/
 static int
-i4btrcread(dev_t dev, struct uio * uio, int ioflag)
+i4btrcread(struct cdev *dev, struct uio * uio, int ioflag)
 {
 	struct mbuf *m;
 	int x;
@@ -346,7 +346,7 @@ i4btrcread(dev_t dev, struct uio * uio, int ioflag)
  *	poll device
  *---------------------------------------------------------------------------*/
 static int
-i4btrcpoll(dev_t dev, int events, struct thread *td)
+i4btrcpoll(struct cdev *dev, int events, struct thread *td)
 {
 	return(ENODEV);
 }
@@ -355,7 +355,7 @@ i4btrcpoll(dev_t dev, int events, struct thread *td)
  *	device driver ioctl routine
  *---------------------------------------------------------------------------*/
 static int
-i4btrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+i4btrcioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
 	int error = 0;
 	int unit = minor(dev);
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 7b19aec..671cba4 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -111,7 +111,7 @@ i4battach(void *dummy)
  *	i4bopen - device driver open routine
  *---------------------------------------------------------------------------*/
 static int
-i4bopen(dev_t dev, int flag, int fmt, struct thread *td)
+i4bopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int x;
 	
@@ -133,7 +133,7 @@ i4bopen(dev_t dev, int flag, int fmt, struct thread *td)
  *	i4bclose - device driver close routine
  *---------------------------------------------------------------------------*/
 static int
-i4bclose(dev_t dev, int flag, int fmt, struct thread *td)
+i4bclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	int x = splimp();	
 	openflag = 0;
@@ -147,7 +147,7 @@ i4bclose(dev_t dev, int flag, int fmt, struct thread *td)
  *	i4bread - device driver read routine
  *---------------------------------------------------------------------------*/
 static int
-i4bread(dev_t dev, struct uio *uio, int ioflag)
+i4bread(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	struct mbuf *m;
 	int x;
@@ -192,7 +192,7 @@ i4bread(dev_t dev, struct uio *uio, int ioflag)
  *	i4bioctl - device driver ioctl routine
  *---------------------------------------------------------------------------*/
 static int
-i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+i4bioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
 	call_desc_t *cd;
 	int error = 0;
@@ -755,7 +755,7 @@ diag_done:
  *	i4bpoll - device driver poll routine
  *---------------------------------------------------------------------------*/
 static int
-i4bpoll(dev_t dev, int events, struct thread *td)
+i4bpoll(struct cdev *dev, int events, struct thread *td)
 {
 	int x;