vserver 2.0 rc7

[linux-2.6.git] / drivers / scsi / sym53c8xx_defs.h

diff --git a/drivers/scsi/sym53c8xx_defs.h b/drivers/scsi/sym53c8xx_defs.h
index c1d1e95..4c4ae7d 100644 (file)
--- a/drivers/scsi/sym53c8xx_defs.h
+++ b/drivers/scsi/sym53c8xx_defs.h
@@ -314,9 +314,9 @@
 #define        writew_b2l      __raw_writew
 #define        writel_b2l      __raw_writel
 #define        readw_raw       __raw_readw
-#define        readl_raw(a)    __raw_readl((unsigned long)(a))
+#define        readl_raw       __raw_readl
 #define        writew_raw      __raw_writew
-#define        writel_raw(v,a) __raw_writel(v,(unsigned long)(a))
+#define        writel_raw      __raw_writel
 #else  /* Other big-endian */
 #define        readw_l2b       readw
 #define        readl_l2b       readl
@@ -1281,34 +1281,34 @@ struct scr_tblsel {
 **     Messages
 */
 
-#define        M_COMPLETE      (0x00)
-#define        M_EXTENDED      (0x01)
-#define        M_SAVE_DP       (0x02)
-#define        M_RESTORE_DP    (0x03)
-#define        M_DISCONNECT    (0x04)
-#define        M_ID_ERROR      (0x05)
-#define        M_ABORT         (0x06)
-#define        M_REJECT        (0x07)
-#define        M_NOOP          (0x08)
-#define        M_PARITY        (0x09)
-#define        M_LCOMPLETE     (0x0a)
-#define        M_FCOMPLETE     (0x0b)
-#define        M_RESET         (0x0c)
-#define        M_ABORT_TAG     (0x0d)
-#define        M_CLEAR_QUEUE   (0x0e)
-#define        M_INIT_REC      (0x0f)
-#define        M_REL_REC       (0x10)
+#define        M_COMPLETE      COMMAND_COMPLETE
+#define        M_EXTENDED      EXTENDED_MESSAGE
+#define        M_SAVE_DP       SAVE_POINTERS
+#define        M_RESTORE_DP    RESTORE_POINTERS
+#define        M_DISCONNECT    DISCONNECT
+#define        M_ID_ERROR      INITIATOR_ERROR
+#define        M_ABORT         ABORT_TASK_SET
+#define        M_REJECT        MESSAGE_REJECT
+#define        M_NOOP          NOP
+#define        M_PARITY        MSG_PARITY_ERROR
+#define        M_LCOMPLETE     LINKED_CMD_COMPLETE
+#define        M_FCOMPLETE     LINKED_FLG_CMD_COMPLETE
+#define        M_RESET         TARGET_RESET
+#define        M_ABORT_TAG     ABORT_TASK
+#define        M_CLEAR_QUEUE   CLEAR_TASK_SET
+#define        M_INIT_REC      INITIATE_RECOVERY
+#define        M_REL_REC       RELEASE_RECOVERY
 #define        M_TERMINATE     (0x11)
-#define        M_SIMPLE_TAG    (0x20)
-#define        M_HEAD_TAG      (0x21)
-#define        M_ORDERED_TAG   (0x22)
-#define        M_IGN_RESIDUE   (0x23)
+#define        M_SIMPLE_TAG    SIMPLE_QUEUE_TAG
+#define        M_HEAD_TAG      HEAD_OF_QUEUE_TAG
+#define        M_ORDERED_TAG   ORDERED_QUEUE_TAG
+#define        M_IGN_RESIDUE   IGNORE_WIDE_RESIDUE
 #define        M_IDENTIFY      (0x80)
 
-#define        M_X_MODIFY_DP   (0x00)
-#define        M_X_SYNC_REQ    (0x01)
-#define        M_X_WIDE_REQ    (0x03)
-#define        M_X_PPR_REQ     (0x04)
+#define        M_X_MODIFY_DP   EXTENDED_MODIFY_DATA_POINTER
+#define        M_X_SYNC_REQ    EXTENDED_SDTR
+#define        M_X_WIDE_REQ    EXTENDED_WDTR
+#define        M_X_PPR_REQ     EXTENDED_PPR
 
 /*
 **     Status