Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

4 files changed, 12 insertions, 12 deletions

diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index 4cd0bdb..a64ea2a 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -67,9 +67,9 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-static dev_t memdev, kmemdev;
+static struct cdev *memdev, *kmemdev;
 #ifdef PERFMON
-static dev_t perfdev;
+static struct cdev *perfdev;
 #endif /* PERFMON */
 
 static	d_open_t	mmopen;
@@ -95,7 +95,7 @@ static struct cdevsw mem_cdevsw = {
 struct mem_range_softc mem_range_softc;
 
 static int
-mmclose(dev_t dev, int flags, int fmt, struct thread *td)
+mmclose(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	switch (minor(dev)) {
 #ifdef PERFMON
@@ -109,7 +109,7 @@ mmclose(dev_t dev, int flags, int fmt, struct thread *td)
 }
 
 static int
-mmopen(dev_t dev, int flags, int fmt, struct thread *td)
+mmopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	int error;
 
@@ -136,7 +136,7 @@ mmopen(dev_t dev, int flags, int fmt, struct thread *td)
 
 /*ARGSUSED*/
 static int
-mmrw(dev_t dev, struct uio *uio, int flags)
+mmrw(struct cdev *dev, struct uio *uio, int flags)
 {
 	vm_offset_t o, v;
 	int c = 0;
@@ -219,7 +219,7 @@ kmemphys:
 * instead of going through read/write			*
 \*******************************************************/
 static int
-memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
+memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
 {
 	/*
 	 * /dev/mem is the only one that makes sense through this
@@ -240,7 +240,7 @@ memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
 }
 
 static int
-mmioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td)
+mmioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td)
 {
 	switch(minor(dev)) {
 #ifdef PERFMON
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index 3a127ea..6ced298 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -86,7 +86,7 @@ void	promcons_delayed_makedev(void);
 
 int
 promopen(dev, flag, mode, td)
-	dev_t dev;
+	struct cdev *dev;
 	int flag, mode;
 	struct thread *td;
 {
@@ -137,7 +137,7 @@ promopen(dev, flag, mode, td)
  
 int
 promclose(dev, flag, mode, td)
-	dev_t dev;
+	struct cdev *dev;
 	int flag, mode;
 	struct thread *td;
 {
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index 9db2b9a..1edf6be 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -66,7 +66,7 @@ struct clockframe {
 /*
  * CTL_MACHDEP definitions.
  */
-#define	CPU_CONSDEV		1	/* dev_t: console terminal device */
+#define	CPU_CONSDEV		1	/* struct cdev *: console terminal device */
 #define	CPU_ROOT_DEVICE		2	/* string: root device name */
 #define	CPU_UNALIGNED_PRINT	3	/* int: print unaligned accesses */
 #define	CPU_UNALIGNED_FIX	4	/* int: fix unaligned accesses */
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 1387f97..d4504d3 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -258,7 +258,7 @@ zs_cnputc(struct consdev *cp, int c)
 
 
 static int
-zsopen(dev_t dev, int flag, int mode, struct thread *td)
+zsopen(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	struct zs_softc *sc = ZS_SOFTC(minor(dev));
 	struct tty *tp;
@@ -305,7 +305,7 @@ zsopen(dev_t dev, int flag, int mode, struct thread *td)
 }
  
 static int
-zsclose(dev_t dev, int flag, int mode, struct thread *td)
+zsclose(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	struct zs_softc *sc = ZS_SOFTC(minor(dev));
 	struct tty *tp;