diff options
| author | mjacob <mjacob@FreeBSD.org> | 2010-03-17 02:48:14 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2010-03-17 02:48:14 +0000 |
| commit | beacc60317b27a9ab9f12cb5d16b7749a55cebaf (patch) | |
| tree | 9b59548fccb01867380e2ab45c7c9743eebf5e7f /sys/dev/isp/isp_pci.c | |
| parent | a16f0fefdce804c5d60c0aea44277f2cb95d3751 (diff) | |
| download | FreeBSD-src-beacc60317b27a9ab9f12cb5d16b7749a55cebaf.zip FreeBSD-src-beacc60317b27a9ab9f12cb5d16b7749a55cebaf.tar.gz | |
Put gone device timer into a structure tag that can hold more than 32 seconds. Oops.
Untangle some of the confusion about what role means when it's in the FCPARAM/SDPARAM
or isp_fc/isp_spi structures. This fixed a problem about seeing targets appear if you've
turned off autologin and find them, or rather don't, via camcontrol rescan.
MFC after: 1 month
Diffstat (limited to 'sys/dev/isp/isp_pci.c')
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 547f48e..8410ea6 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -547,10 +547,10 @@ isp_get_specific_options(device_t dev, int chan, ispsoftc_t *isp) } if (IS_SCSI(isp)) { - ISP_SPI_PC(isp, chan)->role = tval; + ISP_SPI_PC(isp, chan)->def_role = tval; return; } - ISP_FC_PC(isp, chan)->role = tval; + ISP_FC_PC(isp, chan)->def_role = tval; tval = 0; if (resource_int_value(device_get_name(dev), device_get_unit(dev), "fullduplex", &tval) == 0 && tval != 0) { @@ -833,7 +833,7 @@ isp_pci_attach(device_t dev) * The 'it' suffix really only matters for SCSI cards in target mode. */ isp->isp_osinfo.fw = NULL; - if (IS_SCSI(isp) && (ISP_SPI_PC(isp, 0)->role & ISP_ROLE_TARGET)) { + if (IS_SCSI(isp) && (ISP_SPI_PC(isp, 0)->def_role & ISP_ROLE_TARGET)) { snprintf(fwname, sizeof (fwname), "isp_%04x_it", did); isp->isp_osinfo.fw = firmware_get(fwname); } else if (IS_24XX(isp) && (isp->isp_nchan > 1 || isp->isp_osinfo.forcemulti)) { |
