Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

6 files changed, 8 insertions, 8 deletions

diff --git a/sys/boot/i386/libi386/bioscd.c b/sys/boot/i386/libi386/bioscd.c
index 7259ff5..ad0d409 100644
--- a/sys/boot/i386/libi386/bioscd.c
+++ b/sys/boot/i386/libi386/bioscd.c
@@ -325,7 +325,7 @@ bc_read(int unit, daddr_t dblk, int blks, caddr_t dest)
 }
 
 /*
- * Return a suitable dev_t value for (dev).
+ * Return a suitable struct cdev *value for (dev).
  */
 int
 bc_getdev(struct i386_devdesc *dev)
@@ -344,7 +344,7 @@ bc_getdev(struct i386_devdesc *dev)
      * XXX: Need to examine device spec here to figure out if SCSI or
      * ATAPI.  No idea on how to figure out device number.  All we can
      * really pass to the kernel is what bus and device on which bus we
-     * were booted from, which dev_t isn't well suited to since those
+     * were booted from, which struct cdev *isn't well suited to since those
      * number don't match to unit numbers very well.  We may just need
      * to engage in a hack where we pass -C to the boot args if we are
      * the boot device.
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index aeac2e3..42906ba 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -1165,7 +1165,7 @@ bd_getbigeom(int bunit)
 }
 
 /*
- * Return a suitable dev_t value for (dev).
+ * Return a suitable struct cdev *value for (dev).
  *
  * In the case where it looks like (dev) is a SCSI disk, we allow the number of
  * IDE disks to be specified in $num_ide_disks.  There should be a Better Way.
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index f2696e0..b3feacc 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -72,13 +72,13 @@ extern struct devsw pxedisk;
 extern struct fs_ops pxe_fsops;
 
 int	bc_add(int biosdev);		/* Register CD booted from. */
-int	bc_getdev(struct i386_devdesc *dev);	/* return dev_t for (dev) */
+int	bc_getdev(struct i386_devdesc *dev);	/* return struct cdev *for (dev) */
 int	bc_bios2unit(int biosdev);	/* xlate BIOS device -> bioscd unit */
 int	bc_unit2bios(int unit);		/* xlate bioscd unit -> BIOS device */
 u_int32_t	bd_getbigeom(int bunit);	/* return geometry in bootinfo format */
 int	bd_bios2unit(int biosdev);		/* xlate BIOS device -> biosdisk unit */
 int	bd_unit2bios(int unit);			/* xlate biosdisk unit -> BIOS device */
-int	bd_getdev(struct i386_devdesc *dev);	/* return dev_t for (dev) */
+int	bd_getdev(struct i386_devdesc *dev);	/* return struct cdev *for (dev) */
 
 ssize_t	i386_copyin(const void *src, vm_offset_t dest, const size_t len);
 ssize_t	i386_copyout(const vm_offset_t src, void *dest, const size_t len);
diff --git a/sys/boot/pc98/boot2/dinode.h b/sys/boot/pc98/boot2/dinode.h
index 2a78f34..e5fa7e6 100644
--- a/sys/boot/pc98/boot2/dinode.h
+++ b/sys/boot/pc98/boot2/dinode.h
@@ -94,7 +94,7 @@ struct dinode {
  * The di_db fields may be overlaid with other information for
  * file types that do not have associated disk storage. Block
  * and character devices overlay the first data block with their
- * dev_t value. Short symbolic links place their path in the
+ * struct cdev *value. Short symbolic links place their path in the
  * di_db area.
  */
 #define	di_inumber	di_u.inumber
diff --git a/sys/boot/pc98/boot2/inode.h b/sys/boot/pc98/boot2/inode.h
index 9a59f99..facc122 100644
--- a/sys/boot/pc98/boot2/inode.h
+++ b/sys/boot/pc98/boot2/inode.h
@@ -69,7 +69,7 @@ struct inode {
 	struct	vnode  *i_vnode;/* Vnode associated with this inode. */
 	struct	vnode  *i_devvp;/* Vnode for block I/O. */
 	u_int32_t i_flag;	/* flags, see below */
-	dev_t	  i_dev;	/* Device associated with the inode. */
+	struct cdev *i_dev;	/* Device associated with the inode. */
 	ino_t	  i_number;	/* The identity of the inode. */
 	int	  i_effnlink;	/* i_nlink when I/O completes */
 
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index 9b2a535..ec0dffa 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -1481,7 +1481,7 @@ bd_getbigeom(int bunit)
 }
 
 /*
- * Return a suitable dev_t value for (dev).
+ * Return a suitable struct cdev *value for (dev).
  *
  * In the case where it looks like (dev) is a SCSI disk, we allow the number of
  * IDE disks to be specified in $num_ide_disks.  There should be a Better Way.