PERFORCE change 108062 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=108062

Change 108062 by mjacob at newisp on 2006/10/18 20:24:20

	Make the modifier tag for a marker type a short, not
	       8 bits. That makes SBus cards work better.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp_library.c#10 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp_library.c#10 (text) ====

@@ -375,19 +375,16 @@
 	if (ISP_IS_SBUS(isp)) {
 		ISP_IOXPUT_8(isp, src->mrk_reserved0, &dst->mrk_target);
 		ISP_IOXPUT_8(isp, src->mrk_target, &dst->mrk_reserved0);
-		ISP_IOXPUT_8(isp, src->mrk_reserved1, &dst->mrk_modifier);
-		ISP_IOXPUT_8(isp, src->mrk_modifier, &dst->mrk_reserved1);
 	} else {
 		ISP_IOXPUT_8(isp, src->mrk_reserved0, &dst->mrk_reserved0);
 		ISP_IOXPUT_8(isp, src->mrk_target, &dst->mrk_target);
-		ISP_IOXPUT_8(isp, src->mrk_modifier, &dst->mrk_modifier);
-		ISP_IOXPUT_8(isp, src->mrk_reserved1, &dst->mrk_reserved1);
 	}
+	ISP_IOXPUT_16(isp, src->mrk_modifier, &dst->mrk_modifier);
 	ISP_IOXPUT_16(isp, src->mrk_flags, &dst->mrk_flags);
 	ISP_IOXPUT_16(isp, src->mrk_lun, &dst->mrk_lun);
 	for (i = 0; i < 48; i++) {
-		ISP_IOXPUT_8(isp, src->mrk_reserved2[i],
-		    &dst->mrk_reserved2[i]);
+		ISP_IOXPUT_8(isp, src->mrk_reserved1[i],
+		    &dst->mrk_reserved1[i]);
 	}
 }