diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /include/linux/ide.h | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 62325a43e..3672f2789 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -181,12 +181,17 @@ typedef unsigned char byte; /* used everywhere */ struct hwif_s; typedef int (ide_ack_intr_t)(struct hwif_s *); +#ifndef NO_DMA +#define NO_DMA 255 +#endif + /* * Structure to hold all information about the location of this port */ typedef struct hw_regs_s { ide_ioreg_t io_ports[IDE_NR_PORTS]; /* task file registers */ int irq; /* our irq number */ + int dma; /* our dma entry */ ide_ack_intr_t *ack_intr; /* acknowledge interrupt */ void *priv; /* interface specific data */ } hw_regs_t; @@ -356,6 +361,7 @@ typedef enum { ide_unknown, ide_generic, ide_pci, ide_cmd646, ide_cy82c693, ide_4drives } hwif_chipset_t; +#ifdef CONFIG_BLK_DEV_IDEPCI typedef struct ide_pci_devid_s { unsigned short vid; unsigned short did; @@ -363,6 +369,7 @@ typedef struct ide_pci_devid_s { #define IDE_PCI_DEVID_NULL ((ide_pci_devid_t){0,0}) #define IDE_PCI_DEVID_EQ(a,b) (a.vid == b.vid && a.did == b.did) +#endif /* CONFIG_BLK_DEV_IDEPCI */ typedef struct hwif_s { struct hwif_s *next; /* for linked-list in ide_hwgroup_t */ @@ -399,8 +406,10 @@ typedef struct hwif_s { unsigned autodma : 1; /* automatically try to enable DMA at boot */ unsigned udma_four : 1; /* 1=ATA-66 capable, 0=default */ byte channel; /* for dual-port chips: 0=primary, 1=secondary */ +#ifdef CONFIG_BLK_DEV_IDEPCI struct pci_dev *pci_dev; /* for pci chipsets */ ide_pci_devid_t pci_devid; /* for pci chipsets: {VID,DID} */ +#endif /* CONFIG_BLK_DEV_IDEPCI */ #if (DISK_RECOVERY_TIME > 0) unsigned long last_time; /* time when previous rq was done */ #endif @@ -579,7 +588,8 @@ typedef struct ide_module_s { */ #ifndef _IDE_C extern ide_hwif_t ide_hwifs[]; /* master data repository */ -extern ide_module_t *ide_modules; +extern ide_module_t *ide_modules; +extern ide_module_t *ide_probe; #endif /* @@ -851,4 +861,6 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dmabase, unsigned int num_po unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif, int extra, const char *name) __init; #endif +void hwif_unregister (ide_hwif_t *hwif); + #endif /* _IDE_H */ |