Module Name: src
Committed By: phx
Date: Tue Jun 10 18:37:26 UTC 2014
Modified Files:
src/sys/arch/bebox/stand/boot: sd.c
src/sys/arch/prep/stand/boot: sd.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/bebox/stand/boot/sd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/prep/stand/boot/sd.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/arch/bebox/stand/boot/sd.c
diff -u src/sys/arch/bebox/stand/boot/sd.c:1.3 src/sys/arch/bebox/stand/boot/sd.c:1.4
--- src/sys/arch/bebox/stand/boot/sd.c:1.3 Wed Dec 19 13:53:47 2012
+++ src/sys/arch/bebox/stand/boot/sd.c Tue Jun 10 18:37:26 2014
@@ -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 @@ sdstrategy(void *f, int rw, daddr_t dblk
} 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 @@ sdstrategy(void *f, int rw, daddr_t dblk
} 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);
Index: src/sys/arch/prep/stand/boot/sd.c
diff -u src/sys/arch/prep/stand/boot/sd.c:1.1 src/sys/arch/prep/stand/boot/sd.c:1.2
--- src/sys/arch/prep/stand/boot/sd.c:1.1 Sat May 19 14:40:13 2012
+++ src/sys/arch/prep/stand/boot/sd.c Tue Jun 10 18:37:26 2014
@@ -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 @@ sdstrategy(void *f, int rw, daddr_t dblk
} 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 @@ sdstrategy(void *f, int rw, daddr_t dblk
} 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);
