diff options
| author |   nate <nate@openbsd.org> | 2002-01-03 20:28:02 +0000 |
|---|---|---|
| committer | nate <nate@openbsd.org> | 2002-01-03 20:28:02 +0000 |
| commit | b214a894ba70c52542db050ba5cd685ad66fa7f0 (patch) | |
| tree | 7efaeee76c9fe4d809d4a50039b2b291a7ec78ae | |
| parent | cdev_decl(wsdisplay) is already done in <sys/conf.h> (diff) | |
| download | wireguard-openbsd-b214a894ba70c52542db050ba5cd685ad66fa7f0.tar.xz wireguard-openbsd-b214a894ba70c52542db050ba5cd685ad66fa7f0.zip | |
Add the bus to the cardbus_attach_args
From NetBSD
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 3 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardbusvar.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 5dc3cab44be..7d8f2c5360d 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.3 2001/06/24 21:29:05 mickey Exp $ */ +/* $OpenBSD: cardbus.c,v 1.4 2002/01/03 20:28:02 nate Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -501,6 +501,7 @@ cardbus_attach_card(sc) ca.ca_dmat = sc->sc_dmat; ca.ca_tag = tag; + ca.ca_bus = sc->sc_bus; ca.ca_device = sc->sc_device; ca.ca_function = function; ca.ca_id = id; diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h index 70c9d6b8f5b..e5330f97c7f 100644 --- a/sys/dev/cardbus/cardbusvar.h +++ b/sys/dev/cardbus/cardbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbusvar.h,v 1.3 2000/05/15 06:36:21 niklas Exp $ */ +/* $OpenBSD: cardbusvar.h,v 1.4 2002/01/03 20:28:02 nate Exp $ */ /* $NetBSD: cardbusvar.h,v 1.17 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -349,6 +349,7 @@ struct cardbus_attach_args { bus_space_tag_t ca_memt; /* CardBus MEM space tag */ bus_dma_tag_t ca_dmat; /* DMA tag */ + u_int ca_bus; u_int ca_device; u_int ca_function; cardbustag_t ca_tag; |