Get rid of the arch-dependent long type

3 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c
index 86ab68930d5..5d4c74aca34 100644
--- a/sys/dev/atapi/acd.c
+++ b/sys/dev/atapi/acd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acd.c,v 1.25 1997/06/24 05:29:53 downsj Exp $	*/
+/*	$OpenBSD: acd.c,v 1.26 1997/07/07 19:48:46 niklas Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -101,7 +101,7 @@ struct acd_softc {
 
 	struct	cd_parms {
 		int	blksize;
-		u_long	disksize;	/* total number sectors */
+		u_int32_t disksize;	/* total number sectors */
 	} params;
 	struct	buf buf_queue;
 };
@@ -123,7 +123,7 @@ void	acdstrategy __P((struct buf *));
 void	acdstart __P((void *));
 int	acd_pause __P((struct acd_softc *, int));
 void	acdminphys __P((struct buf*));
-u_long	acd_size __P((struct acd_softc*, int));
+u_int32_t acd_size __P((struct acd_softc*, int));
 int	acddone __P((void *));
 int	acdlock __P((struct acd_softc *));
 void	acdunlock __P((struct acd_softc *));
@@ -1094,7 +1094,7 @@ done:
 /*
  * Find out from the device what it's capacity is
  */
-u_long
+u_int32_t
 acd_size(acd, flags)
 	struct acd_softc *acd;
 	int flags;
diff --git a/sys/dev/atapi/atapi.h b/sys/dev/atapi/atapi.h
index e565e1a54f3..4d82d3a1725 100644
--- a/sys/dev/atapi/atapi.h
+++ b/sys/dev/atapi/atapi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atapi.h,v 1.5 1996/08/06 22:41:02 downsj Exp $	*/
+/*	$OpenBSD: atapi.h,v 1.6 1997/07/07 19:48:48 niklas Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -389,7 +389,7 @@ struct atapi_mode_data {
 
 
 int	atapi_exec_cmd __P((struct at_dev_link *, void *, int,
-	    void *, int, long, int));
+	    void *, int, int, int));
 int	atapi_exec_io __P((struct at_dev_link *, void *, int,
 	    struct buf *, int));
 int	atapi_test_unit_ready __P((struct at_dev_link *, int));
diff --git a/sys/dev/atapi/atapiconf.c b/sys/dev/atapi/atapiconf.c
index b343bc4eda2..224bdc84048 100644
--- a/sys/dev/atapi/atapiconf.c
+++ b/sys/dev/atapi/atapiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atapiconf.c,v 1.15 1997/06/24 05:29:54 downsj Exp $	*/
+/*	$OpenBSD: atapiconf.c,v 1.16 1997/07/07 19:48:50 niklas Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -294,7 +294,7 @@ atapi_exec_cmd(ad_link, cmd, cmd_size, databuf, datalen, rw, flags)
 	int cmd_size;
 	void *databuf;
 	int datalen;
-	long rw;
+	int rw;
 	int flags;
 {
 	struct atapi_command_packet *pkt;