From 4aff4458f58398f54c248604694c7005294c1747 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 12 Feb 2013 14:17:15 -0800 Subject: sconfig: rename pci_domain -> domain The name pci_domain was a bit misleading, since the construct is only PCI specific in a particular (northbridge/cpu) implementation, but not by concept. As implementations and hardware change, be more generic about our naming. This will allow us to support non-PCI systems without adding new keywords. Change-Id: Ide885a1d5e15d37560c79b936a39252150560e85 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/2376 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- util/sconfig/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'util/sconfig/main.c') diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 8dfd50c47a..d87238f5ed 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -266,8 +266,8 @@ struct device *new_device(struct device *parent, struct device *busdev, const in new_d->path = ".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}"; break; - case PCI_DOMAIN: - new_d->path = ".type=DEVICE_PATH_PCI_DOMAIN,{.pci_domain={ .domain = 0x%x }}"; + case DOMAIN: + new_d->path = ".type=DEVICE_PATH_DOMAIN,{.domain={ .domain = 0x%x }}"; break; case IOAPIC: @@ -342,7 +342,7 @@ void add_register(struct device *dev, char *name, char *val) { void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inherit) { - if (dev->bustype != PCI && dev->bustype != PCI_DOMAIN) { + if (dev->bustype != PCI && dev->bustype != DOMAIN) { printf("ERROR: 'subsystem' only allowed for PCI devices\n"); exit(1); } @@ -365,7 +365,7 @@ void add_ioapic_info(struct device *dev, int apicid, const char *_srcpin, int ir srcpin = _srcpin[3] - 'A'; - if (dev->bustype != PCI && dev->bustype != PCI_DOMAIN) { + if (dev->bustype != PCI && dev->bustype != DOMAIN) { printf("ERROR: ioapic config only allowed for PCI devices\n"); exit(1); } @@ -529,7 +529,7 @@ static void inherit_subsystem_ids(FILE *file, struct device *dev) for(p = dev; p && p != p->parent; p = p->parent) { - if (p->bustype != PCI && p->bustype != PCI_DOMAIN) + if (p->bustype != PCI && p->bustype != DOMAIN) continue; if (p->inherit_subsystem) { -- cgit v1.2.3