mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-22 00:14:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Disassembler: Add new ACPI 5.0 interrupt sharing flags.

Browse Source 
This changes adds the ShareAndWake and ExclusiveAndWake flags
which were added to the Irq, Interrupt, and Gpio resource
descriptors in ACPI 5.0.
This commit is contained in:
Robert Moore 2012-11-01 16:52:03 -07:00
parent a3e95d8f8e
commit ef93444b93
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1017,7 +1017,7 @@ AcpiDmInterruptDescriptor (
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]);
AcpiGbl_ShrDecode [(Resource->ExtendedIrq.Flags >> 3) & 3]);
/*
* The ResourceSource fields are optional and appear after the interrupt

4
source/components/disassembler/dmresrcl2.c
View File

@ -347,7 +347,7 @@ AcpiDmGpioIntDescriptor (
AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
AcpiGbl_HeDecode [(Resource->Gpio.IntFlags & 1)],
AcpiGbl_LlDecode [(Resource->Gpio.IntFlags >> 1) & 1],
AcpiGbl_ShrDecode [(Resource->Gpio.IntFlags >> 3) & 1]);
AcpiGbl_ShrDecode [(Resource->Gpio.IntFlags >> 3) & 3]);
/* PinConfig, DebounceTimeout */
@ -395,7 +395,7 @@ AcpiDmGpioIoDescriptor (
AcpiDmIndent (Level);
AcpiOsPrintf ("GpioIo (%s, ",
AcpiGbl_ShrDecode [(Resource->Gpio.IntFlags >> 3) & 1]);
AcpiGbl_ShrDecode [(Resource->Gpio.IntFlags >> 3) & 3]);
if (Resource->Gpio.PinConfig <= 3)
{

2
source/components/disassembler/dmresrcs.c
View File

@ -157,7 +157,7 @@ AcpiDmIrqDescriptor (
AcpiOsPrintf ("%s, %s, %s, ",
AcpiGbl_HeDecode [Resource->Irq.Flags & 1],
AcpiGbl_LlDecode [(Resource->Irq.Flags >> 3) & 1],
AcpiGbl_ShrDecode [(Resource->Irq.Flags >> 4) & 1]);
AcpiGbl_ShrDecode [(Resource->Irq.Flags >> 4) & 3]);
}
/* Insert a descriptor name */

6
source/components/resources/rsdump.c
View File

@ -211,7 +211,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpIrq[7] =
{ACPI_RSD_UINT8 , ACPI_RSD_OFFSET (Irq.DescriptorLength), "Descriptor Length", NULL},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Triggering), "Triggering", AcpiGbl_HeDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Polarity), "Polarity", AcpiGbl_LlDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Sharable), "Sharing", AcpiGbl_ShrDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Irq.Sharable), "Sharing", AcpiGbl_ShrDecode},
{ACPI_RSD_UINT8 , ACPI_RSD_OFFSET (Irq.InterruptCount), "Interrupt Count", NULL},
{ACPI_RSD_SHORTLIST,ACPI_RSD_OFFSET (Irq.Interrupts[0]), "Interrupt List", NULL}
};
@ -350,7 +350,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] =
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.ProducerConsumer), "Type", AcpiGbl_ConsumeDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Triggering), "Triggering", AcpiGbl_HeDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Polarity), "Polarity", AcpiGbl_LlDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Sharable), "Sharing", AcpiGbl_ShrDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Sharable), "Sharing", AcpiGbl_ShrDecode},
{ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (ExtendedIrq.ResourceSource), NULL, NULL},
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET (ExtendedIrq.InterruptCount), "Interrupt Count", NULL},
{ACPI_RSD_DWORDLIST,ACPI_RSD_OFFSET (ExtendedIrq.Interrupts[0]), "Interrupt List", NULL}
@ -373,7 +373,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGpio[16] =
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET (Gpio.ConnectionType), "ConnectionType", AcpiGbl_CtDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Gpio.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode},
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET (Gpio.PinConfig), "PinConfig", AcpiGbl_PpcDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Sharable), "Sharable", AcpiGbl_ShrDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Sharable), "Sharing", AcpiGbl_ShrDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.IoRestriction), "IoRestriction", AcpiGbl_IorDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Gpio.Triggering), "Triggering", AcpiGbl_HeDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Polarity), "Polarity", AcpiGbl_LlDecode},

4
source/components/utilities/utresrc.c
View File

@ -220,7 +220,9 @@ const char *AcpiGbl_RwDecode[] =
const char *AcpiGbl_ShrDecode[] =
{
"Exclusive",
"Shared"
"Shared",
"ExclusiveAndWake", /* ACPI 5.0 */
"SharedAndWake" /* ACPI 5.0 */
};
const char *AcpiGbl_SizDecode[] =