Add handling for IGNORE WIDE RESIDUE messages. Actually calculate

resid instead of assuming it is always 0. From bouyer via NetBSD. Note
we are now sync'd with the latest (1.78 siop.c, 1.37 siop_common.c)
NetBSD code.

Tested by various people over the last year+. Didn't solve any of
their problems but didn't cause any regression either.

1 files changed, 87 insertions, 89 deletions

diff --git a/sys/dev/microcode/siop/siop.out b/sys/dev/microcode/siop/siop.out
index a33107b624e..bae025cb8da 100644
--- a/sys/dev/microcode/siop/siop.out
+++ b/sys/dev/microcode/siop/siop.out
@@ -1,19 +1,19 @@
-/*	$OpenBSD: siop.out,v 1.6 2005/10/08 15:59:05 krw Exp $	*/
+/*	$OpenBSD: siop.out,v 1.7 2005/10/10 16:27:24 krw Exp $	*/
 /*
  *	DO NOT EDIT - this file is automatically generated.
- *	created from siop.ss on Sat Oct  8 11:55:06 2005
+ *	created from siop.ss on Mon Oct 10 12:15:59 2005
  */
 const u_int32_t siop_script[] = {
 	0x78340000, 0x00000000,			/* 000 -   0 */
 	0x78350000, 0x00000000,			/* 008 -   8 */
 	0x72370000, 0x00000000,			/* 010 -  16 */
 	0x80840020, 0x00000318,			/* 018 -  24 */
-	0x868b0000, 0x00000380,			/* 020 -  32 */
+	0x868b0000, 0x00000370,			/* 020 -  32 */
 	0x878b0000, 0x000002f8,			/* 028 -  40 */
-	0x808b0000, 0x00000408,			/* 030 -  48 */
-	0x818b0000, 0x000003a0,			/* 038 -  56 */
-	0x828b0000, 0x00000378,			/* 040 -  64 */
-	0x838b0000, 0x00000380,			/* 048 -  72 */
+	0x808b0000, 0x000003f8,			/* 030 -  48 */
+	0x818b0000, 0x00000390,			/* 038 -  56 */
+	0x828b0000, 0x00000368,			/* 040 -  64 */
+	0x838b0000, 0x00000370,			/* 048 -  72 */
 	0x98080000, 0x0000ffff,			/* 050 -  80 */
 	0x741a4000, 0x00000000,			/* 058 -  88 */
 	0x980c0000, 0x0000ff83,			/* 060 -  96 */
@@ -107,83 +107,81 @@ const u_int32_t siop_script[] = {
 	0x7a340100, 0x00000000,			/* 320 - 800 */
 	0x60000008, 0x00000000,			/* 328 - 808 */
 	0x1f000038, 0x00000038,			/* 330 - 816 */
-	0x808c0000, 0x00000218,			/* 338 - 824 */
+	0x808c0000, 0x00000208,			/* 338 - 824 */
 	0x808c0002, 0xffffffd0,			/* 340 - 832 */
-	0x808c0001, 0x00000218,			/* 348 - 840 */
+	0x808c0001, 0x00000208,			/* 348 - 840 */
 	0x98040004, 0x0000ff01,			/* 350 - 848 */
-	0x88880000, 0x000001d0,			/* 358 - 856 */
+	0x88880000, 0x000001c0,			/* 358 - 856 */
 	0x74340100, 0x00000000,			/* 360 - 864 */
 	0x808c0000, 0xfffffd00,			/* 368 - 872 */
-	0x72350000, 0x00000000,			/* 370 - 880 */
-	0x808c0000, 0xfffffcf0,			/* 378 - 888 */
-	0x98080000, 0x0000ff04,			/* 380 - 896 */
-	0x60000040, 0x00000000,			/* 388 - 904 */
-	0x80880000, 0xfffffc88,			/* 390 - 912 */
-	0x58000008, 0x00000000,			/* 398 - 920 */
-	0x60000040, 0x00000000,			/* 3a0 - 928 */
-	0x1e000050, 0x00000050,			/* 3a8 - 936 */
-	0x60000008, 0x00000000,			/* 3b0 - 944 */
+	0x98080000, 0x0000ff04,			/* 370 - 880 */
+	0x60000040, 0x00000000,			/* 378 - 888 */
+	0x80880000, 0xfffffc98,			/* 380 - 896 */
+	0x58000008, 0x00000000,			/* 388 - 904 */
+	0x60000040, 0x00000000,			/* 390 - 912 */
+	0x1e000050, 0x00000050,			/* 398 - 920 */
+	0x60000008, 0x00000000,			/* 3a0 - 928 */
+	0x80880000, 0xfffffc70,			/* 3a8 - 936 */
+	0x1a000058, 0x00000058,			/* 3b0 - 944 */
 	0x80880000, 0xfffffc60,			/* 3b8 - 952 */
-	0x1a000058, 0x00000058,			/* 3c0 - 960 */
+	0x1b000060, 0x00000060,			/* 3c0 - 960 */
 	0x80880000, 0xfffffc50,			/* 3c8 - 968 */
-	0x1b000060, 0x00000060,			/* 3d0 - 976 */
-	0x80880000, 0xfffffc40,			/* 3d8 - 984 */
-	0x88880000, 0x000000b8,			/* 3e0 - 992 */
-	0x7a340200, 0x00000000,			/* 3e8 - 1000 */
-	0x19000068, 0x00000068,			/* 3f0 - 1008 */
-	0x7e350100, 0x00000000,			/* 3f8 - 1016 */
-	0x7e100800, 0x00000000,			/* 400 - 1024 */
-	0x7f110000, 0x00000000,			/* 408 - 1032 */
-	0x7f120000, 0x00000000,			/* 410 - 1040 */
-	0x7f130000, 0x00000000,			/* 418 - 1048 */
-	0x818b0000, 0xffffffc8,			/* 420 - 1056 */
-	0x88880000, 0x000000b8,			/* 428 - 1064 */
-	0x7c34fd00, 0x00000000,			/* 430 - 1072 */
-	0x80880000, 0xfffffbe0,			/* 438 - 1080 */
-	0x88880000, 0x00000058,			/* 440 - 1088 */
-	0x7a340200, 0x00000000,			/* 448 - 1096 */
-	0x18000068, 0x00000068,			/* 450 - 1104 */
-	0x7e350100, 0x00000000,			/* 458 - 1112 */
-	0x7e100800, 0x00000000,			/* 460 - 1120 */
-	0x7f110000, 0x00000000,			/* 468 - 1128 */
-	0x7f120000, 0x00000000,			/* 470 - 1136 */
-	0x7f130000, 0x00000000,			/* 478 - 1144 */
-	0x808b0000, 0xffffffc8,			/* 480 - 1152 */
-	0x88880000, 0x00000058,			/* 488 - 1160 */
-	0x7c34fd00, 0x00000000,			/* 490 - 1168 */
-	0x80880000, 0xfffffb80,			/* 498 - 1176 */
-	0x72100000, 0x00000000,			/* 4a0 - 1184 */
-	0x6a5c0000, 0x00000000,			/* 4a8 - 1192 */
-	0x72110000, 0x00000000,			/* 4b0 - 1200 */
-	0x6a5d0000, 0x00000000,			/* 4b8 - 1208 */
-	0x72120000, 0x00000000,			/* 4c0 - 1216 */
-	0x6a5e0000, 0x00000000,			/* 4c8 - 1224 */
-	0x72130000, 0x00000000,			/* 4d0 - 1232 */
-	0x6a5f0000, 0x00000000,			/* 4d8 - 1240 */
-	0x90080000, 0x00000000,			/* 4e0 - 1248 */
-	0x725c0000, 0x00000000,			/* 4e8 - 1256 */
-	0x6a100000, 0x00000000,			/* 4f0 - 1264 */
-	0x725d0000, 0x00000000,			/* 4f8 - 1272 */
-	0x6a110000, 0x00000000,			/* 500 - 1280 */
-	0x725e0000, 0x00000000,			/* 508 - 1288 */
-	0x6a120000, 0x00000000,			/* 510 - 1296 */
-	0x725f0000, 0x00000000,			/* 518 - 1304 */
-	0x6a130000, 0x00000000,			/* 520 - 1312 */
-	0x90080000, 0x00000000,			/* 528 - 1320 */
-	0x7c027f00, 0x00000000,			/* 530 - 1328 */
-	0x60000008, 0x00000000,			/* 538 - 1336 */
-	0x60000040, 0x00000000,			/* 540 - 1344 */
-	0x48000000, 0x00000000,			/* 548 - 1352 */
-	0x90080000, 0x00000000,			/* 550 - 1360 */
-	0x88880000, 0xffffffd0,			/* 558 - 1368 */
-	0x98080000, 0x0000ff00,			/* 560 - 1376 */
-	0x60000040, 0x00000000,			/* 568 - 1384 */
-	0x1f000040, 0x00000040,			/* 570 - 1392 */
-	0x98080000, 0x0000ff02,			/* 578 - 1400 */
-	0x60000040, 0x00000000,			/* 580 - 1408 */
-	0x1f000048, 0x00000048,			/* 588 - 1416 */
-	0x98080000, 0x0000ff03,			/* 590 - 1424 */
-	0x80000000, 0x00000000,			/* 598 - 1432 */
+	0x88880000, 0x000000b8,			/* 3d0 - 976 */
+	0x7a340200, 0x00000000,			/* 3d8 - 984 */
+	0x19000068, 0x00000068,			/* 3e0 - 992 */
+	0x7e350100, 0x00000000,			/* 3e8 - 1000 */
+	0x7e100800, 0x00000000,			/* 3f0 - 1008 */
+	0x7f110000, 0x00000000,			/* 3f8 - 1016 */
+	0x7f120000, 0x00000000,			/* 400 - 1024 */
+	0x7f130000, 0x00000000,			/* 408 - 1032 */
+	0x818b0000, 0xffffffc8,			/* 410 - 1040 */
+	0x88880000, 0x000000b8,			/* 418 - 1048 */
+	0x7c34fd00, 0x00000000,			/* 420 - 1056 */
+	0x80880000, 0xfffffbf0,			/* 428 - 1064 */
+	0x88880000, 0x00000058,			/* 430 - 1072 */
+	0x7a340200, 0x00000000,			/* 438 - 1080 */
+	0x18000068, 0x00000068,			/* 440 - 1088 */
+	0x7e350100, 0x00000000,			/* 448 - 1096 */
+	0x7e100800, 0x00000000,			/* 450 - 1104 */
+	0x7f110000, 0x00000000,			/* 458 - 1112 */
+	0x7f120000, 0x00000000,			/* 460 - 1120 */
+	0x7f130000, 0x00000000,			/* 468 - 1128 */
+	0x808b0000, 0xffffffc8,			/* 470 - 1136 */
+	0x88880000, 0x00000058,			/* 478 - 1144 */
+	0x7c34fd00, 0x00000000,			/* 480 - 1152 */
+	0x80880000, 0xfffffb90,			/* 488 - 1160 */
+	0x72100000, 0x00000000,			/* 490 - 1168 */
+	0x6a5c0000, 0x00000000,			/* 498 - 1176 */
+	0x72110000, 0x00000000,			/* 4a0 - 1184 */
+	0x6a5d0000, 0x00000000,			/* 4a8 - 1192 */
+	0x72120000, 0x00000000,			/* 4b0 - 1200 */
+	0x6a5e0000, 0x00000000,			/* 4b8 - 1208 */
+	0x72130000, 0x00000000,			/* 4c0 - 1216 */
+	0x6a5f0000, 0x00000000,			/* 4c8 - 1224 */
+	0x90080000, 0x00000000,			/* 4d0 - 1232 */
+	0x725c0000, 0x00000000,			/* 4d8 - 1240 */
+	0x6a100000, 0x00000000,			/* 4e0 - 1248 */
+	0x725d0000, 0x00000000,			/* 4e8 - 1256 */
+	0x6a110000, 0x00000000,			/* 4f0 - 1264 */
+	0x725e0000, 0x00000000,			/* 4f8 - 1272 */
+	0x6a120000, 0x00000000,			/* 500 - 1280 */
+	0x725f0000, 0x00000000,			/* 508 - 1288 */
+	0x6a130000, 0x00000000,			/* 510 - 1296 */
+	0x90080000, 0x00000000,			/* 518 - 1304 */
+	0x7c027f00, 0x00000000,			/* 520 - 1312 */
+	0x60000008, 0x00000000,			/* 528 - 1320 */
+	0x60000040, 0x00000000,			/* 530 - 1328 */
+	0x48000000, 0x00000000,			/* 538 - 1336 */
+	0x90080000, 0x00000000,			/* 540 - 1344 */
+	0x88880000, 0xffffffd0,			/* 548 - 1352 */
+	0x98080000, 0x0000ff00,			/* 550 - 1360 */
+	0x60000040, 0x00000000,			/* 558 - 1368 */
+	0x1f000040, 0x00000040,			/* 560 - 1376 */
+	0x98080000, 0x0000ff02,			/* 568 - 1384 */
+	0x60000040, 0x00000000,			/* 570 - 1392 */
+	0x1f000048, 0x00000048,			/* 578 - 1400 */
+	0x98080000, 0x0000ff03,			/* 580 - 1408 */
+	0x80000000, 0x00000000,			/* 588 - 1416 */
 };
 
 const u_int32_t lun_switch[] = {
@@ -261,24 +259,24 @@ const u_int32_t siop_led_off[] = {
 #define	A_flag_data	0x00000002
 #define	A_flag_data_mask	0x000000fd
 #define	Ent_waitphase	0x00000020
-#define	Ent_send_msgout	0x00000398
-#define	Ent_msgout	0x000003a8
+#define	Ent_send_msgout	0x00000388
+#define	Ent_msgout	0x00000398
 #define	Ent_msgin	0x00000328
 #define	Ent_handle_msgin	0x00000338
-#define	Ent_msgin_ack	0x00000388
-#define	Ent_dataout	0x00000440
-#define	Ent_datain	0x000003e0
-#define	Ent_cmdout	0x000003c0
-#define	Ent_status	0x000003d0
-#define	Ent_disconnect	0x00000530
+#define	Ent_msgin_ack	0x00000378
+#define	Ent_dataout	0x00000430
+#define	Ent_datain	0x000003d0
+#define	Ent_cmdout	0x000003b0
+#define	Ent_status	0x000003c0
+#define	Ent_disconnect	0x00000520
 #define	Ent_reselect	0x000001e0
 #define	Ent_reselected	0x00000000
-#define	Ent_selected	0x00000388
+#define	Ent_selected	0x00000378
 #define	Ent_script_sched	0x00000070
 #define	Ent_script_sched_slot0	0x000000a0
-#define	Ent_get_extmsgdata	0x00000580
+#define	Ent_get_extmsgdata	0x00000570
 #define	Ent_resel_targ0	0x00000238
-#define	Ent_msgin_space	0x00000598
+#define	Ent_msgin_space	0x00000588
 #define	Ent_lunsw_return	0x000002b8
 #define	Ent_led_on1	0x00000068
 #define	Ent_led_on2	0x00000220