From owner-svn-src-head@FreeBSD.ORG  Fri May 27 03:44:47 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFB4E1065672;
	Fri, 27 May 2011 03:44:47 +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 AE5878FC0A;
	Fri, 27 May 2011 03:44:47 +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 p4R3il0v093548;
	Fri, 27 May 2011 03:44:47 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4R3ilJ2093545;
	Fri, 27 May 2011 03:44:47 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201105270344.p4R3ilJ2093545@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 27 May 2011 03:44:47 +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: r222339 - in head: share/examples/ses/srcs sys/cam/scsi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2011 03:44:47 -0000

Author: mav
Date: Fri May 27 03:44:47 2011
New Revision: 222339
URL: http://svn.freebsd.org/changeset/base/222339

Log:
  Change new constant names to ones used by OpenSolaris.

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 03:30:23 2011	(r222338)
+++ head/share/examples/ses/srcs/eltsub.c	Fri May 27 03:44:47 2011	(r222339)
@@ -115,10 +115,10 @@ geteltnm(int type)
 	case SESTYP_ARRAY:
 		sprintf(rbuf, "Array device");
 		break;
-	case SESTYP_SAS_EXP:
+	case SESTYP_SASEXPANDER:
 		sprintf(rbuf, "SAS Expander");
 		break;
-	case SESTYP_SAS_CONN:
+	case SESTYP_SASCONNECTOR:
 		sprintf(rbuf, "SAS Connector");
 		break;
 	default:

Modified: head/sys/cam/scsi/scsi_ses.h
==============================================================================
--- head/sys/cam/scsi/scsi_ses.h	Fri May 27 03:30:23 2011	(r222338)
+++ head/sys/cam/scsi/scsi_ses.h	Fri May 27 03:44:47 2011	(r222339)
@@ -111,8 +111,8 @@ typedef struct {
 #define	SESTYP_SCSI_INI		0x15
 #define	SESTYP_SUBENC		0x16
 #define	SESTYP_ARRAY		0x17
-#define	SESTYP_SAS_EXP		0x18
-#define	SESTYP_SAS_CONN		0x19
+#define	SESTYP_SASEXPANDER	0x18
+#define	SESTYP_SASCONNECTOR	0x19
 
 /*
  * Overall Enclosure Status