--- src/sys/dev/disk/ata/ata-pci.c 2005/05/24 20:58:59 1.20 +++ src/sys/dev/disk/ata/ata-pci.c 2005/05/27 21:12:51 1.21 @@ -43,9 +43,6 @@ #include #include #include -#ifdef __alpha__ -#include -#endif #include #include #include @@ -804,14 +801,10 @@ ata_pci_alloc_resource(device_t dev, dev if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) { if (ATA_MASTERDEV(dev)) { -#ifdef __alpha__ - return alpha_platform_alloc_ide_intr(unit); -#else int irq = (unit == 0 ? 14 : 15); return BUS_ALLOC_RESOURCE(device_get_parent(dev), child, SYS_RES_IRQ, rid, irq, irq, 1, flags); -#endif } else { /* primary and secondary channels share interrupt, keep track */ @@ -865,12 +858,8 @@ ata_pci_release_resource(device_t dev, d return ENOENT; if (ATA_MASTERDEV(dev)) { -#ifdef __alpha__ - return alpha_platform_release_ide_intr(unit, r); -#else return BUS_RELEASE_RESOURCE(device_get_parent(dev), child, SYS_RES_IRQ, rid, r); -#endif } else { /* primary and secondary channels share interrupt, keep track */ @@ -890,12 +879,8 @@ ata_pci_setup_intr(device_t dev, device_ void **cookiep, lwkt_serialize_t serializer) { if (ATA_MASTERDEV(dev)) { -#ifdef __alpha__ - return alpha_platform_setup_ide_intr(irq, intr, arg, cookiep); -#else return BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, intr, arg, cookiep, serializer); -#endif } else return BUS_SETUP_INTR(device_get_parent(dev), dev, irq, @@ -907,11 +892,7 @@ ata_pci_teardown_intr(device_t dev, devi void *cookie) { if (ATA_MASTERDEV(dev)) { -#ifdef __alpha__ - return alpha_platform_teardown_ide_intr(irq, cookie); -#else return BUS_TEARDOWN_INTR(device_get_parent(dev), child, irq, cookie); -#endif } else return BUS_TEARDOWN_INTR(device_get_parent(dev), dev, irq, cookie);