From 7a4fe28b9711ffb91eb5cdba0d45213ea7296b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?= Date: Sat, 9 Mar 2024 16:41:54 +0100 Subject: [PATCH] Fix tests after changing field Preserve behavior --- aml_tests/bankfield.asl | 7 ------- aml_tests/indexfield.asl | 45 ++++++++++++++++++---------------------- aml_tests/opregion.asl | 1 - subprojects/lai | 2 +- 4 files changed, 21 insertions(+), 34 deletions(-) diff --git a/aml_tests/bankfield.asl b/aml_tests/bankfield.asl index f213b70..e131d1e 100644 --- a/aml_tests/bankfield.asl +++ b/aml_tests/bankfield.asl @@ -17,25 +17,18 @@ DefinitionBlock("out.aml", "DSDT", 1, "LAI", "LAI_TEST", 1) } Method(_INI) { - //! io-read: pio 8b 0xBEEF = 0x0 //! io-write: pio 8b 0xBEEF = 0x55 - //! io-read: pio 8b 0xBEF1 = 0x0 //! io-write: pio 8b 0xBEF1 = 0xAA CAFE = 0xAA - //! io-read: pio 8b 0xBEEF = 0x0 //! io-write: pio 8b 0xBEEF = 0x55 //! io-read: pio 8b 0xBEF1 = 0xAA - //! io-read: pio 8b 0xBEEF = 0x0 //! io-write: pio 8b 0xBEEF = 0x55 - //! io-read: pio 8b 0xBEF2 = 0 //! io-write: pio 8b 0xBEF2 = 0xAA BABE = CAFE - //! io-read: pio 8b 0xBEEF = 0x0 //! io-write: pio 8b 0xBEEF = 0x55 - //! io-read: pio 32b 0xBEF3 = 0x0 //! io-write: pio 32b 0xBEF3 = 0xBEEFDEAD TEST = 0xBEEFDEAD } diff --git a/aml_tests/indexfield.asl b/aml_tests/indexfield.asl index 4f6dfdb..b900280 100644 --- a/aml_tests/indexfield.asl +++ b/aml_tests/indexfield.asl @@ -15,47 +15,42 @@ DefinitionBlock("out.aml", "DSDT", 1, "LAI", "LAI_TEST", 1) REGD, 8, REGE, 16, } + + OperationRegion (ID2F, SystemIO, 0xD00, 0x2) + Field (ID2F, ByteAcc, NoLock, Preserve) { + IDX2, 4, + DAT2, 8 + } + + IndexField (IDX2, DAT2, ByteAcc, NoLock, Preserve) { + RE2A, 8, + RE2B, 8 + } Method(_INI) { - //! io-read: pio 8b 0xC00 = 0x0 //! io-write: pio 8b 0xC00 = 0x2 - //! io-read: pio 8b 0xC01 = 0x0 - - //! io-read: pio 8b 0xC00 = 0x0 - //! io-write: pio 8b 0xC00 = 0x2 - //! io-read: pio 8b 0xC01 = 0x0 //! io-write: pio 8b 0xC01 = 0xAA REGC = 0xAA - //! io-read: pio 8b 0xC00 = 0x0 //! io-write: pio 8b 0xC00 = 0x0 - //! io-read: pio 8b 0xC01 = 0x0 - - //! io-read: pio 8b 0xC00 = 0x0 - //! io-write: pio 8b 0xC00 = 0x0 - //! io-read: pio 8b 0xC01 = 0x0 //! io-write: pio 8b 0xC01 = 0x55 REGA = 0x55 - //! io-read: pio 8b 0xC00 = 0x0 - //! io-write: pio 8b 0xC00 = 0x4 - //! io-read: pio 8b 0xC01 = 0x0 - - //! io-read: pio 8b 0xC00 = 0x0 //! io-write: pio 8b 0xC00 = 0x4 - //! io-read: pio 8b 0xC01 = 0x0 //! io-write: pio 8b 0xC01 = 0xCD - //! io-read: pio 8b 0xC00 = 0x0 //! io-write: pio 8b 0xC00 = 0x5 - //! io-read: pio 8b 0xC01 = 0x0 - - //! io-read: pio 8b 0xC00 = 0x0 - //! io-write: pio 8b 0xC00 = 0x5 - //! io-read: pio 8b 0xC01 = 0x0 //! io-write: pio 8b 0xC01 = 0xAB REGE = 0xABCD + + //! io-read: pio 8b 0xD00 = 0x00 + //! io-write: pio 8b 0xD00 = 0x01 + //! io-read: pio 8b 0xD00 = 0x01 + //! io-write: pio 8b 0xD00 = 0xA1 + //! io-read: pio 8b 0xD01 = 0x00 + //! io-write: pio 8b 0xD01 = 0x0A + RE2B = 0xAA } } -} \ No newline at end of file +} diff --git a/aml_tests/opregion.asl b/aml_tests/opregion.asl index a16d537..577cba9 100644 --- a/aml_tests/opregion.asl +++ b/aml_tests/opregion.asl @@ -70,7 +70,6 @@ DefinitionBlock("out.aml", "DSDT", 1, "LAI", "LAI_TEST", 1) FLD6 = 0x00 //! io-read: pio 8b 0xB000 = 0x55 //! io-write: pio 8b 0xB000 = 0xD5 - //! io-read: pio 8b 0xB001 = 0x55 //! io-write: pio 8b 0xB001 = 0xAA FLD8 = 0x155 diff --git a/subprojects/lai b/subprojects/lai index 8cc0b53..1e0d947 160000 --- a/subprojects/lai +++ b/subprojects/lai @@ -1 +1 @@ -Subproject commit 8cc0b535e7c52dcda8f2afb6a7715b0f3bc76bd1 +Subproject commit 1e0d9471ab6cee33c1df19f362aa65474119da47