27c27
< * $FreeBSD: head/sys/dev/acpica/acpi_resource.c 90014 2002-01-31 09:18:27Z takawata $
---
> * $FreeBSD: head/sys/dev/acpica/acpi_resource.c 91125 2002-02-23 05:28:22Z msmith $
47c47
< MODULE_NAME("RESOURCE")
---
> ACPI_MODULE_NAME("RESOURCE")
68c68
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
83c83,84
< if (((status = acpi_GetIntoBuffer(handle, AcpiGetCurrentResources, &buf)) != AE_OK)) {
---
> buf.Length = ACPI_ALLOCATE_BUFFER;
> if (ACPI_FAILURE((status = AcpiGetCurrentResources(handle, &buf)))) {
234c235
< if (res->Data.Address32.ProducerConsumer != CONSUMER) {
---
> if (res->Data.Address32.ProducerConsumer != ACPI_CONSUMER) {
236c237
< (res->Data.Address32.ResourceType == IO_RANGE) ?
---
> (res->Data.Address32.ResourceType == ACPI_IO_RANGE) ?
240,241c241,242
< if ((res->Data.Address32.ResourceType != MEMORY_RANGE) ||
< (res->Data.Address32.ResourceType != IO_RANGE)) {
---
> if ((res->Data.Address32.ResourceType != ACPI_MEMORY_RANGE) ||
> (res->Data.Address32.ResourceType != ACPI_IO_RANGE)) {
247,249c248,250
< if ((res->Data.Address32.MinAddressFixed == ADDRESS_FIXED) &&
< (res->Data.Address32.MaxAddressFixed == ADDRESS_FIXED)) {
< if (res->Data.Address32.ResourceType == MEMORY_RANGE) {
---
> if ((res->Data.Address32.MinAddressFixed == ACPI_ADDRESS_FIXED) &&
> (res->Data.Address32.MaxAddressFixed == ACPI_ADDRESS_FIXED)) {
> if (res->Data.Address32.ResourceType == ACPI_MEMORY_RANGE) {
265c266
< if (res->Data.Address32.ResourceType == MEMORY_RANGE) {
---
> if (res->Data.Address32.ResourceType == ACPI_MEMORY_RANGE) {
292c293
< if (res->Data.Address16.ProducerConsumer != CONSUMER) {
---
> if (res->Data.Address16.ProducerConsumer != ACPI_CONSUMER) {
294c295
< (res->Data.Address16.ResourceType == IO_RANGE) ?
---
> (res->Data.Address16.ResourceType == ACPI_IO_RANGE) ?
298,299c299,300
< if ((res->Data.Address16.ResourceType != MEMORY_RANGE) ||
< (res->Data.Address16.ResourceType != IO_RANGE)) {
---
> if ((res->Data.Address16.ResourceType != ACPI_MEMORY_RANGE) ||
> (res->Data.Address16.ResourceType != ACPI_IO_RANGE)) {
305,307c306,308
< if ((res->Data.Address16.MinAddressFixed == ADDRESS_FIXED) &&
< (res->Data.Address16.MaxAddressFixed == ADDRESS_FIXED)) {
< if (res->Data.Address16.ResourceType == MEMORY_RANGE) {
---
> if ((res->Data.Address16.MinAddressFixed == ACPI_ADDRESS_FIXED) &&
> (res->Data.Address16.MaxAddressFixed == ACPI_ADDRESS_FIXED)) {
> if (res->Data.Address16.ResourceType == ACPI_MEMORY_RANGE) {
323c324
< if (res->Data.Address16.ResourceType == MEMORY_RANGE) {
---
> if (res->Data.Address16.ResourceType == ACPI_MEMORY_RANGE) {