diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2010-08-06 05:26:25 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2010-08-06 05:26:25 +0000 |
| commit | dab8198f4374f17bd4d58910e419155078d46624 (patch) | |
| tree | fe17c81ec3b9c5e9ebcb9e12994b277b01bea908 /sys/dev/ic | |
| parent | 91da7e4b30336f80f8e4180d53861e117377c072 (diff) | |
ACPI suspend/resume for bwi(4). Initial diff from todd@, finished and
tested by me on X40 with a BCM4306.
OK deraadt@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/bwi.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/bwivar.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index 171546c1253..d4e994b6744 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwi.c,v 1.92 2010/05/19 15:27:35 oga Exp $ */ +/* $OpenBSD: bwi.c,v 1.93 2010/08/06 05:26:24 mglocker Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -45,6 +45,7 @@ #include <sys/device.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/workq.h> #include <sys/mbuf.h> #include <sys/proc.h> #include <sys/socket.h> @@ -288,13 +289,11 @@ void bwi_get_clock_freq(struct bwi_softc *, struct bwi_clock_freq *); int bwi_set_clock_mode(struct bwi_softc *, enum bwi_clock_mode); int bwi_set_clock_delay(struct bwi_softc *); -int bwi_init(struct ifnet *); int bwi_ioctl(struct ifnet *, u_long, caddr_t); void bwi_start(struct ifnet *); void bwi_watchdog(struct ifnet *); void bwi_newstate_begin(struct bwi_softc *, enum ieee80211_state); void bwi_init_statechg(struct bwi_softc *, int); -int bwi_stop(struct bwi_softc *, int); int bwi_newstate(struct ieee80211com *, enum ieee80211_state, int); int bwi_media_change(struct ifnet *); void bwi_iter_func(void *, struct ieee80211_node *); diff --git a/sys/dev/ic/bwivar.h b/sys/dev/ic/bwivar.h index 0f7b17cc72a..e7f428354bb 100644 --- a/sys/dev/ic/bwivar.h +++ b/sys/dev/ic/bwivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bwivar.h,v 1.25 2009/01/07 01:01:41 jsg Exp $ */ +/* $OpenBSD: bwivar.h,v 1.26 2010/08/06 05:26:24 mglocker Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -620,6 +620,7 @@ struct bwi_softc { #define sc_txtap sc_txtapu.th int sc_txtap_len; #endif + struct workq_task sc_resume_wqt; }; #define BWI_F_BUS_INITED 0x1 @@ -738,3 +739,5 @@ bwi_rf_lo_update(struct bwi_mac *_mac) int bwi_intr(void *); int bwi_attach(struct bwi_softc *); int bwi_detach(void *); +int bwi_init(struct ifnet *); +int bwi_stop(struct bwi_softc *, int); |