diff options
| author | Matt Jacob <mjacob@FreeBSD.org> | 2006-08-21 00:48:37 +0000 |
|---|---|---|
| committer | Matt Jacob <mjacob@FreeBSD.org> | 2006-08-21 00:48:37 +0000 |
| commit | 9d08b0e53cfbabe07083fc29c9e45212a1570a8d (patch) | |
| tree | 30862417ad43dc94ac4cdf4f3efe3cc84c79c486 /sys/dev/isp | |
| parent | 83b600597d66509524341e93a59dabef1c6d2c25 (diff) | |
Notes
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_ioctl.h | 3 | ||||
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h index d1f3f6754f0c..8704d061ae16 100644 --- a/sys/dev/isp/isp_ioctl.h +++ b/sys/dev/isp/isp_ioctl.h @@ -61,9 +61,6 @@ #define ISP_ROLE_TARGET 0x1 #define ISP_ROLE_INITIATOR 0x2 #define ISP_ROLE_BOTH (ISP_ROLE_TARGET|ISP_ROLE_INITIATOR) -#ifndef ISP_DEFAULT_ROLES -#define ISP_DEFAULT_ROLES ISP_ROLE_BOTH -#endif /* * Get the current adapter role diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 60d72a359b64..54602e4a6b95 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -484,6 +484,12 @@ isp_get_options(device_t dev, ispsoftc_t *isp) } } #endif + bitmap = 0; + if (getenv_int("role", &bitmap)) { + isp->isp_role = bitmap; + } else { + isp->isp_role = ISP_DEFAULT_ROLES; + } } static void |