Print this page
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure
*** 3,13 ****
* Module Name: dmresrcs.c - "Small" 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: dmresrcs.c - "Small" 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:
*** 74,93 ****
UINT32 Level)
{
AcpiDmIndent (Level);
AcpiOsPrintf ("%s (",
! AcpiGbl_IrqDecode [Length & 1]);
/* Decode flags byte if present */
if (Length & 1)
{
AcpiOsPrintf ("%s, %s, %s, ",
! AcpiGbl_HeDecode [Resource->Irq.Flags & 1],
! AcpiGbl_LlDecode [(Resource->Irq.Flags >> 3) & 1],
! AcpiGbl_ShrDecode [(Resource->Irq.Flags >> 4) & 1]);
}
/* Insert a descriptor name */
AcpiDmDescriptorName ();
--- 74,93 ----
UINT32 Level)
{
AcpiDmIndent (Level);
AcpiOsPrintf ("%s (",
! AcpiGbl_IrqDecode [ACPI_GET_1BIT_FLAG (Length)]);
/* Decode flags byte if present */
if (Length & 1)
{
AcpiOsPrintf ("%s, %s, %s, ",
! AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Irq.Flags)],
! AcpiGbl_LlDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->Irq.Flags, 3)],
! AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Irq.Flags, 4)]);
}
/* Insert a descriptor name */
AcpiDmDescriptorName ();
*** 119,131 ****
UINT32 Level)
{
AcpiDmIndent (Level);
AcpiOsPrintf ("DMA (%s, %s, %s, ",
! AcpiGbl_TypDecode [(Resource->Dma.Flags >> 5) & 3],
! AcpiGbl_BmDecode [(Resource->Dma.Flags >> 2) & 1],
! AcpiGbl_SizDecode [(Resource->Dma.Flags >> 0) & 3]);
/* Insert a descriptor name */
AcpiDmDescriptorName ();
AcpiOsPrintf (")\n");
--- 119,131 ----
UINT32 Level)
{
AcpiDmIndent (Level);
AcpiOsPrintf ("DMA (%s, %s, %s, ",
! AcpiGbl_TypDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Dma.Flags, 5)],
! AcpiGbl_BmDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->Dma.Flags, 2)],
! AcpiGbl_SizDecode [ACPI_GET_2BIT_FLAG (Resource->Dma.Flags)]);
/* Insert a descriptor name */
AcpiDmDescriptorName ();
AcpiOsPrintf (")\n");
*** 135,144 ****
--- 135,187 ----
}
/*******************************************************************************
*
+ * FUNCTION: AcpiDmFixedDmaDescriptor
+ *
+ * PARAMETERS: Resource - Pointer to the resource descriptor
+ * Length - Length of the descriptor in bytes
+ * Level - Current source code indentation level
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Decode a FixedDMA descriptor
+ *
+ ******************************************************************************/
+
+ void
+ AcpiDmFixedDmaDescriptor (
+ AML_RESOURCE *Resource,
+ UINT32 Length,
+ UINT32 Level)
+ {
+
+ AcpiDmIndent (Level);
+ AcpiOsPrintf ("FixedDMA (0x%4.4X, 0x%4.4X, ",
+ Resource->FixedDma.RequestLines,
+ Resource->FixedDma.Channels);
+
+ if (Resource->FixedDma.Width <= 5)
+ {
+ AcpiOsPrintf ("%s, ",
+ AcpiGbl_DtsDecode [Resource->FixedDma.Width]);
+ }
+ else
+ {
+ AcpiOsPrintf ("%X /* INVALID DMA WIDTH */, ", Resource->FixedDma.Width);
+ }
+
+ /* Insert a descriptor name */
+
+ AcpiDmDescriptorName ();
+ AcpiOsPrintf (")\n");
+ }
+
+
+ /*******************************************************************************
+ *
* FUNCTION: AcpiDmIoDescriptor
*
* PARAMETERS: Resource - Pointer to the resource descriptor
* Length - Length of the descriptor in bytes
* Level - Current source code indentation level
*** 156,166 ****
UINT32 Level)
{
AcpiDmIndent (Level);
AcpiOsPrintf ("IO (%s,\n",
! AcpiGbl_IoDecode [(Resource->Io.Flags & 1)]);
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
AcpiDmIndent (Level + 1);
--- 199,209 ----
UINT32 Level)
{
AcpiDmIndent (Level);
AcpiOsPrintf ("IO (%s,\n",
! AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
AcpiDmIndent (Level + 1);
*** 242,253 ****
AcpiDmIndent (Level);
if (Length & 1)
{
AcpiOsPrintf ("StartDependentFn (0x%2.2X, 0x%2.2X)\n",
! (UINT32) Resource->StartDpf.Flags & 3,
! (UINT32) (Resource->StartDpf.Flags >> 2) & 3);
}
else
{
AcpiOsPrintf ("StartDependentFnNoPri ()\n");
}
--- 285,296 ----
AcpiDmIndent (Level);
if (Length & 1)
{
AcpiOsPrintf ("StartDependentFn (0x%2.2X, 0x%2.2X)\n",
! (UINT32) ACPI_GET_2BIT_FLAG (Resource->StartDpf.Flags),
! (UINT32) ACPI_EXTRACT_2BIT_FLAG (Resource->StartDpf.Flags, 2));
}
else
{
AcpiOsPrintf ("StartDependentFnNoPri ()\n");
}
*** 310,315 ****
ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_SMALL_HEADER)),
Length, Level);
}
#endif
-
--- 353,357 ----