Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

2 files changed, 10 insertions, 10 deletions

diff --git a/sys/dev/matcd/matcd.c b/sys/dev/matcd/matcd.c
index 9e28d25..aead16c 100644
--- a/sys/dev/matcd/matcd.c
+++ b/sys/dev/matcd/matcd.c
@@ -624,7 +624,7 @@ struct	matcd_mbx {
 
 static	struct matcd_data {
 	device_t	dev;
-	dev_t		matcd_dev_t;
+	struct cdev *matcd_dev_t;
 	short		config;
 	short		drivemode;	/*Last state drive was set to*/
 	short		flags;
@@ -657,8 +657,8 @@ static	unsigned char	if_state[4]={0,0,0,0};	/*State of host I/F and bus*/
 
 int		matcd_probe(struct matcd_softc *sc);
 int		matcd_attach(struct matcd_softc *sc);
-static int	matcdopen(dev_t dev, int flags, int fmt, struct thread *ptx);
-static int	matcdclose(dev_t dev, int flags, int fmt, struct thread *ptx);
+static int	matcdopen(struct cdev *dev, int flags, int fmt, struct thread *ptx);
+static int	matcdclose(struct cdev *dev, int flags, int fmt, struct thread *ptx);
 static void	matcdstrategy(struct bio *bp);
 static d_ioctl_t	matcdioctl;
 static timeout_t	matcd_timeout;
@@ -668,7 +668,7 @@ static timeout_t	matcd_timeout;
 	Internal function declarations
 ---------------------------------------------------------------------------*/
 
-static	int	matcdsize(dev_t dev);
+static	int	matcdsize(struct cdev *dev);
 static	void	matcd_start(struct bio_queue_head *dp);
 static	void	zero_cmd(char *);
 static	void	matcd_pread(int port, int count, unsigned char * data);
@@ -772,7 +772,7 @@ int matcd_attach(struct matcd_softc *sc)
 	unsigned char	data[12];
 	struct	matcd_data *cd;
 	int port = sc->port_bsh;	/*Take port ID selected in probe()*/
-	dev_t	d;
+	struct cdev *d;
 	int unit=0;
 
 	printf("matcdc%d: Host interface type %d port %x\n",
@@ -864,7 +864,7 @@ int matcd_attach(struct matcd_softc *sc)
 <15>	If LOCKDRIVE is enabled, additional minor number devices allow
 <15>	the drive to be locked while being accessed.
 ---------------------------------------------------------------------------*/
-static int	matcdopen(dev_t dev, int flags, int fmt,
+static int	matcdopen(struct cdev *dev, int flags, int fmt,
 		  struct thread *ptx)
 {
 	int cdrive,ldrive,partition,controller,lock;
@@ -1051,7 +1051,7 @@ static int	matcdopen(dev_t dev, int flags, int fmt,
 	the drive.  See Edit 15 in Edit History.
 ---------------------------------------------------------------------------*/
 
-static int matcdclose(dev_t dev, int flags, int fmt,struct thread *ptx)
+static int matcdclose(struct cdev *dev, int flags, int fmt,struct thread *ptx)
 {
 	int	ldrive,cdrive,port,partition,controller,lock;
 	struct matcd_data *cd;
@@ -1910,7 +1910,7 @@ static void matcd_start(struct bio_queue_head *dp)
 	things that don't fit into the block read scheme of things.
 ---------------------------------------------------------------------------*/
 
-static int matcdioctl(dev_t dev, unsigned long command,
+static int matcdioctl(struct cdev *dev, unsigned long command,
 			   caddr_t addr, int flags,
 			   struct thread *td)
 {
@@ -2051,7 +2051,7 @@ static int matcdioctl(dev_t dev, unsigned long command,
 	matcdsize - Reports how many blocks exist on the disc.
 ---------------------------------------------------------------------------*/
 
-static int	matcdsize(dev_t dev)
+static int	matcdsize(struct cdev *dev)
 {
 	int	size,blksize;
 	int	ldrive,part;
diff --git a/sys/dev/matcd/matcd_data.h b/sys/dev/matcd/matcd_data.h
index 381599a..1923cec 100644
--- a/sys/dev/matcd/matcd_data.h
+++ b/sys/dev/matcd/matcd_data.h
@@ -50,7 +50,7 @@ See matcd.c for Edit History
 
 struct matcd_softc {
 	device_t		dev;
-	dev_t			matcd_dev_t;
+	struct cdev *matcd_dev_t;
 	struct resource *	port;
 	int			port_rid;
 	int			port_type;