Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ata drop AT_RST_NOCMD, it's a cut'n'paste side effect
details: https://anonhg.NetBSD.org/src/rev/dc385c80d10b
branches: trunk
changeset: 840417:dc385c80d10b
user: bouyer <bouyer%NetBSD.org@localhost>
date: Fri Apr 05 21:31:44 2019 +0000
description:
drop AT_RST_NOCMD, it's a cut'n'paste side effect
diffstat:
sys/dev/ata/atavar.h | 3 +--
sys/dev/ata/wd.c | 7 +++----
2 files changed, 4 insertions(+), 6 deletions(-)
diffs (45 lines):
diff -r 4cdb049045fd -r dc385c80d10b sys/dev/ata/atavar.h
--- a/sys/dev/ata/atavar.h Fri Apr 05 21:27:44 2019 +0000
+++ b/sys/dev/ata/atavar.h Fri Apr 05 21:31:44 2019 +0000
@@ -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 @@
#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 */
diff -r 4cdb049045fd -r dc385c80d10b sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c Fri Apr 05 21:27:44 2019 +0000
+++ b/sys/dev/ata/wd.c Fri Apr 05 21:31:44 2019 +0000
@@ -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 @@
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;
}
Home |
Main Index |
Thread Index |
Old Index