From owner-svn-src-stable-8@FreeBSD.ORG Wed May 2 06:58:44 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C29A91065673; Wed, 2 May 2012 06:58:44 +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 9420F8FC0C; Wed, 2 May 2012 06:58:44 +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 q426wiZY070040; Wed, 2 May 2012 06:58:44 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q426wiFI070037; Wed, 2 May 2012 06:58:44 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201205020658.q426wiFI070037@svn.freebsd.org> From: Alexander Motin Date: Wed, 2 May 2012 06:58:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234913 - in stable/8: share/examples/ses/srcs sys/cam/scsi X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2012 06:58:44 -0000 Author: mav Date: Wed May 2 06:58:44 2012 New Revision: 234913 URL: http://svn.freebsd.org/changeset/base/234913 Log: MFC r222336, r222339: Add names for few more SES element types according SES-2 specification. Modified: stable/8/share/examples/ses/srcs/eltsub.c stable/8/sys/cam/scsi/scsi_ses.h Directory Properties: stable/8/share/examples/ (props changed) stable/8/sys/ (props changed) Modified: stable/8/share/examples/ses/srcs/eltsub.c ============================================================================== --- stable/8/share/examples/ses/srcs/eltsub.c Wed May 2 06:52:00 2012 (r234912) +++ stable/8/share/examples/ses/srcs/eltsub.c Wed May 2 06:58:44 2012 (r234913) @@ -84,6 +84,9 @@ geteltnm(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; @@ -108,6 +111,15 @@ geteltnm(type) case SESTYP_SUBENC: sprintf(rbuf, "Simple sub-enclosure"); break; + case SESTYP_ARRAY: + sprintf(rbuf, "Array device"); + break; + case SESTYP_SASEXPANDER: + sprintf(rbuf, "SAS Expender"); + break; + case SESTYP_SASCONNECTOR: + sprintf(rbuf, "SAS Connector"); + break; default: (void) sprintf(rbuf, "", type); break; Modified: stable/8/sys/cam/scsi/scsi_ses.h ============================================================================== --- stable/8/sys/cam/scsi/scsi_ses.h Wed May 2 06:52:00 2012 (r234912) +++ stable/8/sys/cam/scsi/scsi_ses.h Wed May 2 06:58:44 2012 (r234913) @@ -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_SASEXPANDER 0x18 +#define SESTYP_SASCONNECTOR 0x19 /* * Overall Enclosure Status