enable twe on amd64, tested with a 7006-2

ok brad@ jmc@

4 files changed, 14 insertions, 15 deletions

diff --git a/share/man/man4/man4.amd64/intro.4 b/share/man/man4/man4.amd64/intro.4
index 46b0244f86c..2acc15f66ba 100644
--- a/share/man/man4/man4.amd64/intro.4
+++ b/share/man/man4/man4.amd64/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.22 2006/04/21 08:48:01 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.23 2006/05/13 21:15:11 martin Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -347,8 +347,8 @@ Alteon Tigon I & II Gigabit Ethernet (3Com 3C985, Netgear GA620, etc).
 .\"IBM TROPIC Token-Ring adapters.
 .\".It Xr trm 4
 .\"TRM-S1040 based PCI SCSI Host Adapters.
-.\".It Xr twe 4
-.\"3ware Escalade RAID controller.
+.It Xr twe 4
+3ware Escalade RAID controller.
 .It Xr txp 4
 3Com 3XP Typhoon/Sidewinder (3CR990) Ethernet.
 .It Xr uaudio 4
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index 7684ebca5fe..e97841b2965 100644
--- a/share/man/man4/twe.4
+++ b/share/man/man4/twe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: twe.4,v 1.21 2005/09/30 20:34:24 jaredy Exp $
+.\"	$OpenBSD: twe.4,v 1.22 2006/05/13 21:15:11 martin Exp $
 .\"
 .\" Michael Shalayeff, 2000. Public Domain.
 .\"
@@ -16,12 +16,13 @@ The
 .Nm
 driver provides support for the Escalade family of RAID controllers,
 including the
-.Tn 3W-5x00
+.Tn 3W-5x00 ,
+.Tn 3W-6x00 ,
 and
-.Tn 3W-6x00
+.Tn 3W-7x00
 models.
 .Pp
-These controllers support RAID 0, RAID 1, RAID 10, and JBOD
+These controllers support RAID 0, RAID 1, RAID 5, RAID 10, and JBOD
 configurations.
 All the RAID set volume management is done via the card's BIOS.
 .Pp
@@ -65,5 +66,3 @@ leave the array idle until all controller activity has ceased.
 None of the volume management or monitoring functions provided by the
 card's firmware are supported due to the fact that information
 on these functions is not public.
-.Pp
-Only the 3W-5400 has been tested, but others should work.
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 05d73e9b631..2be1b95b4ef 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.128 2006/05/13 04:46:15 brad Exp $
+#	$OpenBSD: GENERIC,v 1.129 2006/05/13 21:15:11 martin Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -240,8 +240,8 @@ scsibus* at mpt?
 #scsibus* at dpt?
 gdt*	at pci?				# ICP Vortex GDT RAID controllers
 scsibus* at gdt?
-#twe*	at pci?				# 3ware Escalade RAID controllers
-#scsibus* at twe?
+twe*	at pci?				# 3ware Escalade RAID controllers
+scsibus* at twe?
 #aac*	at pci?				# Adaptec FSA RAID controllers
 #scsibus* at aac?
 ami*	at pci?				# AMI MegaRAID controllers
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 6f30f3382d8..a633347f423 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.52 2006/05/13 04:46:15 brad Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.53 2006/05/13 21:15:11 martin Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -155,8 +155,8 @@ scsibus* at ami?
 #scsibus* at cac?
 ciss*	at pci?			# Compaq Smart ARRAY [56]* RAID controllers
 scsibus* at ciss?
-#twe*	at pci?			# 3ware Escalade RAID controllers
-#scsibus* at twe?
+twe*	at pci?			# 3ware Escalade RAID controllers
+scsibus* at twe?
 #iha*	at pci?			# Initio Ultra/UltraWide SCSI controllers
 #scsibus* at iha?
 isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel