aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-18 18:30:06 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-18 18:30:06 -0400
commit47b687882c02f802dd5bbe1227effe006820246e (patch)
tree7b9048ebfa0a53203e4e3c55649f28e352a143cc /include/linux
parent7cab14a79973893392111b8f887856a54621f759 (diff)
ide: add IDE_HFLAG_NO_{DMA,AUTODMA} host flags
Add IDE_HFLAG_NO_{DMA,AUTODMA} host flags. Convert all host drivers using ide_pci_device_t to use these flags instead of d->autodma and then remove no longer needed d->autodma. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 575bf81dc84a..6f375e044c3e 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1210,10 +1210,6 @@ extern void default_hwif_iops(ide_hwif_t *);
1210extern void default_hwif_mmiops(ide_hwif_t *); 1210extern void default_hwif_mmiops(ide_hwif_t *);
1211extern void default_hwif_transport(ide_hwif_t *); 1211extern void default_hwif_transport(ide_hwif_t *);
1212 1212
1213#define NODMA 0
1214#define NOAUTODMA 1
1215#define AUTODMA 2
1216
1217typedef struct ide_pci_enablebit_s { 1213typedef struct ide_pci_enablebit_s {
1218 u8 reg; /* byte pci reg holding the enable-bit */ 1214 u8 reg; /* byte pci reg holding the enable-bit */
1219 u8 mask; /* mask to isolate the enable-bit */ 1215 u8 mask; /* mask to isolate the enable-bit */
@@ -1252,6 +1248,10 @@ enum {
1252 IDE_HFLAG_NO_ATAPI_DMA = (1 << 12), 1248 IDE_HFLAG_NO_ATAPI_DMA = (1 << 12),
1253 /* set if host is a "bootable" controller */ 1249 /* set if host is a "bootable" controller */
1254 IDE_HFLAG_BOOTABLE = (1 << 13), 1250 IDE_HFLAG_BOOTABLE = (1 << 13),
1251 /* host doesn't support DMA */
1252 IDE_HFLAG_NO_DMA = (1 << 14),
1253 /* check if host is PCI IDE device before allowing DMA */
1254 IDE_HFLAG_NO_AUTODMA = (1 << 15),
1255}; 1255};
1256 1256
1257#ifdef CONFIG_BLK_DEV_OFFBOARD 1257#ifdef CONFIG_BLK_DEV_OFFBOARD
@@ -1269,7 +1269,6 @@ typedef struct ide_pci_device_s {
1269 void (*init_hwif)(ide_hwif_t *); 1269 void (*init_hwif)(ide_hwif_t *);
1270 void (*init_dma)(ide_hwif_t *, unsigned long); 1270 void (*init_dma)(ide_hwif_t *, unsigned long);
1271 void (*fixup)(ide_hwif_t *); 1271 void (*fixup)(ide_hwif_t *);
1272 u8 autodma;
1273 ide_pci_enablebit_t enablebits[2]; 1272 ide_pci_enablebit_t enablebits[2];
1274 unsigned int extra; 1273 unsigned int extra;
1275 struct ide_pci_device_s *next; 1274 struct ide_pci_device_s *next;