6772008 Fix cstyle errors in emlxs driver.

6775030 move qlc header files to usr/src/uts/common/io/fibre-channel/fca/qlc
6775032 move emlxs header files to usr/src/uts/common/io/fibre-channel/fca/emlxs
6781785 lint warning in emlxs code

--HG--
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_adapters.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_adapters.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_config.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_config.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_device.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_device.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfc.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dfc.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfclib.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dfclib.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dhchap.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dhchap.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_extern.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_extern.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fc.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fc.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fcio.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fcio.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fct.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fct.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_hbaapi.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_hbaapi.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_hw.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_hw.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_mdb.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_mdb.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_menlo.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_menlo.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_messages.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_messages.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_msg.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_msg.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_os.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_os.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_thread.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_thread.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_version.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_version.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp10000.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp10000.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp11000.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp11000.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp11002.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp11002.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe11000.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe11000.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe11002.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe11002.h
rename : usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe12000.h => usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe12000.h
rename : usr/src/uts/common/sys/fibre-channel/fca/exioct.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/exioct.h
rename : usr/src/uts/common/sys/fibre-channel/fca/exioctso.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/exioctso.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_api.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_api.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_apps.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_apps.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_debug.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_debug.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_init.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_init.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_iocb.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_iocb.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_ioctl.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_ioctl.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_isr.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_isr.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_mbx.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_mbx.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_open.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_open.h
rename : usr/src/uts/common/sys/fibre-channel/fca/ql_xioctl.h => usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_xioctl.h

60 files changed, 51 insertions, 117 deletions

diff --git a/usr/src/cmd/mdb/intel/amd64/emlxs/Makefile b/usr/src/cmd/mdb/intel/amd64/emlxs/Makefile
index 75e72200e3..ac2ea37f54 100644
--- a/usr/src/cmd/mdb/intel/amd64/emlxs/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/emlxs/Makefile
@@ -28,7 +28,7 @@ MDBTGT = kvm
 
 MODSRCS = emlxs.c
 
-EMLXSBASE = ../../../../../uts/common/io/fibre-channel/fca/emlxs
+EMLXSBASE = ../../../../../uts/common/sys/fibre-channel/fca/emlxs
 
 include ../../../../Makefile.cmd
 include ../../../../Makefile.cmd.64
diff --git a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile
index 86414ba36c..fb2c6befef 100644
--- a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile
@@ -35,7 +35,7 @@ include ../../../Makefile.module
 
 CPPFLAGS += -I$(SRC)/uts/common
 CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel
-CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca
+CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca/qlc
 CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/impl
 
 LINTFLAGS64 +=  -erroff=E_STATIC_UNUSED -erroff=E_FUNC_SET_NOT_USED
diff --git a/usr/src/cmd/mdb/intel/ia32/emlxs/Makefile b/usr/src/cmd/mdb/intel/ia32/emlxs/Makefile
index aa152b66cc..7843988206 100644
--- a/usr/src/cmd/mdb/intel/ia32/emlxs/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/emlxs/Makefile
@@ -28,7 +28,7 @@ MDBTGT = kvm
 
 MODSRCS = emlxs.c
 
-EMLXSBASE = ../../../../../uts/common/io/fibre-channel/fca/emlxs
+EMLXSBASE = ../../../../../uts/common/sys/fibre-channel/fca/emlxs
 
 include ../../../../Makefile.cmd
 include ../../Makefile.ia32
diff --git a/usr/src/cmd/mdb/intel/ia32/qlc/Makefile b/usr/src/cmd/mdb/intel/ia32/qlc/Makefile
index 8920c98311..dd16ec40eb 100644
--- a/usr/src/cmd/mdb/intel/ia32/qlc/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/qlc/Makefile
@@ -34,7 +34,7 @@ include ../../../Makefile.module
 
 CPPFLAGS += -I$(SRC)/uts/common
 CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel
-CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca  
+CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca/qlc
 CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/impl
 
 LINTFLAGS +=  -erroff=E_STATIC_UNUSED -erroff=E_FUNC_SET_NOT_USED
diff --git a/usr/src/cmd/mdb/sparc/v9/emlxs/Makefile b/usr/src/cmd/mdb/sparc/v9/emlxs/Makefile
index 916d5f6d6b..e60fad7964 100644
--- a/usr/src/cmd/mdb/sparc/v9/emlxs/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/emlxs/Makefile
@@ -28,7 +28,7 @@ MDBTGT = kvm
 
 MODSRCS = emlxs.c
 
-EMLXSBASE = ../../../../../uts/common/io/fibre-channel/fca/emlxs
+EMLXSBASE = ../../../../../uts/common/sys/fibre-channel/fca/emlxs
 
 include ../../../../Makefile.cmd
 include ../../../../Makefile.cmd.64
diff --git a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile
index dce2cb3e6b..8471529aa5 100644
--- a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile
@@ -35,7 +35,7 @@ include ../../../Makefile.module
 
 CPPFLAGS += -I$(SRC)/uts/common
 CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel
-CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca
+CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca/qlc
 CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/impl
 
 LINTFLAGS64 +=  -erroff=E_STATIC_UNUSED -erroff=E_FUNC_SET_NOT_USED
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_clock.c b/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_clock.c
index 0f9e7978fe..904c3a7207 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_clock.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_clock.c
@@ -25,7 +25,7 @@
  */
 
 
-#include "emlxs.h"
+#include <emlxs.h>
 
 /* Timer period in seconds */
 #define	EMLXS_TIMER_PERIOD		1	/* secs */
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_solaris.c b/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_solaris.c
index a1042fde2c..ee4eb27971 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_solaris.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_solaris.c
@@ -1674,10 +1674,10 @@ emlxs_bind_port(dev_info_t *dip, fc_fca_port_info_t *port_info,
 	    vpd->fw_version, vpd->fw_label);
 
 #ifdef i386
-		sprintf(port_info->pi_attrs.option_rom_version,
+		(void) sprintf(port_info->pi_attrs.option_rom_version,
 		    "Boot:%s", vpd->boot_version);
 #else   /* sparc */
-		sprintf(port_info->pi_attrs.option_rom_version,
+		(void) sprintf(port_info->pi_attrs.option_rom_version,
 		    "Boot:%s Fcode:%s",
 		    vpd->boot_version, vpd->fcode_version);
 #endif  /* i386 */
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs.h
index 94613965d1..94613965d1 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_adapters.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_adapters.h
index 1098221b9a..1098221b9a 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_adapters.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_adapters.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_config.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_config.h
index 6d15a488f7..6d15a488f7 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_config.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_config.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_device.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_device.h
index 8900225614..8900225614 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_device.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_device.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfc.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dfc.h
index 8a3b326f5f..8a3b326f5f 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfc.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dfc.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfclib.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dfclib.h
index baabfe090e..baabfe090e 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfclib.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dfclib.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dhchap.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dhchap.h
index f6d0f745c5..f6d0f745c5 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dhchap.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_dhchap.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_extern.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_extern.h
index fc4332de16..fc4332de16 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_extern.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_extern.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fc.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fc.h
index ed7f53fdbf..ed7f53fdbf 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fc.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fc.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fcio.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fcio.h
index 3b44cce8e5..3b44cce8e5 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fcio.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fcio.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fct.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fct.h
index 2835ba6d46..2835ba6d46 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_fct.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_fct.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_hbaapi.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_hbaapi.h
index 8e412e9e1d..8e412e9e1d 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_hbaapi.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_hbaapi.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_hw.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_hw.h
index 5537240a3d..5537240a3d 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_hw.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_hw.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_mdb.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_mdb.h
index 02ee03031d..02ee03031d 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_mdb.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_mdb.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_menlo.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_menlo.h
index 773613b599..773613b599 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_menlo.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_menlo.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_messages.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_messages.h
index e107043e79..e107043e79 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_messages.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_messages.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_msg.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_msg.h
index 2fb9a67f5e..2fb9a67f5e 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_msg.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_msg.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_os.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_os.h
index 0c065a155d..0c065a155d 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_os.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_os.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_thread.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_thread.h
index 3dcdc8a632..3dcdc8a632 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_thread.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_thread.h
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_version.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_version.h
index 17ddbb7d41..15262fdcf4 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_version.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/emlxs_version.h
@@ -33,10 +33,10 @@ extern "C" {
 #endif
 
 #define	EMLXS_VERSION		"2.31p"
-#define	EMLXS_DATE_MINUTE	"30"	/* 00-59 */
-#define	EMLXS_DATE_HOUR		"16"	/* 00-23 */
-#define	EMLXS_DATE_DAY		"24"	/* 00-31 */
-#define	EMLXS_DATE_MONTH	"10"	/* 01-12 */
+#define	EMLXS_DATE_MINUTE	"00"	/* 00-59 */
+#define	EMLXS_DATE_HOUR		"22"	/* 00-23 */
+#define	EMLXS_DATE_DAY		"05"	/* 00-31 */
+#define	EMLXS_DATE_MONTH	"12"	/* 01-12 */
 #define	EMLXS_DATE_YEAR		"2008"	/* YYYY  */
 
 
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp10000.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp10000.h
index b386bc237d..780e22ba97 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp10000.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp10000.h
@@ -2,7 +2,7 @@
  * COPYRIGHT (c) 2004-2008 Emulex. All rights reserved.
  * Copying, access, use or distribution is under the terms
  * given in License 2 of LICENSE.txt file .
- */ 
+ */
 
 
 #ifndef	_FW_LP10000_H
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp11000.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp11000.h
index 8e6a372f89..1bd752a684 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp11000.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp11000.h
@@ -2,7 +2,7 @@
  * COPYRIGHT (c) 2004-2008 Emulex. All rights reserved.
  * Copying, access, use or distribution is under the terms
  * given in License 2 of LICENSE.txt file .
- */ 
+ */
 
 #ifndef	_FW_LP11000_H
 #define	_FW_LP11000_H
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp11002.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp11002.h
index 7f042034f4..9e17cdcbe6 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lp11002.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lp11002.h
@@ -2,7 +2,7 @@
  * COPYRIGHT (c) 2004-2008 Emulex. All rights reserved.
  * Copying, access, use or distribution is under the terms
  * given in License 2 of LICENSE.txt file .
- */ 
+ */
 
 #ifndef	_FW_LP11002_H
 #define	_FW_LP11002_H
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe11000.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe11000.h
index 8264f13b5b..9b00912e9b 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe11000.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe11000.h
@@ -2,7 +2,7 @@
  * COPYRIGHT (c) 2004-2008 Emulex. All rights reserved.
  * Copying, access, use or distribution is under the terms
  * given in License 2 of LICENSE.txt file .
- */ 
+ */
 
 #ifndef	_FW_LPe11000_H
 #define	_FW_LPe11000_H
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe11002.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe11002.h
index 2f2871d892..64bf71e986 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe11002.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe11002.h
@@ -2,7 +2,7 @@
  * COPYRIGHT (c) 2004-2008 Emulex. All rights reserved.
  * Copying, access, use or distribution is under the terms
  * given in License 2 of LICENSE.txt file .
- */ 
+ */
 
 #ifndef	_FW_LPe11002_H
 #define	_FW_LPe11002_H
diff --git a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe12000.h b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe12000.h
index 63711d22b4..aec3cb9f14 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/fw_lpe12000.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/emlxs/fw_lpe12000.h
@@ -2,7 +2,7 @@
  * COPYRIGHT (c) 2004-2008 Emulex. All rights reserved.
  * Copying, access, use or distribution is under the terms
  * given in License 2 of LICENSE.txt file .
- */ 
+ */
 
 #ifndef	_FW_LPe12000_H
 #define	_FW_LPe12000_H
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/exioct.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/exioct.h
index fb23652293..fb23652293 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/exioct.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/exioct.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/exioctso.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/exioctso.h
index 105823151d..105823151d 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/exioctso.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/exioctso.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_api.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_api.h
index 875d6b3326..875d6b3326 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_api.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_api.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_apps.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_apps.h
index 5e1e7b8a09..5e1e7b8a09 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_apps.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_apps.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_debug.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_debug.h
index 362916b71b..362916b71b 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_debug.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_debug.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_init.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_init.h
index 7bd055c9f7..7bd055c9f7 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_init.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_init.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_iocb.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_iocb.h
index 572e5e021f..572e5e021f 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_iocb.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_iocb.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_ioctl.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_ioctl.h
index e7fbfffecd..e7fbfffecd 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_ioctl.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_ioctl.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_isr.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_isr.h
index 1ad0421a1e..1ad0421a1e 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_isr.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_isr.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_mbx.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_mbx.h
index 4e9a6ca06e..4e9a6ca06e 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_mbx.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_mbx.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_open.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_open.h
index 1117ef57f1..1117ef57f1 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_open.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_open.h
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/ql_xioctl.h b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_xioctl.h
index 4bb0d3e7f9..4bb0d3e7f9 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/ql_xioctl.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/qlc/ql_xioctl.h
diff --git a/usr/src/uts/intel/emlxs/Makefile b/usr/src/uts/intel/emlxs/Makefile
index 759b234b0f..21a07d649a 100644
--- a/usr/src/uts/intel/emlxs/Makefile
+++ b/usr/src/uts/intel/emlxs/Makefile
@@ -22,11 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#	This makefile drives the production of the fct driver for 
-#	COMSTAR.
-
+# This makefile drives the production of the emlxs driver kernel module.
 #
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE		= ../../
 COMMON_BASE	= ../../../common
@@ -73,12 +71,12 @@ LINTTAGS                += $(EMLXS_LFLAGS) -DEMLXS_ARCH=\"$(CLASS)\"
 #
 MODSTUBS_DIR	 = $(OBJS_DIR)
 
-INC_PATH	+= -I$(UTSBASE)/common/io/fibre-channel/fca/emlxs
 INC_PATH	+= -I$(ROOT)/usr/include
 INC_PATH	+= -I$(UTSBASE)/common/sys
 INC_PATH	+= -I$(COMMON_BASE)/bignum
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca/emlxs
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/impl
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/ulp
 
diff --git a/usr/src/uts/intel/qlc/Makefile b/usr/src/uts/intel/qlc/Makefile
index 2bf3be0704..8d1fb0b5ee 100644
--- a/usr/src/uts/intel/qlc/Makefile
+++ b/usr/src/uts/intel/qlc/Makefile
@@ -22,15 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident "@(#)Makefile 1.10	08/07/25 SMI"
+# This makefile drives the production of qlc driver kernel module.
 #
-# This makefile drives the production of fcp driver kernel module.
-#
-# i86pc architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
@@ -62,7 +56,7 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 INC_PATH	+= -I$(ROOT)/usr/include
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/ulp
-INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca/qlc
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/impl
 
 LDFLAGS		+= -dy -Nmisc/fctl
diff --git a/usr/src/uts/intel/qlc_fw_2200/Makefile b/usr/src/uts/intel/qlc_fw_2200/Makefile
index 619b5c5fdd..ecf7f66f49 100644
--- a/usr/src/uts/intel/qlc_fw_2200/Makefile
+++ b/usr/src/uts/intel/qlc_fw_2200/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2200 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# intel rchitecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/intel/qlc_fw_2300/Makefile b/usr/src/uts/intel/qlc_fw_2300/Makefile
index d9a5c9c96b..b1801137f2 100644
--- a/usr/src/uts/intel/qlc_fw_2300/Makefile
+++ b/usr/src/uts/intel/qlc_fw_2300/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2300 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# intel rchitecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/intel/qlc_fw_2400/Makefile b/usr/src/uts/intel/qlc_fw_2400/Makefile
index 9bbdbdcd53..bd2f56cdb5 100644
--- a/usr/src/uts/intel/qlc_fw_2400/Makefile
+++ b/usr/src/uts/intel/qlc_fw_2400/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2400 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# intel architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/intel/qlc_fw_2500/Makefile b/usr/src/uts/intel/qlc_fw_2500/Makefile
index 36319098a4..f3bc21a51b 100644
--- a/usr/src/uts/intel/qlc_fw_2500/Makefile
+++ b/usr/src/uts/intel/qlc_fw_2500/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2500 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# intel architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/intel/qlc_fw_6322/Makefile b/usr/src/uts/intel/qlc_fw_6322/Makefile
index 1aba45c91f..69ef5777f8 100644
--- a/usr/src/uts/intel/qlc_fw_6322/Makefile
+++ b/usr/src/uts/intel/qlc_fw_6322/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_6322 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# intel architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/sparc/emlxs/Makefile b/usr/src/uts/sparc/emlxs/Makefile
index 92a5816fe2..0a7a37aa20 100644
--- a/usr/src/uts/sparc/emlxs/Makefile
+++ b/usr/src/uts/sparc/emlxs/Makefile
@@ -22,11 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#	This makefile drives the production of the fct driver for 
-#	COMSTAR.
-
+# This makefile drives the production of the emlxs driver kernel module.
 #
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE		= ../../
 COMMON_BASE	= ../../../common
@@ -74,11 +72,11 @@ LINTTAGS                += $(EMLXS_LFLAGS) -DEMLXS_ARCH=\"64\"
 MODSTUBS_DIR	 = $(OBJS_DIR)
 
 INC_PATH	+= -I$(ROOT)/usr/include
-INC_PATH	+= -I$(UTSBASE)/common/io/fibre-channel/fca/emlxs
 INC_PATH	+= -I$(UTSBASE)/common/sys
 INC_PATH	+= -I$(COMMON_BASE)/bignum
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca/emlxs
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/impl
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/ulp
 
diff --git a/usr/src/uts/sparc/qlc/Makefile b/usr/src/uts/sparc/qlc/Makefile
index fe1fa4bdd0..57b0b16006 100644
--- a/usr/src/uts/sparc/qlc/Makefile
+++ b/usr/src/uts/sparc/qlc/Makefile
@@ -22,15 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident "@(#)Makefile 1.10	08/07/25 SMI"
+# This makefile drives the production of qlc driver kernel module.
 #
-# This makefile drives the production of fcp driver kernel module.
-#
-# i86pc architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
@@ -62,7 +56,7 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 INC_PATH	+= -I$(ROOT)/usr/include
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/ulp
-INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca/qlc
 INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/impl
 
 LDFLAGS		+= -dy -Nmisc/fctl
diff --git a/usr/src/uts/sparc/qlc_fw_2200/Makefile b/usr/src/uts/sparc/qlc_fw_2200/Makefile
index ea58523440..157ad5a558 100644
--- a/usr/src/uts/sparc/qlc_fw_2200/Makefile
+++ b/usr/src/uts/sparc/qlc_fw_2200/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2200 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# sparc rchitecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/sparc/qlc_fw_2300/Makefile b/usr/src/uts/sparc/qlc_fw_2300/Makefile
index cf634ed0b8..6bff90a028 100644
--- a/usr/src/uts/sparc/qlc_fw_2300/Makefile
+++ b/usr/src/uts/sparc/qlc_fw_2300/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2300 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# sparc rchitecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/sparc/qlc_fw_2400/Makefile b/usr/src/uts/sparc/qlc_fw_2400/Makefile
index 78a03509c6..df071e6272 100644
--- a/usr/src/uts/sparc/qlc_fw_2400/Makefile
+++ b/usr/src/uts/sparc/qlc_fw_2400/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2400 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# sparc rchitecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/sparc/qlc_fw_2500/Makefile b/usr/src/uts/sparc/qlc_fw_2500/Makefile
index 106a527fa4..b4e7836162 100644
--- a/usr/src/uts/sparc/qlc_fw_2500/Makefile
+++ b/usr/src/uts/sparc/qlc_fw_2500/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_2500 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# sparc rchitecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..
 
diff --git a/usr/src/uts/sparc/qlc_fw_6322/Makefile b/usr/src/uts/sparc/qlc_fw_6322/Makefile
index 344bbe1875..b0b5de9ea7 100644
--- a/usr/src/uts/sparc/qlc_fw_6322/Makefile
+++ b/usr/src/uts/sparc/qlc_fw_6322/Makefile
@@ -22,14 +22,9 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# This makefile drives the production of qlc_fw_6322 firmware module.
 #
-# This makefile drives the production of qlc driver kernel module.
-#
-# sparc architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
+# Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE	= ../..