svn commit: r188743 - head/sys/dev/aac

[Ed Maste]

Author: emaste
Date: Wed Feb 18 01:36:20 2009
New Revision: 188743
URL: http://svn.freebsd.org/changeset/base/188743

Log:
  Use outbound message register 0 instead of mailbox 7 in
  aac_{rx,rkt}_get_fwstatus, as done in Adaptec's vendor driver as well as
  the Linux drivers.
  
  Submitted by:   jkim, from Adaptec's driver

Modified:
  head/sys/dev/aac/aac.c
  head/sys/dev/aac/aacreg.h

Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c	Tue Feb 17 23:56:16 2009	(r188742)
+++ head/sys/dev/aac/aac.c	Wed Feb 18 01:36:20 2009	(r188743)
@@ -2375,7 +2375,7 @@ aac_rx_get_fwstatus(struct aac_softc *sc
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RX_FWSTATUS));
+	return(AAC_GETREG4(sc, AAC_RX_OMR0));
 }
 
 static int
@@ -2394,7 +2394,7 @@ aac_rkt_get_fwstatus(struct aac_softc *s
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RKT_FWSTATUS));
+	return(AAC_GETREG4(sc, AAC_RKT_OMR0));
 }
 
 /*

Modified: head/sys/dev/aac/aacreg.h
==============================================================================
--- head/sys/dev/aac/aacreg.h	Tue Feb 17 23:56:16 2009	(r188742)
+++ head/sys/dev/aac/aacreg.h	Wed Feb 18 01:36:20 2009	(r188743)
@@ -1495,6 +1495,8 @@ enum {
  * and other related adapters.
  */
 
+#define AAC_RX_OMR0		0x18	/* outbound message register 0 */
+#define AAC_RX_OMR1		0x1c	/* outbound message register 1 */
 #define AAC_RX_IDBR		0x20	/* inbound doorbell register */
 #define AAC_RX_IISR		0x24	/* inbound interrupt status register */
 #define AAC_RX_IIMR		0x28	/* inbound interrupt mask register */
@@ -1512,6 +1514,8 @@ enum {
  * Unsurprisingly, it's quite similar to the i960!
  */
 
+#define AAC_RKT_OMR0		0x18	/* outbound message register 0 */
+#define AAC_RKT_OMR1		0x1c	/* outbound message register 1 */
 #define AAC_RKT_IDBR		0x20	/* inbound doorbell register */
 #define AAC_RKT_IISR		0x24	/* inbound interrupt status register */
 #define AAC_RKT_IIMR		0x28	/* inbound interrupt mask register */