From owner-svn-src-all@FreeBSD.ORG  Fri May 27 03:23:40 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 630DA1065676;
	Fri, 27 May 2011 03:23:40 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DF8D88FC17;
	Fri, 27 May 2011 03:23:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4R3Ndr0092824;
	Fri, 27 May 2011 03:23:39 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4R3Nd6m092821;
	Fri, 27 May 2011 03:23:39 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201105270323.p4R3Nd6m092821@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 27 May 2011 03:23:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222336 - in head: share/examples/ses/srcs sys/cam/scsi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2011 03:23:40 -0000

Author: mav
Date: Fri May 27 03:23:39 2011
New Revision: 222336
URL: http://svn.freebsd.org/changeset/base/222336

Log:
  Add names for few more SES element types according SES-2 specification.

Modified:
  head/share/examples/ses/srcs/eltsub.c
  head/sys/cam/scsi/scsi_ses.h

Modified: head/share/examples/ses/srcs/eltsub.c
==============================================================================
--- head/share/examples/ses/srcs/eltsub.c	Fri May 27 00:23:44 2011	(r222335)
+++ head/share/examples/ses/srcs/eltsub.c	Fri May 27 03:23:39 2011	(r222336)
@@ -85,6 +85,9 @@ geteltnm(int type)
 	case SESTYP_KEYPAD:
 		sprintf(rbuf, "Key pad entry device");
 		break;
+	case SESTYP_ENCLOSURE:
+		sprintf(rbuf, "Enclosure");
+		break;
 	case SESTYP_SCSIXVR:
 		sprintf(rbuf, "SCSI port/transceiver");
 		break;
@@ -109,6 +112,15 @@ geteltnm(int type)
 	case SESTYP_SUBENC:
 		sprintf(rbuf, "Simple sub-enclosure");
 		break;
+	case SESTYP_ARRAY:
+		sprintf(rbuf, "Array device");
+		break;
+	case SESTYP_SAS_EXP:
+		sprintf(rbuf, "SAS Expender");
+		break;
+	case SESTYP_SAS_CONN:
+		sprintf(rbuf, "SAS Connector");
+		break;
 	default:
 		(void) sprintf(rbuf, "<Type 0x%x>", type);
 		break;

Modified: head/sys/cam/scsi/scsi_ses.h
==============================================================================
--- head/sys/cam/scsi/scsi_ses.h	Fri May 27 00:23:44 2011	(r222335)
+++ head/sys/cam/scsi/scsi_ses.h	Fri May 27 03:23:39 2011	(r222336)
@@ -101,6 +101,7 @@ typedef struct {
 #define	SESTYP_UPS		0x0b
 #define	SESTYP_DISPLAY		0x0c
 #define	SESTYP_KEYPAD		0x0d
+#define	SESTYP_ENCLOSURE	0x0e
 #define	SESTYP_SCSIXVR		0x0f
 #define	SESTYP_LANGUAGE		0x10
 #define	SESTYP_COMPORT		0x11
@@ -109,6 +110,9 @@ typedef struct {
 #define	SESTYP_SCSI_TGT		0x14
 #define	SESTYP_SCSI_INI		0x15
 #define	SESTYP_SUBENC		0x16
+#define	SESTYP_ARRAY		0x17
+#define	SESTYP_SAS_EXP		0x18
+#define	SESTYP_SAS_CONN		0x19
 
 /*
  * Overall Enclosure Status