svn commit: r186132 - head/sys/dev/mfi

[Doug Ambrisko]

Author: ambrisko
Date: Mon Dec 15 17:11:40 2008
New Revision: 186132
URL: http://svn.freebsd.org/changeset/base/186132

Log:
  Change Dell's gen2 catch-all from Dell PERC H700/H800 to Dell PERC Gen2
  and bump the driver version from 2 to 3 and fix the related style problem.
  
  Suggested by:	LSI

Modified:
  head/sys/dev/mfi/mfi.c
  head/sys/dev/mfi/mfi_pci.c

Modified: head/sys/dev/mfi/mfi.c
==============================================================================
--- head/sys/dev/mfi/mfi.c	Mon Dec 15 15:46:56 2008	(r186131)
+++ head/sys/dev/mfi/mfi.c	Mon Dec 15 17:11:40 2008	(r186132)
@@ -296,7 +296,8 @@ mfi_attach(struct mfi_softc *sc)
 	uint32_t status;
 	int error, commsz, framessz, sensesz;
 	int frames, unit, max_fw_sge;
-    device_printf(sc->mfi_dev, "Megaraid SAS driver Ver 2.00 \n");
+
+	device_printf(sc->mfi_dev, "Megaraid SAS driver Ver 3.00 \n");
 
 	mtx_init(&sc->mfi_io_lock, "MFI I/O lock", NULL, MTX_DEF);
 	sx_init(&sc->mfi_config_lock, "MFI config");

Modified: head/sys/dev/mfi/mfi_pci.c
==============================================================================
--- head/sys/dev/mfi/mfi_pci.c	Mon Dec 15 15:46:56 2008	(r186131)
+++ head/sys/dev/mfi/mfi_pci.c	Mon Dec 15 17:11:40 2008	(r186132)
@@ -123,7 +123,7 @@ struct mfi_ident {
 	{0x1000, 0x0079, 0x1028, 0x1f18, MFI_FLAGS_GEN2,  "Dell PERC H700 Modular"},
 	{0x1000, 0x0079, 0x1028, 0x1f19, MFI_FLAGS_GEN2,  "Dell PERC H700"},
 	{0x1000, 0x0079, 0x1028, 0x1f1b, MFI_FLAGS_GEN2,  "Dell PERC H800"},
-	{0x1000, 0x0079, 0x1028, 0xffff, MFI_FLAGS_GEN2,  "Dell PERC H700/H800"},
+	{0x1000, 0x0079, 0x1028, 0xffff, MFI_FLAGS_GEN2,  "Dell PERC Gen2"},
 	{0x1000, 0x0079, 0xffff, 0xffff, MFI_FLAGS_GEN2,  "LSI MegaSAS Gen2"},
 	{0x1000, 0x007c, 0xffff, 0xffff, MFI_FLAGS_1078,  "LSI MegaSAS 1078"},
 	{0x1000, 0x0411, 0xffff, 0xffff, MFI_FLAGS_1064R, "LSI MegaSAS 1064R"}, /* Brocton IOP */