[Midnightbsd-cvs] src [7983] trunk/sys/dev/isp/isp.c: unbreak register tests for parallel scsi

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Sep 15 04:24:44 EDT 2016


Revision: 7983
          http://svnweb.midnightbsd.org/src/?rev=7983
Author:   laffer1
Date:     2016-09-15 04:24:44 -0400 (Thu, 15 Sep 2016)
Log Message:
-----------
unbreak register tests for parallel scsi

Modified Paths:
--------------
    trunk/sys/dev/isp/isp.c

Modified: trunk/sys/dev/isp/isp.c
===================================================================
--- trunk/sys/dev/isp/isp.c	2016-09-15 08:24:16 UTC (rev 7982)
+++ trunk/sys/dev/isp/isp.c	2016-09-15 08:24:44 UTC (rev 7983)
@@ -710,8 +710,11 @@
 			0x6666, 0x6677, 0x1122, 0x33ff,
 			0x0000, 0x0001, 0x1000, 0x1010,
 		};
+		int nmbox = ISP_NMBOX(isp);
+		if (IS_SCSI(isp))
+			nmbox = 6;
 		MBSINIT(&mbs, MBOX_MAILBOX_REG_TEST, MBLOGALL, 0);
-		for (i = 1; i < ISP_NMBOX(isp); i++) {
+		for (i = 1; i < nmbox; i++) {
 			mbs.param[i] = patterns[i];
 		}
 		isp_mboxcmd(isp, &mbs);
@@ -719,7 +722,7 @@
 			ISP_RESET0(isp);
 			return;
 		}
-		for (i = 1; i < ISP_NMBOX(isp); i++) {
+		for (i = 1; i < nmbox; i++) {
 			if (mbs.param[i] != patterns[i]) {
 				ISP_RESET0(isp);
 				isp_prt(isp, ISP_LOGERR, "Register Test Failed at Register %d: should have 0x%04x but got 0x%04x", i, patterns[i], mbs.param[i]);



More information about the Midnightbsd-cvs mailing list