diff options
Diffstat (limited to 'sys/contrib/dev/acpica/rslist.c')
| -rw-r--r-- | sys/contrib/dev/acpica/rslist.c | 122 |
1 files changed, 60 insertions, 62 deletions
diff --git a/sys/contrib/dev/acpica/rslist.c b/sys/contrib/dev/acpica/rslist.c index 1171f2b..809544b 100644 --- a/sys/contrib/dev/acpica/rslist.c +++ b/sys/contrib/dev/acpica/rslist.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: rslist - Linked list utilities - * $Revision: 19 $ + * $Revision: 26 $ * ******************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp. * All rights reserved. * * 2. License @@ -120,7 +120,7 @@ #include "acresrc.h" #define _COMPONENT ACPI_RESOURCES - MODULE_NAME ("rslist") + ACPI_MODULE_NAME ("rslist") /******************************************************************************* @@ -141,30 +141,28 @@ AcpiRsGetResourceType ( UINT8 ResourceStartByte) { - FUNCTION_ENTRY (); + ACPI_FUNCTION_ENTRY (); /* * Determine if this is a small or large resource */ - switch (ResourceStartByte & RESOURCE_DESC_TYPE_MASK) + switch (ResourceStartByte & ACPI_RDESC_TYPE_MASK) { - case RESOURCE_DESC_TYPE_SMALL: + case ACPI_RDESC_TYPE_SMALL: /* * Small Resource Type -- Only bits 6:3 are valid */ - return ((UINT8) (ResourceStartByte & RESOURCE_DESC_SMALL_MASK)); - break; + return ((UINT8) (ResourceStartByte & ACPI_RDESC_SMALL_MASK)); - case RESOURCE_DESC_TYPE_LARGE: + case ACPI_RDESC_TYPE_LARGE: /* * Large Resource Type -- All bits are valid */ return (ResourceStartByte); - break; } return (0xFF); @@ -191,18 +189,18 @@ ACPI_STATUS AcpiRsByteStreamToList ( UINT8 *ByteStreamBuffer, UINT32 ByteStreamBufferLength, - UINT8 **OutputBuffer) + UINT8 *OutputBuffer) { ACPI_STATUS Status; UINT32 BytesParsed = 0; UINT8 ResourceType = 0; - UINT32 BytesConsumed = 0; - UINT8 **Buffer = OutputBuffer; - UINT32 StructureSize = 0; + ACPI_SIZE BytesConsumed = 0; + UINT8 *Buffer = OutputBuffer; + ACPI_SIZE StructureSize = 0; BOOLEAN EndTagProcessed = FALSE; + ACPI_RESOURCE *Resource; - - FUNCTION_TRACE ("RsByteStreamToList"); + ACPI_FUNCTION_TRACE ("RsByteStreamToList"); while (BytesParsed < ByteStreamBufferLength && @@ -215,148 +213,148 @@ AcpiRsByteStreamToList ( switch (ResourceType) { - case RESOURCE_DESC_MEMORY_24: + case ACPI_RDESC_TYPE_MEMORY_24: /* * 24-Bit Memory Resource */ Status = AcpiRsMemory24Resource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_LARGE_VENDOR: + case ACPI_RDESC_TYPE_LARGE_VENDOR: /* * Vendor Defined Resource */ Status = AcpiRsVendorResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_MEMORY_32: + case ACPI_RDESC_TYPE_MEMORY_32: /* * 32-Bit Memory Range Resource */ Status = AcpiRsMemory32RangeResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_FIXED_MEMORY_32: + case ACPI_RDESC_TYPE_FIXED_MEMORY_32: /* * 32-Bit Fixed Memory Resource */ Status = AcpiRsFixedMemory32Resource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_QWORD_ADDRESS_SPACE: + case ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE: /* * 64-Bit Address Resource */ Status = AcpiRsAddress64Resource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_DWORD_ADDRESS_SPACE: + case ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE: /* * 32-Bit Address Resource */ Status = AcpiRsAddress32Resource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_WORD_ADDRESS_SPACE: + case ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE: /* * 16-Bit Address Resource */ Status = AcpiRsAddress16Resource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_EXTENDED_XRUPT: + case ACPI_RDESC_TYPE_EXTENDED_XRUPT: /* * Extended IRQ */ Status = AcpiRsExtendedIrqResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_IRQ_FORMAT: + case ACPI_RDESC_TYPE_IRQ_FORMAT: /* * IRQ Resource */ Status = AcpiRsIrqResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_DMA_FORMAT: + case ACPI_RDESC_TYPE_DMA_FORMAT: /* * DMA Resource */ Status = AcpiRsDmaResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_START_DEPENDENT: + case ACPI_RDESC_TYPE_START_DEPENDENT: /* * Start Dependent Functions Resource */ - Status = AcpiRsStartDependentFunctionsResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + Status = AcpiRsStartDependFnsResource (ByteStreamBuffer, + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_END_DEPENDENT: + case ACPI_RDESC_TYPE_END_DEPENDENT: /* * End Dependent Functions Resource */ - Status = AcpiRsEndDependentFunctionsResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + Status = AcpiRsEndDependFnsResource (ByteStreamBuffer, + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_IO_PORT: + case ACPI_RDESC_TYPE_IO_PORT: /* * IO Port Resource */ Status = AcpiRsIoResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_FIXED_IO_PORT: + case ACPI_RDESC_TYPE_FIXED_IO_PORT: /* * Fixed IO Port Resource */ Status = AcpiRsFixedIoResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_SMALL_VENDOR: + case ACPI_RDESC_TYPE_SMALL_VENDOR: /* * Vendor Specific Resource */ Status = AcpiRsVendorResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; - case RESOURCE_DESC_END_TAG: + case ACPI_RDESC_TYPE_END_TAG: /* * End Tag */ EndTagProcessed = TRUE; Status = AcpiRsEndTagResource (ByteStreamBuffer, - &BytesConsumed, Buffer, &StructureSize); + &BytesConsumed, &Buffer, &StructureSize); break; @@ -368,8 +366,7 @@ AcpiRsByteStreamToList ( break; } - - if (!ACPI_SUCCESS(Status)) + if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } @@ -387,7 +384,9 @@ AcpiRsByteStreamToList ( /* * Set the Buffer to the next structure */ - *Buffer += StructureSize; + Resource = (ACPI_RESOURCE *)Buffer; + Resource->Length = ACPI_ALIGN_RESOURCE_SIZE(Resource->Length); + Buffer += ACPI_ALIGN_RESOURCE_SIZE(StructureSize); } /* end while */ @@ -428,15 +427,15 @@ ACPI_STATUS AcpiRsListToByteStream ( ACPI_RESOURCE *LinkedList, UINT32 ByteStreamSizeNeeded, - UINT8 **OutputBuffer) + UINT8 *OutputBuffer) { ACPI_STATUS Status; - UINT8 *Buffer = *OutputBuffer; - UINT32 BytesConsumed = 0; + UINT8 *Buffer = OutputBuffer; + ACPI_SIZE BytesConsumed = 0; BOOLEAN Done = FALSE; - FUNCTION_TRACE ("RsListToByteStream"); + ACPI_FUNCTION_TRACE ("RsListToByteStream"); while (!Done) @@ -461,7 +460,7 @@ AcpiRsListToByteStream ( /* * Start Dependent Functions Resource */ - Status = AcpiRsStartDependentFunctionsStream (LinkedList, + Status = AcpiRsStartDependFnsStream (LinkedList, &Buffer, &BytesConsumed); break; @@ -469,7 +468,7 @@ AcpiRsListToByteStream ( /* * End Dependent Functions Resource */ - Status = AcpiRsEndDependentFunctionsStream (LinkedList, + Status = AcpiRsEndDependFnsStream (LinkedList, &Buffer, &BytesConsumed); break; @@ -571,8 +570,7 @@ AcpiRsListToByteStream ( } /* switch (LinkedList->Id) */ - - if (!ACPI_SUCCESS(Status)) + if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } @@ -585,7 +583,7 @@ AcpiRsListToByteStream ( /* * Point to the next object */ - LinkedList = POINTER_ADD (ACPI_RESOURCE, + LinkedList = ACPI_PTR_ADD (ACPI_RESOURCE, LinkedList, LinkedList->Length); } |
