Date: Tue, 27 Apr 2010 18:05:33 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r207285 - head/sys/dev/sym Message-ID: <201004271805.o3RI5XAp082217@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Tue Apr 27 18:05:33 2010 New Revision: 207285 URL: http://svn.freebsd.org/changeset/base/207285 Log: - 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. Modified: head/sys/dev/sym/sym_hipd.c Modified: head/sys/dev/sym/sym_hipd.c ============================================================================== --- head/sys/dev/sym/sym_hipd.c Tue Apr 27 17:57:04 2010 (r207284) +++ head/sys/dev/sym/sym_hipd.c Tue Apr 27 18:05:33 2010 (r207285) @@ -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, */ 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?).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004271805.o3RI5XAp082217>