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/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c
index 7b35c9f357c..de0dedb127f 100644
--- a/sys/dev/onewire/onewire.c
+++ b/sys/dev/onewire/onewire.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: onewire.c,v 1.10 2009/01/02 05:27:12 miod Exp $	*/
+/*	$OpenBSD: onewire.c,v 1.11 2009/10/13 19:33:16 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -65,7 +65,7 @@ struct onewire_device {
 int	onewire_match(struct device *, void *, void *);
 void	onewire_attach(struct device *, struct device *, void *);
 int	onewire_detach(struct device *, int);
-int	onewire_activate(struct device *, enum devact);
+int	onewire_activate(struct device *, int);
 int	onewire_print(void *, const char *);
 
 void	onewire_thread(void *);
@@ -129,7 +129,7 @@ onewire_detach(struct device *self, int flags)
 }
 
 int
-onewire_activate(struct device *self, enum devact act)
+onewire_activate(struct device *self, int act)
 {
 	struct onewire_softc *sc = (struct onewire_softc *)self;
 
diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c
index e2efab5b6d2..3a0e23d8dd1 100644
--- a/sys/dev/onewire/owid.c
+++ b/sys/dev/onewire/owid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owid.c,v 1.6 2008/10/25 00:27:09 deraadt Exp $	*/
+/*	$OpenBSD: owid.c,v 1.7 2009/10/13 19:33:16 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -46,7 +46,7 @@ struct owid_softc {
 int	owid_match(struct device *, void *, void *);
 void	owid_attach(struct device *, struct device *, void *);
 int	owid_detach(struct device *, int);
-int	owid_activate(struct device *, enum devact);
+int	owid_activate(struct device *, int);
 
 struct cfattach owid_ca = {
 	sizeof(struct owid_softc),
@@ -104,7 +104,7 @@ owid_detach(struct device *self, int flags)
 }
 
 int
-owid_activate(struct device *self, enum devact act)
+owid_activate(struct device *self, int act)
 {
 	struct owid_softc *sc = (struct owid_softc *)self;
 
diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c
index ee9cd555e78..b7821da74bf 100644
--- a/sys/dev/onewire/owsbm.c
+++ b/sys/dev/onewire/owsbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owsbm.c,v 1.6 2009/01/26 15:07:49 kettenis Exp $	*/
+/*	$OpenBSD: owsbm.c,v 1.7 2009/10/13 19:33:16 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2007 Aaron Linville <aaron@linville.org>
@@ -77,7 +77,7 @@ struct owsbm_softc {
 int	owsbm_match(struct device *, void *, void *);
 void	owsbm_attach(struct device *, struct device *, void *);
 int	owsbm_detach(struct device *, int);
-int	owsbm_activate(struct device *, enum devact);
+int	owsbm_activate(struct device *, int);
 
 void	owsbm_update(void *);
 
@@ -163,7 +163,7 @@ owsbm_detach(struct device *self, int flags)
 }
 
 int
-owsbm_activate(struct device *self, enum devact act)
+owsbm_activate(struct device *self, int act)
 {
 	return (0);
 }
diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c
index 8461be87b43..6b7786f9a8e 100644
--- a/sys/dev/onewire/owtemp.c
+++ b/sys/dev/onewire/owtemp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owtemp.c,v 1.13 2009/01/18 09:12:04 grange Exp $	*/
+/*	$OpenBSD: owtemp.c,v 1.14 2009/10/13 19:33:16 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2006, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -61,7 +61,7 @@ struct owtemp_softc {
 int	owtemp_match(struct device *, void *, void *);
 void	owtemp_attach(struct device *, struct device *, void *);
 int	owtemp_detach(struct device *, int);
-int	owtemp_activate(struct device *, enum devact);
+int	owtemp_activate(struct device *, int);
 
 void	owtemp_update(void *);
 
@@ -133,7 +133,7 @@ owtemp_detach(struct device *self, int flags)
 }
 
 int
-owtemp_activate(struct device *self, enum devact act)
+owtemp_activate(struct device *self, int act)
 {
 	return (0);
 }