diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-23 19:11:07 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-23 19:11:07 +0000 |
| commit | b3a91e36bb8e33e50e69effebb753c1a91409e59 (patch) | |
| tree | a681276193ca95188944309af44a8a3c81e64337 /sys/dev/cardbus/if_athn_cardbus.c | |
| parent | b441200e48f163d3945f5a343666d4fde967f080 (diff) | |
move things from athn_attach() to athn_init() such that we can
power off the cardbus slot after athn_attach() and in athn_stop().
Diffstat (limited to 'sys/dev/cardbus/if_athn_cardbus.c')
| -rw-r--r-- | sys/dev/cardbus/if_athn_cardbus.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/cardbus/if_athn_cardbus.c b/sys/dev/cardbus/if_athn_cardbus.c index 7219b3e3169..ddc13bd10e5 100644 --- a/sys/dev/cardbus/if_athn_cardbus.c +++ b/sys/dev/cardbus/if_athn_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_cardbus.c,v 1.1 2009/11/14 16:55:11 damien Exp $ */ +/* $OpenBSD: if_athn_cardbus.c,v 1.2 2009/11/23 19:11:06 damien Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -131,17 +131,12 @@ athn_cardbus_attach(struct device *parent, struct device *self, void *aux) csc->sc_bar_val = base | CARDBUS_MAPREG_TYPE_MEM; /* Set up the PCI configuration registers. */ -#ifdef notyet athn_cardbus_setup(csc); -#else - athn_cardbus_enable(sc); -#endif + printf(": irq %d", csc->sc_intrline); athn_attach(sc); -#ifdef notyet Cardbus_function_disable(ct); -#endif } int |