get rid of a boolean typedef. this is c, we have ints, deal with it.

ok marco@ krw@

3 files changed, 12 insertions, 14 deletions

diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 472449f98ce..0f45be2fa7c 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.c,v 1.114 2006/10/01 13:00:47 dlg Exp $	*/
+/*	$OpenBSD: scsiconf.c,v 1.115 2006/10/02 09:06:26 dlg Exp $	*/
 /*	$NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $	*/
 
 /*
@@ -477,7 +477,7 @@ scsibusprint(void *aux, const char *pnp)
 	struct scsibus_attach_args	*sa = aux;
 	struct scsi_inquiry_data	*inqbuf;
 	u_int8_t			type;
-	boolean				removable;
+	int				removable;
 	char				*dtype, *qtype;
 	char				vendor[33], product[65], revision[17];
 	int				target, lun;
@@ -765,7 +765,7 @@ scsi_inqmatch(struct scsi_inquiry_data *inqbuf, const void *base, int nmatches,
     int matchsize, int *bestpriority)
 {
 	u_int8_t			type;
-	boolean				removable;
+	int				removable;
 	const void			*bestmatch;
 
 	/* Include the qualifier to catch vendor-unique types. */
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index de5c5125f27..8c48c53a9c7 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.h,v 1.73 2006/09/22 00:33:41 dlg Exp $	*/
+/*	$OpenBSD: scsiconf.h,v 1.74 2006/10/02 09:06:26 dlg Exp $	*/
 /*	$NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $	*/
 
 /*
@@ -50,8 +50,6 @@
 #ifndef	SCSI_SCSICONF_H
 #define SCSI_SCSICONF_H 1
 
-typedef	int			boolean;
-
 #include <sys/queue.h>
 #include <sys/timeout.h>
 #include <machine/cpu.h>
@@ -192,7 +190,7 @@ int	scsiprint(void *, const char *);
  */
 struct scsi_inquiry_pattern {
 	u_int8_t type;
-	boolean removable;
+	int removable;
 	char *vendor;
 	char *product;
 	char *revision;
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 91f216cc57c..f825a76ab95 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.63 2006/06/11 03:59:59 krw Exp $	*/
+/*	$OpenBSD: st.c,v 1.64 2006/10/02 09:06:26 dlg Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -222,8 +222,8 @@ void	stattach(struct device *, struct device *, void *);
 void	st_identify_drive(struct st_softc *, struct scsi_inquiry_data *);
 void	st_loadquirks(struct st_softc *);
 int	st_mount_tape(dev_t, int);
-void	st_unmount(struct st_softc *, boolean, boolean);
-int	st_decide_mode(struct st_softc *, boolean);
+void	st_unmount(struct st_softc *, int, int);
+int	st_decide_mode(struct st_softc *, int);
 void	ststart(void *);
 int	st_read(struct st_softc *, char *, int, int);
 int	st_read_block_limits(struct st_softc *, int);
@@ -231,7 +231,7 @@ int	st_mode_sense(struct st_softc *, int);
 int	st_mode_select(struct st_softc *, int);
 int	st_space(struct st_softc *, daddr_t, u_int, int);
 int	st_write_filemarks(struct st_softc *, daddr_t, int);
-int	st_check_eod(struct st_softc *, boolean, int *, int);
+int	st_check_eod(struct st_softc *, int, int *, int);
 int	st_load(struct st_softc *, u_int, int);
 int	st_rewind(struct st_softc *, u_int, int);
 int	st_interpret_sense(struct scsi_xfer *);
@@ -613,7 +613,7 @@ st_mount_tape(dev, flags)
 void
 st_unmount(st, eject, rewind)
 	struct st_softc *st;
-	boolean eject, rewind;
+	int eject, rewind;
 {
 	struct scsi_link *sc_link = st->sc_link;
 	int nmarks;
@@ -640,7 +640,7 @@ st_unmount(st, eject, rewind)
 int
 st_decide_mode(st, first_read)
 	struct st_softc *st;
-	boolean	first_read;
+	int	first_read;
 {
 	struct scsi_link *sc_link = st->sc_link;
 
@@ -1613,7 +1613,7 @@ st_write_filemarks(st, number, flags)
 int
 st_check_eod(st, position, nmarks, flags)
 	struct st_softc *st;
-	boolean position;
+	int position;
 	int *nmarks;
 	int flags;
 {