>Number:         13139
>Category:       kern
>Synopsis:       fixes to adv driver
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jun 08 07:15:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     YAMAMOTO Takashi
>Release:        1.5W
>Organization:
>Environment:
	
System: NetBSD capybara 1.5W NetBSD 1.5W (stg) #274: Fri Jun 8 22:59:09 JST 2001 takashi@capybara:/usr/src/sys/arch/i386/compile/stg i386
Architecture: i386
Machine: i386
>Description:
	- set XS_TIMEOUT when timeout
	- differnce from original linux driver(by mistake?)
>How-To-Repeat:
>Fix:
Index: adv.c
===================================================================
RCS file: /cvs/cvsroot/syssrc/sys/dev/ic/adv.c,v
retrieving revision 1.24
diff -u -r1.24 adv.c
--- adv.c	2001/04/25 17:53:28	1.24
+++ adv.c	2001/06/08 13:58:35
@@ -963,6 +963,10 @@
 			}
 			break;
 
+		case ASC_QHSTA_M_SEL_TIMEOUT:
+			xs->error = XS_TIMEOUT;
+			break;
+
 		default:
 			/* QHSTA error occurred */
 			xs->error = XS_DRIVER_STUFFUP;
Index: advlib.c
===================================================================
RCS file: /cvs/cvsroot/syssrc/sys/dev/ic/advlib.c,v
retrieving revision 1.15
diff -u -r1.15 advlib.c
--- advlib.c	2001/04/30 02:57:17	1.15
+++ advlib.c	2001/06/08 13:58:52
@@ -702,7 +702,7 @@
 	DvcSleepMilliSecond(200);
 
 	ASC_SET_CHIP_STATUS(iot, ioh, ASC_CIW_CLR_SCSI_RESET_INT);
-	AscStartChip(iot, ioh);
+	ASC_SET_CHIP_STATUS(iot, ioh, 0);
 
 	DvcSleepMilliSecond(200);
 
@@ -986,7 +986,7 @@
 		word_data |= ((u_int16_t) data) & 0x00FF;
 	}
 
-	AscWriteLramWord(iot, ioh, addr, word_data);
+	AscWriteLramWord(iot, ioh, addr & 0xFFFE, word_data);
 }
 
 
>Release-Note:
>Audit-Trail:
>Unformatted: