2 files changed, 21 insertions, 12 deletions

diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 2844ac47f0e3..0dce729b1faa 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -711,15 +711,7 @@ scsi_op_desc(u_int16_t opcode, struct scsi_inquiry_data *inq_data)
 	asc, asc, action
 #endif 
 
-/*
- * If we're in the kernel, 'quantum' is already defined in cam_xpt.c.
- * Otherwise, we need to define it.
- */
-#ifdef _KERNEL
-extern const char quantum[];
-#else
 static const char quantum[] = "QUANTUM";
-#endif
 
 /*
  * WARNING:  You must update the num_ascs field below for this quirk table 
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 1574d0dcee74..46c14ef332d0 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -134,6 +134,9 @@ struct da_quirk_entry {
 	da_quirks quirks;
 };
 
+static const char quantum[] = "QUANTUM";
+static const char microp[] = "MICROP";
+
 static struct da_quirk_entry da_quirk_table[] =
 {
 	{
@@ -152,7 +155,7 @@ static struct da_quirk_entry da_quirk_table[] =
 		 * either.  Reported by: Matthew Jacob <mjacob@feral.com>
 		 * in NetBSD PR kern/6027, August 24, 1998.
 		 */
-		{T_DIRECT, SIP_MEDIA_FIXED, "MICROP", "2217*", "*"},
+		{T_DIRECT, SIP_MEDIA_FIXED, microp, "2217*", "*"},
 		/*quirks*/ DA_Q_NO_SYNC_CACHE
 	},
 	{
@@ -161,7 +164,7 @@ static struct da_quirk_entry da_quirk_table[] =
 		 * either.  Reported by: Hellmuth Michaelis (hm@kts.org)
 		 * (PR 8882).
 		 */
-		{T_DIRECT, SIP_MEDIA_FIXED, "MICROP", "2112*", "*"},
+		{T_DIRECT, SIP_MEDIA_FIXED, microp, "2112*", "*"},
 		/*quirks*/ DA_Q_NO_SYNC_CACHE
 	},
 	{
@@ -174,19 +177,33 @@ static struct da_quirk_entry da_quirk_table[] =
 	},
 	{
 		/*
+		 * Doesn't like the synchronize cache command.
+		 */
+		{T_DIRECT, SIP_MEDIA_FIXED, quantum, "MAVERICK 540S", "*"},
+		/*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
+		 * Doesn't like the synchronize cache command.
+		 */
+		{T_DIRECT, SIP_MEDIA_FIXED, quantum, "LPS525S", "*"},
+		/*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
 		 * Doesn't work correctly with 6 byte reads/writes.
 		 * Returns illegal request, and points to byte 9 of the
 		 * 6-byte CDB.
 		 * Reported by:  Adam McDougall <bsdx@spawnet.com>
 		 */
-		{T_DIRECT, SIP_MEDIA_FIXED, "QUANTUM", "VIKING 4*", "*"},
+		{T_DIRECT, SIP_MEDIA_FIXED, quantum, "VIKING 4*", "*"},
 		/*quirks*/ DA_Q_NO_6_BYTE
 	},
 	{
 		/*
 		 * See above.
 		 */
-		{T_DIRECT, SIP_MEDIA_FIXED, "QUANTUM", "VIKING 2*", "*"},
+		{T_DIRECT, SIP_MEDIA_FIXED, quantum, "VIKING 2*", "*"},
 		/*quirks*/ DA_Q_NO_6_BYTE
 	},
 	{