Module Name: src
Committed By: jdolecek
Date: Tue Aug 1 21:39:51 UTC 2017
Modified Files:
src/sys/dev/ata [jdolecek-ncq]: ata.c atavar.h
Log Message:
move the drive recovery block to drive struct, it's inherently per-drive
To generate a diff of this commit:
cvs rdiff -u -r1.132.8.22 -r1.132.8.23 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.92.8.20 -r1.92.8.21 src/sys/dev/ata/atavar.h
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/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.22 src/sys/dev/ata/ata.c:1.132.8.23
--- src/sys/dev/ata/ata.c:1.132.8.22 Sat Jul 29 12:58:29 2017
+++ src/sys/dev/ata/ata.c Tue Aug 1 21:39:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.132.8.22 2017/07/29 12:58:29 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.132.8.23 2017/08/01 21:39:51 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.22 2017/07/29 12:58:29 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.23 2017/08/01 21:39:51 jdolecek Exp $");
#include "opt_ata.h"
@@ -1051,7 +1051,7 @@ ata_read_log_ext_ncq(struct ata_drive_da
xfer = ata_get_xfer_ext(chp, C_RECOVERY, 0);
- tb = chp->ch_recovery;
+ tb = drvp->recovery_blk;
memset(tb, 0, DEV_BSIZE);
/*
Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.92.8.20 src/sys/dev/ata/atavar.h:1.92.8.21
--- src/sys/dev/ata/atavar.h:1.92.8.20 Sat Jul 29 12:58:29 2017
+++ src/sys/dev/ata/atavar.h Tue Aug 1 21:39:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.92.8.20 2017/07/29 12:58:29 jdolecek Exp $ */
+/* $NetBSD: atavar.h,v 1.92.8.21 2017/08/01 21:39:51 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -321,6 +321,9 @@ struct ata_drive_datas {
struct disklabel *lp; /* pointer to drive's label info */
uint8_t multi; /* # of blocks to transfer in multi-mode */
daddr_t badsect[127]; /* 126 plus trailing -1 marker */
+
+ /* Recovery buffer */
+ uint8_t recovery_blk[DEV_BSIZE];
};
/* User config flags that force (or disable) the use of a mode */
@@ -425,9 +428,6 @@ struct ata_channel {
/* Number of sata PMP ports, if any */
int ch_satapmp_nports;
-
- /* Recovery buffer */
- uint8_t ch_recovery[DEV_BSIZE];
};
/*
