ACK: [PATCH 2/3] fwts-test: update disassemble test to sync with latest ACPICA changes
IvanHu
ivan.hu at canonical.com
Thu Jul 31 08:57:04 UTC 2014
On 07/25/2014 03:57 AM, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> The latest ACPICA can now handle ToUUID() so we need update the tests
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
> fwts-test/disassemble-0001/DSDT.dsl.original | 6 +++---
> fwts-test/disassemble-0001/SSDT0.dsl.original | 6 +++---
> fwts-test/disassemble-0001/SSDT1.dsl.original | 6 +++---
> fwts-test/disassemble-0001/SSDT2.dsl.original | 6 +++---
> fwts-test/disassemble-0001/SSDT3.dsl.original | 6 +++---
> fwts-test/disassemble-0001/SSDT4.dsl.original | 30 +++++++--------------------
> 6 files changed, 22 insertions(+), 38 deletions(-)
>
> diff --git a/fwts-test/disassemble-0001/DSDT.dsl.original b/fwts-test/disassemble-0001/DSDT.dsl.original
> index f886877..7812c6d 100644
> --- a/fwts-test/disassemble-0001/DSDT.dsl.original
> +++ b/fwts-test/disassemble-0001/DSDT.dsl.original
> @@ -1,9 +1,9 @@
> /*
> * Intel ACPI Component Architecture
> - * AML Disassembler version 20140627-64 [Jun 27 2014]
> + * AML Disassembler version 20140724-64 [Jul 24 2014]
> * Copyright (c) 2000 - 2014 Intel Corporation
> *
> - * Disassembly of /tmp/fwts_iasl_24623_DSDT.dat, Fri Jun 27 19:11:41 2014
> + * Disassembly of /tmp/fwts_iasl_1052_DSDT.dat, Thu Jul 24 20:48:05 2014
> *
> * Original Table Header:
> * Signature "DSDT"
> @@ -16,7 +16,7 @@
> * Compiler ID "INTL"
> * Compiler Version 0x20060608 (537265672)
> */
> -DefinitionBlock ("/tmp/fwts_iasl_24623_DSDT.aml", "DSDT", 2, "TOSCPL", "CRESTLNE", 0x06040000)
> +DefinitionBlock ("/tmp/fwts_iasl_1052_DSDT.aml", "DSDT", 2, "TOSCPL", "CRESTLNE", 0x06040000)
> {
>
> External (_PR_.CPU0._PPC, UnknownObj)
> diff --git a/fwts-test/disassemble-0001/SSDT0.dsl.original b/fwts-test/disassemble-0001/SSDT0.dsl.original
> index e1eaa87..b8d8569 100644
> --- a/fwts-test/disassemble-0001/SSDT0.dsl.original
> +++ b/fwts-test/disassemble-0001/SSDT0.dsl.original
> @@ -1,9 +1,9 @@
> /*
> * Intel ACPI Component Architecture
> - * AML Disassembler version 20140627-64 [Jun 27 2014]
> + * AML Disassembler version 20140724-64 [Jul 24 2014]
> * Copyright (c) 2000 - 2014 Intel Corporation
> *
> - * Disassembly of /tmp/fwts_iasl_24623_SSDT.dat, Fri Jun 27 19:11:41 2014
> + * Disassembly of /tmp/fwts_iasl_1052_SSDT.dat, Thu Jul 24 20:48:05 2014
> *
> * Original Table Header:
> * Signature "SSDT"
> @@ -16,7 +16,7 @@
> * Compiler ID "INTL"
> * Compiler Version 0x20050624 (537200164)
> */
> -DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "SataRe", "SataAhci", 0x00001000)
> +DefinitionBlock ("/tmp/fwts_iasl_1052_SSDT.aml", "SSDT", 1, "SataRe", "SataAhci", 0x00001000)
> {
>
> External (_SB_.PCI0.SATA, DeviceObj)
> diff --git a/fwts-test/disassemble-0001/SSDT1.dsl.original b/fwts-test/disassemble-0001/SSDT1.dsl.original
> index febfd46..16faed7 100644
> --- a/fwts-test/disassemble-0001/SSDT1.dsl.original
> +++ b/fwts-test/disassemble-0001/SSDT1.dsl.original
> @@ -1,9 +1,9 @@
> /*
> * Intel ACPI Component Architecture
> - * AML Disassembler version 20140627-64 [Jun 27 2014]
> + * AML Disassembler version 20140724-64 [Jul 24 2014]
> * Copyright (c) 2000 - 2014 Intel Corporation
> *
> - * Disassembly of /tmp/fwts_iasl_24623_SSDT.dat, Fri Jun 27 19:11:41 2014
> + * Disassembly of /tmp/fwts_iasl_1052_SSDT.dat, Thu Jul 24 20:48:05 2014
> *
> * Original Table Header:
> * Signature "SSDT"
> @@ -16,7 +16,7 @@
> * Compiler ID "INTL"
> * Compiler Version 0x20050624 (537200164)
> */
> -DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "BrtRef", "DD01BRT", 0x00001000)
> +DefinitionBlock ("/tmp/fwts_iasl_1052_SSDT.aml", "SSDT", 1, "BrtRef", "DD01BRT", 0x00001000)
> {
>
> External (_SB_.PCI0.GFX0.DD03, DeviceObj)
> diff --git a/fwts-test/disassemble-0001/SSDT2.dsl.original b/fwts-test/disassemble-0001/SSDT2.dsl.original
> index 6d894f7..71a6701 100644
> --- a/fwts-test/disassemble-0001/SSDT2.dsl.original
> +++ b/fwts-test/disassemble-0001/SSDT2.dsl.original
> @@ -1,9 +1,9 @@
> /*
> * Intel ACPI Component Architecture
> - * AML Disassembler version 20140627-64 [Jun 27 2014]
> + * AML Disassembler version 20140724-64 [Jul 24 2014]
> * Copyright (c) 2000 - 2014 Intel Corporation
> *
> - * Disassembly of /tmp/fwts_iasl_24623_SSDT.dat, Fri Jun 27 19:11:41 2014
> + * Disassembly of /tmp/fwts_iasl_1052_SSDT.dat, Thu Jul 24 20:48:06 2014
> *
> * Original Table Header:
> * Signature "SSDT"
> @@ -16,7 +16,7 @@
> * Compiler ID "INTL"
> * Compiler Version 0x20050624 (537200164)
> */
> -DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "PmRef", "Cpu0Tst", 0x00003000)
> +DefinitionBlock ("/tmp/fwts_iasl_1052_SSDT.aml", "SSDT", 1, "PmRef", "Cpu0Tst", 0x00003000)
> {
>
> External (_PR_.CPU0, DeviceObj)
> diff --git a/fwts-test/disassemble-0001/SSDT3.dsl.original b/fwts-test/disassemble-0001/SSDT3.dsl.original
> index bda2412..ad65fa0 100644
> --- a/fwts-test/disassemble-0001/SSDT3.dsl.original
> +++ b/fwts-test/disassemble-0001/SSDT3.dsl.original
> @@ -1,9 +1,9 @@
> /*
> * Intel ACPI Component Architecture
> - * AML Disassembler version 20140627-64 [Jun 27 2014]
> + * AML Disassembler version 20140724-64 [Jul 24 2014]
> * Copyright (c) 2000 - 2014 Intel Corporation
> *
> - * Disassembly of /tmp/fwts_iasl_24623_SSDT.dat, Fri Jun 27 19:11:41 2014
> + * Disassembly of /tmp/fwts_iasl_1052_SSDT.dat, Thu Jul 24 20:48:06 2014
> *
> * Original Table Header:
> * Signature "SSDT"
> @@ -16,7 +16,7 @@
> * Compiler ID "INTL"
> * Compiler Version 0x20050624 (537200164)
> */
> -DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "PmRef", "Cpu1Tst", 0x00003000)
> +DefinitionBlock ("/tmp/fwts_iasl_1052_SSDT.aml", "SSDT", 1, "PmRef", "Cpu1Tst", 0x00003000)
> {
>
> External (_PR_.CPU0._PTC, IntObj)
> diff --git a/fwts-test/disassemble-0001/SSDT4.dsl.original b/fwts-test/disassemble-0001/SSDT4.dsl.original
> index d038362..3394ac6 100644
> --- a/fwts-test/disassemble-0001/SSDT4.dsl.original
> +++ b/fwts-test/disassemble-0001/SSDT4.dsl.original
> @@ -1,9 +1,9 @@
> /*
> * Intel ACPI Component Architecture
> - * AML Disassembler version 20140627-64 [Jun 27 2014]
> + * AML Disassembler version 20140724-64 [Jul 24 2014]
> * Copyright (c) 2000 - 2014 Intel Corporation
> *
> - * Disassembly of /tmp/fwts_iasl_24623_SSDT.dat, Fri Jun 27 19:11:41 2014
> + * Disassembly of /tmp/fwts_iasl_1052_SSDT.dat, Thu Jul 24 20:48:06 2014
> *
> * Original Table Header:
> * Signature "SSDT"
> @@ -16,7 +16,7 @@
> * Compiler ID "INTL"
> * Compiler Version 0x20050624 (537200164)
> */
> -DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "PmRef", "CpuPm", 0x00003000)
> +DefinitionBlock ("/tmp/fwts_iasl_1052_SSDT.aml", "SSDT", 1, "PmRef", "CpuPm", 0x00003000)
> {
>
> External (_PR_.CPU0, DeviceObj)
> @@ -63,11 +63,7 @@ DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "PmRef", "CpuPm", 0
> 0x00, 0x00, 0x00, 0x00 /* .... */
> })
> Concatenate (STS0, TEMP, Local2)
> - _OSC (Buffer (0x10)
> - {
> - /* 0000 */ 0x16, 0xA6, 0x77, 0x40, 0x0C, 0x29, 0xBE, 0x47, /* ..w at .).G */
> - /* 0008 */ 0x9E, 0xBD, 0xD8, 0x70, 0x58, 0x71, 0x39, 0x53 /* ...pXq9S */
> - }, REVS, SIZE, Local2)
> + _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953"), REVS, SIZE, Local2)
> }
>
> Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
> @@ -78,11 +74,7 @@ DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "PmRef", "CpuPm", 0
> CreateDWordField (Arg0, 0x04, IID1)
> CreateDWordField (Arg0, 0x08, IID2)
> CreateDWordField (Arg0, 0x0C, IID3)
> - Name (UID0, Buffer (0x10)
> - {
> - /* 0000 */ 0x16, 0xA6, 0x77, 0x40, 0x0C, 0x29, 0xBE, 0x47, /* ..w at .).G */
> - /* 0008 */ 0x9E, 0xBD, 0xD8, 0x70, 0x58, 0x71, 0x39, 0x53 /* ...pXq9S */
> - })
> + Name (UID0, ToUUID ("4077a616-290c-47be-9ebd-d87058713953"))
> CreateDWordField (UID0, 0x00, EID0)
> CreateDWordField (UID0, 0x04, EID1)
> CreateDWordField (UID0, 0x08, EID2)
> @@ -146,11 +138,7 @@ DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "PmRef", "CpuPm", 0
> 0x00, 0x00, 0x00, 0x00 /* .... */
> })
> Concatenate (STS1, TEMP, Local2)
> - _OSC (Buffer (0x10)
> - {
> - /* 0000 */ 0x16, 0xA6, 0x77, 0x40, 0x0C, 0x29, 0xBE, 0x47, /* ..w at .).G */
> - /* 0008 */ 0x9E, 0xBD, 0xD8, 0x70, 0x58, 0x71, 0x39, 0x53 /* ...pXq9S */
> - }, REVS, SIZE, Local2)
> + _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953"), REVS, SIZE, Local2)
> }
>
> Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
> @@ -161,11 +149,7 @@ DefinitionBlock ("/tmp/fwts_iasl_24623_SSDT.aml", "SSDT", 1, "PmRef", "CpuPm", 0
> CreateDWordField (Arg0, 0x04, IID1)
> CreateDWordField (Arg0, 0x08, IID2)
> CreateDWordField (Arg0, 0x0C, IID3)
> - Name (UID1, Buffer (0x10)
> - {
> - /* 0000 */ 0x16, 0xA6, 0x77, 0x40, 0x0C, 0x29, 0xBE, 0x47, /* ..w at .).G */
> - /* 0008 */ 0x9E, 0xBD, 0xD8, 0x70, 0x58, 0x71, 0x39, 0x53 /* ...pXq9S */
> - })
> + Name (UID1, ToUUID ("4077a616-290c-47be-9ebd-d87058713953"))
> CreateDWordField (UID1, 0x00, EID0)
> CreateDWordField (UID1, 0x04, EID1)
> CreateDWordField (UID1, 0x08, EID2)
>
Acked-by: Ivan Hu <ivan.hu at canonical.com>
More information about the fwts-devel
mailing list