The latest release of the FreeBSD driver (twa) for

3ware's 9xxx series controllers.  This corresponds to
the 9.2 release (for FreeBSD 5.2.1) on the 3ware website.

Highlights of this release are:

1. The driver has been re-architected to use a "Common Layer"
    (all tw_cl* files), which is a consolidation of all OS-independent
    parts of the driver.  The FreeBSD OS specific portions of the
    driver go into an "OS Layer" (all tw_osl* files).
    This re-architecture is to achieve better maintainability, consistency
    of behavior across OS's, and better portability to new OS's (drivers
    for new OS's can be written by just adding an OS Layer that's specific
    to the OS, by complying to a "Common Layer Programming Interface" API.

2. The driver takes advantage of multiple processors.

3. The driver has a new firmware image bundled, the new features of which
   include Online Capacity Expansion and multi-lun support, among others.
   More details about 3ware's 9.2 release can be found here:
   http://www.3ware.com/download/Escalade9000Series/9.2/9.2_Release_Notes_Web.pdf

Since the Common Layer is used across OS's, the FreeBSD specific include
path for header files (/sys/dev/twa) is not part of the #include pre-processor
directive in any of the source files.  For being able to integrate twa into
the kernel despite this, Makefile.<arch> has been changed to add the include
path to CFLAGS.

Reviewed by: scottl

9 files changed, 23 insertions, 5 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 850e2e80063a..f7ae3b5866cb 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -87,4 +87,6 @@ __reml.S: $S/$M/$M/divrem.m4
 
 %RULES
 
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index ce37f7e69b4b..b7e9d4d88d15 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -52,4 +52,6 @@ MKMODULESENV+= MACHINE=amd64
 
 %RULES
 
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index e2ee825e7da9..09cf6c34678f 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -58,4 +58,6 @@ ldscript.$M: $S/conf/ldscript.$M
 	  sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
 %RULES
 	
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 9f10876ab666..42570c0a8588 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -46,4 +46,6 @@ MKMODULESENV+= MACHINE=i386
 
 %RULES
 
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 671d01c4c7e2..2c9aa78027e7 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -52,4 +52,6 @@ ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
 
 %RULES
 
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 32bb6f0df136..337b9b749485 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -46,4 +46,6 @@ MKMODULESENV+=	MACHINE=pc98
 
 %RULES
 
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 7b44dcd6f57b..093e21c986a4 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -51,4 +51,6 @@ CFLAGS+=	-fno-omit-frame-pointer
 
 %RULES
 
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 4f6888e0bc52..82d980ded0d6 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -46,4 +46,6 @@ MDOBJS=	exception.o interrupt.o
 
 %RULES
 
+CFLAGS+=-I/sys/dev/twa
+
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/files b/sys/conf/files
index 73fd93a147cb..d3d92386b6ce 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -799,11 +799,13 @@ dev/syscons/star/star_saver.c	optional star_saver
 dev/syscons/warp/warp_saver.c	optional warp_saver
 dev/tdfx/tdfx_pci.c		optional tdfx pci
 dev/trm/trm.c			optional trm
-dev/twa/twa.c			optional twa
-dev/twa/twa_cam.c		optional twa
-dev/twa/twa_freebsd.c		optional twa
-dev/twa/twa_fwimg.c		optional twa
-dev/twa/twa_globals.c		optional twa
+dev/twa/tw_cl_fwimg.c		optional twa
+dev/twa/tw_cl_init.c		optional twa
+dev/twa/tw_cl_intr.c		optional twa
+dev/twa/tw_cl_io.c		optional twa
+dev/twa/tw_cl_misc.c		optional twa
+dev/twa/tw_osl_cam.c		optional twa
+dev/twa/tw_osl_freebsd.c	optional twa
 dev/twe/twe.c			optional twe
 dev/twe/twe_freebsd.c		optional twe
 dev/tx/if_tx.c			optional tx