Cleanse the SCSI subsystem of its internally defined types

	u_int32, u_int16, u_int8, int32, int16, int8.
	Use the system defined *_t types instead.

1 files changed, 23 insertions, 23 deletions

diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index b9fe20e..35177a1 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.84 1996/01/27 04:18:02 bde Exp $
+ *      $Id: sd.c,v 1.85 1996/03/02 18:24:13 peter Exp $
  */
 
 #include "opt_bounce.h"
@@ -48,7 +48,7 @@
 #include <machine/md_var.h>
 #include <i386/i386/cons.h>		/* XXX *//* for aborting dump */
 
-static u_int32 sdstrats, sdqueues;
+static u_int32_t sdstrats, sdqueues;
 
 #define SECSIZE 512
 #define	SDOUTSTANDING	4
@@ -64,21 +64,21 @@ static u_int32 sdstrats, sdqueues;
 
 static errval	sd_get_parms __P((int unit, int flags));
 static errval	sd_reassign_blocks __P((int unit, int block));
-static u_int32	sd_size __P((int unit, int flags));
+static u_int32_t	sd_size __P((int unit, int flags));
 static	void	sdstrategy1 __P((struct buf *));
 
 static int		sd_sense_handler __P((struct scsi_xfer *));
-static void    sdstart __P((u_int32, u_int32));
+static void    sdstart __P((u_int32_t, u_int32_t));
 
 struct scsi_data {
-	u_int32 flags;
+	u_int32_t flags;
 #define	SDINIT		0x04	/* device has been init'd */
 	struct disk_parms {
 		u_char  heads;	/* Number of heads */
-		u_int16 cyls;	/* Number of cylinders */
+		u_int16_t cyls;	/* Number of cylinders */
 		u_char  sectors;	/*dubious *//* Number of sectors/track */
-		u_int16 secsiz;	/* Number of bytes/sector */
-		u_int32 disksize;	/* total number sectors */
+		u_int16_t secsiz;	/* Number of bytes/sector */
+		u_int32_t disksize;	/* total number sectors */
 	} params;
 	struct diskslices *dk_slices;	/* virtual drives */
 	struct buf_queue_head buf_queue;
@@ -191,7 +191,7 @@ sd_registerdev(int unit)
 static errval
 sdattach(struct scsi_link *sc_link)
 {
-	u_int32 unit;
+	u_int32_t unit;
 	struct disk_parms *dp;
 #ifdef DEVFS
 	int	mynor;
@@ -261,7 +261,7 @@ sd_open(dev, mode, fmt, p, sc_link)
 	struct scsi_link *sc_link;
 {
 	errval  errcode = 0;
-	u_int32 unit;
+	u_int32_t unit;
 	struct disklabel label;
 	struct scsi_data *sd;
 
@@ -402,9 +402,9 @@ sd_close(dev, fflag, fmt, p, sc_link)
 static void
 sd_strategy(struct buf *bp, struct scsi_link *sc_link)
 {
-	u_int32 opri;
+	u_int32_t opri;
 	struct scsi_data *sd;
-	u_int32 unit;
+	u_int32_t unit;
 
 	sdstrats++;
 	unit = SDUNIT((bp->b_dev));
@@ -500,13 +500,13 @@ sdstrategy1(struct buf *bp)
  * sdstart() is called at SPLSD  from sdstrategy and scsi_done
  */
 static void
-sdstart(u_int32 unit, u_int32 flags)
+sdstart(u_int32_t unit, u_int32_t flags)
 {
 	register struct	scsi_link *sc_link = SCSI_LINK(&sd_switch, unit);
 	register struct scsi_data *sd = sc_link->sd;
 	struct buf *bp = NULL;
 	struct scsi_rw_big cmd;
-	u_int32 blkno, nblk;
+	u_int32_t blkno, nblk;
 
 	SC_DEBUG(sc_link, SDEV_DB2, ("sdstart "));
 	/*
@@ -637,13 +637,13 @@ sd_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p,
 /*
  * Find out from the device what it's capacity is
  */
-static u_int32
+static u_int32_t
 sd_size(unit, flags)
 	int	unit, flags;
 {
 	struct scsi_read_cap_data rdcap;
 	struct scsi_read_capacity scsi_cmd;
-	u_int32 size;
+	u_int32_t size;
 	struct scsi_link *sc_link = SCSI_LINK(&sd_switch, unit);
 
 	/*
@@ -729,7 +729,7 @@ sd_get_parms(unit, flags)
 		struct blk_desc blk_desc;
 		union disk_pages pages;
 	} scsi_sense;
-	u_int32 sectors;
+	u_int32_t sectors;
 
 	/*
 	 * First check if we have it all loaded
@@ -817,7 +817,7 @@ sdsize(dev_t dev)
 {
 	struct scsi_data *sd;
 
-	sd = SCSI_DATA(&sd_switch, (u_int32) SDUNIT(dev));
+	sd = SCSI_DATA(&sd_switch, (u_int32_t) SDUNIT(dev));
 	if (sd == NULL)
 		return (-1);
 	return (dssize(dev, &sd->dk_slices, sdopen, sdclose));
@@ -886,10 +886,10 @@ sddump(dev_t dev)
 	struct disklabel *lp;
 	register struct scsi_data *sd;	/* disk unit to do the IO */
 	struct scsi_link *sc_link;
-	int32	num;		/* number of sectors to write */
-	u_int32	unit, part;
-	int32	blkoff, blknum, blkcnt = MAXTRANSFER;
-	int32	nblocks;
+	int32_t	num;		/* number of sectors to write */
+	u_int32_t	unit, part;
+	int32_t	blkoff, blknum, blkcnt = MAXTRANSFER;
+	int32_t	nblocks;
 	char	*addr;
 	struct	scsi_rw_big cmd;
 	static	int sddoingadump = 0;
@@ -925,7 +925,7 @@ sddump(dev_t dev)
 		return (ENXIO);
 
 	/* Convert to disk sectors */
-	num = (u_int32) num * NBPG / sd->params.secsiz;	/* XXX it must be 512 */
+	num = (u_int32_t) num * NBPG / sd->params.secsiz;	/* XXX it must be 512 */
 
 	/* check if controller active */
 	if (sddoingadump)