diff options
| author | scottl <scottl@FreeBSD.org> | 2007-06-17 05:55:54 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2007-06-17 05:55:54 +0000 |
| commit | ff584e70faf04177b3d2b50035e4e0031ad7e655 (patch) | |
| tree | 1f069a0af9a8c28e09089c8dc789bcd435a94cce /sys/dev/aic7xxx | |
| parent | 001175ac64443d5853311173ea76dffb961d6c9f (diff) | |
| download | FreeBSD-src-ff584e70faf04177b3d2b50035e4e0031ad7e655.zip FreeBSD-src-ff584e70faf04177b3d2b50035e4e0031ad7e655.tar.gz | |
Prepare for future integration between CAM and newbus. xpt_bus_register
now takes a device_t to be the parent of the bus that is being created.
Most SIMs have been updated with a reasonable argument, but a few exceptions
just pass NULL for now. This argument isn't used yet and the newbus
integration likely won't be ready until after 7.0-RELEASE.
Diffstat (limited to 'sys/dev/aic7xxx')
| -rw-r--r-- | sys/dev/aic7xxx/aic79xx_osm.c | 2 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_osm.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index e6a1cad..db8fd88 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -148,7 +148,7 @@ ahd_attach(struct ahd_softc *ahd) goto fail; } - if (xpt_bus_register(sim, /*bus_id*/0) != CAM_SUCCESS) { + if (xpt_bus_register(sim, ahd->dev_softc, /*bus_id*/0) != CAM_SUCCESS) { cam_sim_free(sim, /*free_devq*/TRUE); sim = NULL; goto fail; diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index ff8106d..eeb06af 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -202,7 +202,7 @@ ahc_attach(struct ahc_softc *ahc) goto fail; } - if (xpt_bus_register(sim, bus_id) != CAM_SUCCESS) { + if (xpt_bus_register(sim, ahc->dev_softc, bus_id) != CAM_SUCCESS) { cam_sim_free(sim, /*free_devq*/TRUE); sim = NULL; goto fail; @@ -237,7 +237,8 @@ ahc_attach(struct ahc_softc *ahc) goto fail; } - if (xpt_bus_register(sim2, bus_id2) != CAM_SUCCESS) { + if (xpt_bus_register(sim2, ahc->dev_softc, bus_id2) != + CAM_SUCCESS) { printf("ahc_attach: Unable to attach second " "bus due to resource shortage"); /* |
