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/mpt | |
| 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/mpt')
| -rw-r--r-- | sys/dev/mpt/mpt_cam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c index f1e6eef..eba5b8c 100644 --- a/sys/dev/mpt/mpt_cam.c +++ b/sys/dev/mpt/mpt_cam.c @@ -323,7 +323,7 @@ mpt_cam_attach(struct mpt_softc *mpt) /* * Create the device queue for our SIM(s). */ - devq = cam_simq_alloc(maxq); + devq = cam_simq_alloc(1); if (devq == NULL) { mpt_prt(mpt, "Unable to allocate CAM SIMQ!\n"); error = ENOMEM; @@ -334,7 +334,7 @@ mpt_cam_attach(struct mpt_softc *mpt) * Construct our SIM entry. */ mpt->sim = - mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, maxq, devq); + mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, 1, devq); if (mpt->sim == NULL) { mpt_prt(mpt, "Unable to allocate CAM SIM!\n"); cam_simq_free(devq); @@ -346,7 +346,7 @@ mpt_cam_attach(struct mpt_softc *mpt) * Register exactly this bus. */ MPT_LOCK(mpt); - if (xpt_bus_register(mpt->sim, 0) != CAM_SUCCESS) { + if (xpt_bus_register(mpt->sim, mpt->dev, 0) != CAM_SUCCESS) { mpt_prt(mpt, "Bus registration Failed!\n"); error = ENOMEM; MPT_UNLOCK(mpt); @@ -374,7 +374,7 @@ mpt_cam_attach(struct mpt_softc *mpt) * Create a "bus" to export all hidden disks to CAM. */ mpt->phydisk_sim = - mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, maxq, devq); + mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, 1, devq); if (mpt->phydisk_sim == NULL) { mpt_prt(mpt, "Unable to allocate Physical Disk CAM SIM!\n"); error = ENOMEM; @@ -385,7 +385,7 @@ mpt_cam_attach(struct mpt_softc *mpt) * Register this bus. */ MPT_LOCK(mpt); - if (xpt_bus_register(mpt->phydisk_sim, 1) != CAM_SUCCESS) { + if (xpt_bus_register(mpt->phydisk_sim, mpt->dev, 1) != CAM_SUCCESS) { mpt_prt(mpt, "Physical Disk Bus registration Failed!\n"); error = ENOMEM; MPT_UNLOCK(mpt); |
