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_freebsd.h | |
| 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_freebsd.h')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 2942594..dea6266 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -175,7 +175,7 @@ struct isp_fc { simqfrozen : 3, default_id : 8, hysteresis : 8, - role : 2, + def_role : 2, /* default role */ gdt_running : 1, loop_dead : 1, fcbsy : 1, @@ -203,7 +203,7 @@ struct isp_spi { tm_enabled : 1, #endif simqfrozen : 3, - role : 3, + def_role : 2, iid : 4; #ifdef ISP_TARGET_MODE struct tslist lun_hash[LUN_HASH_SIZE]; @@ -467,12 +467,12 @@ default: \ #define DEFAULT_EXEC_THROTTLE(isp) isp->isp_osinfo.exec_throttle #define GET_DEFAULT_ROLE(isp, chan) \ - (IS_FC(isp)? ISP_FC_PC(isp, chan)->role : ISP_SPI_PC(isp, chan)->role) + (IS_FC(isp)? ISP_FC_PC(isp, chan)->def_role : ISP_SPI_PC(isp, chan)->def_role) #define SET_DEFAULT_ROLE(isp, chan, val) \ if (IS_FC(isp)) { \ - ISP_FC_PC(isp, chan)->role = val; \ + ISP_FC_PC(isp, chan)->def_role = val; \ } else { \ - ISP_SPI_PC(isp, chan)->role = val; \ + ISP_SPI_PC(isp, chan)->def_role = val; \ } #define DEFAULT_IID(isp, chan) isp->isp_osinfo.pc.spi[chan].iid |
