diff options
Diffstat (limited to 'drivers/scsi/ips.h')
| -rw-r--r-- | drivers/scsi/ips.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index 3bcbd9ff056b..fb4a03661ce1 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h | |||
| @@ -60,14 +60,14 @@ | |||
| 60 | */ | 60 | */ |
| 61 | #define IPS_HA(x) ((ips_ha_t *) x->hostdata) | 61 | #define IPS_HA(x) ((ips_ha_t *) x->hostdata) |
| 62 | #define IPS_COMMAND_ID(ha, scb) (int) (scb - ha->scbs) | 62 | #define IPS_COMMAND_ID(ha, scb) (int) (scb - ha->scbs) |
| 63 | #define IPS_IS_TROMBONE(ha) (((ha->device_id == IPS_DEVICEID_COPPERHEAD) && \ | 63 | #define IPS_IS_TROMBONE(ha) (((ha->pcidev->device == IPS_DEVICEID_COPPERHEAD) && \ |
| 64 | (ha->revision_id >= IPS_REVID_TROMBONE32) && \ | 64 | (ha->pcidev->revision >= IPS_REVID_TROMBONE32) && \ |
| 65 | (ha->revision_id <= IPS_REVID_TROMBONE64)) ? 1 : 0) | 65 | (ha->pcidev->revision <= IPS_REVID_TROMBONE64)) ? 1 : 0) |
| 66 | #define IPS_IS_CLARINET(ha) (((ha->device_id == IPS_DEVICEID_COPPERHEAD) && \ | 66 | #define IPS_IS_CLARINET(ha) (((ha->pcidev->device == IPS_DEVICEID_COPPERHEAD) && \ |
| 67 | (ha->revision_id >= IPS_REVID_CLARINETP1) && \ | 67 | (ha->pcidev->revision >= IPS_REVID_CLARINETP1) && \ |
| 68 | (ha->revision_id <= IPS_REVID_CLARINETP3)) ? 1 : 0) | 68 | (ha->pcidev->revision <= IPS_REVID_CLARINETP3)) ? 1 : 0) |
| 69 | #define IPS_IS_MORPHEUS(ha) (ha->device_id == IPS_DEVICEID_MORPHEUS) | 69 | #define IPS_IS_MORPHEUS(ha) (ha->pcidev->device == IPS_DEVICEID_MORPHEUS) |
| 70 | #define IPS_IS_MARCO(ha) (ha->device_id == IPS_DEVICEID_MARCO) | 70 | #define IPS_IS_MARCO(ha) (ha->pcidev->device == IPS_DEVICEID_MARCO) |
| 71 | #define IPS_USE_I2O_DELIVER(ha) ((IPS_IS_MORPHEUS(ha) || \ | 71 | #define IPS_USE_I2O_DELIVER(ha) ((IPS_IS_MORPHEUS(ha) || \ |
| 72 | (IPS_IS_TROMBONE(ha) && \ | 72 | (IPS_IS_TROMBONE(ha) && \ |
| 73 | (ips_force_i2o))) ? 1 : 0) | 73 | (ips_force_i2o))) ? 1 : 0) |
| @@ -1034,7 +1034,6 @@ typedef struct ips_ha { | |||
| 1034 | uint8_t ha_id[IPS_MAX_CHANNELS+1]; | 1034 | uint8_t ha_id[IPS_MAX_CHANNELS+1]; |
| 1035 | uint32_t dcdb_active[IPS_MAX_CHANNELS]; | 1035 | uint32_t dcdb_active[IPS_MAX_CHANNELS]; |
| 1036 | uint32_t io_addr; /* Base I/O address */ | 1036 | uint32_t io_addr; /* Base I/O address */ |
| 1037 | uint8_t irq; /* IRQ for adapter */ | ||
| 1038 | uint8_t ntargets; /* Number of targets */ | 1037 | uint8_t ntargets; /* Number of targets */ |
| 1039 | uint8_t nbus; /* Number of buses */ | 1038 | uint8_t nbus; /* Number of buses */ |
| 1040 | uint8_t nlun; /* Number of Luns */ | 1039 | uint8_t nlun; /* Number of Luns */ |
| @@ -1066,10 +1065,7 @@ typedef struct ips_ha { | |||
| 1066 | int ioctl_reset; /* IOCTL Requested Reset Flag */ | 1065 | int ioctl_reset; /* IOCTL Requested Reset Flag */ |
| 1067 | uint16_t reset_count; /* number of resets */ | 1066 | uint16_t reset_count; /* number of resets */ |
| 1068 | time_t last_ffdc; /* last time we sent ffdc info*/ | 1067 | time_t last_ffdc; /* last time we sent ffdc info*/ |
| 1069 | uint8_t revision_id; /* Revision level */ | ||
| 1070 | uint16_t device_id; /* PCI device ID */ | ||
| 1071 | uint8_t slot_num; /* PCI Slot Number */ | 1068 | uint8_t slot_num; /* PCI Slot Number */ |
| 1072 | uint16_t subdevice_id; /* Subsystem device ID */ | ||
| 1073 | int ioctl_len; /* size of ioctl buffer */ | 1069 | int ioctl_len; /* size of ioctl buffer */ |
| 1074 | dma_addr_t ioctl_busaddr; /* dma address of ioctl buffer*/ | 1070 | dma_addr_t ioctl_busaddr; /* dma address of ioctl buffer*/ |
| 1075 | uint8_t bios_version[8]; /* BIOS Revision */ | 1071 | uint8_t bios_version[8]; /* BIOS Revision */ |