Add changes from the Linux-2.6 tree.

[linux-2.6.git] / drivers / scsi / sym53c8xx_2 / sym_defs.h

diff --git a/drivers/scsi/sym53c8xx_2/sym_defs.h b/drivers/scsi/sym53c8xx_2/sym_defs.h
index 2e1d89f..defccc4 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/sym_defs.h
+++ b/drivers/scsi/sym53c8xx_2/sym_defs.h
@@ -40,33 +40,13 @@
 #ifndef SYM_DEFS_H
 #define SYM_DEFS_H
 
-#define SYM_VERSION "2.1.18m"
+#define SYM_VERSION "2.2.3"
 #define SYM_DRIVER_NAME        "sym-" SYM_VERSION
 
-/*
- *  PCI device identifier of SYMBIOS chips.
- */
-#define PCI_ID_SYM53C810       PCI_DEVICE_ID_NCR_53C810
-#define PCI_ID_SYM53C810AP     PCI_DEVICE_ID_LSI_53C810AP
-#define PCI_ID_SYM53C815       PCI_DEVICE_ID_NCR_53C815
-#define PCI_ID_SYM53C820       PCI_DEVICE_ID_NCR_53C820
-#define PCI_ID_SYM53C825       PCI_DEVICE_ID_NCR_53C825
-#define PCI_ID_SYM53C860       PCI_DEVICE_ID_NCR_53C860
-#define PCI_ID_SYM53C875       PCI_DEVICE_ID_NCR_53C875
-#define PCI_ID_SYM53C875_2     PCI_DEVICE_ID_NCR_53C875J
-#define PCI_ID_SYM53C885       PCI_DEVICE_ID_NCR_53C885
-#define PCI_ID_SYM53C895       PCI_DEVICE_ID_NCR_53C895
-#define PCI_ID_SYM53C896       PCI_DEVICE_ID_NCR_53C896
-#define PCI_ID_SYM53C895A      PCI_DEVICE_ID_LSI_53C895A
-#define PCI_ID_SYM53C875A      PCI_DEVICE_ID_LSI_53C875A
-#define PCI_ID_LSI53C1010_33   PCI_DEVICE_ID_LSI_53C1010_33
-#define PCI_ID_LSI53C1010_66   PCI_DEVICE_ID_LSI_53C1010_66
-#define PCI_ID_LSI53C1510D     PCI_DEVICE_ID_LSI_53C1510
-
 /*
  *     SYM53C8XX device features descriptor.
  */
-struct sym_pci_chip {
+struct sym_chip {
        u_short device_id;
        u_short revision_id;
        char    *name;
@@ -764,27 +744,27 @@ struct sym_tblsel {
 #define        M_RESTORE_DP    RESTORE_POINTERS
 #define        M_DISCONNECT    DISCONNECT
 #define        M_ID_ERROR      INITIATOR_ERROR
-#define        M_ABORT         ABORT
+#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         BUS_DEVICE_RESET
-#define        M_ABORT_TAG     (0x0d)
-#define        M_CLEAR_QUEUE   (0x0e)
+#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    SIMPLE_QUEUE_TAG
 #define        M_HEAD_TAG      HEAD_OF_QUEUE_TAG
 #define        M_ORDERED_TAG   ORDERED_QUEUE_TAG
-#define        M_IGN_RESIDUE   (0x23)
+#define        M_IGN_RESIDUE   IGNORE_WIDE_RESIDUE
 
 #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     (0x04)
+#define        M_X_PPR_REQ     EXTENDED_PPR
 
 /*
  *     PPR protocol options