diff options
| author | Jordan Hargrave <jordan@cvs.openbsd.org> | 2009-03-11 20:37:47 +0000 |
|---|---|---|
| committer | Jordan Hargrave <jordan@cvs.openbsd.org> | 2009-03-11 20:37:47 +0000 |
| commit | 792deb44a3773eae61acf87bcaa84d581e9fb2b2 (patch) | |
| tree | a73fa4e65d35c5b6700ba56d2cc5af1b63863b61 /sys/dev/acpi/dsdt.c | |
| parent | 19ce25b27427f1d8b93efb77e700f93762de2622 (diff) | |
Cleanup.. use aml_evalinteger instead of aml_evalname
ok marco@
Diffstat (limited to 'sys/dev/acpi/dsdt.c')
| -rw-r--r-- | sys/dev/acpi/dsdt.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index 2be52c2d40b..29edc0b01d3 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.140 2009/03/10 20:36:10 jordan Exp $ */ +/* $OpenBSD: dsdt.c,v 1.141 2009/03/11 20:37:46 jordan Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> * @@ -1378,15 +1378,14 @@ int amlop_delay; u_int64_t aml_getpciaddr(struct acpi_softc *sc, struct aml_node *root) { - struct aml_value tmpres; + int64_t tmpres; u_int64_t pciaddr; /* PCI */ pciaddr = 0; - if (!aml_evalname(dsdt_softc, root, "_ADR", 0, NULL, &tmpres)) { + if (!aml_evalinteger(dsdt_softc, root, "_ADR", 0, NULL, &tmpres)) { /* Device:Function are bits 16-31,32-47 */ - pciaddr += (aml_val2int(&tmpres) << 16L); - aml_freevalue(&tmpres); + pciaddr += (tmpres << 16L); dnprintf(20, "got _adr [%s]\n", aml_nodename(root)); } else { /* Mark invalid */ @@ -1394,10 +1393,9 @@ aml_getpciaddr(struct acpi_softc *sc, struct aml_node *root) return pciaddr; } - if (!aml_evalname(dsdt_softc, root, "_BBN", 0, NULL, &tmpres)) { + if (!aml_evalinteger(dsdt_softc, root, "_BBN", 0, NULL, &tmpres)) { /* PCI bus is in bits 48-63 */ - pciaddr += (aml_val2int(&tmpres) << 48L); - aml_freevalue(&tmpres); + pciaddr += (tmpres << 48L); dnprintf(20, "got _bbn [%s]\n", aml_nodename(root)); } dnprintf(20, "got pciaddr: %s:%llx\n", aml_nodename(root), pciaddr); |