svn commit: r250183 - head/sys/cam/scsi

[Steven Hartland]

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 */