From owner-svn-src-head@FreeBSD.ORG  Thu May  2 15:03:30 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A7D6E12E;
 Thu,  2 May 2013 15:03:30 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 99B8411B6;
 Thu,  2 May 2013 15:03:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42F3UwQ095053;
 Thu, 2 May 2013 15:03:30 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42F3UBU095052;
 Thu, 2 May 2013 15:03:30 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201305021503.r42F3UBU095052@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Thu, 2 May 2013 15:03:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250183 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 02 May 2013 15:03:30 -0000

Author: smh
Date: Thu May  2 15:03:30 2013
New Revision: 250183
URL: http://svnweb.freebsd.org/changeset/base/250183

Log:
  Enable CAM SCSI to choice ATA TRIM during autodetection and correct method
  names after increasing the priority of ATA TRIM.
  
  Reviewed by:	mav
  Approved by:	pjd (mentor)
  MFC after:	1 week

Modified:
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Thu May  2 14:55:21 2013	(r250182)
+++ head/sys/cam/scsi/scsi_da.c	Thu May  2 15:03:30 2013	(r250183)
@@ -133,14 +133,14 @@ typedef enum {
 	DA_DELETE_WS16,
 	DA_DELETE_WS10,
 	DA_DELETE_ZERO,
-	DA_DELETE_MIN = DA_DELETE_UNMAP,
+	DA_DELETE_MIN = DA_DELETE_ATA_TRIM,
 	DA_DELETE_MAX = DA_DELETE_ZERO
 } da_delete_methods;
 
 static const char *da_delete_method_names[] =
-    { "NONE", "DISABLE", "UNMAP", "ATA_TRIM", "WS16", "WS10", "ZERO" };
+    { "NONE", "DISABLE", "ATA_TRIM", "UNMAP", "WS16", "WS10", "ZERO" };
 static const char *da_delete_method_desc[] =
-    { "NONE", "DISABLED", "UNMAP", "ATA TRIM", "WRITE SAME(16) with UNMAP",
+    { "NONE", "DISABLED", "ATA TRIM", "UNMAP", "WRITE SAME(16) with UNMAP",
       "WRITE SAME(10) with UNMAP", "ZERO" };
 
 /* Offsets into our private area for storing information */