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

*** 3,13 **** * Module Name: dmutils - AML disassembler utilities * ******************************************************************************/ /* ! * 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: dmutils - AML disassembler utilities * ******************************************************************************/ /* ! * 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:
*** 133,143 **** * * PARAMETERS: Attribute - Attribute field of AccessAs keyword * * RETURN: None * ! * DESCRIPTION: Decode the AccessAs attribute byte. (Mostly SMBus stuff) * ******************************************************************************/ void AcpiDmDecodeAttribute ( --- 133,144 ---- * * PARAMETERS: Attribute - Attribute field of AccessAs keyword * * RETURN: None * ! * DESCRIPTION: Decode the AccessAs attribute byte. (Mostly SMBus and ! * GenericSerialBus stuff.) * ******************************************************************************/ void AcpiDmDecodeAttribute (
*** 144,191 **** UINT8 Attribute) { switch (Attribute) { ! case AML_FIELD_ATTRIB_SMB_QUICK: ! AcpiOsPrintf ("SMBQuick"); break; ! case AML_FIELD_ATTRIB_SMB_SEND_RCV: ! AcpiOsPrintf ("SMBSendReceive"); break; ! case AML_FIELD_ATTRIB_SMB_BYTE: ! AcpiOsPrintf ("SMBByte"); break; ! case AML_FIELD_ATTRIB_SMB_WORD: ! AcpiOsPrintf ("SMBWord"); break; ! case AML_FIELD_ATTRIB_SMB_WORD_CALL: ! AcpiOsPrintf ("SMBProcessCall"); break; ! case AML_FIELD_ATTRIB_SMB_BLOCK: ! AcpiOsPrintf ("SMBBlock"); break; ! case AML_FIELD_ATTRIB_SMB_BLOCK_CALL: ! AcpiOsPrintf ("SMBBlockProcessCall"); break; default: ! AcpiOsPrintf ("0x%.2X", Attribute); break; } } --- 145,209 ---- UINT8 Attribute) { switch (Attribute) { ! case AML_FIELD_ATTRIB_QUICK: ! AcpiOsPrintf ("AttribQuick"); break; ! case AML_FIELD_ATTRIB_SEND_RCV: ! AcpiOsPrintf ("AttribSendReceive"); break; ! case AML_FIELD_ATTRIB_BYTE: ! AcpiOsPrintf ("AttribByte"); break; ! case AML_FIELD_ATTRIB_WORD: ! AcpiOsPrintf ("AttribWord"); break; ! case AML_FIELD_ATTRIB_BLOCK: ! AcpiOsPrintf ("AttribBlock"); break; ! case AML_FIELD_ATTRIB_MULTIBYTE: ! AcpiOsPrintf ("AttribBytes"); break; ! case AML_FIELD_ATTRIB_WORD_CALL: ! AcpiOsPrintf ("AttribProcessCall"); break; + case AML_FIELD_ATTRIB_BLOCK_CALL: + + AcpiOsPrintf ("AttribBlockProcessCall"); + break; + + case AML_FIELD_ATTRIB_RAW_BYTES: + + AcpiOsPrintf ("AttribRawBytes"); + break; + + case AML_FIELD_ATTRIB_RAW_PROCESS: + + AcpiOsPrintf ("AttribRawProcessBytes"); + break; + default: ! /* A ByteConst is allowed by the grammar */ ! ! AcpiOsPrintf ("0x%2.2X", Attribute); break; } }
*** 232,242 **** ACPI_PARSE_OBJECT *Op) { if (!Op->Common.Next) { ! return FALSE; } if (AcpiDmListType (Op->Common.Parent) & BLOCK_COMMA_LIST) { /* Check for a NULL target operand */ --- 250,260 ---- ACPI_PARSE_OBJECT *Op) { if (!Op->Common.Next) { ! return (FALSE); } if (AcpiDmListType (Op->Common.Parent) & BLOCK_COMMA_LIST) { /* Check for a NULL target operand */
*** 250,267 **** * is the one and only target -- no comma needed. Otherwise, * we need a comma to prepare for the next target. */ if (!Op->Common.Next->Common.Next) { ! return FALSE; } } if ((Op->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST) && (!(Op->Common.Next->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST))) { ! return FALSE; } AcpiOsPrintf (", "); return (TRUE); } --- 268,285 ---- * is the one and only target -- no comma needed. Otherwise, * we need a comma to prepare for the next target. */ if (!Op->Common.Next->Common.Next) { ! return (FALSE); } } if ((Op->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST) && (!(Op->Common.Next->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST))) { ! return (FALSE); } AcpiOsPrintf (", "); return (TRUE); }