[src/trunk]: src/sys/arch Fix SCSI reads beyond block 0x1fffff, by writing th...

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

details:   https://anonhg.NetBSD.org/src/rev/ca946e078371
branches:  trunk
changeset: 329817:ca946e078371
user:      phx <phx%NetBSD.org@localhost>
date:      Tue Jun 10 18:37:26 2014 +0000

description:
Fix SCSI reads beyond block 0x1fffff, by writing the READ_10/READ_16 opcode
into the correct scsipi_rw_10/scsipi_rw_16 command structure.

diffstat:

 sys/arch/bebox/stand/boot/sd.c |  6 +++---
 sys/arch/prep/stand/boot/sd.c  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 43d1e72783b7 -r ca946e078371 sys/arch/bebox/stand/boot/sd.c
--- a/sys/arch/bebox/stand/boot/sd.c    Tue Jun 10 18:27:41 2014 +0000
+++ b/sys/arch/bebox/stand/boot/sd.c    Tue Jun 10 18:37:26 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sd.c,v 1.3 2012/12/19 13:53:47 kiyohara Exp $  */
+/*     $NetBSD: sd.c,v 1.4 2014/06/10 18:37:26 phx Exp $       */
 /*
  * Copyright (c) 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -713,7 +713,7 @@
                } else if ((blkno & 0xffffffff) == blkno) {
                        /* 10-byte CDB */
                        memset(&cmd_big, 0, sizeof(cmd_big));
-                       cmd_small.opcode = READ_10;
+                       cmd_big.opcode = READ_10;
                        _lto4b(blkno, cmd_big.addr);
                        _lto2b(1, cmd_big.length);
                        cmdlen = sizeof(cmd_big);
@@ -721,7 +721,7 @@
                } else {
                        /* 16-byte CDB */
                        memset(&cmd16, 0, sizeof(cmd16));
-                       cmd_small.opcode = READ_16;
+                       cmd16.opcode = READ_16;
                        _lto8b(blkno, cmd16.addr);
                        _lto4b(1, cmd16.length);
                        cmdlen = sizeof(cmd16);
diff -r 43d1e72783b7 -r ca946e078371 sys/arch/prep/stand/boot/sd.c
--- a/sys/arch/prep/stand/boot/sd.c     Tue Jun 10 18:27:41 2014 +0000
+++ b/sys/arch/prep/stand/boot/sd.c     Tue Jun 10 18:37:26 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sd.c,v 1.1 2012/05/19 14:40:13 kiyohara Exp $  */
+/*     $NetBSD: sd.c,v 1.2 2014/06/10 18:37:26 phx Exp $       */
 /*
  * Copyright (c) 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -713,7 +713,7 @@
                } else if ((blkno & 0xffffffff) == blkno) {
                        /* 10-byte CDB */
                        memset(&cmd_big, 0, sizeof(cmd_big));
-                       cmd_small.opcode = READ_10;
+                       cmd_big.opcode = READ_10;
                        _lto4b(blkno, cmd_big.addr);
                        _lto2b(1, cmd_big.length);
                        cmdlen = sizeof(cmd_big);
@@ -721,7 +721,7 @@
                } else {
                        /* 16-byte CDB */
                        memset(&cmd16, 0, sizeof(cmd16));
-                       cmd_small.opcode = READ_16;
+                       cmd16.opcode = READ_16;
                        _lto8b(blkno, cmd16.addr);
                        _lto4b(1, cmd16.length);
                        cmdlen = sizeof(cmd16);