diff options
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/device_const.c | 2 | ||||
| -rw-r--r-- | src/device/device_util.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/device/device_const.c b/src/device/device_const.c index fc76304994..9f3443e94c 100644 --- a/src/device/device_const.c +++ b/src/device/device_const.c @@ -118,7 +118,7 @@ static int path_eq(const struct device_path *path1, equal = (path1->apic.apic_id == path2->apic.apic_id); break; case DEVICE_PATH_DOMAIN: - equal = (path1->domain.domain == path2->domain.domain); + equal = (path1->domain.domain_id == path2->domain.domain_id); break; case DEVICE_PATH_CPU_CLUSTER: equal = (path1->cpu_cluster.cluster diff --git a/src/device/device_util.c b/src/device/device_util.c index 22dc5f7499..3514de7cd5 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -109,7 +109,7 @@ u32 dev_path_encode(const struct device *dev) ret |= dev->path.apic.apic_id; break; case DEVICE_PATH_DOMAIN: - ret |= dev->path.domain.domain; + ret |= dev->path.domain.domain_id; break; case DEVICE_PATH_CPU_CLUSTER: ret |= dev->path.cpu_cluster.cluster; @@ -193,7 +193,7 @@ const char *dev_path(const struct device *dev) break; case DEVICE_PATH_DOMAIN: snprintf(buffer, sizeof(buffer), "DOMAIN: %08x", - dev->path.domain.domain); + dev->path.domain.domain_id); break; case DEVICE_PATH_CPU_CLUSTER: snprintf(buffer, sizeof(buffer), "CPU_CLUSTER: %01x", @@ -273,12 +273,12 @@ unsigned int dev_get_domain_id(const struct device *dev) return 0; } - return domain_dev->path.domain.domain; + return domain_dev->path.domain.domain_id; } bool is_domain0(const struct device *dev) { - return dev && dev->path.type == DEVICE_PATH_DOMAIN && dev->path.domain.domain == 0; + return dev && dev->path.type == DEVICE_PATH_DOMAIN && dev->path.domain.domain_id == 0; } bool is_dev_on_domain0(const struct device *dev) |