diff options
| author |   brad <brad@openbsd.org> | 2004-09-18 00:19:48 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2004-09-18 00:19:48 +0000 |
| commit | 3a7f5ac13a458b91896407ea91df97f0e6c2a61c (patch) | |
| tree | 15488960b60d13ca4c127521e907cd64daeaef46 /sys | |
| parent | add Linksys PCM200 (diff) | |
| download | wireguard-openbsd-3a7f5ac13a458b91896407ea91df97f0e6c2a61c.tar.xz wireguard-openbsd-3a7f5ac13a458b91896407ea91df97f0e6c2a61c.zip | |
- Record handles for memory and IO space
- If the CIS pointer is all-0s, don't try to read the CIS.
From NetBSD
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 5bf1a798d0c..08643cf78b1 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.13 2004/08/02 21:42:58 brad Exp $ */ +/* $OpenBSD: cardbus.c,v 1.14 2004/09/18 00:19:48 brad Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -512,6 +512,11 @@ cardbus_attach_card(sc) ca.ca_memt = sc->sc_memt; ca.ca_dmat = sc->sc_dmat; +#if rbus + ca.ca_rbus_iot = sc->sc_rbus_iot; + ca.ca_rbus_memt = sc->sc_rbus_memt; +#endif + ca.ca_tag = tag; ca.ca_bus = sc->sc_bus; ca.ca_device = sc->sc_device; @@ -521,13 +526,15 @@ cardbus_attach_card(sc) ca.ca_intrline = sc->sc_intrline; - if(cardbus_read_tuples(&ca, cis_ptr, tuple, sizeof(tuple))) { - printf("cardbus_attach_card: failed to read CIS\n"); - } else { + if (cis_ptr != 0) { + if(cardbus_read_tuples(&ca, cis_ptr, tuple, sizeof(tuple))) { + printf("cardbus_attach_card: failed to read CIS\n"); + } else { #ifdef CARDBUS_DEBUG - decode_tuples(tuple, 2048, print_tuple, NULL); + decode_tuples(tuple, 2048, print_tuple, NULL); #endif - decode_tuples(tuple, 2048, parse_tuple, &ca.ca_cis); + decode_tuples(tuple, 2048, parse_tuple, &ca.ca_cis); + } } if (NULL == (csc = config_found_sm((void *)sc, &ca, cardbusprint, cardbussubmatch))) { |