diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/scsi/ini9100u.h | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/scsi/ini9100u.h')
| -rw-r--r-- | drivers/scsi/ini9100u.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/scsi/ini9100u.h b/drivers/scsi/ini9100u.h index fa2c6c537..14302f256 100644 --- a/drivers/scsi/ini9100u.h +++ b/drivers/scsi/ini9100u.h @@ -63,7 +63,9 @@ * - Removed unused code * 12/13/98 bv - v1.03b * - Add spinlocks to HCS structure. -*******************************************************************************/ + * 21/01/99 bv - v1.03e + * - Added PCI_ID structure + **************************************************************************/ #ifndef CVT_LINUX_VERSION #define CVT_LINUX_VERSION(V,P,S) (((V) * 65536) + ((P) * 256) + (S)) @@ -88,7 +90,7 @@ extern struct proc_dir_entry proc_scsi_ini9100u; extern int i91u_biosparam(Disk *, int, int *); /*for linux v1.13 */ #endif -#define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.03d" +#define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.03g" #if LINUX_VERSION_CODE < CVT_LINUX_VERSION(1, 3, 0) #define INI9100U { \ @@ -207,13 +209,21 @@ extern int i91u_biosparam(Disk *, int, int *); /*for linux v1.13 */ #define SENSE_SIZE 14 #define INI_VENDOR_ID 0x1101 /* Initio's PCI vendor ID */ -#define DMX_VENDOR_ID 0x134a /* Domex's PCI vendor ID */ +#define DMX_VENDOR_ID 0x134a /* Domex's PCI vendor ID */ #define I950_DEVICE_ID 0x9500 /* Initio's inic-950 product ID */ #define I940_DEVICE_ID 0x9400 /* Initio's inic-940 product ID */ #define I935_DEVICE_ID 0x9401 /* Initio's inic-935 product ID */ #define I920_DEVICE_ID 0x0002 /* Initio's other product ID */ /************************************************************************/ +/* Vendor ID/Device ID Pair Structure */ +/************************************************************************/ +typedef struct PCI_ID_Struc { + unsigned short vendor_id; + unsigned short device_id; +} PCI_ID; + +/************************************************************************/ /* Scatter-Gather Element Structure */ /************************************************************************/ typedef struct SG_Struc { |