git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / drivers / ide / pci / pdc202xx_old.h
diff --git a/drivers/ide/pci/pdc202xx_old.h b/drivers/ide/pci/pdc202xx_old.h
index 82b773b..6afebd1 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.h
+++ b/drivers/ide/pci/pdc202xx_old.h
@@ -10,7 +10,6 @@
 #endif
 
 #define PDC202XX_DEBUG_DRIVE_INFO              0
-#define PDC202XX_DECODE_REGISTER_INFO          0
 
 static const char *pdc_quirk_drives[] = {
        "QUANTUM FIREBALLlct08 08",
@@ -99,76 +98,6 @@ static inline u8 *pdc202xx_ultra_verbose (u32 drive_pci, u16 slow_cable)
 #define        MC1             0x02    /* DMA"C" timing */
 #define        MC0             0x01    /* DMA"C" timing */
 
-#if PDC202XX_DECODE_REGISTER_INFO
-
-#define REG_A          0x01
-#define REG_B          0x02
-#define REG_C          0x04
-#define REG_D          0x08
-
-static void decode_registers (u8 registers, u8 value)
-{
-       u8      bit = 0, bit1 = 0, bit2 = 0;
-
-       switch(registers) {
-               case REG_A:
-                       bit2 = 0;
-                       printk("A Register ");
-                       if (value & 0x80) printk("SYNC_IN ");
-                       if (value & 0x40) printk("ERRDY_EN ");
-                       if (value & 0x20) printk("IORDY_EN ");
-                       if (value & 0x10) printk("PREFETCH_EN ");
-                       if (value & 0x08) { printk("PA3 ");bit2 |= 0x08; }
-                       if (value & 0x04) { printk("PA2 ");bit2 |= 0x04; }
-                       if (value & 0x02) { printk("PA1 ");bit2 |= 0x02; }
-                       if (value & 0x01) { printk("PA0 ");bit2 |= 0x01; }
-                       printk("PIO(A) = %d ", bit2);
-                       break;
-               case REG_B:
-                       bit1 = 0;bit2 = 0;
-                       printk("B Register ");
-                       if (value & 0x80) { printk("MB2 ");bit1 |= 0x80; }
-                       if (value & 0x40) { printk("MB1 ");bit1 |= 0x40; }
-                       if (value & 0x20) { printk("MB0 ");bit1 |= 0x20; }
-                       printk("DMA(B) = %d ", bit1 >> 5);
-                       if (value & 0x10) printk("PIO_FORCED/PB4 ");
-                       if (value & 0x08) { printk("PB3 ");bit2 |= 0x08; }
-                       if (value & 0x04) { printk("PB2 ");bit2 |= 0x04; }
-                       if (value & 0x02) { printk("PB1 ");bit2 |= 0x02; }
-                       if (value & 0x01) { printk("PB0 ");bit2 |= 0x01; }
-                       printk("PIO(B) = %d ", bit2);
-                       break;
-               case REG_C:
-                       bit2 = 0;
-                       printk("C Register ");
-                       if (value & 0x80) printk("DMARQp ");
-                       if (value & 0x40) printk("IORDYp ");
-                       if (value & 0x20) printk("DMAR_EN ");
-                       if (value & 0x10) printk("DMAW_EN ");
-
-                       if (value & 0x08) { printk("MC3 ");bit2 |= 0x08; }
-                       if (value & 0x04) { printk("MC2 ");bit2 |= 0x04; }
-                       if (value & 0x02) { printk("MC1 ");bit2 |= 0x02; }
-                       if (value & 0x01) { printk("MC0 ");bit2 |= 0x01; }
-                       printk("DMA(C) = %d ", bit2);
-                       break;
-               case REG_D:
-                       printk("D Register ");
-                       break;
-               default:
-                       return;
-       }
-       printk("\n        %s ", (registers & REG_D) ? "DP" :
-                               (registers & REG_C) ? "CP" :
-                               (registers & REG_B) ? "BP" :
-                               (registers & REG_A) ? "AP" : "ERROR");
-       for (bit=128;bit>0;bit/=2)
-               printk("%s", (value & bit) ? "1" : "0");
-       printk("\n");
-}
-
-#endif /* PDC202XX_DECODE_REGISTER_INFO */
-
 #define DISPLAY_PDC202XX_TIMINGS
 
 static void init_setup_pdc202ata4(struct pci_dev *dev, ide_pci_device_t *d);
@@ -180,62 +109,46 @@ static void init_dma_pdc202xx(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20246,
                .name           = "PDC20246",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 16,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20262,
                .name           = "PDC20262",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 48,
+               .flags          = IDEPCI_FLAG_FORCE_PDC,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20263,
                .name           = "PDC20263",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 48,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20265,
                .name           = "PDC20265",
                .init_setup     = init_setup_pdc20265,
                .init_chipset   = init_chipset_pdc202xx,
@@ -243,36 +156,25 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 48,
+               .flags          = IDEPCI_FLAG_FORCE_PDC,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20267,
                .name           = "PDC20267",
                .init_setup     = init_setup_pdc202xx,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 48,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 
linux-2.6