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
commit7cab14a79973893392111b8f887856a54621f759 (patch)
tree925ad89a10daa3584e05806eadffb628ef97313b /include/linux
parent33c1002ed912ac9dacedd5d5b166da3b72d18460 (diff)
ide: add IDE_HFLAG_BOOTABLE host flag
Add IDE_HFLAG_BOOTABLE host flag and IDE_HFLAG_OFF_BOARD define. Convert all host drivers using ide_pci_device_t to use IDE_HFLAG_{BOOTABLE,OFF_BOARD} instead of d->bootable and then remove no longer needed d->bootable. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e44ecc942ff8..575bf81dc84a 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1210,15 +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 ON_BOARD 1
1214#define NEVER_BOARD 0
1215
1216#ifdef CONFIG_BLK_DEV_OFFBOARD
1217# define OFF_BOARD ON_BOARD
1218#else /* CONFIG_BLK_DEV_OFFBOARD */
1219# define OFF_BOARD NEVER_BOARD
1220#endif /* CONFIG_BLK_DEV_OFFBOARD */
1221
1222#define NODMA 0 1213#define NODMA 0
1223#define NOAUTODMA 1 1214#define NOAUTODMA 1
1224#define AUTODMA 2 1215#define AUTODMA 2
@@ -1259,8 +1250,16 @@ enum {
1259 IDE_HFLAG_VDMA = (1 << 11), 1250 IDE_HFLAG_VDMA = (1 << 11),
1260 /* ATAPI DMA is unsupported */ 1251 /* ATAPI DMA is unsupported */
1261 IDE_HFLAG_NO_ATAPI_DMA = (1 << 12), 1252 IDE_HFLAG_NO_ATAPI_DMA = (1 << 12),
1253 /* set if host is a "bootable" controller */
1254 IDE_HFLAG_BOOTABLE = (1 << 13),
1262}; 1255};
1263 1256
1257#ifdef CONFIG_BLK_DEV_OFFBOARD
1258# define IDE_HFLAG_OFF_BOARD IDE_HFLAG_BOOTABLE
1259#else
1260# define IDE_HFLAG_OFF_BOARD 0
1261#endif
1262
1264typedef struct ide_pci_device_s { 1263typedef struct ide_pci_device_s {
1265 char *name; 1264 char *name;
1266 int (*init_setup)(struct pci_dev *, struct ide_pci_device_s *); 1265 int (*init_setup)(struct pci_dev *, struct ide_pci_device_s *);
@@ -1272,7 +1271,6 @@ typedef struct ide_pci_device_s {
1272 void (*fixup)(ide_hwif_t *); 1271 void (*fixup)(ide_hwif_t *);
1273 u8 autodma; 1272 u8 autodma;
1274 ide_pci_enablebit_t enablebits[2]; 1273 ide_pci_enablebit_t enablebits[2];
1275 u8 bootable;
1276 unsigned int extra; 1274 unsigned int extra;
1277 struct ide_pci_device_s *next; 1275 struct ide_pci_device_s *next;
1278 u16 host_flags; 1276 u16 host_flags;