diff options
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/device.c | 8 | ||||
| -rw-r--r-- | src/device/device_util.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/device/device.c b/src/device/device.c index 07bbc7a72a..e0c8bf0523 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -994,7 +994,7 @@ void dev_configure(void) /* Compute resources for all domains. */ for (child = root->link_list->children; child; child = child->sibling) { - if (!(child->path.type == DEVICE_PATH_PCI_DOMAIN)) + if (!(child->path.type == DEVICE_PATH_DOMAIN)) continue; for (res = child->resource_list; res; res = res->next) { if (res->flags & IORESOURCE_FIXED) @@ -1019,7 +1019,7 @@ void dev_configure(void) /* For all domains. */ for (child = root->link_list->children; child; child=child->sibling) - if (child->path.type == DEVICE_PATH_PCI_DOMAIN) + if (child->path.type == DEVICE_PATH_DOMAIN) avoid_fixed_resources(child); /* @@ -1027,7 +1027,7 @@ void dev_configure(void) * the highest address managable. */ for (child = root->link_list->children; child; child = child->sibling) { - if (child->path.type != DEVICE_PATH_PCI_DOMAIN) + if (child->path.type != DEVICE_PATH_DOMAIN) continue; for (res = child->resource_list; res; res = res->next) { if (!(res->flags & IORESOURCE_MEM) || @@ -1040,7 +1040,7 @@ void dev_configure(void) /* Store the computed resource allocations into device registers ... */ printk(BIOS_INFO, "Setting resources...\n"); for (child = root->link_list->children; child; child = child->sibling) { - if (!(child->path.type == DEVICE_PATH_PCI_DOMAIN)) + if (!(child->path.type == DEVICE_PATH_DOMAIN)) continue; for (res = child->resource_list; res; res = res->next) { if (res->flags & IORESOURCE_FIXED) diff --git a/src/device/device_util.c b/src/device/device_util.c index 224c58ee64..60f555af3c 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -205,9 +205,9 @@ const char *dev_path(device_t dev) sprintf(buffer, "IOAPIC: %02x", dev->path.ioapic.ioapic_id); break; - case DEVICE_PATH_PCI_DOMAIN: - sprintf(buffer, "PCI_DOMAIN: %04x", - dev->path.pci_domain.domain); + case DEVICE_PATH_DOMAIN: + sprintf(buffer, "DOMAIN: %04x", + dev->path.domain.domain); break; case DEVICE_PATH_APIC_CLUSTER: sprintf(buffer, "APIC_CLUSTER: %01x", @@ -271,8 +271,8 @@ int path_eq(struct device_path *path1, struct device_path *path2) case DEVICE_PATH_APIC: equal = (path1->apic.apic_id == path2->apic.apic_id); break; - case DEVICE_PATH_PCI_DOMAIN: - equal = (path1->pci_domain.domain == path2->pci_domain.domain); + case DEVICE_PATH_DOMAIN: + equal = (path1->domain.domain == path2->domain.domain); break; case DEVICE_PATH_APIC_CLUSTER: equal = (path1->apic_cluster.cluster |