[src/jdolecek-ncq]: src/sys/dev/ata move the drive recovery block to drive st...

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

details:   https://anonhg.NetBSD.org/src/rev/65708947d8b8
branches:  jdolecek-ncq
changeset: 822986:65708947d8b8
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Aug 01 21:39:51 2017 +0000

description:
move the drive recovery block to drive struct, it's inherently per-drive

diffstat:

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

diffs (56 lines):

diff -r 652e4b0f56ed -r 65708947d8b8 sys/dev/ata/ata.c
--- a/sys/dev/ata/ata.c Mon Jul 31 20:11:17 2017 +0000
+++ b/sys/dev/ata/ata.c Tue Aug 01 21:39:51 2017 +0000
@@ -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 @@
 
        xfer = ata_get_xfer_ext(chp, C_RECOVERY, 0);
 
-       tb = chp->ch_recovery;
+       tb = drvp->recovery_blk;
        memset(tb, 0, DEV_BSIZE);
 
        /*
diff -r 652e4b0f56ed -r 65708947d8b8 sys/dev/ata/atavar.h
--- a/sys/dev/ata/atavar.h      Mon Jul 31 20:11:17 2017 +0000
+++ b/sys/dev/ata/atavar.h      Tue Aug 01 21:39:51 2017 +0000
@@ -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 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 @@
 
        /* Number of sata PMP ports, if any */
        int ch_satapmp_nports;
-
-       /* Recovery buffer */
-       uint8_t ch_recovery[DEV_BSIZE];
 };
 
 /*