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

*** 3,13 **** * Name: acresrc.h - Resource Manager function prototypes * *****************************************************************************/ /* ! * 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 ---- * Name: acresrc.h - Resource Manager function prototypes * *****************************************************************************/ /* ! * Copyright (C) 2000 - 2013, 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:
*** 73,105 **** } ACPI_RSCONVERT_INFO; /* Resource conversion opcodes */ ! #define ACPI_RSC_INITGET 0 ! #define ACPI_RSC_INITSET 1 ! #define ACPI_RSC_FLAGINIT 2 ! #define ACPI_RSC_1BITFLAG 3 ! #define ACPI_RSC_2BITFLAG 4 ! #define ACPI_RSC_COUNT 5 ! #define ACPI_RSC_COUNT16 6 ! #define ACPI_RSC_LENGTH 7 ! #define ACPI_RSC_MOVE8 8 ! #define ACPI_RSC_MOVE16 9 ! #define ACPI_RSC_MOVE32 10 ! #define ACPI_RSC_MOVE64 11 ! #define ACPI_RSC_SET8 12 ! #define ACPI_RSC_DATA8 13 ! #define ACPI_RSC_ADDRESS 14 ! #define ACPI_RSC_SOURCE 15 ! #define ACPI_RSC_SOURCEX 16 ! #define ACPI_RSC_BITMASK 17 ! #define ACPI_RSC_BITMASK16 18 ! #define ACPI_RSC_EXIT_NE 19 ! #define ACPI_RSC_EXIT_LE 20 ! #define ACPI_RSC_EXIT_EQ 21 /* Resource Conversion sub-opcodes */ #define ACPI_RSC_COMPARE_AML_LENGTH 0 #define ACPI_RSC_COMPARE_VALUE 1 --- 73,119 ---- } ACPI_RSCONVERT_INFO; /* Resource conversion opcodes */ ! typedef enum ! { ! ACPI_RSC_INITGET = 0, ! ACPI_RSC_INITSET, ! ACPI_RSC_FLAGINIT, ! ACPI_RSC_1BITFLAG, ! ACPI_RSC_2BITFLAG, ! ACPI_RSC_3BITFLAG, ! ACPI_RSC_ADDRESS, ! ACPI_RSC_BITMASK, ! ACPI_RSC_BITMASK16, ! ACPI_RSC_COUNT, ! ACPI_RSC_COUNT16, ! ACPI_RSC_COUNT_GPIO_PIN, ! ACPI_RSC_COUNT_GPIO_RES, ! ACPI_RSC_COUNT_GPIO_VEN, ! ACPI_RSC_COUNT_SERIAL_RES, ! ACPI_RSC_COUNT_SERIAL_VEN, ! ACPI_RSC_DATA8, ! ACPI_RSC_EXIT_EQ, ! ACPI_RSC_EXIT_LE, ! ACPI_RSC_EXIT_NE, ! ACPI_RSC_LENGTH, ! ACPI_RSC_MOVE_GPIO_PIN, ! ACPI_RSC_MOVE_GPIO_RES, ! ACPI_RSC_MOVE_SERIAL_RES, ! ACPI_RSC_MOVE_SERIAL_VEN, ! ACPI_RSC_MOVE8, ! ACPI_RSC_MOVE16, ! ACPI_RSC_MOVE32, ! ACPI_RSC_MOVE64, ! ACPI_RSC_SET8, ! ACPI_RSC_SOURCE, ! ACPI_RSC_SOURCEX + } ACPI_RSCONVERT_OPCODES; + /* Resource Conversion sub-opcodes */ #define ACPI_RSC_COMPARE_AML_LENGTH 0 #define ACPI_RSC_COMPARE_VALUE 1
*** 107,116 **** --- 121,133 ---- #define ACPI_RS_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_RESOURCE,f) #define AML_OFFSET(f) (UINT8) ACPI_OFFSET (AML_RESOURCE,f) + /* + * Individual entry for the resource dump tables + */ typedef const struct acpi_rsdump_info { UINT8 Opcode; UINT8 Offset; char *Name;
*** 118,157 **** } ACPI_RSDUMP_INFO; /* Values for the Opcode field above */ ! #define ACPI_RSD_TITLE 0 ! #define ACPI_RSD_LITERAL 1 ! #define ACPI_RSD_STRING 2 ! #define ACPI_RSD_UINT8 3 ! #define ACPI_RSD_UINT16 4 ! #define ACPI_RSD_UINT32 5 ! #define ACPI_RSD_UINT64 6 ! #define ACPI_RSD_1BITFLAG 7 ! #define ACPI_RSD_2BITFLAG 8 ! #define ACPI_RSD_SHORTLIST 9 ! #define ACPI_RSD_LONGLIST 10 ! #define ACPI_RSD_DWORDLIST 11 ! #define ACPI_RSD_ADDRESS 12 ! #define ACPI_RSD_SOURCE 13 /* restore default alignment */ #pragma pack() /* Resource tables indexed by internal resource type */ extern const UINT8 AcpiGbl_AmlResourceSizes[]; extern ACPI_RSCONVERT_INFO *AcpiGbl_SetResourceDispatch[]; /* Resource tables indexed by raw AML resource descriptor type */ extern const UINT8 AcpiGbl_ResourceStructSizes[]; extern ACPI_RSCONVERT_INFO *AcpiGbl_GetResourceDispatch[]; typedef struct acpi_vendor_walk_info { ACPI_VENDOR_UUID *Uuid; ACPI_BUFFER *Buffer; --- 135,184 ---- } ACPI_RSDUMP_INFO; /* Values for the Opcode field above */ ! typedef enum ! { ! ACPI_RSD_TITLE = 0, ! ACPI_RSD_1BITFLAG, ! ACPI_RSD_2BITFLAG, ! ACPI_RSD_3BITFLAG, ! ACPI_RSD_ADDRESS, ! ACPI_RSD_DWORDLIST, ! ACPI_RSD_LITERAL, ! ACPI_RSD_LONGLIST, ! ACPI_RSD_SHORTLIST, ! ACPI_RSD_SHORTLISTX, ! ACPI_RSD_SOURCE, ! ACPI_RSD_STRING, ! ACPI_RSD_UINT8, ! ACPI_RSD_UINT16, ! ACPI_RSD_UINT32, ! ACPI_RSD_UINT64, ! ACPI_RSD_WORDLIST + } ACPI_RSDUMP_OPCODES; + /* restore default alignment */ #pragma pack() /* Resource tables indexed by internal resource type */ extern const UINT8 AcpiGbl_AmlResourceSizes[]; + extern const UINT8 AcpiGbl_AmlResourceSerialBusSizes[]; extern ACPI_RSCONVERT_INFO *AcpiGbl_SetResourceDispatch[]; /* Resource tables indexed by raw AML resource descriptor type */ extern const UINT8 AcpiGbl_ResourceStructSizes[]; + extern const UINT8 AcpiGbl_ResourceStructSerialBusSizes[]; extern ACPI_RSCONVERT_INFO *AcpiGbl_GetResourceDispatch[]; + extern ACPI_RSCONVERT_INFO *AcpiGbl_ConvertResourceSerialBusDispatch[]; typedef struct acpi_vendor_walk_info { ACPI_VENDOR_UUID *Uuid; ACPI_BUFFER *Buffer;
*** 168,178 **** ACPI_OPERAND_OBJECT *AmlBuffer, ACPI_BUFFER *OutputBuffer); ACPI_STATUS AcpiRsCreateAmlResources ( ! ACPI_RESOURCE *LinkedListBuffer, ACPI_BUFFER *OutputBuffer); ACPI_STATUS AcpiRsCreatePciRoutingTable ( ACPI_OPERAND_OBJECT *PackageObject, --- 195,205 ---- ACPI_OPERAND_OBJECT *AmlBuffer, ACPI_BUFFER *OutputBuffer); ACPI_STATUS AcpiRsCreateAmlResources ( ! ACPI_BUFFER *ResourceList, ACPI_BUFFER *OutputBuffer); ACPI_STATUS AcpiRsCreatePciRoutingTable ( ACPI_OPERAND_OBJECT *PackageObject,
*** 206,215 **** --- 233,246 ---- ACPI_STATUS AcpiRsSetSrsMethodData ( ACPI_NAMESPACE_NODE *Node, ACPI_BUFFER *RetBuffer); + ACPI_STATUS + AcpiRsGetAeiMethodData ( + ACPI_NAMESPACE_NODE *Node, + ACPI_BUFFER *RetBuffer); /* * rscalc */ ACPI_STATUS
*** 218,228 **** UINT32 AmlBufferLength, ACPI_SIZE *SizeNeeded); ACPI_STATUS AcpiRsGetAmlLength ( ! ACPI_RESOURCE *LinkedListBuffer, ACPI_SIZE *SizeNeeded); ACPI_STATUS AcpiRsGetPciRoutingTableLength ( ACPI_OPERAND_OBJECT *PackageObject, --- 249,260 ---- UINT32 AmlBufferLength, ACPI_SIZE *SizeNeeded); ACPI_STATUS AcpiRsGetAmlLength ( ! ACPI_RESOURCE *ResourceList, ! ACPI_SIZE ResourceListSize, ACPI_SIZE *SizeNeeded); ACPI_STATUS AcpiRsGetPciRoutingTableLength ( ACPI_OPERAND_OBJECT *PackageObject,
*** 232,242 **** AcpiRsConvertAmlToResources ( UINT8 *Aml, UINT32 Length, UINT32 Offset, UINT8 ResourceIndex, ! void *Context); ACPI_STATUS AcpiRsConvertResourcesToAml ( ACPI_RESOURCE *Resource, ACPI_SIZE AmlSizeNeeded, --- 264,274 ---- AcpiRsConvertAmlToResources ( UINT8 *Aml, UINT32 Length, UINT32 Offset, UINT8 ResourceIndex, ! void **Context); ACPI_STATUS AcpiRsConvertResourcesToAml ( ACPI_RESOURCE *Resource, ACPI_SIZE AmlSizeNeeded,
*** 346,355 **** --- 378,392 ---- extern ACPI_RSCONVERT_INFO AcpiRsConvertAddress32[]; extern ACPI_RSCONVERT_INFO AcpiRsConvertAddress16[]; extern ACPI_RSCONVERT_INFO AcpiRsConvertExtIrq[]; extern ACPI_RSCONVERT_INFO AcpiRsConvertAddress64[]; extern ACPI_RSCONVERT_INFO AcpiRsConvertExtAddress64[]; + extern ACPI_RSCONVERT_INFO AcpiRsConvertGpio[]; + extern ACPI_RSCONVERT_INFO AcpiRsConvertFixedDma[]; + extern ACPI_RSCONVERT_INFO AcpiRsConvertI2cSerialBus[]; + extern ACPI_RSCONVERT_INFO AcpiRsConvertSpiSerialBus[]; + extern ACPI_RSCONVERT_INFO AcpiRsConvertUartSerialBus[]; /* These resources require separate get/set tables */ extern ACPI_RSCONVERT_INFO AcpiRsGetIrq[]; extern ACPI_RSCONVERT_INFO AcpiRsGetStartDpf[];
*** 364,392 **** #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /* * rsinfo */ extern ACPI_RSDUMP_INFO *AcpiGbl_DumpResourceDispatch[]; /* ! * rsdump */ extern ACPI_RSDUMP_INFO AcpiRsDumpIrq[]; extern ACPI_RSDUMP_INFO AcpiRsDumpDma[]; extern ACPI_RSDUMP_INFO AcpiRsDumpStartDpf[]; extern ACPI_RSDUMP_INFO AcpiRsDumpEndDpf[]; extern ACPI_RSDUMP_INFO AcpiRsDumpIo[]; extern ACPI_RSDUMP_INFO AcpiRsDumpFixedIo[]; extern ACPI_RSDUMP_INFO AcpiRsDumpVendor[]; extern ACPI_RSDUMP_INFO AcpiRsDumpEndTag[]; extern ACPI_RSDUMP_INFO AcpiRsDumpMemory24[]; extern ACPI_RSDUMP_INFO AcpiRsDumpMemory32[]; extern ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[]; extern ACPI_RSDUMP_INFO AcpiRsDumpAddress16[]; extern ACPI_RSDUMP_INFO AcpiRsDumpAddress32[]; extern ACPI_RSDUMP_INFO AcpiRsDumpAddress64[]; extern ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[]; extern ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[]; extern ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[]; #endif #endif /* __ACRESRC_H__ */ --- 401,440 ---- #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /* * rsinfo */ extern ACPI_RSDUMP_INFO *AcpiGbl_DumpResourceDispatch[]; + extern ACPI_RSDUMP_INFO *AcpiGbl_DumpSerialBusDispatch[]; /* ! * rsdumpinfo */ extern ACPI_RSDUMP_INFO AcpiRsDumpIrq[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpPrt[]; extern ACPI_RSDUMP_INFO AcpiRsDumpDma[]; extern ACPI_RSDUMP_INFO AcpiRsDumpStartDpf[]; extern ACPI_RSDUMP_INFO AcpiRsDumpEndDpf[]; extern ACPI_RSDUMP_INFO AcpiRsDumpIo[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[]; extern ACPI_RSDUMP_INFO AcpiRsDumpFixedIo[]; extern ACPI_RSDUMP_INFO AcpiRsDumpVendor[]; extern ACPI_RSDUMP_INFO AcpiRsDumpEndTag[]; extern ACPI_RSDUMP_INFO AcpiRsDumpMemory24[]; extern ACPI_RSDUMP_INFO AcpiRsDumpMemory32[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[]; extern ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[]; extern ACPI_RSDUMP_INFO AcpiRsDumpAddress16[]; extern ACPI_RSDUMP_INFO AcpiRsDumpAddress32[]; extern ACPI_RSDUMP_INFO AcpiRsDumpAddress64[]; extern ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[]; extern ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[]; extern ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpGpio[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpFixedDma[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpCommonSerialBus[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpI2cSerialBus[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpSpiSerialBus[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpUartSerialBus[]; + extern ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[]; #endif #endif /* __ACRESRC_H__ */