svn commit: r207869 - stable/8/sys/dev/sym

[Marius Strobl]

Author: marius
Date: Mon May 10 18:53:32 2010
New Revision: 207869
URL: http://svn.freebsd.org/changeset/base/207869

Log:
  MFC: r207285
  
  - 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:
  stable/8/sys/dev/sym/sym_hipd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/sym/sym_hipd.c
==============================================================================
--- stable/8/sys/dev/sym/sym_hipd.c	Mon May 10 18:52:00 2010	(r207868)
+++ stable/8/sys/dev/sym/sym_hipd.c	Mon May 10 18:53:32 2010	(r207869)
@@ -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?).