svn commit: r239693 - head/sys/dev/ahci

[Alexander Motin]

Author: mav
Date: Sat Aug 25 23:01:57 2012
New Revision: 239693
URL: http://svn.freebsd.org/changeset/base/239693

Log:
  Return "locally assigned" Enclosure Logical Identifier instead of 8 zero
  bytes. Zeroes there are incorrect and tend to cause false device ID matches.

Modified:
  head/sys/dev/ahci/ahciem.c

Modified: head/sys/dev/ahci/ahciem.c
==============================================================================
--- head/sys/dev/ahci/ahciem.c	Sat Aug 25 22:45:26 2012	(r239692)
+++ head/sys/dev/ahci/ahciem.c	Sat Aug 25 23:01:57 2012	(r239693)
@@ -380,6 +380,8 @@ ahci_em_emulate_ses_on_led(device_t dev,
 	    ccb->ataio.cmd.sector_count >= 16) {
 		bzero(buf, ccb->ataio.dxfer_len);
 		buf[0] = 64;		/* Valid bytes. */
+		buf[2] = 0x30;		/* NAA Locally Assigned. */
+		strncpy(&buf[3], device_get_nameunit(dev), 7);
 		strncpy(&buf[10], "AHCI    ", SID_VENDOR_SIZE);
 		strncpy(&buf[18], "SGPIO Enclosure ", SID_PRODUCT_SIZE);
 		strncpy(&buf[34], "1.00", SID_REVISION_SIZE);