ACPI: Delineate q35 ACSP DSL code into sections.

Add comments around major sections of the DSL file.  Also, add scope
declarations where needed so that each section only contains one
scope.

This is the q35 equivalent of e9fe15b86c6e98a91b30511d005ecdcc8a3e578d.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/q35-acpi-dsdt.dsl b/src/q35-acpi-dsdt.dsl
index 18dfafa00d8327dc77dc3d0a690f8dbe5b7c0123..2fd79cc5e945e0eb1130518cf0db7448ec7de1a3 100644 (file)
--- a/src/q35-acpi-dsdt.dsl
+++ b/src/q35-acpi-dsdt.dsl
@@ -48,7 +48,11 @@ DefinitionBlock (
         Store(Arg0, \PICF)
     }
 
-    /* PCI Bus definition */
+
+/****************************************************************
+ * PCI Bus definition
+ ****************************************************************/
+
     Scope(\_SB) {
         Device(PCI0) {
             Name(_HID, EisaId("PNP0A08"))
@@ -116,6 +120,11 @@ DefinitionBlock (
 #include "acpi-dsdt-pci-crs.dsl"
 #include "acpi-dsdt-hpet.dsl"
 
+
+/****************************************************************
+ * VGA
+ ****************************************************************/
+
     Scope(\_SB.PCI0) {
         Device(VGA) {
             Name(_ADR, 0x00010000)
@@ -129,7 +138,14 @@ DefinitionBlock (
                 Return (0x00)
             }
         }
+    }
+
 
+/****************************************************************
+ * LPC ISA bridge
+ ****************************************************************/
+
+    Scope(\_SB.PCI0) {
         /* PCI D31:f0 LPC ISA bridge */
         Device(ISA) {
             /* PCI D31:f0 */
@@ -173,7 +189,11 @@ DefinitionBlock (
 
 #include "acpi-dsdt-isa.dsl"
 
-    /* PCI IRQs */
+
+/****************************************************************
+ * PCI IRQs
+ ****************************************************************/
+
     Scope(\_SB) {
         Scope(PCI0) {
 #define prt_slot_lnk(nr, lnk0, lnk1, lnk2, lnk3)  \
@@ -380,6 +400,11 @@ DefinitionBlock (
 
 #include "acpi-dsdt-cpu-hotplug.dsl"
 
+
+/****************************************************************
+ * General purpose events
+ ****************************************************************/
+
     Scope(\_GPE) {
         Name(_HID, "ACPI0006")