summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2009-11-15 16:44:43 +0000
committerattilio <attilio@FreeBSD.org>2009-11-15 16:44:43 +0000
commit9dd892aeae833cc67a6f5e8d602972bbedec5eb6 (patch)
treea803af1c94671a1fcfeeaba899652b29e87f3253 /tools
parentd1297db1aeb036a628e2f6fc5bd24e6f91cdb7b0 (diff)
downloadFreeBSD-src-9dd892aeae833cc67a6f5e8d602972bbedec5eb6.zip
FreeBSD-src-9dd892aeae833cc67a6f5e8d602972bbedec5eb6.tar.gz
Collapse devinfo_state_t with device_state_t in order to avoid a
structure replication and improve manteneability. Reviewed by: jhb, imp Tested by: Riccardo Torrini <riccardo at torrini dot org>
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/ncpus/acpi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/tools/ncpus/acpi.c b/tools/tools/ncpus/acpi.c
index 88ec6fc..5366dc8 100644
--- a/tools/tools/ncpus/acpi.c
+++ b/tools/tools/ncpus/acpi.c
@@ -247,13 +247,13 @@ static const char *
devstate(devinfo_state_t state)
{
switch (state) {
- case DIS_NOTPRESENT:
+ case DS_NOTPRESENT:
return "not-present";
- case DIS_ALIVE:
+ case DS_ALIVE:
return "alive";
- case DIS_ATTACHED:
+ case DS_ATTACHED:
return "attached";
- case DIS_BUSY:
+ case DS_BUSY:
return "busy";
default:
return "unknown-state";
@@ -266,8 +266,8 @@ acpi0_check(struct devinfo_dev *dd, void *arg)
printf("%s: %s %s\n", __func__, dd->dd_name, devstate(dd->dd_state));
/* NB: device must be present AND attached */
if (strcmp(dd->dd_name, "acpi0") == 0)
- return (dd->dd_state == DIS_ATTACHED ||
- dd->dd_state == DIS_BUSY);
+ return (dd->dd_state == DS_ATTACHED ||
+ dd->dd_state == DS_BUSY);
return devinfo_foreach_device_child(dd, acpi0_check, arg);
}
OpenPOWER on IntegriCloud