From b50569b71dfb110a58aa3e83f629115291802a74 Mon Sep 17 00:00:00 2001 From: Scott Long Date: Sun, 17 Jun 2007 05:55:54 +0000 Subject: 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. --- sys/dev/firewire/sbp.c | 2 +- sys/dev/firewire/sbp_targ.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/firewire') diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c index f4aadb24f233..b4d89d54fcf3 100644 --- a/sys/dev/firewire/sbp.c +++ b/sys/dev/firewire/sbp.c @@ -2033,7 +2033,7 @@ END_DEBUG } SBP_LOCK(sbp); - if (xpt_bus_register(sbp->sim, /*bus*/0) != CAM_SUCCESS) + if (xpt_bus_register(sbp->sim, dev, /*bus*/0) != CAM_SUCCESS) goto fail; if (xpt_create_path(&sbp->path, xpt_periph, cam_sim_path(sbp->sim), diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c index 3967458abb22..c5b9d2312cac 100644 --- a/sys/dev/firewire/sbp_targ.c +++ b/sys/dev/firewire/sbp_targ.c @@ -1703,7 +1703,7 @@ sbp_targ_attach(device_t dev) } SBP_LOCK(sc); - if (xpt_bus_register(sc->sim, /*bus*/0) != CAM_SUCCESS) + if (xpt_bus_register(sc->sim, dev, /*bus*/0) != CAM_SUCCESS) goto fail; if (xpt_create_path(&sc->path, /*periph*/ NULL, cam_sim_path(sc->sim), -- cgit v1.3