diff options
| author | mckusick <mckusick@FreeBSD.org> | 2010-05-06 17:37:23 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2010-05-06 17:37:23 +0000 |
| commit | b25e55dcc52d6203a9ae995ca470a66b6483f71d (patch) | |
| tree | 781f2c991a11a3806fdb0891b7a615cb77ebe3ab /sys/dev/isp/isp_pci.c | |
| parent | 3a0f5972a0de87aebef1af257922515700da4217 (diff) | |
| parent | f3856c6cf2fb115757967b7e32bdeb21bd27d1ee (diff) | |
| download | FreeBSD-src-b25e55dcc52d6203a9ae995ca470a66b6483f71d.zip FreeBSD-src-b25e55dcc52d6203a9ae995ca470a66b6483f71d.tar.gz | |
Final update to current version of head in preparation for reintegration.
Diffstat (limited to 'sys/dev/isp/isp_pci.c')
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 8410ea6..e152e99 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -46,6 +46,11 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/uio.h> +#ifdef __sparc64__ +#include <dev/ofw/openfirm.h> +#include <machine/ofw_machdep.h> +#endif + #include <dev/isp/isp_freebsd.h> static uint32_t isp_pci_rd_reg(ispsoftc_t *, int); @@ -517,7 +522,11 @@ isp_get_specific_options(device_t dev, int chan, ispsoftc_t *isp) if (IS_FC(isp)) { ISP_FC_PC(isp, chan)->default_id = 109 - chan; } else { +#ifdef __sparc64__ + ISP_SPI_PC(isp, chan)->iid = OF_getscsinitid(dev); +#else ISP_SPI_PC(isp, chan)->iid = 7; +#endif } } else { if (IS_FC(isp)) { |
