Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Change the SCSI select timeout from 2ms to 250ms as...



details:   https://anonhg.NetBSD.org/src/rev/17a5896ed287
branches:  trunk
changeset: 325649:17a5896ed287
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jan 02 17:43:32 2014 +0000

description:
Change the SCSI select timeout from 2ms to 250ms as kernel spc(4) driver does.

Noticed by miod@openbsd.

diffstat:

 sys/arch/hp300/stand/common/scsi.c |  10 +++++-----
 sys/arch/luna68k/stand/boot/sc.c   |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r 0bbf8dc105c4 -r 17a5896ed287 sys/arch/hp300/stand/common/scsi.c
--- a/sys/arch/hp300/stand/common/scsi.c        Thu Jan 02 16:46:40 2014 +0000
+++ b/sys/arch/hp300/stand/common/scsi.c        Thu Jan 02 17:43:32 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsi.c,v 1.10 2011/02/08 20:20:14 rmind Exp $  */
+/*     $NetBSD: scsi.c,v 1.11 2014/01/02 17:43:32 tsutsui Exp $        */
 
 /*
  * This is reported to fix some odd failures when disklabeling
@@ -181,10 +181,10 @@
 
        hd->scsi_pctl = 0;
        hd->scsi_temp = (1 << target) | our_addr;
-       /* select timeout is hardcoded to 2ms */
-       hd->scsi_tch = 0;
-       hd->scsi_tcm = 32;
-       hd->scsi_tcl = 4;
+       /* select timeout is hardcoded to 250ms */
+       hd->scsi_tch = 2;
+       hd->scsi_tcm = 113;
+       hd->scsi_tcl = 3;
 
        hd->scsi_scmd = SCMD_SELECT;
        return 0;
diff -r 0bbf8dc105c4 -r 17a5896ed287 sys/arch/luna68k/stand/boot/sc.c
--- a/sys/arch/luna68k/stand/boot/sc.c  Thu Jan 02 16:46:40 2014 +0000
+++ b/sys/arch/luna68k/stand/boot/sc.c  Thu Jan 02 17:43:32 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sc.c,v 1.4 2013/01/22 15:48:40 tsutsui Exp $   */
+/*     $NetBSD: sc.c,v 1.5 2014/01/02 17:47:23 tsutsui Exp $   */
 
 /*
  * Copyright (c) 1992 OMRON Corporation.
@@ -191,10 +191,10 @@
        hd->scsi_pctl = 0;
        hd->scsi_temp = (1 << SCSI_ID) | (1 << target);
 
-       /* select timeout is hardcoded to 2ms */
-       hd->scsi_tch = 0;
-       hd->scsi_tcm = 32;
-       hd->scsi_tcl = 4;
+       /* select timeout is hardcoded to 250ms */
+       hd->scsi_tch = 2;
+       hd->scsi_tcm = 113;
+       hd->scsi_tcl = 3;
 
        hd->scsi_scmd = SCMD_SELECT;
 



Home | Main Index | Thread Index | Old Index