mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-15 22:09:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of optional fields

Browse Source 
date	2005.03.03.22.12.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:33:01 +00:00
parent 74861b4cb5
commit 32884d5402
1 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source/components/disassembler/dmresrcl.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmresrcl.c - "Large" Resource Descriptor disassembly
* $Revision: 1.16 $
* $Revision: 1.18 $
*
******************************************************************************/
@ -189,9 +189,16 @@ void
AcpiDmIoFlags2 (
UINT8 SpecificFlags)
{
AcpiOsPrintf (", %s, %s",
AcpiGbl_TTPDecode [(SpecificFlags & 0x10) >> 4],
AcpiGbl_TRSDecode [(SpecificFlags & 0x20) >> 5]);
AcpiOsPrintf (", %s",
AcpiGbl_TTPDecode [(SpecificFlags & 0x10) >> 4]);
/* TRS is only used if TTP is TypeTranslation */
if (SpecificFlags & 0x10)
{
AcpiOsPrintf (", %s",
AcpiGbl_TRSDecode [(SpecificFlags & 0x20) >> 5]);
}
}
@ -291,16 +298,16 @@ AcpiDmWordDescriptor (
AcpiOsPrintf ("\n");
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%4.4X, /* Address Space Granularity */\n",
AcpiOsPrintf ("0x%4.4X, // Address Space Granularity\n",
(UINT32) Resource->Granularity);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%4.4X, /* Address Range Minimum */\n",
AcpiOsPrintf ("0x%4.4X, // Address Range Minimum\n",
(UINT32) Resource->AddressMin);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%4.4X, /* Address Range Maximum */\n",
AcpiOsPrintf ("0x%4.4X, // Address Range Maximum\n",
(UINT32) Resource->AddressMax);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%4.4X, /* Address Translation Offset */\n",
AcpiOsPrintf ("0x%4.4X, // Address Translation Offset\n",
(UINT32) Resource->TranslationOffset);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%4.4X",
@ -317,6 +324,10 @@ AcpiDmWordDescriptor (
AcpiOsPrintf (", %s",
&Resource->OptionalFields[1]);
}
else
{
AcpiOsPrintf (",,");
}
}
else
{
@ -390,16 +401,16 @@ AcpiDmDwordDescriptor (
AcpiOsPrintf ("\n");
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X, /* Address Space Granularity */\n",
AcpiOsPrintf ("0x%8.8X, // Address Space Granularity\n",
Resource->Granularity);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X, /* Address Range Minimum */\n",
AcpiOsPrintf ("0x%8.8X, // Address Range Minimum\n",
Resource->AddressMin);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X, /* Address Range Maximum */\n",
AcpiOsPrintf ("0x%8.8X, // Address Range Maximum\n",
Resource->AddressMax);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X, /* Address Translation Offset */\n",
AcpiOsPrintf ("0x%8.8X, // Address Translation Offset\n",
Resource->TranslationOffset);
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X",
@ -416,6 +427,10 @@ AcpiDmDwordDescriptor (
AcpiOsPrintf (", %s",
&Resource->OptionalFields[1]);
}
else
{
AcpiOsPrintf (",,");
}
}
else
{
@ -488,23 +503,23 @@ AcpiDmExtendedDescriptor (
AcpiOsPrintf ("\n");
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Space Granularity */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Space Granularity\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->Granularity)));
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Range Minimum */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Range Minimum\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->AddressMin)));
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Range Maximum */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Range Maximum\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->AddressMax)));
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Translation Offset */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Translation Offset\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->TranslationOffset)));
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Length */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Length\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->AddressLength)));
/* Type-specific flags */
@ -512,7 +527,7 @@ AcpiDmExtendedDescriptor (
AcpiDmIndent (Level + 1);
if (Resource->ResourceType == ACPI_IO_RANGE)
{
AcpiOsPrintf ("0x%8.8X%8.8X, /* Type Specific Attributes */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Type Specific Attributes\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->TypeSpecificAttributes)));
AcpiDmIndent (Level + 1);
AcpiDmIoFlags2 (Resource->SpecificFlags);
@ -520,7 +535,7 @@ AcpiDmExtendedDescriptor (
}
else if (Resource->ResourceType == ACPI_MEMORY_RANGE)
{
AcpiOsPrintf ("0x%8.8X%8.8X, /* Type Specific Attributes */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Type Specific Attributes\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->TypeSpecificAttributes)));
AcpiDmIndent (Level + 1);
AcpiDmMemoryFlags2 (Resource->SpecificFlags);
@ -528,7 +543,7 @@ AcpiDmExtendedDescriptor (
}
else
{
AcpiOsPrintf ("0x%8.8X%8.8X) /* Type Specific Attributes */\n",
AcpiOsPrintf ("0x%8.8X%8.8X) // Type Specific Attributes\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->TypeSpecificAttributes)));
}
@ -584,19 +599,19 @@ AcpiDmQwordDescriptor (
AcpiOsPrintf ("\n");
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Space Granularity */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Space Granularity\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->Granularity)));
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Range Minimum */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Range Minimum\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->AddressMin)));
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Range Maximum */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Range Maximum\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->AddressMax)));
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X%8.8X, /* Address Translation Offset */\n",
AcpiOsPrintf ("0x%8.8X%8.8X, // Address Translation Offset\n",
ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Resource->TranslationOffset)));
AcpiDmIndent (Level + 1);
@ -614,6 +629,10 @@ AcpiDmQwordDescriptor (
AcpiOsPrintf (", %s",
&Resource->OptionalFields[1]);
}
else
{
AcpiOsPrintf (",,");
}
}
else
{