Subject: port-alpha/17677: Kernel config files have ADW incorrect options
To: None <gnats-bugs@gnats.netbsd.org>
From: Julio Merino <jmmv@hispabsd.org>
List: netbsd-bugs
Date: 07/22/2002 15:54:24
>Number:         17677
>Category:       port-alpha
>Synopsis:       Kernel config files have ADW incorrect options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    port-alpha-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jul 22 06:53:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6D
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar.local 1.6D NetBSD 1.6D (DARKSTAR) #0: Mon Jul 22 12:44:12 CEST 2002 jmmv@darkstar.local:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	Most of the example configuration files included in sys/arch/alpha/conf
	use ADW_*_DISABLE options (all commented out). According to the adw(4)
	manpage and to sources, these variables should be SCSI_ADW_*_DISABLE.
>How-To-Repeat:
	
>Fix:

Index: ALPHA
===================================================================
RCS file: /pub/NetBSD-CVS/syssrc/sys/arch/alpha/conf/ALPHA,v
retrieving revision 1.166
diff -u -u -r1.166 ALPHA
--- ALPHA	2002/06/17 05:14:04	1.166
+++ ALPHA	2002/07/22 13:49:57
@@ -238,9 +238,9 @@
 # PCI devices
 adv*	at	pci? dev ? function ?		# AdvanSys SCSI
 adw*	at	pci? dev ? function ?		# AdvanSys Wide SCSI
-#options 	ADW_WDTR_DISABLE		# 	disable WDTR
-#options 	ADW_SDTR_DISABLE		# 	disable SDTR
-#options 	ADW_TAGQ_DISABLE		# 	disable Tag Queuing
+#options 	SCSI_ADW_WDTR_DISABLE		# 	disable WDTR
+#options 	SCSI_ADW_SDTR_DISABLE		# 	disable SDTR
+#options 	SCSI_ADW_TAGQ_DISABLE		# 	disable Tag Queuing
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
Index: BASIL
===================================================================
RCS file: /pub/NetBSD-CVS/syssrc/sys/arch/alpha/conf/BASIL,v
retrieving revision 1.12
diff -u -u -r1.12 BASIL
--- BASIL	2002/06/17 05:14:04	1.12
+++ BASIL	2002/07/22 13:49:57
@@ -205,9 +205,9 @@
 # PCI devices
 adv*	at	pci? dev ? function ?		# AdvanSys SCSI
 adw*	at	pci? dev ? function ?		# AdvanSys Wide SCSI
-#options 	ADW_WDTR_DISABLE		# 	disable WDTR
-#options 	ADW_SDTR_DISABLE		# 	disable SDTR
-#options 	ADW_TAGQ_DISABLE		# 	disable Tag Queuing
+#options 	SCSI_ADW_WDTR_DISABLE		# 	disable WDTR
+#options 	SCSI_ADW_SDTR_DISABLE		# 	disable SDTR
+#options 	SCSI_ADW_TAGQ_DISABLE		# 	disable Tag Queuing
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 #cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
Index: FRAU-FARBISSINA
===================================================================
RCS file: /pub/NetBSD-CVS/syssrc/sys/arch/alpha/conf/FRAU-FARBISSINA,v
retrieving revision 1.17
diff -u -u -r1.17 FRAU-FARBISSINA
--- FRAU-FARBISSINA	2002/06/17 05:14:04	1.17
+++ FRAU-FARBISSINA	2002/07/22 13:49:57
@@ -180,9 +180,9 @@
 # PCI devices
 #adv*	at	pci? dev ? function ?		# AdvanSys SCSI
 adw*	at	pci? dev ? function ?		# AdvanSys Wide SCSI
-#options 	ADW_WDTR_DISABLE		# 	disable WDTR
-#options 	ADW_SDTR_DISABLE		# 	disable SDTR
-#options 	ADW_TAGQ_DISABLE		# 	disable Tag Queuing
+#options 	SCSI_ADW_WDTR_DISABLE		# 	disable WDTR
+#options 	SCSI_ADW_SDTR_DISABLE		# 	disable SDTR
+#options 	SCSI_ADW_TAGQ_DISABLE		# 	disable Tag Queuing
 #ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 #bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 #cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
Index: GENERIC
===================================================================
RCS file: /pub/NetBSD-CVS/syssrc/sys/arch/alpha/conf/GENERIC,v
retrieving revision 1.210
diff -u -u -r1.210 GENERIC
--- GENERIC	2002/07/10 22:05:29	1.210
+++ GENERIC	2002/07/22 13:49:58
@@ -239,9 +239,9 @@
 # PCI devices
 adv*	at	pci? dev ? function ?		# AdvanSys SCSI
 adw*	at	pci? dev ? function ?		# AdvanSys Wide SCSI
-#options 	ADW_WDTR_DISABLE		# 	disable WDTR
-#options 	ADW_SDTR_DISABLE		# 	disable SDTR
-#options 	ADW_TAGQ_DISABLE		# 	disable Tag Queuing
+#options 	SCSI_ADW_WDTR_DISABLE		# 	disable WDTR
+#options 	SCSI_ADW_SDTR_DISABLE		# 	disable SDTR
+#options 	SCSI_ADW_TAGQ_DISABLE		# 	disable Tag Queuing
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
Index: INSTALL
===================================================================
RCS file: /pub/NetBSD-CVS/syssrc/sys/arch/alpha/conf/INSTALL,v
retrieving revision 1.65
diff -u -u -r1.65 INSTALL
--- INSTALL	2002/07/05 13:40:10	1.65
+++ INSTALL	2002/07/22 13:49:58
@@ -164,9 +164,9 @@
 # PCI devices
 adv*	at	pci? dev ? function ?		# AdvanSys SCSI
 adw*	at	pci? dev ? function ?		# AdvanSys Wide SCSI
-#options 	ADW_WDTR_DISABLE		# 	disable WDTR
-#options 	ADW_SDTR_DISABLE		# 	disable SDTR
-#options 	ADW_TAGQ_DISABLE		# 	disable Tag Queuing
+#options 	SCSI_ADW_WDTR_DISABLE		# 	disable WDTR
+#options 	SCSI_ADW_SDTR_DISABLE		# 	disable SDTR
+#options 	SCSI_ADW_TAGQ_DISABLE		# 	disable Tag Queuing
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
>Release-Note:
>Audit-Trail:
>Unformatted: