Get rid of devact enum, substitute it with an int and coresponding defines.

This is needed for the addition of further suspend/resume actions.

Okay deraadt@, marco@.

4 files changed, 12 insertions, 12 deletions

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 01feb0726b2..970890d640b 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.149 2009/08/13 15:23:11 deraadt Exp $	*/
+/*	$OpenBSD: cd.c,v 1.150 2009/10/13 19:33:19 pirofti Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -90,7 +90,7 @@ struct cd_toc {
 
 int	cdmatch(struct device *, void *, void *);
 void	cdattach(struct device *, struct device *, void *);
-int	cdactivate(struct device *, enum devact);
+int	cdactivate(struct device *, int);
 int	cddetach(struct device *, int);
 
 void	cdstart(void *);
@@ -224,7 +224,7 @@ cdattach(struct device *parent, struct device *self, void *aux)
 
 
 int
-cdactivate(struct device *self, enum devact act)
+cdactivate(struct device *self, int act)
 {
 	int rv = 0;
 
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 6bcadf46a88..118bdc0c69b 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.c,v 1.143 2009/09/14 00:03:28 dlg Exp $	*/
+/*	$OpenBSD: scsiconf.c,v 1.144 2009/10/13 19:33:19 pirofti Exp $	*/
 /*	$NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $	*/
 
 /*
@@ -83,7 +83,7 @@ struct scsi_device probe_switch = {
 
 int	scsibusmatch(struct device *, void *, void *);
 void	scsibusattach(struct device *, struct device *, void *);
-int	scsibusactivate(struct device *, enum devact);
+int	scsibusactivate(struct device *, int);
 int	scsibusdetach(struct device *, int);
 
 int	scsibussubmatch(struct device *, void *, void *);
@@ -197,7 +197,7 @@ scsibusattach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-scsibusactivate(struct device *dev, enum devact act)
+scsibusactivate(struct device *dev, int act)
 {
 	return (config_activate_children(dev, act));
 }
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 8f4ebe6040e..45e25fec19f 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.158 2009/09/14 00:03:28 dlg Exp $	*/
+/*	$OpenBSD: sd.c,v 1.159 2009/10/13 19:33:19 pirofti Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -77,7 +77,7 @@
 
 int	sdmatch(struct device *, void *, void *);
 void	sdattach(struct device *, struct device *, void *);
-int	sdactivate(struct device *, enum devact);
+int	sdactivate(struct device *, int);
 int	sddetach(struct device *, int);
 
 void	sdminphys(struct buf *);
@@ -266,7 +266,7 @@ sdattach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-sdactivate(struct device *self, enum devact act)
+sdactivate(struct device *self, int act)
 {
 	struct sd_softc *sd = (struct sd_softc *)self;
 	int rv = 0;
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 82dc5f39bb1..555f8a7e911 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.86 2009/02/16 21:19:07 miod Exp $	*/
+/*	$OpenBSD: st.c,v 1.87 2009/10/13 19:33:19 pirofti Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -223,7 +223,7 @@ struct st_softc {
 
 int	stmatch(struct device *, void *, void *);
 void	stattach(struct device *, struct device *, void *);
-int	stactivate(struct device *, enum devact);
+int	stactivate(struct device *, int);
 int	stdetach(struct device *, int);
 
 void	stminphys(struct buf *);
@@ -355,7 +355,7 @@ stattach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-stactivate(struct device *self, enum devact act)
+stactivate(struct device *self, int act)
 {
 	struct st_softc *st = (struct st_softc *)self;
 	int rv = 0;