Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

5 files changed, 22 insertions, 18 deletions

diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index 845befc..afd5a0a 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -79,7 +79,7 @@ static struct fla_s {
 	struct doc2k_stat ds;
 	struct bio_queue_head bio_queue;
 	struct disk *disk;
-	dev_t dev;
+	struct cdev *dev;
 } softc[8];
 
 static int
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c
index 8a36dc3..b6b9dd7 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil.c
@@ -665,7 +665,11 @@ struct thread *td;
 # else
 )
 # endif
+#ifdef _KERNEL
+struct cdev *dev;
+#else
 dev_t dev;
+#endif
 # if defined(__NetBSD__) || defined(__OpenBSD__) || \
 	(_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300000)
 u_long cmd;
@@ -1135,7 +1139,7 @@ struct thread *td;
 #  else
 )
 #  endif
-dev_t dev;
+struct cdev *dev;
 int flags;
 # endif /* __sgi */
 {
@@ -1165,7 +1169,7 @@ struct thread *td;
 #  else
 )
 #  endif
-dev_t dev;
+struct cdev *dev;
 int flags;
 # endif /* __sgi */
 {
@@ -1193,7 +1197,7 @@ int ioflag;
 #  else
 int IPL_EXTERN(read)(dev, uio)
 #  endif
-dev_t dev;
+struct cdev *dev;
 register struct uio *uio;
 # endif /* __sgi */
 {
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h
index bf407c2..75e434c 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/sys/contrib/ipfilter/netinet/ip_fil.h
@@ -574,12 +574,12 @@ extern	int	iplidentify __P((char *));
       (NetBSD >= 199511) || defined(__OpenBSD__)
 #    if defined(__NetBSD__) || (_BSDI_VERSION >= 199701) || \
        defined(__OpenBSD__) || (__FreeBSD_version >= 300000)
-extern	int	iplioctl __P((dev_t, u_long, caddr_t, int, struct thread *));
+extern	int	iplioctl __P((struct cdev *, u_long, caddr_t, int, struct thread *));
 #    else
 extern	int	iplioctl __P((dev_t, int, caddr_t, int, struct thread *));
 #    endif
-extern	int	iplopen __P((dev_t, int, int, struct thread *));
-extern	int	iplclose __P((dev_t, int, int, struct thread *));
+extern	int	iplopen __P((struct cdev *, int, int, struct thread *));
+extern	int	iplclose __P((struct cdev *, int, int, struct thread *));
 #   else
 #    ifndef	linux
 extern	int	iplopen __P((dev_t, int));
@@ -592,7 +592,7 @@ extern	void	iplclose __P((struct inode *, struct file *));
 #    endif /* !linux */
 #   endif /* (_BSDI_VERSION >= 199510) */
 #   if	BSD >= 199306
-extern	int	iplread __P((dev_t, struct uio *, int));
+extern	int	iplread __P((struct cdev *, struct uio *, int));
 #   else
 #    ifndef linux
 extern	int	iplread __P((dev_t, struct uio *));
diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
index df1bb75..c06b719 100644
--- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
@@ -55,7 +55,7 @@
 #include <netinet/ip_frag.h>
 #include <netinet/ip_proxy.h>
 
-static dev_t ipf_devs[IPL_LOGMAX + 1];
+static struct cdev *ipf_devs[IPL_LOGMAX + 1];
 
 SYSCTL_DECL(_net_inet);
 SYSCTL_NODE(_net_inet, OID_AUTO, ipf, CTLFLAG_RW, 0, "IPF");
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index bb83ac1..3053de3 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/contrib/pf/net/pf_ioctl.c
@@ -103,8 +103,8 @@ void			 cleanup_pf_zone(void);
 int			 pfattach(void);
 #else
 void			 pfattach(int);
-int			 pfopen(dev_t, int, int, struct proc *);
-int			 pfclose(dev_t, int, int, struct proc *);
+int			 pfopen(struct cdev *, int, int, struct proc *);
+int			 pfclose(struct cdev *, int, int, struct proc *);
 #endif
 struct pf_pool		*pf_get_pool(char *, char *, u_int32_t,
 			    u_int8_t, u_int32_t, u_int8_t, u_int8_t, u_int8_t);
@@ -113,9 +113,9 @@ void			 pf_init_ruleset(struct pf_ruleset *);
 void			 pf_mv_pool(struct pf_palist *, struct pf_palist *);
 void			 pf_empty_pool(struct pf_palist *);
 #ifdef __FreeBSD__
-int			 pfioctl(dev_t, u_long, caddr_t, int, struct thread *);
+int			 pfioctl(struct cdev *, u_long, caddr_t, int, struct thread *);
 #else
-int			 pfioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int			 pfioctl(struct cdev *, u_long, caddr_t, int, struct proc *);
 #endif
 
 #ifdef __FreeBSD__
@@ -139,7 +139,7 @@ TAILQ_HEAD(pf_tags, pf_tagname)	pf_tags = TAILQ_HEAD_INITIALIZER(pf_tags);
 
 
 #ifdef __FreeBSD__
-static dev_t		pf_dev;
+static struct cdev *pf_dev;
 
 /*
  * XXX - These are new and need to be checked when moveing to a new version
@@ -421,7 +421,7 @@ pfattach(int num)
 }
 
 int
-pfopen(dev_t dev, int flags, int fmt, struct proc *p)
+pfopen(struct cdev *dev, int flags, int fmt, struct proc *p)
 {
 	if (minor(dev) >= 1)
 		return (ENXIO);
@@ -429,7 +429,7 @@ pfopen(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 int
-pfclose(dev_t dev, int flags, int fmt, struct proc *p)
+pfclose(struct cdev *dev, int flags, int fmt, struct proc *p)
 {
 	if (minor(dev) >= 1)
 		return (ENXIO);
@@ -771,10 +771,10 @@ pf_tag_unref(u_int16_t tag)
 
 #ifdef __FreeBSD__
 int
-pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
+pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
 #else
 int
-pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
+pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 #endif
 {
 	struct pf_pooladdr	*pa = NULL;