mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-24 17:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

iASL: Fix to deterministically detect "Raw Table Data" field in DTC.

Browse Source 
Caused a problem with the recent changes for generic data types
in the Data Table compiler. Lin Ming.
This commit is contained in:
Robert Moore 2011-01-11 13:19:01 -08:00
parent 9a5f2aa74c
commit 314834b417
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/common/dmtable.c
View File

@ -516,7 +516,8 @@ AcpiDmDumpDataTable (
{
/* Dump the raw table data */
AcpiOsPrintf ("\nRaw Table Data\n\n");
AcpiOsPrintf ("\n%s: Length %d (0x%X)\n\n",
ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
AcpiUtDumpBuffer2 (ACPI_CAST_PTR (UINT8, Table), Length, DB_BYTE_DISPLAY);
}
}

30
source/compiler/dtio.c
View File

@ -132,7 +132,7 @@ static void
DtLinkField (
DT_FIELD *Field);
static void
static ACPI_STATUS
DtParseLine (
char *LineBuffer,
UINT32 Line,
@ -298,13 +298,13 @@ DtLinkField (
* Line - Current line number in the source
* Offset - Current byte offset of the line
*
* RETURN: None
* RETURN: Status
*
* DESCRIPTION: Parse one source line
*
*****************************************************************************/
static void
static ACPI_STATUS
DtParseLine (
char *LineBuffer,
UINT32 Line,
@ -325,13 +325,20 @@ DtParseLine (
if (!LineBuffer)
{
return;
return (AE_OK);
}
/* All lines after "Raw Table Data" are ingored */
if (strstr (LineBuffer, ACPI_RAW_TABLE_DATA_HEADER))
{
return (AE_NOT_FOUND);
}
Colon = strchr (LineBuffer, ':');
if (!Colon)
{
return;
return (AE_OK);
}
Start = LineBuffer;
@ -426,6 +433,8 @@ DtParseLine (
DtLinkField (Field);
}
return (AE_OK);
}
@ -617,6 +626,7 @@ DT_FIELD *
DtScanFile (
FILE *Handle)
{
ACPI_STATUS Status;
UINT32 Offset;
@ -638,7 +648,11 @@ DtScanFile (
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Line %2.2u/%4.4X - %s",
Gbl_CurrentLineNumber, Offset, Gbl_CurrentLineBuffer));
DtParseLine (Gbl_CurrentLineBuffer, Gbl_CurrentLineNumber, Offset);
Status = DtParseLine (Gbl_CurrentLineBuffer, Gbl_CurrentLineNumber, Offset);
if (Status == AE_NOT_FOUND)
{
break;
}
}
return (Gbl_FieldList);
@ -880,8 +894,8 @@ DtWriteTableToListing (
AcpiOsRedirectOutput (Gbl_Files[ASL_FILE_LISTING_OUTPUT].Handle);
AcpiOsPrintf ("\nRaw Table Data: Length %d (0x%X)\n\n",
Gbl_TableLength, Gbl_TableLength);
AcpiOsPrintf ("\n%s: Length %d (0x%X)\n\n",
ACPI_RAW_TABLE_DATA_HEADER, Gbl_TableLength, Gbl_TableLength);
AcpiUtDumpBuffer2 (Buffer, Gbl_TableLength, DB_BYTE_DISPLAY);
AcpiOsRedirectOutput (stdout);

6
source/include/acdisasm.h
View File

@ -125,6 +125,12 @@
#define BLOCK_COMMA_LIST 4
#define ACPI_DEFAULT_RESNAME *(UINT32 *) "__RD"
/*
* Raw table data header. Used by disassembler and data table compiler.
* Do not change.
*/
#define ACPI_RAW_TABLE_DATA_HEADER "Raw Table Data"
typedef const struct acpi_dmtable_info
{