ide: add ide_pci_device_t.host_flags (take 2)
* Rename ide_pci_device_t.flags to ide_pci_device_t.host_flags and IDEPCI_FLAG_ISA_PORTS flag to IDE_HFLAG_ISA_PORTS. * Add IDE_HFLAG_SINGLE flag for single channel devices. * Convert core code and all IDE PCI drivers to use IDE_HFLAG_SINGLE and remove no longer needed ide_pci_device_t.channels field. v2: * Fix issues noticed by Sergei: - correct code alignment in scc_pata.c - s/IDE_HFLAG_SINGLE/~IDE_HFLAG_SINGLE/ in serverworks.c Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -1244,7 +1244,8 @@ typedef struct ide_pci_enablebit_s {
|
||||
|
||||
enum {
|
||||
/* Uses ISA control ports not PCI ones. */
|
||||
IDEPCI_FLAG_ISA_PORTS = (1 << 0),
|
||||
IDE_HFLAG_ISA_PORTS = (1 << 0),
|
||||
IDE_HFLAG_SINGLE = (1 << 1),
|
||||
};
|
||||
|
||||
typedef struct ide_pci_device_s {
|
||||
@@ -1256,13 +1257,12 @@ typedef struct ide_pci_device_s {
|
||||
void (*init_hwif)(ide_hwif_t *);
|
||||
void (*init_dma)(ide_hwif_t *, unsigned long);
|
||||
void (*fixup)(ide_hwif_t *);
|
||||
u8 channels;
|
||||
u8 autodma;
|
||||
ide_pci_enablebit_t enablebits[2];
|
||||
u8 bootable;
|
||||
unsigned int extra;
|
||||
struct ide_pci_device_s *next;
|
||||
u8 flags;
|
||||
u8 host_flags;
|
||||
u8 udma_mask;
|
||||
} ide_pci_device_t;
|
||||
|
||||
|
Reference in New Issue
Block a user