summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpl196000 <none@none>2007-01-31 21:30:17 -0800
committerpl196000 <none@none>2007-01-31 21:30:17 -0800
commita9f097b092ad90eed0beaf0312c98cb55054513c (patch)
tree0822cbbd511d4370bee3a02f20e9928cdf88548a
parentef8846857fcf954444cdc77e72249afef48377d2 (diff)
downloadillumos-joyent-a9f097b092ad90eed0beaf0312c98cb55054513c.tar.gz
6519035 Bit mask constants in aac_new_intr() should better be defined as macros
-rw-r--r--usr/src/uts/intel/io/aac/aac.c6
-rw-r--r--usr/src/uts/intel/io/aac/aac_regs.h7
2 files changed, 9 insertions, 4 deletions
diff --git a/usr/src/uts/intel/io/aac/aac.c b/usr/src/uts/intel/io/aac/aac.c
index 38ed4cd502..4871874ee5 100644
--- a/usr/src/uts/intel/io/aac/aac.c
+++ b/usr/src/uts/intel/io/aac/aac.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -1016,7 +1016,7 @@ aac_intr_new(caddr_t arg)
if (index == 0xffffffff)
return (DDI_INTR_UNCLAIMED);
do {
- if (index & 2) {
+ if (index & AAC_SENDERADDR_MASK_AIF) {
int i;
if (index == 0xfffffffe)
@@ -1035,7 +1035,7 @@ aac_intr_new(caddr_t arg)
AAC_OUTB_SET(softs, index);
AAC_STATUS_CLR(softs, AAC_DB_RESPONSE_READY);
} else {
- fast = index & 1;
+ fast = index & AAC_SENDERADDR_MASK_FAST_RESPONSE;
index >>= 2;
/* Make sure firmware reported index is valid */
diff --git a/usr/src/uts/intel/io/aac/aac_regs.h b/usr/src/uts/intel/io/aac/aac_regs.h
index 5cc41115b7..a04e6ddc13 100644
--- a/usr/src/uts/intel/io/aac/aac_regs.h
+++ b/usr/src/uts/intel/io/aac/aac_regs.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -145,6 +145,11 @@ struct aac_fib_header {
int next;
};
+/* FIB completed without error or no data was transferred in the FIB */
+#define AAC_SENDERADDR_MASK_FAST_RESPONSE 0x01
+/* The received FIB is an AIF */
+#define AAC_SENDERADDR_MASK_AIF 0x02
+
#define AAC_FIB_SIZE 512 /* size of a fib block in byte */
#define AAC_FIB_DATASIZE (AAC_FIB_SIZE - sizeof (struct aac_fib_header))