diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/scsi/eata.h | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/scsi/eata.h')
| -rw-r--r-- | drivers/scsi/eata.h | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/drivers/scsi/eata.h b/drivers/scsi/eata.h index 2eb04f657..f1641f42d 100644 --- a/drivers/scsi/eata.h +++ b/drivers/scsi/eata.h @@ -11,41 +11,48 @@ int eata2x_detect(Scsi_Host_Template *); int eata2x_release(struct Scsi_Host *); int eata2x_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int eata2x_abort(Scsi_Cmnd *); -int eata2x_reset(Scsi_Cmnd *, unsigned int); +int eata2x_old_abort(Scsi_Cmnd *); +int eata2x_reset(Scsi_Cmnd *); +int eata2x_old_reset(Scsi_Cmnd *, unsigned int); +int eata2x_biosparam(Disk *, kdev_t, int *); -#define EATA_VERSION "4.20.00" +#define EATA_VERSION "4.33.00" #define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s)) -#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,88) +#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,101) #define EATA { \ name: "EATA/DMA 2.0x rev. " EATA_VERSION " ", \ - detect: eata2x_detect, \ - release: eata2x_release, \ - queuecommand: eata2x_queuecommand, \ - abort: eata2x_abort, \ - reset: eata2x_reset, \ - bios_param: scsicam_bios_param, \ - this_id: 7, \ - unchecked_isa_dma: 1, \ - use_clustering: ENABLE_CLUSTERING, \ - use_new_eh_code: 1 /* Enable new error code */ \ + detect: eata2x_detect, \ + release: eata2x_release, \ + queuecommand: eata2x_queuecommand, \ + abort: eata2x_old_abort, \ + reset: eata2x_old_reset, \ + eh_abort_handler: eata2x_abort, \ + eh_device_reset_handler: NULL, \ + eh_bus_reset_handler: NULL, \ + eh_host_reset_handler: eata2x_reset, \ + bios_param: eata2x_biosparam, \ + this_id: 7, \ + unchecked_isa_dma: 1, \ + use_clustering: ENABLE_CLUSTERING, \ + use_new_eh_code: 1 /* Enable new error code */ \ } #else /* Use old scsi code */ #define EATA { \ name: "EATA/DMA 2.0x rev. " EATA_VERSION " ", \ - detect: eata2x_detect, \ - release: eata2x_release, \ - queuecommand: eata2x_queuecommand, \ - abort: eata2x_abort, \ - reset: eata2x_reset, \ - bios_param: scsicam_bios_param, \ - this_id: 7, \ - unchecked_isa_dma: 1, \ - use_clustering: ENABLE_CLUSTERING \ + detect: eata2x_detect, \ + release: eata2x_release, \ + queuecommand: eata2x_queuecommand, \ + abort: eata2x_old_abort, \ + reset: eata2x_old_reset, \ + bios_param: eata2x_biosparam, \ + this_id: 7, \ + unchecked_isa_dma: 1, \ + use_clustering: ENABLE_CLUSTERING \ } #endif |