mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-03-18 04:03:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tests-ASLTS: Update for resource descriptor changes.

Browse Source 
Resource tag references now always return a bit offset, not
sometimes bit, sometimes byte. Update descriptor tests to
reflect this change.
This commit is contained in:
Robert Moore 2011-10-05 12:22:03 -07:00
parent 6ac92ae253
commit 348a6da123
23 changed files with 479 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/aslts/src/runtime/cntl/common.asl
View File

@ -237,9 +237,9 @@ Name(ERR7, 0) // The number of errors detected during the loading stage
* ATTENTION:
* These globals are introduced due to the lack of
* parameters of ASL-Method (7).
* Somethimes these parameters may mislead, because
* may be redirected by the following more dipper
* calls. We dont restore the previous values - it
* Sometimes these parameters may mislead, because
* may be redirected by the following more deeper
* calls. We don't restore the previous values - it
* would be too complicated.
*
* Apply it when the common Methods are used and
@ -247,11 +247,11 @@ Name(ERR7, 0) // The number of errors detected during the loading stage
* is somewhere in another file and there is no remained
* ArgX to pass that information.
*
* Aply it also when there are many entries with the
* Apply it also when there are many entries with the
* "index of checking" in the same file. It is more
* convenient to erange them inside the particular
* convenient to arrange them inside the particular
* Methods than to update all them inside the entire
* file each time when it is needed to chahge any
* file each time when it is needed to change any
* or add some new.
*
* Note:
@ -1353,7 +1353,7 @@ Method(TCN0, 1) {
* arg0 - index of test collection
* arg1 - index of test inside the collection
*/
Method(TNIC, 2) {
Method(TNIC, 2, Serialized) {
Store("?", Local7)
switch (arg0) {
case (1) {
@ -1666,7 +1666,7 @@ Name(TFN0, Package() {
* arg1 - information of checking (Word 1)
* arg2 - name of Method initiating the checking (Word 2)
*/
Method(UNP0, 3)
Method(UNP0, 3, Serialized)
{
// c - index of tests collection
ShiftRight(arg0, 28, Local7)

2
tests/aslts/src/runtime/cntl/runmode.asl
View File

@ -492,7 +492,7 @@ Name(SETN, 5)
*
* arg0 - settings number of aslts (see SETN for comment)
*/
Method(SET2, 1) {
Method(SET2, 1, Serialized) {
Store(arg0, Local0)

20
tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl
View File

@ -936,7 +936,7 @@ Name (p440, Package() {
// Particular cases
Name (p441, Package(2) {
Name (p441, Package() {
ResourceTemplate () {
DMA (Compatibility, BusMaster, Transfer8_16) {4}
},
@ -983,21 +983,21 @@ Method(RT1b)
Store("TEST: RT1b, Concatenate two resource templates", Debug)
// Calculate the checksum
// m334(p440, 3)
m332(ts, 3, "p440", p438, p438, p440)
// Calculate the checksum for the target first
// m334(p440, 3)
// m332(ts, 3, "p440", p438, p438, p440)
// Particular cases
Store(0, Local0)
Store(Buffer(Local0){}, Local1)
Store(Local1, Index(p441, 1))
// Store(0, Local0)
// Store(Buffer(Local0){}, Local1)
// Store(Local1, Index(p441, 1))
m332(ts, 2, "p443", p441, p442, p443)
m332(ts, 1, "p443", p441, p442, p443)
m332(ts, 2, "p444", p442, p441, p444)
m332(ts, 1, "p444", p442, p441, p444)
CH03(ts, z007, 0x123, 0, 0)
}

25
tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl
View File

@ -504,6 +504,9 @@ Method(RT0d)
Store("TEST: RT0d, DWord IO Resource Descriptor Macro", Debug)
m330(ts, 37, "p418", p418, p419)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
DWordIO (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
@ -512,17 +515,17 @@ Method(RT0d)
0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, , , DIO1)
}, Local0)
m331(ts, 1, DIO0._DEC, 0x21, DIO1._DEC, 0xf1, "_DEC")
m331(ts, 2, DIO0._MIF, 0x22, DIO1._MIF, 0xf2, "_MIF")
m331(ts, 3, DIO0._MAF, 0x23, DIO1._MAF, 0xf3, "_MAF")
m331(ts, 4, DIO0._RNG, 0x28, DIO1._RNG, 0xf8, "_RNG")
m331(ts, 5, DIO0._TTP, 0x2c, DIO1._TTP, 0xfc, "_TTP")
m331(ts, 6, DIO0._TRS, 0x2d, DIO1._TRS, 0xfd, "_TRS")
m331(ts, 7, DIO0._GRA, 6, DIO1._GRA, 32, "_GRA")
m331(ts, 8, DIO0._MIN, 10, DIO1._MIN, 36, "_MIN")
m331(ts, 9, DIO0._MAX, 14, DIO1._MAX, 40, "_MAX")
m331(ts, 10, DIO0._TRA, 18, DIO1._TRA, 44, "_TRA")
m331(ts, 11, DIO0._LEN, 22, DIO1._LEN, 48, "_LEN")
m331(ts, 1, DIO0._DEC, 0x21, DIO1._DEC, 0xf1, "_DEC")
m331(ts, 2, DIO0._MIF, 0x22, DIO1._MIF, 0xf2, "_MIF")
m331(ts, 3, DIO0._MAF, 0x23, DIO1._MAF, 0xf3, "_MAF")
m331(ts, 4, DIO0._RNG, 0x28, DIO1._RNG, 0xf8, "_RNG")
m331(ts, 5, DIO0._TTP, 0x2c, DIO1._TTP, 0xfc, "_TTP")
m331(ts, 6, DIO0._TRS, 0x2d, DIO1._TRS, 0xfd, "_TRS")
m331(ts, 7, DIO0._GRA, 0x30, DIO1._GRA, 0x100, "_GRA")
m331(ts, 8, DIO0._MIN, 0x50, DIO1._MIN, 0x120, "_MIN")
m331(ts, 9, DIO0._MAX, 0x70, DIO1._MAX, 0x140, "_MAX")
m331(ts, 10, DIO0._TRA, 0x90, DIO1._TRA, 0x160, "_TRA")
m331(ts, 11, DIO0._LEN, 0xB0, DIO1._LEN, 0x180, "_LEN")
}

27
tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl
View File

@ -1011,6 +1011,9 @@ Method(RT11)
Store("TEST: RT11, DWord Memory Resource Descriptor Macro", Debug)
m330(ts, 89, "p426", p426, p427)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
DWordMemory (ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, NonCacheable, ReadOnly,
@ -1019,17 +1022,17 @@ Method(RT11)
0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, , , DME1)
}, Local0)
m331(ts, 1, DME0._DEC, 0x21, DME1._DEC, 0xf1, "_DEC")
m331(ts, 2, DME0._MIF, 0x22, DME1._MIF, 0xf2, "_MIF")
m331(ts, 3, DME0._MAF, 0x23, DME1._MAF, 0xf3, "_MAF")
m331(ts, 4, DME0._RW, 0x28, DME1._RW, 0xf8, "_RW")
m331(ts, 5, DME0._MEM, 0x29, DME1._MEM, 0xf9, "_MEM")
m331(ts, 6, DME0._MTP, 0x2b, DME1._MTP, 0xfb, "_MTP")
m331(ts, 6, DME0._TTP, 0x2d, DME1._TTP, 0xfd, "_TTP")
m331(ts, 7, DME0._GRA, 6, DME1._GRA, 32, "_GRA")
m331(ts, 8, DME0._MIN, 10, DME1._MIN, 36, "_MIN")
m331(ts, 9, DME0._MAX, 14, DME1._MAX, 40, "_MAX")
m331(ts, 10, DME0._TRA, 18, DME1._TRA, 44, "_TRA")
m331(ts, 11, DME0._LEN, 22, DME1._LEN, 48, "_LEN")
m331(ts, 1, DME0._DEC, 0x21, DME1._DEC, 0xf1, "_DEC")
m331(ts, 2, DME0._MIF, 0x22, DME1._MIF, 0xf2, "_MIF")
m331(ts, 3, DME0._MAF, 0x23, DME1._MAF, 0xf3, "_MAF")
m331(ts, 4, DME0._RW, 0x28, DME1._RW, 0xf8, "_RW")
m331(ts, 5, DME0._MEM, 0x29, DME1._MEM, 0xf9, "_MEM")
m331(ts, 6, DME0._MTP, 0x2b, DME1._MTP, 0xfb, "_MTP")
m331(ts, 6, DME0._TTP, 0x2d, DME1._TTP, 0xfd, "_TTP")
m331(ts, 7, DME0._GRA, 0x30, DME1._GRA, 0x100, "_GRA")
m331(ts, 8, DME0._MIN, 0x50, DME1._MIN, 0x120, "_MIN")
m331(ts, 9, DME0._MAX, 0x70, DME1._MAX, 0x140, "_MAX")
m331(ts, 10, DME0._TRA, 0x90, DME1._TRA, 0x160, "_TRA")
m331(ts, 11, DME0._LEN, 0xB0, DME1._LEN, 0x180, "_LEN")
}

18
tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl
View File

@ -416,6 +416,8 @@ Method(RT15)
m330(ts, 27, "p42e", p42e, p42f)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
DWordSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
@ -424,12 +426,12 @@ Method(RT15)
0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, , , DSP1)
}, Local0)
m331(ts, 1, DSP0._DEC, 0x21, DSP1._DEC, 0xf1, "_DEC")
m331(ts, 2, DSP0._MIF, 0x22, DSP1._MIF, 0xf2, "_MIF")
m331(ts, 3, DSP0._MAF, 0x23, DSP1._MAF, 0xf3, "_MAF")
m331(ts, 7, DSP0._GRA, 6, DSP1._GRA, 32, "_GRA")
m331(ts, 8, DSP0._MIN, 10, DSP1._MIN, 36, "_MIN")
m331(ts, 9, DSP0._MAX, 14, DSP1._MAX, 40, "_MAX")
m331(ts, 10, DSP0._TRA, 18, DSP1._TRA, 44, "_TRA")
m331(ts, 11, DSP0._LEN, 22, DSP1._LEN, 48, "_LEN")
m331(ts, 1, DSP0._DEC, 0x21, DSP1._DEC, 0xf1, "_DEC")
m331(ts, 2, DSP0._MIF, 0x22, DSP1._MIF, 0xf2, "_MIF")
m331(ts, 3, DSP0._MAF, 0x23, DSP1._MAF, 0xf3, "_MAF")
m331(ts, 7, DSP0._GRA, 0x30, DSP1._GRA, 0x100, "_GRA")
m331(ts, 8, DSP0._MIN, 0x50, DSP1._MIN, 0x120, "_MIN")
m331(ts, 9, DSP0._MAX, 0x70, DSP1._MAX, 0x140, "_MAX")
m331(ts, 10, DSP0._TRA, 0x90, DSP1._TRA, 0x160, "_TRA")
m331(ts, 11, DSP0._LEN, 0xB0, DSP1._LEN, 0x180, "_LEN")
}

26
tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl
View File

@ -623,6 +623,8 @@ Method(RT0f)
m330(ts, 34, "p422", p422, p423)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
ExtendedIO (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
@ -633,18 +635,18 @@ Method(RT0f)
0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, EIO1)
}, Local0)
m331(ts, 1, EIO0._DEC, 0x21, EIO1._DEC, 0x1e1, "_DEC")
m331(ts, 2, EIO0._MIF, 0x22, EIO1._MIF, 0x1e2, "_MIF")
m331(ts, 3, EIO0._MAF, 0x23, EIO1._MAF, 0x1e3, "_MAF")
m331(ts, 4, EIO0._RNG, 0x28, EIO1._RNG, 0x1e8, "_RNG")
m331(ts, 5, EIO0._TTP, 0x2c, EIO1._TTP, 0x1ec, "_TTP")
m331(ts, 6, EIO0._TRS, 0x2d, EIO1._TRS, 0x1ed, "_TRS")
m331(ts, 7, EIO0._GRA, 8, EIO1._GRA, 64, "_GRA")
m331(ts, 8, EIO0._MIN, 16, EIO1._MIN, 72, "_MIN")
m331(ts, 9, EIO0._MAX, 24, EIO1._MAX, 80, "_MAX")
m331(ts, 10, EIO0._TRA, 32, EIO1._TRA, 88, "_TRA")
m331(ts, 11, EIO0._LEN, 40, EIO1._LEN, 96, "_LEN")
m331(ts, 12, EIO0._ATT, 48, EIO1._ATT, 104, "_ATT")
m331(ts, 1, EIO0._DEC, 0x21, EIO1._DEC, 0x1e1, "_DEC")
m331(ts, 2, EIO0._MIF, 0x22, EIO1._MIF, 0x1e2, "_MIF")
m331(ts, 3, EIO0._MAF, 0x23, EIO1._MAF, 0x1e3, "_MAF")
m331(ts, 4, EIO0._RNG, 0x28, EIO1._RNG, 0x1e8, "_RNG")
m331(ts, 5, EIO0._TTP, 0x2c, EIO1._TTP, 0x1ec, "_TTP")
m331(ts, 6, EIO0._TRS, 0x2d, EIO1._TRS, 0x1ed, "_TRS")
m331(ts, 7, EIO0._GRA, 0x40, EIO1._GRA, 0x200, "_GRA")
m331(ts, 8, EIO0._MIN, 0x80, EIO1._MIN, 0x240, "_MIN")
m331(ts, 9, EIO0._MAX, 0xC0, EIO1._MAX, 0x280, "_MAX")
m331(ts, 10, EIO0._TRA, 0x100, EIO1._TRA, 0x2C0, "_TRA")
m331(ts, 11, EIO0._LEN, 0x140, EIO1._LEN, 0x300, "_LEN")
m331(ts, 12, EIO0._ATT, 0x180, EIO1._ATT, 0x340, "_ATT")
}

28
tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl
View File

@ -1300,6 +1300,8 @@ Method(RT13)
m330(ts, 86, "p42a", p42a, p42b)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
ExtendedMemory (ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, NonCacheable, ReadOnly,
@ -1310,19 +1312,19 @@ Method(RT13)
0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, EME1)
}, Local0)
m331(ts, 1, EME0._DEC, 0x21, EME1._DEC, 0x1e1, "_DEC")
m331(ts, 2, EME0._MIF, 0x22, EME1._MIF, 0x1e2, "_MIF")
m331(ts, 3, EME0._MAF, 0x23, EME1._MAF, 0x1e3, "_MAF")
m331(ts, 4, EME0._RW, 0x28, EME1._RW, 0x1e8, "_RW")
m331(ts, 5, EME0._MEM, 0x29, EME1._MEM, 0x1e9, "_MEM")
m331(ts, 6, EME0._MTP, 0x2b, EME1._MTP, 0x1eb, "_MTP")
m331(ts, 6, EME0._TTP, 0x2d, EME1._TTP, 0x1ed, "_TTP")
m331(ts, 7, EME0._GRA, 8, EME1._GRA, 64, "_GRA")
m331(ts, 8, EME0._MIN, 16, EME1._MIN, 72, "_MIN")
m331(ts, 9, EME0._MAX, 24, EME1._MAX, 80, "_MAX")
m331(ts, 10, EME0._TRA, 32, EME1._TRA, 88, "_TRA")
m331(ts, 11, EME0._LEN, 40, EME1._LEN, 96, "_LEN")
m331(ts, 12, EME0._ATT, 48, EME1._ATT, 104, "_ATT")
m331(ts, 1, EME0._DEC, 0x21, EME1._DEC, 0x1e1, "_DEC")
m331(ts, 2, EME0._MIF, 0x22, EME1._MIF, 0x1e2, "_MIF")
m331(ts, 3, EME0._MAF, 0x23, EME1._MAF, 0x1e3, "_MAF")
m331(ts, 4, EME0._RW, 0x28, EME1._RW, 0x1e8, "_RW")
m331(ts, 5, EME0._MEM, 0x29, EME1._MEM, 0x1e9, "_MEM")
m331(ts, 6, EME0._MTP, 0x2b, EME1._MTP, 0x1eb, "_MTP")
m331(ts, 6, EME0._TTP, 0x2d, EME1._TTP, 0x1ed, "_TTP")
m331(ts, 7, EME0._GRA, 0x40, EME1._GRA, 0x200, "_GRA")
m331(ts, 8, EME0._MIN, 0x80, EME1._MIN, 0x240, "_MIN")
m331(ts, 9, EME0._MAX, 0xC0, EME1._MAX, 0x280, "_MAX")
m331(ts, 10, EME0._TRA, 0x100, EME1._TRA, 0x2C0, "_TRA")
m331(ts, 11, EME0._LEN, 0x140, EME1._LEN, 0x300, "_LEN")
m331(ts, 12, EME0._ATT, 0x180, EME1._ATT, 0x340, "_ATT")
}

14
tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl
View File

@ -455,6 +455,8 @@ Method(RT17)
m330(ts, 24, "p432", p432, p433)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
ExtendedSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
@ -468,12 +470,12 @@ Method(RT17)
m331(ts, 1, ESP0._DEC, 0x21, ESP1._DEC, 0x1e1, "_DEC")
m331(ts, 2, ESP0._MIF, 0x22, ESP1._MIF, 0x1e2, "_MIF")
m331(ts, 3, ESP0._MAF, 0x23, ESP1._MAF, 0x1e3, "_MAF")
m331(ts, 4, ESP0._GRA, 8, ESP1._GRA, 64, "_GRA")
m331(ts, 5, ESP0._MIN, 16, ESP1._MIN, 72, "_MIN")
m331(ts, 6, ESP0._MAX, 24, ESP1._MAX, 80, "_MAX")
m331(ts, 7, ESP0._TRA, 32, ESP1._TRA, 88, "_TRA")
m331(ts, 8, ESP0._LEN, 40, ESP1._LEN, 96, "_LEN")
m331(ts, 9, ESP0._ATT, 48, ESP1._ATT, 104, "_ATT")
m331(ts, 4, ESP0._GRA, 0x40, ESP1._GRA, 0x200, "_GRA")
m331(ts, 5, ESP0._MIN, 0x80, ESP1._MIN, 0x240, "_MIN")
m331(ts, 6, ESP0._MAX, 0xC0, ESP1._MAX, 0x280, "_MAX")
m331(ts, 7, ESP0._TRA, 0x100, ESP1._TRA, 0x2C0, "_TRA")
m331(ts, 8, ESP0._LEN, 0x140, ESP1._LEN, 0x300, "_LEN")
m331(ts, 9, ESP0._ATT, 0x180, ESP1._ATT, 0x340, "_ATT")
}

10
tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl
View File

@ -34,7 +34,7 @@
Name (p40a, Package() {
ResourceTemplate () {
FixedIO (0xf0f1, 0xf2)
FixedIO (0x03f1, 0xf2)
},
ResourceTemplate () {
FixedIO (0, 0)
@ -56,7 +56,7 @@ Byte 3 (Range length, _LEN)
*/
Name (p40b, Package() {
Buffer () {0x4b, 0xf1, 0xf0, 0xf2, 0x79, 0x00},
Buffer () {0x4b, 0xf1, 0x03, 0xf2, 0x79, 0x00},
Buffer () {0x4b, 0x00, 0x00, 0x00, 0x79, 0x00},
})
@ -68,12 +68,14 @@ Method(RT06)
m330(ts, 2, "p40a", p40a, p40b)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
FixedIO (0x0001, 0xff, FIO0)
FixedIO (0x0001, 0xff, FIO1)
}, Local0)
m331(ts, 1, FIO0._BAS, 1, FIO1._BAS, 5, "_BAS")
m331(ts, 2, FIO0._LEN, 3, FIO1._LEN, 7, "_LEN")
m331(ts, 1, FIO0._BAS, 0x08, FIO1._BAS, 0x28, "_BAS")
m331(ts, 2, FIO0._LEN, 0x18, FIO1._LEN, 0x38, "_LEN")
}

12
tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl
View File

@ -234,7 +234,7 @@ Byte 4n+5 Interrupt Number, _INT bits [7:0] Interrupt number
Byte 4n+6 Interrupt Number, _INT bits [15:8]
Byte 4n+7 Interrupt Number, _INT bits [23:16]
Byte 4n+8 Interrupt Number, _INT bits [31:24]
… … Additional interrupt numbers
Additional interrupt numbers
Byte x Resource Source Index (Optional) Only present if Resource Source (below) is present.
This field gives an index to the specific resource descriptor
that this device consumes from in the current resource template
@ -552,7 +552,9 @@ Method(RT18)
Store("TEST: RT18, Interrupt() Interrupt Resource Descriptor Macro", Debug)
m330(ts, 24, "p434", p434, p435)
m330(ts, 23, "p434", p434, p435)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
@ -560,10 +562,10 @@ Method(RT18)
Interrupt (ResourceProducer, Edge, ActiveLow, Shared, , , INT1) {0xfcfdfeff}
}, Local0)
m331(ts, 1, INT0._HE, 0x19, INT1._HE, 0x61, "_HE")
m331(ts, 2, INT0._LL, 0x1a, INT1._LL, 0x62, "_LL")
m331(ts, 1, INT0._HE, 0x19, INT1._HE, 0x61, "_HE")
m331(ts, 2, INT0._LL, 0x1a, INT1._LL, 0x62, "_LL")
m331(ts, 3, INT0._SHR, 0x1b, INT1._SHR, 0x63, "_SHR")
m331(ts, 4, INT0._INT, 5, INT1._INT, 14, "_INT")
m331(ts, 4, INT0._INT, 0x28, INT1._INT, 0x70, "_INT")
CH03(ts, z017, 0x123, 0, 0)
}

10
tests/aslts/src/runtime/collections/functional/descriptor/io.asl
View File

@ -84,6 +84,8 @@ Method(RT05)
m330(ts, 3, "p408", p408, p409)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
IO (Decode16, 0xf0f1, 0xf2f3, 0xf4, 0xf5, IO0)
@ -91,8 +93,8 @@ Method(RT05)
}, Local0)
m331(ts, 1, IO0._DEC, 0x08, IO1._DEC, 0x48, "_DEC")
m331(ts, 2, IO0._MIN, 2, IO1._MIN, 10, "_MIN")
m331(ts, 3, IO0._MAX, 4, IO1._MAX, 12, "_MAX")
m331(ts, 4, IO0._ALN, 6, IO1._ALN, 14, "_ALN")
m331(ts, 5, IO0._LEN, 7, IO1._LEN, 15, "_LEN")
m331(ts, 2, IO0._MIN, 0x10, IO1._MIN, 0x50, "_MIN")
m331(ts, 3, IO0._MAX, 0x20, IO1._MAX, 0x60, "_MAX")
m331(ts, 4, IO0._ALN, 0x30, IO1._ALN, 0x70, "_ALN")
m331(ts, 5, IO0._LEN, 0x38, IO1._LEN, 0x78, "_LEN")
}

12
tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl
View File

@ -98,15 +98,17 @@ Method(RT08)
m330(ts, 3, "p40e", p40e, p40f)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
Memory24 (ReadOnly, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M240)
Memory24 (ReadOnly, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M241)
}, Local0)
m331(ts, 1, M240._RW, 0x18, M241._RW, 0x78, "_RW")
m331(ts, 2, M240._MIN, 4, M241._MIN, 16, "_MIN")
m331(ts, 3, M240._MAX, 6, M241._MAX, 18, "_MAX")
m331(ts, 4, M240._ALN, 8, M241._ALN, 20, "_ALN")
m331(ts, 5, M240._LEN, 10, M241._LEN, 22, "_LEN")
m331(ts, 1, M240._RW, 0x18, M241._RW, 0x78, "_RW")
m331(ts, 2, M240._MIN, 0x20, M241._MIN, 0x80, "_MIN")
m331(ts, 3, M240._MAX, 0x30, M241._MAX, 0x90, "_MAX")
m331(ts, 4, M240._ALN, 0x40, M241._ALN, 0xA0, "_ALN")
m331(ts, 5, M240._LEN, 0x50, M241._LEN, 0xB0, "_LEN")
}

12
tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl
View File

@ -96,15 +96,17 @@ Method(RT0a)
m330(ts, 3, "p412", p412, p413)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
Memory32 (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M320)
Memory32 (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M321)
}, Local0)
m331(ts, 1, M320._RW, 0x18, M321._RW, 0xb8, "_RW")
m331(ts, 2, M320._MIN, 4, M321._MIN, 24, "_MIN")
m331(ts, 3, M320._MAX, 8, M321._MAX, 28, "_MAX")
m331(ts, 4, M320._ALN, 12, M321._ALN, 32, "_ALN")
m331(ts, 5, M320._LEN, 16, M321._LEN, 36, "_LEN")
m331(ts, 1, M320._RW, 0x18, M321._RW, 0xB8, "_RW")
m331(ts, 2, M320._MIN, 0x20, M321._MIN, 0xC0, "_MIN")
m331(ts, 3, M320._MAX, 0x40, M321._MAX, 0xE0, "_MAX")
m331(ts, 4, M320._ALN, 0x60, M321._ALN, 0x0100, "_ALN")
m331(ts, 5, M320._LEN, 0x80, M321._LEN, 0x0120, "_LEN")
}

8
tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl
View File

@ -85,13 +85,15 @@ Method(RT0b)
m330(ts, 3, "p414", p414, p415)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3F0)
Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3F1)
}, Local0)
m331(ts, 1, M3F0._RW, 0x18, M3F1._RW, 0x78, "_RW")
m331(ts, 2, M3F0._BAS, 4, M3F1._BAS, 16, "_BAS")
m331(ts, 3, M3F0._LEN, 8, M3F1._LEN, 20, "_LEN")
m331(ts, 1, M3F0._RW, 0x18, M3F1._RW, 0x78, "_RW")
m331(ts, 2, M3F0._BAS, 0x20, M3F1._BAS, 0x80, "_BAS")
m331(ts, 3, M3F0._LEN, 0x40, M3F1._LEN, 0xA0, "_LEN")
}

25
tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl
View File

@ -671,6 +671,9 @@ Method(RT0c)
Store("TEST: RT0c, QWord IO Resource Descriptor Macro", Debug)
m330(ts, 37, "p416", p416, p417)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
QWordIO (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
@ -681,17 +684,17 @@ Method(RT0c)
0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QIO1)
}, Local0)
m331(ts, 1, QIO0._DEC, 0x21, QIO1._DEC, 0x191, "_DEC")
m331(ts, 2, QIO0._MIF, 0x22, QIO1._MIF, 0x192, "_MIF")
m331(ts, 3, QIO0._MAF, 0x23, QIO1._MAF, 0x193, "_MAF")
m331(ts, 4, QIO0._RNG, 0x28, QIO1._RNG, 0x198, "_RNG")
m331(ts, 5, QIO0._TTP, 0x2c, QIO1._TTP, 0x19c, "_TTP")
m331(ts, 6, QIO0._TRS, 0x2d, QIO1._TRS, 0x19d, "_TRS")
m331(ts, 7, QIO0._GRA, 6, QIO1._GRA, 52, "_GRA")
m331(ts, 8, QIO0._MIN, 14, QIO1._MIN, 60, "_MIN")
m331(ts, 9, QIO0._MAX, 22, QIO1._MAX, 68, "_MAX")
m331(ts, 10, QIO0._TRA, 30, QIO1._TRA, 76, "_TRA")
m331(ts, 11, QIO0._LEN, 38, QIO1._LEN, 84, "_LEN")
m331(ts, 1, QIO0._DEC, 0x21, QIO1._DEC, 0x0191, "_DEC")
m331(ts, 2, QIO0._MIF, 0x22, QIO1._MIF, 0x0192, "_MIF")
m331(ts, 3, QIO0._MAF, 0x23, QIO1._MAF, 0x0193, "_MAF")
m331(ts, 4, QIO0._RNG, 0x28, QIO1._RNG, 0x0198, "_RNG")
m331(ts, 5, QIO0._TTP, 0x2c, QIO1._TTP, 0x019c, "_TTP")
m331(ts, 6, QIO0._TRS, 0x2d, QIO1._TRS, 0x019d, "_TRS")
m331(ts, 7, QIO0._GRA, 0x30, QIO1._GRA, 0x01A0, "_GRA")
m331(ts, 8, QIO0._MIN, 0x70, QIO1._MIN, 0x01E0, "_MIN")
m331(ts, 9, QIO0._MAX, 0xB0, QIO1._MAX, 0x0220, "_MAX")
m331(ts, 10, QIO0._TRA, 0xF0, QIO1._TRA, 0x0260, "_TRA")
m331(ts, 11, QIO0._LEN, 0x0130, QIO1._LEN, 0x02A0, "_LEN")
}

27
tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl
View File

@ -1297,6 +1297,9 @@ Method(RT10)
Store("TEST: RT10, QWord Memory Resource Descriptor Macro", Debug)
m330(ts, 89, "p424", p424, p425)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
QWordMemory (ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, NonCacheable, ReadOnly,
@ -1307,18 +1310,18 @@ Method(RT10)
0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QME1)
}, Local0)
m331(ts, 1, QME0._DEC, 0x21, QME1._DEC, 0x191, "_DEC")
m331(ts, 2, QME0._MIF, 0x22, QME1._MIF, 0x192, "_MIF")
m331(ts, 3, QME0._MAF, 0x23, QME1._MAF, 0x193, "_MAF")
m331(ts, 4, QME0._RW, 0x28, QME1._RW, 0x198, "_RW")
m331(ts, 5, QME0._MEM, 0x29, QME1._MEM, 0x199, "_MEM")
m331(ts, 6, QME0._MTP, 0x2b, QME1._MTP, 0x19b, "_MTP")
m331(ts, 6, QME0._TTP, 0x2d, QME1._TTP, 0x19d, "_TTP")
m331(ts, 7, QME0._GRA, 6, QME1._GRA, 52, "_GRA")
m331(ts, 8, QME0._MIN, 14, QME1._MIN, 60, "_MIN")
m331(ts, 9, QME0._MAX, 22, QME1._MAX, 68, "_MAX")
m331(ts, 10, QME0._TRA, 30, QME1._TRA, 76, "_TRA")
m331(ts, 11, QME0._LEN, 38, QME1._LEN, 84, "_LEN")
m331(ts, 1, QME0._DEC, 0x21, QME1._DEC, 0x191, "_DEC")
m331(ts, 2, QME0._MIF, 0x22, QME1._MIF, 0x192, "_MIF")
m331(ts, 3, QME0._MAF, 0x23, QME1._MAF, 0x193, "_MAF")
m331(ts, 4, QME0._RW, 0x28, QME1._RW, 0x198, "_RW")
m331(ts, 5, QME0._MEM, 0x29, QME1._MEM, 0x199, "_MEM")
m331(ts, 6, QME0._MTP, 0x2b, QME1._MTP, 0x19b, "_MTP")
m331(ts, 6, QME0._TTP, 0x2d, QME1._TTP, 0x19d, "_TTP")
m331(ts, 7, QME0._GRA, 0x30, QME1._GRA, 0x1A0, "_GRA")
m331(ts, 8, QME0._MIN, 0x70, QME1._MIN, 0x1E0, "_MIN")
m331(ts, 9, QME0._MAX, 0xB0, QME1._MAX, 0x220, "_MAX")
m331(ts, 10, QME0._TRA, 0xF0, QME1._TRA, 0x260, "_TRA")
m331(ts, 11, QME0._LEN, 0x130, QME1._LEN, 0x2A0, "_LEN")
}

18
tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl
View File

@ -516,6 +516,8 @@ Method(RT14)
m330(ts, 27, "p42c", p42c, p42d)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
QWordSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
@ -526,14 +528,14 @@ Method(RT14)
0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QSP1)
}, Local0)
m331(ts, 1, QSP0._DEC, 0x21, QSP1._DEC, 0x191, "_DEC")
m331(ts, 2, QSP0._MIF, 0x22, QSP1._MIF, 0x192, "_MIF")
m331(ts, 3, QSP0._MAF, 0x23, QSP1._MAF, 0x193, "_MAF")
m331(ts, 7, QSP0._GRA, 6, QSP1._GRA, 52, "_GRA")
m331(ts, 8, QSP0._MIN, 14, QSP1._MIN, 60, "_MIN")
m331(ts, 9, QSP0._MAX, 22, QSP1._MAX, 68, "_MAX")
m331(ts, 10, QSP0._TRA, 30, QSP1._TRA, 76, "_TRA")
m331(ts, 11, QSP0._LEN, 38, QSP1._LEN, 84, "_LEN")
m331(ts, 1, QSP0._DEC, 0x21, QSP1._DEC, 0x191, "_DEC")
m331(ts, 2, QSP0._MIF, 0x22, QSP1._MIF, 0x192, "_MIF")
m331(ts, 3, QSP0._MAF, 0x23, QSP1._MAF, 0x193, "_MAF")
m331(ts, 7, QSP0._GRA, 0x30, QSP1._GRA, 0x1A0, "_GRA")
m331(ts, 8, QSP0._MIN, 0x70, QSP1._MIN, 0x1E0, "_MIN")
m331(ts, 9, QSP0._MAX, 0xB0, QSP1._MAX, 0x220, "_MAX")
m331(ts, 10, QSP0._TRA, 0xF0, QSP1._TRA, 0x260, "_TRA")
m331(ts, 11, QSP0._LEN, 0x130, QSP1._LEN, 0x2A0, "_LEN")
}

12
tests/aslts/src/runtime/collections/functional/descriptor/register.asl
View File

@ -164,15 +164,17 @@ Method(RT19)
/* Register macro DescriptorName is recently implemented */
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
Register (SystemMemory, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9, 0, REG0)
Register (SystemMemory, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9, 0, REG1)
}, Local0)
m331(ts, 1, REG0._ASI, 3, REG1._ASI, 18, "_ASI")
m331(ts, 2, REG0._RBW, 4, REG1._RBW, 19, "_RBW")
m331(ts, 3, REG0._RBO, 5, REG1._RBO, 20, "_RBO")
m331(ts, 4, REG0._ASZ, 6, REG1._ASZ, 21, "_ASZ")
m331(ts, 5, REG0._ADR, 7, REG1._ADR, 22, "_ADR")
m331(ts, 1, REG0._ASI, 0x18, REG1._ASI, 0x90, "_ASI")
m331(ts, 2, REG0._RBW, 0x20, REG1._RBW, 0x98, "_RBW")
m331(ts, 3, REG0._RBO, 0x28, REG1._RBO, 0xA0, "_RBO")
m331(ts, 4, REG0._ASZ, 0x30, REG1._ASZ, 0xA8, "_ASZ")
m331(ts, 5, REG0._ADR, 0x38, REG1._ADR, 0xB0, "_ADR")
}

530
tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl
View File

File diff suppressed because it is too large Load Diff

19
tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl
View File

@ -332,6 +332,9 @@ Method(RT12)
Store("TEST: RT12, Word Bus Number Resource Descriptor Macro", Debug)
m330(ts, 25, "p428", p428, p429)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
WordBusNumber (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode,
@ -340,12 +343,12 @@ Method(RT12)
0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff, , , WBN1)
}, Local0)
m331(ts, 1, WBN0._DEC, 0x21, WBN1._DEC, 0xa1, "_DEC")
m331(ts, 2, WBN0._MIF, 0x22, WBN1._MIF, 0xa2, "_MIF")
m331(ts, 3, WBN0._MAF, 0x23, WBN1._MAF, 0xa3, "_MAF")
m331(ts, 7, WBN0._GRA, 6, WBN1._GRA, 22, "_GRA")
m331(ts, 8, WBN0._MIN, 8, WBN1._MIN, 24, "_MIN")
m331(ts, 9, WBN0._MAX, 10, WBN1._MAX, 26, "_MAX")
m331(ts, 10, WBN0._TRA, 12, WBN1._TRA, 28, "_TRA")
m331(ts, 11, WBN0._LEN, 14, WBN1._LEN, 30, "_LEN")
m331(ts, 1, WBN0._DEC, 0x21, WBN1._DEC, 0xa1, "_DEC")
m331(ts, 2, WBN0._MIF, 0x22, WBN1._MIF, 0xa2, "_MIF")
m331(ts, 3, WBN0._MAF, 0x23, WBN1._MAF, 0xa3, "_MAF")
m331(ts, 7, WBN0._GRA, 0x30, WBN1._GRA, 0xB0, "_GRA")
m331(ts, 8, WBN0._MIN, 0x40, WBN1._MIN, 0xC0, "_MIN")
m331(ts, 9, WBN0._MAX, 0x50, WBN1._MAX, 0xD0, "_MAX")
m331(ts, 10, WBN0._TRA, 0x60, WBN1._TRA, 0xE0, "_TRA")
m331(ts, 11, WBN0._LEN, 0x70, WBN1._LEN, 0xF0, "_LEN")
}

25
tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl
View File

@ -457,6 +457,9 @@ Method(RT0e)
Store("TEST: RT0e, Word IO Resource Descriptor Macro", Debug)
m330(ts, 37, "p420", p420, p421)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
WordIO (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
@ -465,17 +468,17 @@ Method(RT0e)
0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff, , , WIO1)
}, Local0)
m331(ts, 1, WIO0._DEC, 0x21, WIO1._DEC, 0xa1, "_DEC")
m331(ts, 2, WIO0._MIF, 0x22, WIO1._MIF, 0xa2, "_MIF")
m331(ts, 3, WIO0._MAF, 0x23, WIO1._MAF, 0xa3, "_MAF")
m331(ts, 4, WIO0._RNG, 0x28, WIO1._RNG, 0xa8, "_RNG")
m331(ts, 5, WIO0._TTP, 0x2c, WIO1._TTP, 0xac, "_TTP")
m331(ts, 6, WIO0._TRS, 0x2d, WIO1._TRS, 0xad, "_TRS")
m331(ts, 7, WIO0._GRA, 6, WIO1._GRA, 22, "_GRA")
m331(ts, 8, WIO0._MIN, 8, WIO1._MIN, 24, "_MIN")
m331(ts, 9, WIO0._MAX, 10, WIO1._MAX, 26, "_MAX")
m331(ts, 10, WIO0._TRA, 12, WIO1._TRA, 28, "_TRA")
m331(ts, 11, WIO0._LEN, 14, WIO1._LEN, 30, "_LEN")
m331(ts, 1, WIO0._DEC, 0x21, WIO1._DEC, 0xa1, "_DEC")
m331(ts, 2, WIO0._MIF, 0x22, WIO1._MIF, 0xa2, "_MIF")
m331(ts, 3, WIO0._MAF, 0x23, WIO1._MAF, 0xa3, "_MAF")
m331(ts, 4, WIO0._RNG, 0x28, WIO1._RNG, 0xa8, "_RNG")
m331(ts, 5, WIO0._TTP, 0x2c, WIO1._TTP, 0xac, "_TTP")
m331(ts, 6, WIO0._TRS, 0x2d, WIO1._TRS, 0xad, "_TRS")
m331(ts, 7, WIO0._GRA, 0x30, WIO1._GRA, 0xB0, "_GRA")
m331(ts, 8, WIO0._MIN, 0x40, WIO1._MIN, 0xC0, "_MIN")
m331(ts, 9, WIO0._MAX, 0x50, WIO1._MAX, 0xD0, "_MAX")
m331(ts, 10, WIO0._TRA, 0x60, WIO1._TRA, 0xE0, "_TRA")
m331(ts, 11, WIO0._LEN, 0x70, WIO1._LEN, 0xF0, "_LEN")
}

18
tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl
View File

@ -352,6 +352,8 @@ Method(RT16)
m330(ts, 27, "p430", p430, p431)
// Check resource descriptor tag offsets
Store (
ResourceTemplate () {
WordSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
@ -360,12 +362,12 @@ Method(RT16)
0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff, , , WSP1)
}, Local0)
m331(ts, 1, WSP0._DEC, 0x21, WSP1._DEC, 0xa1, "_DEC")
m331(ts, 2, WSP0._MIF, 0x22, WSP1._MIF, 0xa2, "_MIF")
m331(ts, 3, WSP0._MAF, 0x23, WSP1._MAF, 0xa3, "_MAF")
m331(ts, 7, WSP0._GRA, 6, WSP1._GRA, 22, "_GRA")
m331(ts, 8, WSP0._MIN, 8, WSP1._MIN, 24, "_MIN")
m331(ts, 9, WSP0._MAX, 10, WSP1._MAX, 26, "_MAX")
m331(ts, 10, WSP0._TRA, 12, WSP1._TRA, 28, "_TRA")
m331(ts, 11, WSP0._LEN, 14, WSP1._LEN, 30, "_LEN")
m331(ts, 1, WSP0._DEC, 0x21, WSP1._DEC, 0xa1, "_DEC")
m331(ts, 2, WSP0._MIF, 0x22, WSP1._MIF, 0xa2, "_MIF")
m331(ts, 3, WSP0._MAF, 0x23, WSP1._MAF, 0xa3, "_MAF")
m331(ts, 7, WSP0._GRA, 0x30, WSP1._GRA, 0xB0, "_GRA")
m331(ts, 8, WSP0._MIN, 0x40, WSP1._MIN, 0xC0, "_MIN")
m331(ts, 9, WSP0._MAX, 0x50, WSP1._MAX, 0xD0, "_MAX")
m331(ts, 10, WSP0._TRA, 0x60, WSP1._TRA, 0xE0, "_TRA")
m331(ts, 11, WSP0._LEN, 0x70, WSP1._LEN, 0xF0, "_LEN")
}