Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

8 files changed, 37 insertions, 37 deletions

diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index ddc0742..31c85f8 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -96,8 +96,8 @@ typedef struct mse_softc {
 	u_char		sc_bytes[MOUSE_SYS_PACKETSIZE];
 	struct		callout_handle sc_callout;
 	int		sc_watchdog;
-	dev_t		sc_dev;
-	dev_t		sc_ndev;
+	struct cdev *sc_dev;
+	struct cdev *sc_ndev;
 	mousehw_t	hw;
 	mousemode_t	mode;
 	mousestatus_t	status;
@@ -386,7 +386,7 @@ mse_detach(dev)
  */
 static	int
 mseopen(dev, flags, fmt, td)
-	dev_t dev;
+	struct cdev *dev;
 	int flags;
 	int fmt;
 	struct thread *td;
@@ -426,7 +426,7 @@ mseopen(dev, flags, fmt, td)
  */
 static	int
 mseclose(dev, flags, fmt, td)
-	dev_t dev;
+	struct cdev *dev;
 	int flags;
 	int fmt;
 	struct thread *td;
@@ -450,7 +450,7 @@ mseclose(dev, flags, fmt, td)
  */
 static	int
 mseread(dev, uio, ioflag)
-	dev_t dev;
+	struct cdev *dev;
 	struct uio *uio;
 	int ioflag;
 {
@@ -517,7 +517,7 @@ mseread(dev, uio, ioflag)
  */
 static int
 mseioctl(dev, cmd, addr, flag, td)
-	dev_t dev;
+	struct cdev *dev;
 	u_long cmd;
 	caddr_t addr;
 	int flag;
@@ -634,7 +634,7 @@ mseioctl(dev, cmd, addr, flag, td)
  */
 static	int
 msepoll(dev, events, td)
-	dev_t dev;
+	struct cdev *dev;
 	int events;
 	struct thread *td;
 {
@@ -667,10 +667,10 @@ static void
 msetimeout(arg)
 	void *arg;
 {
-	dev_t dev;
+	struct cdev *dev;
 	mse_softc_t *sc;
 
-	dev = (dev_t)arg;
+	dev = (struct cdev *)arg;
 	sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
 	if (sc->sc_watchdog) {
 		if (bootverbose)
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 39c7b83..ac38733 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -271,7 +271,7 @@ pcvt_attach(device_t dev)
  *	driver open
  *---------------------------------------------------------------------------*/
 static int
-pcvt_open(dev_t dev, int flag, int mode, struct thread *td)
+pcvt_open(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	register struct tty *tp;
 	register struct video_state *vsx;
@@ -339,7 +339,7 @@ pcvt_open(dev_t dev, int flag, int mode, struct thread *td)
  *	driver close
  *---------------------------------------------------------------------------*/
 static int
-pcvt_close(dev_t dev, int flag, int mode, struct thread *td)
+pcvt_close(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	register struct tty *tp;
 	register struct video_state *vsx;
@@ -369,7 +369,7 @@ pcvt_close(dev_t dev, int flag, int mode, struct thread *td)
  *	driver ioctl
  *---------------------------------------------------------------------------*/
 static int
-pcvt_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+pcvt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
 	register int error;
 	register struct tty *tp;
@@ -404,7 +404,7 @@ pcvt_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
  *	driver mmap
  *---------------------------------------------------------------------------*/
 static int
-pcvt_mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
+pcvt_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
 {
 	if (offset > 0x20000 - PAGE_SIZE)
 		return -1;
diff --git a/sys/i386/isa/pcvt/pcvt_ext.c b/sys/i386/isa/pcvt/pcvt_ext.c
index 639c50c..035c2af 100644
--- a/sys/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/i386/isa/pcvt/pcvt_ext.c
@@ -2393,7 +2393,7 @@ vgapage(int new_screen)
  *	ioctl handling for VT_USL mode
  *---------------------------------------------------------------------------*/
 int
-usl_vt_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct thread *td)
+usl_vt_ioctl(struct cdev *dev, int cmd, caddr_t data, int flag, struct thread *td)
 {
 	struct proc *p;
 	int i, j, error, opri;
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 44b65a4..a100de7 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -948,7 +948,7 @@ void	get_usl_keymap( keymap_t *map );
 
 void	init_sfkl ( struct video_state *svsp );
 void	init_ufkl ( struct video_state *svsp );
-int	kbdioctl ( dev_t dev, int cmd, caddr_t data, int flag );
+int	kbdioctl ( struct cdev *dev, int cmd, caddr_t data, int flag );
 void	kbd_code_init ( void );
 void	kbd_code_init1 ( void );
 
@@ -1001,14 +1001,14 @@ void 	update_hp ( struct video_state *svsp );
 void	update_led ( void );
 
 #ifdef XSERVER
-int	usl_vt_ioctl (dev_t dev, int cmd, caddr_t data, int flag, struct thread *);
+int	usl_vt_ioctl (struct cdev *dev, int cmd, caddr_t data, int flag, struct thread *);
 #endif
 
 void	vga10_vga10 ( u_char *invga, u_char *outvga );
 void	vga10_vga14 ( u_char *invga, u_char *outvga );
 void	vga10_vga16 ( u_char *invga, u_char *outvga );
 void	vga10_vga8 ( u_char *invga, u_char *outvga );
-int	vgaioctl ( dev_t dev, int cmd, caddr_t data, int flag );
+int	vgaioctl ( struct cdev *dev, int cmd, caddr_t data, int flag );
 
 #ifdef XSERVER
 int	vgapage ( int n );
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index d3f060a..343f385 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -1199,7 +1199,7 @@ setkeydef(Ovl_tbl *data)
  *	keyboard ioctl's entry
  *---------------------------------------------------------------------------*/
 int
-kbdioctl(dev_t dev, int cmd, caddr_t data, int flag)
+kbdioctl(struct cdev *dev, int cmd, caddr_t data, int flag)
 {
 	int key;
 
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index 49fe289..16d5f60 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -58,13 +58,13 @@ static void vid_cursor ( struct cursorshape *data );
 static void vgasetfontattr ( struct vgafontattr *data );
 static void vgagetfontattr ( struct vgafontattr *data );
 static void vgaloadchar ( struct vgaloadchar *data );
-static void vid_getscreen ( struct screeninfo *data, dev_t dev );
-static void vid_setscreen ( struct screeninfo *data, dev_t dev );
+static void vid_getscreen ( struct screeninfo *data, struct cdev *dev );
+static void vid_setscreen ( struct screeninfo *data, struct cdev *dev );
 static void setchargen ( void );
 static void setchargen3 ( void );
 static void resetchargen ( void );
-static void vgareadpel ( struct vgapel *data, dev_t dev );
-static void vgawritepel ( struct vgapel *data, dev_t dev );
+static void vgareadpel ( struct vgapel *data, struct cdev *dev );
+static void vgawritepel ( struct vgapel *data, struct cdev *dev );
 static void vgapcvtid ( struct pcvtid *data );
 static void vgapcvtinfo ( struct pcvtinfo *data );
 
@@ -102,7 +102,7 @@ static u_short getrand ( void );
  *	execute vga ioctls
  *---------------------------------------------------------------------------*/
 int
-vgaioctl(dev_t dev, int cmd, caddr_t data, int flag)
+vgaioctl(struct cdev *dev, int cmd, caddr_t data, int flag)
 {
 	if(minor(dev) >= PCVT_NSCREENS)
 		return -1;
@@ -553,7 +553,7 @@ vgaloadchar(struct vgaloadchar *data)
  *	video ioctl - get screen information
  *---------------------------------------------------------------------------*/
 static void
-vid_getscreen(struct screeninfo *data, dev_t dev)
+vid_getscreen(struct screeninfo *data, struct cdev *dev)
 {
 	int device = minor(dev);
 	data->adaptor_type = adaptor_type;	/* video adapter installed */
@@ -576,7 +576,7 @@ vid_getscreen(struct screeninfo *data, dev_t dev)
  *	video ioctl - set screen information
  *---------------------------------------------------------------------------*/
 static void
-vid_setscreen(struct screeninfo *data, dev_t dev)
+vid_setscreen(struct screeninfo *data, struct cdev *dev)
 {
 	int screen;
 
@@ -770,7 +770,7 @@ reallocate_scrollbuffer(struct video_state *svsp, int pages)
  *	VGA ioctl - read DAC palette entry
  *---------------------------------------------------------------------------*/
 static void
-vgareadpel(struct vgapel *data, dev_t dev)
+vgareadpel(struct vgapel *data, struct cdev *dev)
 {
 	register unsigned vpage = minor(dev);
 	register unsigned idx = data->idx;
@@ -788,7 +788,7 @@ vgareadpel(struct vgapel *data, dev_t dev)
  *	VGA ioctl - write DAC palette entry
  *---------------------------------------------------------------------------*/
 static void
-vgawritepel(struct vgapel *data, dev_t dev)
+vgawritepel(struct vgapel *data, struct cdev *dev)
 {
 	register unsigned vpage = minor(dev);
 	register unsigned idx = data->idx;
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index 3b0a419..1ded09c 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -443,7 +443,7 @@ spictimeout(void *arg)
 }
 
 static int
-spicopen(dev_t dev, int flag, int fmt, struct thread *td)
+spicopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	struct spic_softc *sc;
 
@@ -461,7 +461,7 @@ spicopen(dev_t dev, int flag, int fmt, struct thread *td)
 }
 
 static int
-spicclose(dev_t dev, int flag, int fmt, struct thread *td)
+spicclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	struct spic_softc *sc;
 
@@ -474,7 +474,7 @@ spicclose(dev_t dev, int flag, int fmt, struct thread *td)
 }
 
 static int
-spicread(dev_t dev, struct uio *uio, int flag)
+spicread(struct cdev *dev, struct uio *uio, int flag)
 {
 	struct spic_softc *sc;
 	int l, s, error;
@@ -508,7 +508,7 @@ spicread(dev_t dev, struct uio *uio, int flag)
 }
 
 static int
-spicioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+spicioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
 	struct spic_softc *sc;
 
@@ -518,7 +518,7 @@ spicioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 }
 
 static int
-spicpoll(dev_t dev, int events, struct thread *td)
+spicpoll(struct cdev *dev, int events, struct thread *td)
 {
 	struct spic_softc *sc;
 	int revents = 0, s;
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index e73ab8d..2dc74e3 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -472,7 +472,7 @@ static char *spkr_inbuf;  /* incoming buf */
 
 static int
 spkropen(dev, flags, fmt, td)
-	dev_t		dev;
+	struct cdev *dev;
 	int		flags;
 	int		fmt;
 	struct thread	*td;
@@ -499,7 +499,7 @@ spkropen(dev, flags, fmt, td)
 
 static int
 spkrwrite(dev, uio, ioflag)
-	dev_t		dev;
+	struct cdev *dev;
 	struct uio	*uio;
 	int		ioflag;
 {
@@ -531,7 +531,7 @@ spkrwrite(dev, uio, ioflag)
 
 static int
 spkrclose(dev, flags, fmt, td)
-	dev_t		dev;
+	struct cdev *dev;
 	int		flags;
 	int		fmt;
 	struct thread	*td;
@@ -554,7 +554,7 @@ spkrclose(dev, flags, fmt, td)
 
 static int
 spkrioctl(dev, cmd, cmdarg, flags, td)
-	dev_t		dev;
+	struct cdev *dev;
 	unsigned long	cmd;
 	caddr_t		cmdarg;
 	int		flags;
@@ -610,7 +610,7 @@ static struct isa_pnp_id speaker_ids[] = {
 	{ 0 }
 };
 
-static dev_t speaker_dev;
+static struct cdev *speaker_dev;
 
 static int
 speaker_probe(device_t dev)