- 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.
This commit is contained in:
Marius Strobl 2010-04-27 18:05:33 +00:00
parent 637bfa488b
commit 699346fc8b

View File

@ -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?).