summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorPaul Irofti <pirofti@cvs.openbsd.org>2009-10-13 19:33:20 +0000
committerPaul Irofti <pirofti@cvs.openbsd.org>2009-10-13 19:33:20 +0000
commit6682179a1c327ebfd5a91e7dc39282434a805c2f (patch)
tree4d4643ee1beb2ad41f471df273cdcf08291d535b /sys/arch/macppc
parent8120c6ba90a94a5745094b6f232932d0695cae1c (diff)
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@.
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r--sys/arch/macppc/dev/if_wi_obio.c6
-rw-r--r--sys/arch/macppc/dev/tpms.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c
index 3663d52b169..98100cd830e 100644
--- a/sys/arch/macppc/dev/if_wi_obio.c
+++ b/sys/arch/macppc/dev/if_wi_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_obio.c,v 1.15 2006/06/19 22:42:33 miod Exp $ */
+/* $OpenBSD: if_wi_obio.c,v 1.16 2009/10/13 19:33:16 pirofti Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -75,7 +75,7 @@
int wi_obio_match(struct device *, void *, void *);
void wi_obio_attach(struct device *, struct device *, void *);
int wi_obio_detach(struct device *, int);
-int wi_obio_activate(struct device *, enum devact);
+int wi_obio_activate(struct device *, int);
void wi_obio_attach(struct device *, struct device *, void *);
int wi_obio_enable(struct wi_softc *sc);
void wi_obio_disable(struct wi_softc *sc);
@@ -161,7 +161,7 @@ wi_obio_detach(dev, flags)
int
wi_obio_activate(dev, act)
struct device *dev;
- enum devact act;
+ int act;
{
struct wi_obio_softc *psc = (struct wi_obio_softc *)dev;
struct wi_softc *sc = &psc->sc_wi;
diff --git a/sys/arch/macppc/dev/tpms.c b/sys/arch/macppc/dev/tpms.c
index 13be917e32b..fad1671b045 100644
--- a/sys/arch/macppc/dev/tpms.c
+++ b/sys/arch/macppc/dev/tpms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tpms.c,v 1.13 2009/03/08 14:10:08 robert Exp $ */
+/* $OpenBSD: tpms.c,v 1.14 2009/10/13 19:33:16 pirofti Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@@ -271,7 +271,7 @@ const struct wsmouse_accessops tpms_accessops = {
int tpms_match(struct device *, void *, void *);
void tpms_attach(struct device *, struct device *, void *);
int tpms_detach(struct device *, int);
-int tpms_activate(struct device *, enum devact);
+int tpms_activate(struct device *, int);
struct cfdriver tpms_cd = {
NULL, "tpms", DV_DULL
@@ -403,7 +403,7 @@ tpms_detach(struct device *self, int flags)
/* Activate the device. */
int
-tpms_activate(struct device *self, enum devact act)
+tpms_activate(struct device *self, int act)
{
struct tpms_softc *sc = (struct tpms_softc *)self;
int ret;