Module Name: src
Committed By: bouyer
Date: Fri Apr 5 21:31:44 UTC 2019
Modified Files:
src/sys/dev/ata: atavar.h wd.c
Log Message:
drop AT_RST_NOCMD, it's a cut'n'paste side effect
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.447 -r1.448 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/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.102 src/sys/dev/ata/atavar.h:1.103
--- src/sys/dev/ata/atavar.h:1.102 Fri Apr 5 20:44:09 2019
+++ src/sys/dev/ata/atavar.h Fri Apr 5 21:31:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.102 2019/04/05 20:44:09 christos Exp $ */
+/* $NetBSD: atavar.h,v 1.103 2019/04/05 21:31:44 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -117,7 +117,6 @@ struct ata_command {
#define AT_READREG 0x1000 /* Read registers on completion */
#define AT_LBA 0x2000 /* LBA28 */
#define AT_LBA48 0x4000 /* LBA48 */
-#define AT_RST_NOCMD 0x8000 /* ??? */
int timeout; /* timeout (in ms) */
void *data; /* Data buffer address */
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.447 src/sys/dev/ata/wd.c:1.448
--- src/sys/dev/ata/wd.c:1.447 Fri Apr 5 18:23:45 2019
+++ src/sys/dev/ata/wd.c Fri Apr 5 21:31:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.447 2019/04/05 18:23:45 bouyer Exp $ */
+/* $NetBSD: wd.c,v 1.448 2019/04/05 21:31:44 bouyer 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.447 2019/04/05 18:23:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.448 2019/04/05 21:31:44 bouyer Exp $");
#include "opt_ata.h"
#include "opt_wd.h"
@@ -1647,8 +1647,7 @@ again:
case CMD_ERR:
if (retry == 0) {
retry++;
- (*wd->atabus->ata_reset_drive)(wd->drvp,
- flags | AT_RST_NOCMD, NULL);
+ (*wd->atabus->ata_reset_drive)(wd->drvp, flags, NULL);
goto again;
}
