[src/trunk]: src TRIM showed up sometime between ATA-7 and ATA-8.

[soren <soren%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81ae9475249e
branches:  trunk
changeset: 789101:81ae9475249e
user:      soren <soren%NetBSD.org@localhost>
date:      Tue Aug 06 19:13:13 2013 +0000

description:
TRIM showed up sometime between ATA-7 and ATA-8.

diffstat:

 sbin/atactl/atactl.c |  6 +++---
 sys/dev/ata/wd.c     |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r b3abc0ac2fc6 -r 81ae9475249e sbin/atactl/atactl.c
--- a/sbin/atactl/atactl.c      Tue Aug 06 19:02:57 2013 +0000
+++ b/sbin/atactl/atactl.c      Tue Aug 06 19:13:13 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atactl.c,v 1.70 2013/08/03 18:35:31 soren Exp $        */
+/*     $NetBSD: atactl.c,v 1.71 2013/08/06 19:13:13 soren Exp $        */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: atactl.c,v 1.70 2013/08/03 18:35:31 soren Exp $");
+__RCSID("$NetBSD: atactl.c,v 1.71 2013/08/06 19:13:13 soren Exp $");
 #endif
 
 
@@ -1067,7 +1067,7 @@
                            inqbuf->atap_sata_features_supp, ata_sata_feat);
        }
 
-       if ((inqbuf->atap_ata_major & WDC_VER_ATA8) &&
+       if ((inqbuf->atap_ata_major & WDC_VER_ATA7) &&
            (inqbuf->support_dsm & ATA_SUPPORT_DSM_TRIM))
                printf("TRIM supported\n");
 
diff -r b3abc0ac2fc6 -r 81ae9475249e sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Tue Aug 06 19:02:57 2013 +0000
+++ b/sys/dev/ata/wd.c  Tue Aug 06 19:13:13 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.403 2013/05/29 00:47:48 christos Exp $ */
+/*     $NetBSD: wd.c,v 1.404 2013/08/06 19:13:13 soren Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.403 2013/05/29 00:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.404 2013/08/06 19:13:13 soren Exp $");
 
 #include "opt_ata.h"
 
@@ -1530,12 +1530,12 @@
        case DIOCGDISCARDPARAMS: {
                struct disk_discard_params * tp;
 
-               if (!(wd->sc_params.atap_ata_major & WDC_VER_ATA8)
+               if (!(wd->sc_params.atap_ata_major & WDC_VER_ATA7)
                    || !(wd->sc_params.support_dsm & ATA_SUPPORT_DSM_TRIM))
                        return ENOTTY;
                tp = (struct disk_discard_params *)addr;
                tp->maxsize = 0xffff; /*wd->sc_params.max_dsm_blocks*/
-               printf("wd: maxtrimsize %ld\n", tp->maxsize);
+               aprint_debug_dev(wd->sc_dev, "TRIM maxsize %ld\n", tp->maxsize);
                return 0;
        }
        case DIOCDISCARD: