Print this page
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure

*** 3,13 **** * Module Name: dmresrcl.c - "Large" Resource Descriptor disassembly * ******************************************************************************/ /* ! * Copyright (C) 2000 - 2011, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: --- 3,13 ---- * Module Name: dmresrcl.c - "Large" Resource Descriptor disassembly * ******************************************************************************/ /* ! * Copyright (C) 2000 - 2014, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met:
*** 151,170 **** --- 151,173 ---- AcpiDmIndent (Level + 1); switch (Type) { case 16: + AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i], AcpiDmMemoryNames[i]); break; case 32: + AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i], AcpiDmMemoryNames[i]); break; default: + return; } } }
*** 199,223 **** --- 202,230 ---- AcpiDmIndent (Level + 1); switch (Type) { case 16: + AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i], AcpiDmAddressNames[i]); break; case 32: + AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i], AcpiDmAddressNames[i]); break; case 64: + AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i], AcpiDmAddressNames[i]); break; default: + return; } } }
*** 240,265 **** --- 247,277 ---- { switch (Type) { case ACPI_RESOURCE_TYPE_ADDRESS16: + AcpiOsPrintf ("Word"); break; case ACPI_RESOURCE_TYPE_ADDRESS32: + AcpiOsPrintf ("DWord"); break; case ACPI_RESOURCE_TYPE_ADDRESS64: + AcpiOsPrintf ("QWord"); break; case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: + AcpiOsPrintf ("Extended"); break; default: + return; } }
*** 316,326 **** return; } /* This is either a Memory, IO, or BusNumber descriptor (0,1,2) */ ! AcpiOsPrintf ("%s (", AcpiGbl_WordDecode [ResourceType & 0x3]); /* Decode the general and type-specific flags */ if (ResourceType == ACPI_MEMORY_RANGE) { --- 328,338 ---- return; } /* This is either a Memory, IO, or BusNumber descriptor (0,1,2) */ ! AcpiOsPrintf ("%s (", AcpiGbl_WordDecode [ACPI_GET_2BIT_FLAG (ResourceType)]); /* Decode the general and type-specific flags */ if (ResourceType == ACPI_MEMORY_RANGE) {
*** 329,339 **** else /* IO range or BusNumberRange */ { AcpiDmIoFlags (Flags); if (ResourceType == ACPI_IO_RANGE) { ! AcpiOsPrintf (" %s,", AcpiGbl_RngDecode [SpecificFlags & 0x3]); } } } --- 341,351 ---- else /* IO range or BusNumberRange */ { AcpiDmIoFlags (Flags); if (ResourceType == ACPI_IO_RANGE) { ! AcpiOsPrintf (" %s,", AcpiGbl_RngDecode [ACPI_GET_2BIT_FLAG (SpecificFlags)]); } } }
*** 381,394 **** AcpiDmSpaceFlags ( UINT8 Flags) { AcpiOsPrintf ("%s, %s, %s, %s,", ! AcpiGbl_ConsumeDecode [(Flags & 1)], ! AcpiGbl_DecDecode [(Flags & 0x2) >> 1], ! AcpiGbl_MinDecode [(Flags & 0x4) >> 2], ! AcpiGbl_MaxDecode [(Flags & 0x8) >> 3]); } /******************************************************************************* * --- 393,406 ---- AcpiDmSpaceFlags ( UINT8 Flags) { AcpiOsPrintf ("%s, %s, %s, %s,", ! AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Flags)], ! AcpiGbl_DecDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 1)], ! AcpiGbl_MinDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 2)], ! AcpiGbl_MaxDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 3)]); } /******************************************************************************* *
*** 405,418 **** static void AcpiDmIoFlags ( UINT8 Flags) { AcpiOsPrintf ("%s, %s, %s, %s,", ! AcpiGbl_ConsumeDecode [(Flags & 1)], ! AcpiGbl_MinDecode [(Flags & 0x4) >> 2], ! AcpiGbl_MaxDecode [(Flags & 0x8) >> 3], ! AcpiGbl_DecDecode [(Flags & 0x2) >> 1]); } /******************************************************************************* * --- 417,430 ---- static void AcpiDmIoFlags ( UINT8 Flags) { AcpiOsPrintf ("%s, %s, %s, %s,", ! AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Flags)], ! AcpiGbl_MinDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 2)], ! AcpiGbl_MaxDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 3)], ! AcpiGbl_DecDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 1)]); } /******************************************************************************* *
*** 430,447 **** AcpiDmIoFlags2 ( UINT8 SpecificFlags) { 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]); } } /******************************************************************************* --- 442,459 ---- AcpiDmIoFlags2 ( UINT8 SpecificFlags) { AcpiOsPrintf (", %s", ! AcpiGbl_TtpDecode [ACPI_EXTRACT_1BIT_FLAG (SpecificFlags, 4)]); /* TRS is only used if TTP is TypeTranslation */ if (SpecificFlags & 0x10) { AcpiOsPrintf (", %s", ! AcpiGbl_TrsDecode [ACPI_EXTRACT_1BIT_FLAG (SpecificFlags, 5)]); } } /*******************************************************************************
*** 462,477 **** UINT8 Flags, UINT8 SpecificFlags) { AcpiOsPrintf ("%s, %s, %s, %s, %s, %s,", ! AcpiGbl_ConsumeDecode [(Flags & 1)], ! AcpiGbl_DecDecode [(Flags & 0x2) >> 1], ! AcpiGbl_MinDecode [(Flags & 0x4) >> 2], ! AcpiGbl_MaxDecode [(Flags & 0x8) >> 3], ! AcpiGbl_MemDecode [(SpecificFlags & 0x6) >> 1], ! AcpiGbl_RwDecode [(SpecificFlags & 0x1)]); } /******************************************************************************* * --- 474,489 ---- UINT8 Flags, UINT8 SpecificFlags) { AcpiOsPrintf ("%s, %s, %s, %s, %s, %s,", ! AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Flags)], ! AcpiGbl_DecDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 1)], ! AcpiGbl_MinDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 2)], ! AcpiGbl_MaxDecode [ACPI_EXTRACT_1BIT_FLAG (Flags, 3)], ! AcpiGbl_MemDecode [ACPI_EXTRACT_2BIT_FLAG (SpecificFlags, 1)], ! AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (SpecificFlags)]); } /******************************************************************************* *
*** 489,500 **** AcpiDmMemoryFlags2 ( UINT8 SpecificFlags) { AcpiOsPrintf (", %s, %s", ! AcpiGbl_MtpDecode [(SpecificFlags & 0x18) >> 3], ! AcpiGbl_TtpDecode [(SpecificFlags & 0x20) >> 5]); } /******************************************************************************* * --- 501,512 ---- AcpiDmMemoryFlags2 ( UINT8 SpecificFlags) { AcpiOsPrintf (", %s, %s", ! AcpiGbl_MtpDecode [ACPI_EXTRACT_2BIT_FLAG (SpecificFlags, 3)], ! AcpiGbl_TtpDecode [ACPI_EXTRACT_1BIT_FLAG (SpecificFlags, 5)]); } /******************************************************************************* *
*** 551,561 **** /* Make sure that the ResourceSource string exists before dumping it */ if (TotalLength > (MinimumTotalLength + 1)) { AcpiOsPrintf (" "); ! AcpiUtPrintString ((char *) &AmlResourceSource[1], ACPI_UINT8_MAX); } AcpiOsPrintf (", "); } --- 563,573 ---- /* Make sure that the ResourceSource string exists before dumping it */ if (TotalLength > (MinimumTotalLength + 1)) { AcpiOsPrintf (" "); ! AcpiUtPrintString ((char *) &AmlResourceSource[1], ACPI_UINT16_MAX); } AcpiOsPrintf (", "); }
*** 765,775 **** /* Dump name and read/write flag */ AcpiDmIndent (Level); AcpiOsPrintf ("Memory24 (%s,\n", ! AcpiGbl_RwDecode [Resource->Memory24.Flags & 1]); /* Dump the 4 contiguous WORD values */ AcpiDmMemoryFields (&Resource->Memory24.Minimum, 16, Level); --- 777,787 ---- /* Dump name and read/write flag */ AcpiDmIndent (Level); AcpiOsPrintf ("Memory24 (%s,\n", ! AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->Memory24.Flags)]); /* Dump the 4 contiguous WORD values */ AcpiDmMemoryFields (&Resource->Memory24.Minimum, 16, Level);
*** 804,814 **** /* Dump name and read/write flag */ AcpiDmIndent (Level); AcpiOsPrintf ("Memory32 (%s,\n", ! AcpiGbl_RwDecode [Resource->Memory32.Flags & 1]); /* Dump the 4 contiguous DWORD values */ AcpiDmMemoryFields (&Resource->Memory32.Minimum, 32, Level); --- 816,826 ---- /* Dump name and read/write flag */ AcpiDmIndent (Level); AcpiOsPrintf ("Memory32 (%s,\n", ! AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->Memory32.Flags)]); /* Dump the 4 contiguous DWORD values */ AcpiDmMemoryFields (&Resource->Memory32.Minimum, 32, Level);
*** 843,853 **** /* Dump name and read/write flag */ AcpiDmIndent (Level); AcpiOsPrintf ("Memory32Fixed (%s,\n", ! AcpiGbl_RwDecode [Resource->FixedMemory32.Flags & 1]); AcpiDmIndent (Level + 1); AcpiDmDumpInteger32 (Resource->FixedMemory32.Address, "Address Base"); AcpiDmIndent (Level + 1); --- 855,865 ---- /* Dump name and read/write flag */ AcpiDmIndent (Level); AcpiOsPrintf ("Memory32Fixed (%s,\n", ! AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]); AcpiDmIndent (Level + 1); AcpiDmDumpInteger32 (Resource->FixedMemory32.Address, "Address Base"); AcpiDmIndent (Level + 1);
*** 940,953 **** UINT32 i; AcpiDmIndent (Level); AcpiOsPrintf ("Interrupt (%s, %s, %s, %s, ", ! AcpiGbl_ConsumeDecode [(Resource->ExtendedIrq.Flags & 1)], ! AcpiGbl_HeDecode [(Resource->ExtendedIrq.Flags >> 1) & 1], ! AcpiGbl_LlDecode [(Resource->ExtendedIrq.Flags >> 2) & 1], ! AcpiGbl_ShrDecode [(Resource->ExtendedIrq.Flags >> 3) & 1]); /* * The ResourceSource fields are optional and appear after the interrupt * list. Must compute length based on length of the list. First xrupt * is included in the struct (reason for -1 below) --- 952,965 ---- UINT32 i; AcpiDmIndent (Level); AcpiOsPrintf ("Interrupt (%s, %s, %s, %s, ", ! AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->ExtendedIrq.Flags)], ! AcpiGbl_HeDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->ExtendedIrq.Flags, 1)], ! AcpiGbl_LlDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->ExtendedIrq.Flags, 2)], ! AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->ExtendedIrq.Flags, 3)]); /* * The ResourceSource fields are optional and appear after the interrupt * list. Must compute length based on length of the list. First xrupt * is included in the struct (reason for -1 below)
*** 1048,1053 **** ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_LARGE_HEADER)), Length, Level); } #endif - --- 1060,1064 ----