diff options
| author | Martin Dalecki <dalecki@evision-ventures.com> | 2002-04-08 21:08:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-08 21:08:04 -0700 |
| commit | 88da4c77f58d6b632714814d103ebbf5039a7ab1 (patch) | |
| tree | 38c65291dce91643890b4cd6ca04fd067e2c1653 /include/linux/ide.h | |
| parent | 6e16d892a8875baa492199f2d4e08ce47917ee15 (diff) | |
[PATCH] 2.5.8-pre2 IDE 29b
- Eliminate the mate member of the ata_channel structure. The information
provided by it is already present. This patch may have undesirable
effects on the ns87415.c and trm290.c host chip drivers, but it's worth
for structural reasons to have it.
- Kill unused code, which was "fixing" interrupt routing from ide-pci.c Don't
pass any "mate" between the functions there.
- Don't define SUPPORT_VLB_SYNC unconditionally in ide-taskfile.c
- Apply Vojtech Pavliks fix for piix host-chip driver crashes.
- Add linux/types.h to ide-pnp.c.
- Apply latest sis5513 host chip driver patch from by Lionel Bouton by hand.
- Apply patch by Paul Macerras for power-mac.
- Try to make the ns87415 driver a bit more reentrant.
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 6d80160690b2..1b0d74f37f3e 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -433,10 +433,10 @@ typedef void (ide_intrproc_t) (ide_drive_t *); typedef void (ide_maskproc_t) (ide_drive_t *, int); typedef void (ide_rw_proc_t) (ide_drive_t *, ide_dma_action_t); -/* - * ide soft-power support - */ -typedef int (ide_busproc_t) (ide_drive_t *, int); +enum { + ATA_PRIMARY = 0, + ATA_SECONDARY = 1 +}; struct ata_channel { struct device dev; /* device handle */ @@ -467,7 +467,6 @@ struct ata_channel { struct scatterlist *sg_table; /* Scatter-gather list used to build the above */ int sg_nents; /* Current number of entries in it */ int sg_dma_direction; /* dma transfer direction */ - struct ata_channel *mate; /* other hwif from same PCI chip */ unsigned long dma_base; /* base addr for dma ports */ unsigned dma_extra; /* extra addr for dma ports */ unsigned long config_data; /* for use by chipset-specific code */ @@ -480,7 +479,7 @@ struct ata_channel { hwif_chipset_t chipset; /* sub-module for tuning.. */ unsigned noprobe : 1; /* don't probe for this interface */ unsigned present : 1; /* there is a device on this interface */ - unsigned serialized : 1; /* serialized operation with mate hwif */ + unsigned serialized : 1; /* serialized operation between channels */ unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */ unsigned reset : 1; /* reset after probe */ unsigned autodma : 1; /* automatically try to enable DMA at boot */ @@ -490,7 +489,7 @@ struct ata_channel { unsigned long last_time; /* time when previous rq was done */ #endif byte straight8; /* Alan's straight 8 check */ - ide_busproc_t *busproc; /* driver soft-power interface */ + int (*busproc)(ide_drive_t *, int); /* driver soft-power interface */ byte bus_state; /* power state of the IDE bus */ }; @@ -513,7 +512,6 @@ typedef enum { */ typedef ide_startstop_t (ide_pre_handler_t)(ide_drive_t *, struct request *); typedef ide_startstop_t (ide_handler_t)(ide_drive_t *); -typedef ide_startstop_t (ide_post_handler_t)(ide_drive_t *); /* * when ide_timer_expiry fires, invoke a handler of this type |