diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2012-11-06 13:08:57 -0800 |
|---|---|---|
| committer | Robert Moore <Robert.Moore@intel.com> | 2012-11-06 13:08:57 -0800 |
| commit | 56037d01c3f685ace801123c80e9681db073fdd9 (patch) | |
| tree | b405400d55c9428076660bfb03b92d8ac1bd9468 | |
| parent | 568c54255b4e553356f8cc65ba2d4bbd41505b0d (diff) | |
| download | acpica-56037d01c3f685ace801123c80e9681db073fdd9.tar.gz | |
AcpiBin: Display compared headers side-by-side.
Improvement over displaying one header after the other.
| -rw-r--r-- | source/tools/acpibin/abcompare.c | 28 | ||||
| -rw-r--r-- | source/tools/acpibin/abmain.c | 4 |
2 files changed, 28 insertions, 4 deletions
diff --git a/source/tools/acpibin/abcompare.c b/source/tools/acpibin/abcompare.c index a978c3852..d448d3fd0 100644 --- a/source/tools/acpibin/abcompare.c +++ b/source/tools/acpibin/abcompare.c @@ -146,6 +146,11 @@ static void AbPrintHeaderInfo ( ACPI_TABLE_HEADER *Header); +static void +AbPrintHeadersInfo ( + ACPI_TABLE_HEADER *Header, + ACPI_TABLE_HEADER *Header2); + ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer ( void); @@ -305,6 +310,26 @@ AbPrintHeaderInfo ( printf ("\n"); } +static void +AbPrintHeadersInfo ( + ACPI_TABLE_HEADER *Header, + ACPI_TABLE_HEADER *Header2) +{ + + /* Display header information for both headers */ + + printf ("Signature %8.4s : %4.4s\n", Header->Signature, Header2->Signature); + printf ("Length %8.8X : %8.8X\n", Header->Length, Header2->Length); + printf ("Revision %8.2X : %2.2X\n", Header->Revision, Header2->Revision); + printf ("Checksum %8.2X : %2.2X\n", Header->Checksum, Header2->Checksum); + printf ("OEM ID %8.6s : %6.6s\n", Header->OemId, Header2->OemId); + printf ("OEM Table ID %8.8s : %8.8s\n", Header->OemTableId, Header2->OemTableId); + printf ("OEM Revision %8.8X : %8.8X\n", Header->OemRevision, Header2->OemRevision); + printf ("ASL Compiler ID %8.4s : %4.4s\n", Header->AslCompilerId, Header2->AslCompilerId); + printf ("Compiler Revision %8.8X : %8.8X\n", Header->AslCompilerRevision, Header2->AslCompilerRevision); + printf ("\n"); +} + /****************************************************************************** * @@ -513,8 +538,7 @@ AbCompareAmlFiles ( { /* Display header information */ - AbPrintHeaderInfo (&Header1); - AbPrintHeaderInfo (&Header2); + AbPrintHeadersInfo (&Header1, &Header2); } if (memcmp (&Header1, &Header2, sizeof (ACPI_TABLE_HEADER))) diff --git a/source/tools/acpibin/abmain.c b/source/tools/acpibin/abmain.c index a07640136..52c6df73e 100644 --- a/source/tools/acpibin/abmain.c +++ b/source/tools/acpibin/abmain.c @@ -145,9 +145,9 @@ AbDisplayUsage ( ACPI_USAGE_HEADER ("acpibin [options]"); - ACPI_OPTION ("-c <File1><File2>", "Compare two AML files"); + ACPI_OPTION ("-c <File1><File2>", "Compare two binary AML files"); ACPI_OPTION ("-d <In><Out>", "Dump AML binary to text file"); - ACPI_OPTION ("-e <Sig><In><Out>", "Extract binary AML table from AcpiDmp file"); + ACPI_OPTION ("-e <Sig><In><Out>", "Extract binary AML table from AcpiDump file"); ACPI_OPTION ("-h <File>", "Display table header for binary AML file"); ACPI_OPTION ("-s <File>", "Update checksum for binary AML file"); ACPI_OPTION ("-t", "Terse mode"); |