Module Name: src
Committed By: soren
Date: Tue Aug 6 19:13:13 UTC 2013
Modified Files:
src/sbin/atactl: atactl.c
src/sys/dev/ata: wd.c
Log Message:
TRIM showed up sometime between ATA-7 and ATA-8.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sbin/atactl/atactl.c
cvs rdiff -u -r1.403 -r1.404 src/sys/dev/ata/wd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.70 src/sbin/atactl/atactl.c:1.71
--- src/sbin/atactl/atactl.c:1.70 Sat Aug 3 18:35:31 2013
+++ src/sbin/atactl/atactl.c Tue Aug 6 19:13:13 2013
@@ -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 @@ device_identify(int argc, char *argv[])
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");
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.403 src/sys/dev/ata/wd.c:1.404
--- src/sys/dev/ata/wd.c:1.403 Wed May 29 00:47:48 2013
+++ src/sys/dev/ata/wd.c Tue Aug 6 19:13:13 2013
@@ -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 @@ wdioctl(dev_t dev, u_long xfer, void *ad
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:
