diff options
| author | marius <marius@FreeBSD.org> | 2010-04-27 18:05:33 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2010-04-27 18:05:33 +0000 |
| commit | 810d92b3d2a82e273d353c01b779d771b914ede7 (patch) | |
| tree | 34313cd5d32a96aa01a29e82cba4bf5a91a1fe15 /sys/dev/sym | |
| parent | 16ffa87683fefed796ccdad41a11b885b0688b24 (diff) | |
| download | FreeBSD-src-810d92b3d2a82e273d353c01b779d771b914ede7.zip FreeBSD-src-810d92b3d2a82e273d353c01b779d771b914ede7.tar.gz | |
- On sparc64 obtain the initiator ID from the Open Firmware device tree
in order to match what the PROM built-in driver uses.
- Remove some no longer used includes.
Diffstat (limited to 'sys/dev/sym')
| -rw-r--r-- | sys/dev/sym/sym_hipd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index a43c816..5050a5f 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -87,6 +87,12 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/resource.h> + +#ifdef __sparc64__ +#include <dev/ofw/openfirm.h> +#include <machine/ofw_machdep.h> +#endif + #include <sys/rman.h> #include <cam/cam.h> @@ -98,10 +104,6 @@ __FBSDID("$FreeBSD$"); #include <cam/scsi/scsi_all.h> #include <cam/scsi/scsi_message.h> -#include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/pmap.h> - /* Short and quite clear integer types */ typedef int8_t s8; typedef int16_t s16; @@ -2682,6 +2684,9 @@ static int sym_prepare_setting(hcb_p np, struct sym_nvram *nvram) */ np->myaddr = 255; sym_nvram_setup_host (np, nvram); +#ifdef __sparc64__ + np->myaddr = OF_getscsinitid(np->device); +#endif /* * Get SCSI addr of host adapter (set by bios?). |
