mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-25 11:37:56 +00:00
*sigh* Revert stuff that wasn't supposed to be committed. The
acpi_resource change was a minor nit offered as an early candidate for the recent ACPICA import problem and the acpi.c change is one I need to test still that makes the ordered probing of system devices actually work as advertised (probe devices in order based on the type of device rather than in the order we encounter them in the device tree).
This commit is contained in:
parent
f25bdd3bb3
commit
3a6497c102
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=152171
@ -1497,13 +1497,13 @@ acpi_probe_order(ACPI_HANDLE handle, int *order)
|
||||
ret = 0;
|
||||
if (acpi_MatchHid(handle, "PNP0C01") || acpi_MatchHid(handle, "PNP0C02")) {
|
||||
*order = 1;
|
||||
ret = 0;
|
||||
ret = 1;
|
||||
} else if (acpi_MatchHid(handle, "PNP0C09")) {
|
||||
*order = 2;
|
||||
ret = 0;
|
||||
ret = 1;
|
||||
} else if (acpi_MatchHid(handle, "PNP0C0F")) {
|
||||
*order = 3;
|
||||
ret = 0;
|
||||
ret = 1;
|
||||
}
|
||||
|
||||
return (ret);
|
||||
|
@ -168,7 +168,6 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
|
||||
|
||||
/* Fetch the device's current resources. */
|
||||
buf.Length = ACPI_ALLOCATE_BUFFER;
|
||||
buf.Pointer = NULL;
|
||||
if (ACPI_FAILURE((status = AcpiGetCurrentResources(handle, &buf)))) {
|
||||
if (status != AE_NOT_FOUND)
|
||||
printf("can't fetch resources for %s - %s\n",
|
||||
|
Loading…
Reference in New Issue
Block a user