Tests: Update copyright to 2009.

Also removed obsolete developer names and email addresses. Automated tool removed some extraneous space characters.
author: Robert Moore <Robert.Moore@intel.com> 2009-03-25 08:45:10 -0700
committer: Robert Moore <Robert.Moore@intel.com> 2009-03-25 08:45:10 -0700
commit: e103504655c7ad5403623f9a0458ffd2fbe31254 (patch)
tree: c6846694c2502b95131fe667172df92fb102898b /tests/aslts/src/runtime/collections/functional/descriptor
parent: 0dc5d933311094a9da7fdfa3960606a806aa3da6 (diff)
download: acpica-e103504655c7ad5403623f9a0458ffd2fbe31254.tar.gz
31 files changed, 442 insertions, 504 deletions
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/DECL.asl b/tests/aslts/src/runtime/collections/functional/descriptor/DECL.asl
index 3dbd7e0c7..c78379293 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/DECL.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/DECL.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/MAIN.asl b/tests/aslts/src/runtime/collections/functional/descriptor/MAIN.asl
index 442364b8d..329297932 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/MAIN.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/MAIN.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/RUN.asl b/tests/aslts/src/runtime/collections/functional/descriptor/RUN.asl
index 2ac70357d..ad1c35221 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/RUN.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/RUN.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl
index 2d72b5483..bd9e0f03c 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl
index b89b5e7d1..d31094d8b 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl
index 24be8fa33..3829a9740 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -123,7 +121,7 @@ Name (p404, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.2.2   DMA Descriptor 
+6.4.2.2   DMA Descriptor
 
 DMA Descriptor layout:
 
@@ -139,9 +137,9 @@ Bits[6:5]	DMA channel speed supported, _TYP
 			11	Indicates Type F
 Bit[2] 		Logical device bus master status, _BM
 			0	Logical device is not a bus master
-			1	Logical device is a bus master 
+			1	Logical device is a bus master
 Bits[1:0]	DMA transfer type preference, _SIZ
-			00	8-bit only 
+			00	8-bit only
 			01	8- and 16-bit
 			10	16-bit only
 			11	Reserved
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl
index e2f384952..de0cdc68d 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -226,7 +224,7 @@ Name (p418, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.2   DWord Address Space Descriptor 
+6.4.3.5.2   DWord Address Space Descriptor
 
 I/O DWord Address Space Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl
index 47d54fc7f..e89b4c262 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -493,7 +491,7 @@ Name (p426, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.2   DWord Address Space Descriptor 
+6.4.3.5.2   DWord Address Space Descriptor
 
 Memory DWord Address Space Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl
index 257b4bdd7..80c14f81e 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -175,7 +173,7 @@ Name (p42e, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.2   DWord Address Space Descriptor 
+6.4.3.5.2   DWord Address Space Descriptor
 
 Memory DWord Address Space Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl
index f912f5877..01f8dddb9 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -45,77 +43,77 @@ Name (p422, Package() {
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceProducer, MinNotFixed, MaxNotFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceProducer, MinNotFixed, MaxFixed, PosDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceProducer, MinNotFixed, MaxFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceProducer, MinFixed, MaxNotFixed, PosDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceProducer, MinFixed, MaxNotFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceProducer, MinFixed, MaxFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinNotFixed, MaxNotFixed, PosDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinNotFixed, MaxNotFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinNotFixed, MaxFixed, PosDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinNotFixed, MaxFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinFixed, MaxNotFixed, PosDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinFixed, MaxNotFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, PosDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -123,73 +121,73 @@ Name (p422, Package() {
 
 	ResourceTemplate () {
 		ExtendedIO ( , , , , NonISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeStatic, DenseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , NonISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeStatic, SparseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , NonISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeTranslation, DenseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , NonISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeTranslation, SparseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeStatic, DenseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeStatic, SparseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeTranslation, DenseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ISAOnlyRanges,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeTranslation, SparseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeStatic, DenseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeStatic, SparseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeTranslation, DenseTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , TypeTranslation, SparseTranslation)
 	},
@@ -198,29 +196,29 @@ Name (p422, Package() {
 
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7)
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , )
 	},
 	ResourceTemplate () {
 		ExtendedIO ( , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, ,
 			 , , )
 	},
 	ResourceTemplate () {
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIO0, TypeTranslation, SparseTranslation)
 	},
@@ -234,7 +232,7 @@ Name (p422, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.4   Extended Address Space Descriptor 
+6.4.3.5.4   Extended Address Space Descriptor
 
 I/O Extended Address Space Descriptor layout:
 
@@ -628,10 +626,10 @@ Method(RT0f)
 	Store (
 		ResourceTemplate () {
 			ExtendedIO (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
-				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 				0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, EIO0)
 			ExtendedIO (ResourceConsumer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
-				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 				0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, EIO1)
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl b/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl
index a87980f0a..14e236bca 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -40,82 +38,82 @@ Name (p42a, Package() {
 
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, PosDecode, MinNotFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, PosDecode, MinFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, SubDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, SubDecode, MinNotFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, SubDecode, MinFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceProducer, SubDecode, MinFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, PosDecode, MinNotFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, PosDecode, MinFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, PosDecode, MinFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, SubDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, SubDecode, MinNotFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxNotFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -124,97 +122,97 @@ Name (p42a, Package() {
 	// NonCacheable
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , NonCacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
@@ -222,97 +220,97 @@ Name (p42a, Package() {
 	// Cacheable
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Cacheable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
@@ -320,97 +318,97 @@ Name (p42a, Package() {
 	// WriteCombining
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , WriteCombining, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
@@ -418,97 +416,97 @@ Name (p42a, Package() {
 	// Prefetchable
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , Prefetchable, ReadWrite,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , AddressRangeNVS, TypeTranslation)
 	},
@@ -517,29 +515,29 @@ Name (p42a, Package() {
 
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7)
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , )
 	},
 	ResourceTemplate () {
 		ExtendedMemory ( , , , , , ,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, ,
 			 , , )
 	},
 	ResourceTemplate () {
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EME0, AddressRangeACPI, TypeTranslation)
 	},
@@ -552,7 +550,7 @@ Name (p42a, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.4   Extended Address Space Descriptor 
+6.4.3.5.4   Extended Address Space Descriptor
 
 Memory Extended Address Space Descriptor layout:
 
@@ -1305,10 +1303,10 @@ Method(RT13)
 	Store (
 		ResourceTemplate () {
 			ExtendedMemory (ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, NonCacheable, ReadOnly,
-				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 				0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, EME0)
 			ExtendedMemory (ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, NonCacheable, ReadOnly,
-				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 				0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, EME1)
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl
index 7deda9b1b..0d6275474 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -40,82 +38,82 @@ Name (p432, Package() {
 
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x0a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc1, ResourceProducer, PosDecode, MinNotFixed, MaxFixed, 0x1a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc2, ResourceProducer, PosDecode, MinFixed, MaxNotFixed, 0x2a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc3, ResourceProducer, PosDecode, MinFixed, MaxFixed, 0x3a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc4, ResourceProducer, SubDecode, MinNotFixed, MaxNotFixed, 0x4a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc5, ResourceProducer, SubDecode, MinNotFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc6, ResourceProducer, SubDecode, MinFixed, MaxNotFixed, 0x6a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc7, ResourceProducer, SubDecode, MinFixed, MaxFixed, 0x7a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc8, ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, 0x8a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc9, ResourceConsumer, PosDecode, MinNotFixed, MaxFixed, 0x9a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xca, ResourceConsumer, PosDecode, MinFixed, MaxNotFixed, 0xaa,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xcb, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xba,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xcc, ResourceConsumer, SubDecode, MinNotFixed, MaxNotFixed, 0xca,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xcd, ResourceConsumer, SubDecode, MinNotFixed, MaxFixed, 0xda,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xce, ResourceConsumer, SubDecode, MinFixed, MaxNotFixed, 0xea,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xff, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0xfa,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -123,12 +121,12 @@ Name (p432, Package() {
 
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, , , , , 0x00,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, , , , , 0xff,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -136,29 +134,29 @@ Name (p432, Package() {
 
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, , , , , 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, , , , , 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7)
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, , , , , 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 )
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, , , , , 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, ,
 			 )
 	},
 	ResourceTemplate () {
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESP0)
 	},
@@ -171,7 +169,7 @@ Name (p432, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.4   Extended Address Space Descriptor 
+6.4.3.5.4   Extended Address Space Descriptor
 
 Space Extended Address Space Descriptor layout:
 
@@ -460,10 +458,10 @@ Method(RT17)
 	Store (
 		ResourceTemplate () {
 			ExtendedSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
-				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 				0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, ESP0)
 			ExtendedSpace (0xc0, ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
-				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+				0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 				0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, ESP1)
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl
index 10691dc34..74dab9f34 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -45,7 +43,7 @@ Name (p40a, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.2.6   Fixed Location I/O Port Descriptor 
+6.4.2.6   Fixed Location I/O Port Descriptor
 
 Fixed Location I/O Port Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl
index f83822198..b3758a79e 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -204,7 +202,7 @@ Name (p434, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.6   Extended Interrupt Descriptor 
+6.4.3.6   Extended Interrupt Descriptor
 
 Extended Interrupt Descriptor layout:
 
@@ -215,14 +213,14 @@ Byte 3	Interrupt Vector Flags	Interrupt Vector Information.
 	Bit[7:4]	Reserved (must be 0)
 	Bit[3]		Interrupt is shareable, _SHR
 	Bit[2] 		Interrupt Polarity, _LL
-			0	Active-High: This interrupt is sampled 
+			0	Active-High: This interrupt is sampled
 				when the signal is high, or true.
 			1	Active-Low: This interrupt is sampled
 				when the signal is low, or false.
 	Bit[1] 		Interrupt Mode, _HE
 			0	Level-Triggered: Interrupt is triggered in response
 				to the signal being in either a high or low state.
-			1	Edge-Triggered: This interrupt is 
+			1	Edge-Triggered: This interrupt is
 				triggered in response to a change in signal
 				state, either high to low or low to high.
 	Bit[0] 		Consumer/Producer:
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/io.asl b/tests/aslts/src/runtime/collections/functional/descriptor/io.asl
index cd1e8b26d..a6bbc909d 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/io.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/io.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -48,7 +46,7 @@ Name (p408, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.2.5   I/O Port Descriptor 
+6.4.2.5   I/O Port Descriptor
 
 I/O Port Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl b/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl
index 583cd365d..77de15f94 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -108,7 +106,7 @@ Bit[4] 		Interrupt is sharable, _SHR
 Bit[3]		Interrupt Polarity, _LL
 			0	Active-High - This interrupt is sampled when the signal is high, or true
 			1	Active-Low - This interrupt is sampled when the signal is low, or false.
-Bit[0]		Interrupt Mode, _HE 
+Bit[0]		Interrupt Mode, _HE
 			0	Level-Triggered - Interrupt is triggered in response to signal in a low state.
 			1	Edge-Triggered - Interrupt is triggered in response to a change in signal state
 			        from low to high.
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl b/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl
index 346ea61b3..13c4d0fbd 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl b/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl
index 12935822a..0c1276bbc 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -48,7 +46,7 @@ Name (p40e, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.1   24-Bit Memory Range Descriptor 
+6.4.3.1   24-Bit Memory Range Descriptor
 
 24-Bit Memory Range Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl b/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl
index 2e2a24fd8..505f4ae9c 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -48,7 +46,7 @@ Name (p412, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.3   32-Bit Memory Range Descriptor 
+6.4.3.3   32-Bit Memory Range Descriptor
 
 32-Bit Memory Range Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl b/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl
index 61f4219d2..b1c162b70 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl
index a0c9a0311..7511e8b64 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -40,82 +38,82 @@ Name (p416, Package() {
 
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinNotFixed, MaxNotFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinNotFixed, MaxFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinNotFixed, MaxFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinFixed, MaxNotFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinFixed, MaxNotFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceProducer, MinFixed, MaxFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinNotFixed, MaxNotFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinNotFixed, MaxNotFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinNotFixed, MaxFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinNotFixed, MaxFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinFixed, MaxNotFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinFixed, MaxNotFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, PosDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -123,73 +121,73 @@ Name (p416, Package() {
 
 	ResourceTemplate () {
 		QWordIO ( , , , , NonISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeStatic, DenseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , NonISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeStatic, SparseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , NonISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeTranslation, DenseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , NonISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeTranslation, SparseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeStatic, DenseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeStatic, SparseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeTranslation, DenseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ISAOnlyRanges,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeTranslation, SparseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeStatic, DenseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeStatic, SparseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeTranslation, DenseTranslation)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , TypeTranslation, SparseTranslation)
 	},
@@ -198,12 +196,12 @@ Name (p416, Package() {
 
 	ResourceTemplate () {
 		QWordIO ( , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			, , , , )
 	},
@@ -212,25 +210,25 @@ Name (p416, Package() {
 
 	ResourceTemplate () {
 		QWordIO ( , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x01, "", , , )
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x0f, "P", , , )
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xf0, "PATH", , , )
 	},
 	ResourceTemplate () {
 		QWordIO ( , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff,
 			"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&'()*",
@@ -241,7 +239,7 @@ Name (p416, Package() {
 
 	ResourceTemplate () {
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIO0, TypeTranslation, SparseTranslation)
 	},
@@ -254,7 +252,7 @@ Name (p416, Package() {
 	// 20051021, relaxation for omitted ResourceSource (bug-fix 70 rejection)
 	ResourceTemplate () {
 		QWordIO ( , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x0f)
 	},
@@ -262,7 +260,7 @@ Name (p416, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.1   QWord Address Space Descriptor 
+6.4.3.5.1   QWord Address Space Descriptor
 
 I/O QWord Address Space Descriptor layout:
 
@@ -676,10 +674,10 @@ Method(RT0c)
 	Store (
 		ResourceTemplate () {
 			QWordIO (ResourceProducer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
-				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 				0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QIO0)
 			QWordIO (ResourceConsumer, MinNotFixed, MaxNotFixed, PosDecode, EntireRange,
-				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 				0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QIO1)
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl b/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl
index 7f9caf904..4c156462b 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -40,82 +38,82 @@ Name (p424, Package() {
 
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, PosDecode, MinNotFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, SubDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, SubDecode, MinNotFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, SubDecode, MinFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceProducer, SubDecode, MinFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, PosDecode, MinNotFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, PosDecode, MinFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, PosDecode, MinFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, SubDecode, MinNotFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, SubDecode, MinNotFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxNotFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -124,97 +122,97 @@ Name (p424, Package() {
 	// NonCacheable
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , NonCacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
@@ -222,97 +220,97 @@ Name (p424, Package() {
 	// Cacheable
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Cacheable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
@@ -320,97 +318,97 @@ Name (p424, Package() {
 	// WriteCombining
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , WriteCombining, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
@@ -418,97 +416,97 @@ Name (p424, Package() {
 	// Prefetchable
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeMemory, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeReserved, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeACPI, TypeTranslation)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeStatic)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , Prefetchable, ReadWrite,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , , AddressRangeNVS, TypeTranslation)
 	},
@@ -517,12 +515,12 @@ Name (p424, Package() {
 
 	ResourceTemplate () {
 		QWordMemory ( , , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			, , , , )
 	},
@@ -531,25 +529,25 @@ Name (p424, Package() {
 
 	ResourceTemplate () {
 		QWordMemory ( , , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x01, "", , , )
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x0f, "P", , , )
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xf0, "PATH", , , )
 	},
 	ResourceTemplate () {
 		QWordMemory ( , , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff,
 			"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&'()*",
@@ -560,7 +558,7 @@ Name (p424, Package() {
 
 	ResourceTemplate () {
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QME0, AddressRangeACPI, TypeTranslation)
 	},
@@ -573,7 +571,7 @@ Name (p424, Package() {
 	// 20051021, relaxation for omitted ResourceSource (bug-fix 70 rejection)
 	ResourceTemplate () {
 		QWordMemory ( , , , , , ,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x0f)
 	},
@@ -581,7 +579,7 @@ Name (p424, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.1   QWord Address Space Descriptor 
+6.4.3.5.1   QWord Address Space Descriptor
 
 Memory QWord Address Space Descriptor layout:
 
@@ -1302,10 +1300,10 @@ Method(RT10)
 	Store (
 		ResourceTemplate () {
 			QWordMemory (ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, NonCacheable, ReadOnly,
-				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 				0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QME0)
 			QWordMemory (ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, NonCacheable, ReadOnly,
-				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 				0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QME1)
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl
index 21c6b8eb3..49bfaa8ae 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -40,82 +38,82 @@ Name (p42c, Package() {
 
 	ResourceTemplate () {
 		QWordSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x0a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc1, ResourceProducer, PosDecode, MinNotFixed, MaxFixed, 0x1a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc2, ResourceProducer, PosDecode, MinFixed, MaxNotFixed, 0x2a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc3, ResourceProducer, PosDecode, MinFixed, MaxFixed, 0x3a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc4, ResourceProducer, SubDecode, MinNotFixed, MaxNotFixed, 0x4a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc5, ResourceProducer, SubDecode, MinNotFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc6, ResourceProducer, SubDecode, MinFixed, MaxNotFixed, 0x6a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc7, ResourceProducer, SubDecode, MinFixed, MaxFixed, 0x7a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc8, ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, 0x8a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc9, ResourceConsumer, PosDecode, MinNotFixed, MaxFixed, 0x9a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xca, ResourceConsumer, PosDecode, MinFixed, MaxNotFixed, 0xaa,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xcb, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xba,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xcc, ResourceConsumer, SubDecode, MinNotFixed, MaxNotFixed, 0xca,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xcd, ResourceConsumer, SubDecode, MinNotFixed, MaxFixed, 0xda,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xce, ResourceConsumer, SubDecode, MinFixed, MaxNotFixed, 0xea,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xff, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0xfa,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -123,12 +121,12 @@ Name (p42c, Package() {
 
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x00,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0xff,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff)
 	},
 
@@ -136,13 +134,13 @@ Name (p42c, Package() {
 
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , )
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			 , , )
 	},
@@ -151,25 +149,25 @@ Name (p42c, Package() {
 
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x01, "")
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x0f, "P")
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xf0, "PATH")
 	},
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff,
 			"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&'()*",
@@ -180,7 +178,7 @@ Name (p42c, Package() {
 
 	ResourceTemplate () {
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSP0)
 	},
@@ -193,7 +191,7 @@ Name (p42c, Package() {
 	// 20051021, relaxation for omitted ResourceSource (bug-fix 70 rejection)
 	ResourceTemplate () {
 		QWordSpace (0xc0, , , , , 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0x0f)
 	},
@@ -201,7 +199,7 @@ Name (p42c, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.1   QWord Address Space Descriptor 
+6.4.3.5.1   QWord Address Space Descriptor
 
 Memory QWord Address Space Descriptor layout:
 
@@ -521,10 +519,10 @@ Method(RT14)
 	Store (
 		ResourceTemplate () {
 			QWordSpace (0xc0, ResourceProducer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
-				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 				0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QSP0)
 			QWordSpace (0xc0, ResourceConsumer, PosDecode, MinNotFixed, MaxNotFixed, 0x5a,
-				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+				0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 				0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff, , , QSP1)
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl
index 4c3a81c86..1ad7cce34 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -87,7 +85,7 @@ Name (p436, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.7   Generic Register Descriptor 
+6.4.3.7   Generic Register Descriptor
 
 Generic Register Descriptor layout:
 
@@ -101,7 +99,7 @@ Byte 3	Address Space ID, _ASI	The address space where the data structure or regi
 	0x02	PCI Configuration Space
 	0x03	Embedded Controller
 	0x04	SMBus
-	0x7F	Functional Fixed Hardware 
+	0x7F	Functional Fixed Hardware
 Byte 4	Register Bit Width, _RBW	Indicates the register width in bits.
 Byte 5	Register Bit Offset, _RBO	Indicates the offset to the start of the register in bits
 				from the Register Address.
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl
index d703363ae..553dfebb9 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -31,7 +29,7 @@
 /*
  * Resource Descriptor macros
  *
- * Resource To Buffer Conversion Macro 
+ * Resource To Buffer Conversion Macro
  */
 
 Name (p438, Package() {
@@ -47,12 +45,12 @@ Name (p438, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIOX, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -62,7 +60,7 @@ Name (p438, Package() {
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIOX, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QMEX, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -93,22 +91,22 @@ Name (p438, Package() {
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIOX, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EMEX, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESPX)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSPX)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSPX)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -175,12 +173,12 @@ Name (p438, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIOY, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -190,7 +188,7 @@ Name (p438, Package() {
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIOY, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QMEY, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -221,22 +219,22 @@ Name (p438, Package() {
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIOY, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EMEY, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESPY)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSPY)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSPY)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -265,7 +263,7 @@ Name (p438, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
@@ -288,12 +286,12 @@ Name (p445, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24Z)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32Z)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FZ)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIOZ, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -303,7 +301,7 @@ Name (p445, Package() {
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIOZ, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QMEZ, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -334,22 +332,22 @@ Name (p445, Package() {
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIOZ, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EMEZ, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESPZ)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSPZ)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSPZ)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -367,12 +365,12 @@ Name (p445, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M241)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32Y)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3F1)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIO1, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -382,7 +380,7 @@ Name (p445, Package() {
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIO1, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QME1, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -413,22 +411,22 @@ Name (p445, Package() {
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIO1, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EME1, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESP1)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSP1)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSP1)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -496,12 +494,12 @@ Name (p445, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24G)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32G)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FG)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIOG, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -511,7 +509,7 @@ Name (p445, Package() {
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIOG, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QMEG, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -542,22 +540,22 @@ Name (p445, Package() {
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIOG, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EMEG, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESPG)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSPG)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSPG)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -586,7 +584,7 @@ Name (p445, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24K)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32K)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FK)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
@@ -655,12 +653,12 @@ Name (p445, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24H)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32H)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FH)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIOH, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -670,7 +668,7 @@ Name (p445, Package() {
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIOH, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QMEH, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -701,22 +699,22 @@ Name (p445, Package() {
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIOH, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EMEH, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESPH)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSPH)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSPH)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -745,7 +743,7 @@ Name (p445, Package() {
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24L)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32L)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FL)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
@@ -757,7 +755,7 @@ Name (p445, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.2.8   End Tag 
+6.4.2.8   End Tag
 
 Type 0, Small Item Name 0xF, Length = 1
 The End tag identifies an end of resource data.
@@ -2152,12 +2150,12 @@ Method(RT1c)
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M240)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M320)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3F0)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIO0, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -2167,7 +2165,7 @@ Method(RT1c)
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIO0, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QME0, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -2198,22 +2196,22 @@ Method(RT1c)
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIO0, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EME0, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESP0)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSP0)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSP0)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -2231,12 +2229,12 @@ Method(RT1c)
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M241)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M321)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3F1)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIO1, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -2246,7 +2244,7 @@ Method(RT1c)
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIO1, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QME1, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -2277,22 +2275,22 @@ Method(RT1c)
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIO1, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EME1, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESP1)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSP1)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSP1)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -2360,12 +2358,12 @@ Method(RT1c)
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24G)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32G)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FG)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIOG, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -2375,7 +2373,7 @@ Method(RT1c)
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIOG, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QMEG, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -2406,22 +2404,22 @@ Method(RT1c)
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIOG, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EMEG, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESPG)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSPG)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSPG)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -2450,7 +2448,7 @@ Method(RT1c)
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24K)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32K)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FK)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
@@ -2519,12 +2517,12 @@ Method(RT1c)
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24H)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32H)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FH)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 		QWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QIOH, TypeTranslation, SparseTranslation)
 		DWordIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
@@ -2534,7 +2532,7 @@ Method(RT1c)
 			0xf6f7, 0xf8f9, 0xfafb, 0xfcfd, 0xfeff,
 			0xff, "PATHPATHPATH", WIOH, TypeTranslation, SparseTranslation)
 		QWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QMEH, AddressRangeACPI, TypeTranslation)
 		DWordMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
@@ -2565,22 +2563,22 @@ Method(RT1c)
 			241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}
 		Register (FFixedHW, 0xf0, 0xf1, 0xf2f3f4f5f6f7f8f9)
 		ExtendedIO (ResourceConsumer, MinFixed, MaxFixed, SubDecode, EntireRange,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EIOH, TypeTranslation, SparseTranslation)
 		ExtendedMemory (ResourceConsumer, SubDecode, MinFixed, MaxFixed, NonCacheable, ReadOnly,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			EMEH, AddressRangeACPI, TypeTranslation)
 		ExtendedSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 
+			0xd0d1d2d3d4d5d6d7, 0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7,
 			0xe8e9eaebecedeeef, 0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			ESPH)
 		DWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
 			0xecedeeef, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff,
 			0xff, "PATHPATHPATH", DSPH)
 		QWordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
-			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef, 
+			0xd8d9dadbdcdddedf, 0xe0e1e2e3e4e5e6e7, 0xe8e9eaebecedeeef,
 			0xf0f1f2f3f4f5f6f7, 0xf8f9fafbfcfdfeff,
 			0xff, "PATHPATHPATH", QSPH)
 		WordSpace (0xc0, ResourceConsumer, SubDecode, MinFixed, MaxFixed, 0x5a,
@@ -2609,7 +2607,7 @@ Method(RT1c)
 		Memory24 (ReadWrite, 0xf0f1, 0xf2f3, 0xf4f5, 0xf6f7, M24L)
 		Memory32 (ReadWrite, 0xf0f1f2f3, 0xf4f5f6f7, 0xf8f9fafb, 0xfcfdfeff, M32L)
 		Memory32Fixed (ReadOnly, 0xf0f1f2f3, 0xf4f5f6f7, M3FL)
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl
index a2f2560bd..5d98dcf5a 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl b/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl
index e2c6d66c2..0b6f73c61 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -36,19 +34,19 @@
 
 Name (p410, Package() {
 	ResourceTemplate () {
-		VendorLong () {0x8f, 
+		VendorLong () {0x8f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff}
 	},
 	ResourceTemplate () {
-		VendorLong () {0x9f, 
+		VendorLong () {0x9f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			0x00, 0x01, 0x02, 0x03}
 	},
 
 	ResourceTemplate () {
-		VendorLong () {0xaf, 
+		VendorLong () {0xaf,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 			// 257 bytes
@@ -78,11 +76,11 @@ Name (p410, Package() {
 		VendorLong () {0xbf}
 	},
 	ResourceTemplate () {
-		VendorLong () {0xcf, 
+		VendorLong () {0xcf,
 			0xf0}
 	},
 	ResourceTemplate () {
-		VendorLong () {0xdf, 
+		VendorLong () {0xdf,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe}
 	},
@@ -90,7 +88,7 @@ Name (p410, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.2   Vendor-Defined Descriptor 
+6.4.3.2   Vendor-Defined Descriptor
 
 Large Vendor-Defined Descriptor layout:
 
@@ -161,7 +159,7 @@ Method(RT09)
 
 	Store (
 		ResourceTemplate () {
-			VendorLong (VL00) {0x8f, 
+			VendorLong (VL00) {0x8f,
 			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff}
 		}, Local0)
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl b/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl
index 45e39d063..cdcead8d4 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl b/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl
index 84d7e6d3c..6ffc03810 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -162,7 +160,7 @@ Name (p428, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.3   Word Address Space Descriptor 
+6.4.3.5.3   Word Address Space Descriptor
 
 Bus Number Word Address Space Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl
index 4b2cb0d61..89c8c9d6f 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -226,7 +224,7 @@ Name (p420, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.3   Word Address Space Descriptor 
+6.4.3.5.3   Word Address Space Descriptor
 
 I/O Word Address Space Descriptor layout:
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl
index 7fde6b896..bfe5e234e 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl
@@ -1,7 +1,5 @@
 /*
- * Copyright (c) 2006, Intel Corp.
- * Copyright (C) 2006, Valery Podrezov <valery.a.podrezov@intel.com>
- * Copyright (C) 2006, Fiodor Suietov <fiodor.f.suietov@intel.com>
+ * Some or all of this work - Copyright (c) 2006 - 2009, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -175,7 +173,7 @@ Name (p430, Package() {
 
 /*
 ACPI Specification, Revision 3.0, September 2, 2004
-6.4.3.5.3   Word Address Space Descriptor 
+6.4.3.5.3   Word Address Space Descriptor
 
 Memory Word Address Space Descriptor layout:
author	Robert Moore <Robert.Moore@intel.com>	2009-03-25 08:45:10 -0700
committer	Robert Moore <Robert.Moore@intel.com>	2009-03-25 08:45:10 -0700
commit	e103504655c7ad5403623f9a0458ffd2fbe31254 (patch)
tree	c6846694c2502b95131fe667172df92fb102898b /tests/aslts/src/runtime/collections/functional/descriptor
parent	0dc5d933311094a9da7fdfa3960606a806aa3da6 (diff)
download	acpica-e103504655c7ad5403623f9a0458ffd2fbe31254.tar.gz