Simplify PCI hotplug acpi macros.

Change the macros to pass the slot number via hex, and then remove
passing of duplicate information.

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

1 files changed, 100 insertions, 101 deletions

diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl
index ac54972..1d6bf5f 100644
--- a/src/acpi-dsdt.dsl
+++ b/src/acpi-dsdt.dsl
@@ -466,110 +466,116 @@ DefinitionBlock (
 
     Scope(\_SB.PCI0) {
 
-#define gen_pci_device(name, nr)                                \
-        Device(SL##name) {                                      \
-            Name (_ADR, nr##0000)                               \
+#define gen_pci_device(slot)                                    \
+        Device(SL##slot) {                                      \
+            Name (_ADR, 0x##slot##0000)                         \
             Method (_RMV) {                                     \
-                If (And(\_SB.PCI0.PCRM, ShiftLeft(1, nr))) {    \
+                If (And(\_SB.PCI0.PCRM, ShiftLeft(1, 0x##slot))) {    \
                     Return (0x1)                                \
                 }                                               \
                 Return (0x0)                                    \
             }                                                   \
-            Name (_SUN, name)                                   \
+            Name (_SUN, 0x##slot)                               \
         }
 
         /* VGA (slot 1) and ISA bus (slot 2) defined above */
-	gen_pci_device(3, 0x0003)
-	gen_pci_device(4, 0x0004)
-	gen_pci_device(5, 0x0005)
-	gen_pci_device(6, 0x0006)
-	gen_pci_device(7, 0x0007)
-	gen_pci_device(8, 0x0008)
-	gen_pci_device(9, 0x0009)
-	gen_pci_device(10, 0x000a)
-	gen_pci_device(11, 0x000b)
-	gen_pci_device(12, 0x000c)
-	gen_pci_device(13, 0x000d)
-	gen_pci_device(14, 0x000e)
-	gen_pci_device(15, 0x000f)
-	gen_pci_device(16, 0x0010)
-	gen_pci_device(17, 0x0011)
-	gen_pci_device(18, 0x0012)
-	gen_pci_device(19, 0x0013)
-	gen_pci_device(20, 0x0014)
-	gen_pci_device(21, 0x0015)
-	gen_pci_device(22, 0x0016)
-	gen_pci_device(23, 0x0017)
-	gen_pci_device(24, 0x0018)
-	gen_pci_device(25, 0x0019)
-	gen_pci_device(26, 0x001a)
-	gen_pci_device(27, 0x001b)
-	gen_pci_device(28, 0x001c)
-	gen_pci_device(29, 0x001d)
-	gen_pci_device(30, 0x001e)
-	gen_pci_device(31, 0x001f)
-
-#define hotplug_slot(name, nr)                \
-        Device (S##name) {                    \
-           Name (_ADR, nr##0000)              \
+        gen_pci_device(03)
+        gen_pci_device(04)
+        gen_pci_device(05)
+        gen_pci_device(06)
+        gen_pci_device(07)
+        gen_pci_device(08)
+        gen_pci_device(09)
+        gen_pci_device(0a)
+        gen_pci_device(0b)
+        gen_pci_device(0c)
+        gen_pci_device(0d)
+        gen_pci_device(0e)
+        gen_pci_device(0f)
+        gen_pci_device(10)
+        gen_pci_device(11)
+        gen_pci_device(12)
+        gen_pci_device(13)
+        gen_pci_device(14)
+        gen_pci_device(15)
+        gen_pci_device(16)
+        gen_pci_device(17)
+        gen_pci_device(18)
+        gen_pci_device(19)
+        gen_pci_device(1a)
+        gen_pci_device(1b)
+        gen_pci_device(1c)
+        gen_pci_device(1d)
+        gen_pci_device(1e)
+        gen_pci_device(1f)
+
+#define hotplug_slot(slot)                    \
+        Device (S##slot) {                    \
+           Name (_ADR, 0x##slot##0000)        \
            Method (_EJ0,1) {                  \
-                Store(ShiftLeft(1, nr), B0EJ) \
+                Store(ShiftLeft(1, 0x##slot), B0EJ) \
                 Return (0x0)                  \
            }                                  \
-           Name (_SUN, name)                  \
-        }
-
-        hotplug_slot(1, 0x0001)
-        hotplug_slot(2, 0x0002)
-        hotplug_slot(3, 0x0003)
-        hotplug_slot(4, 0x0004)
-        hotplug_slot(5, 0x0005)
-        hotplug_slot(6, 0x0006)
-        hotplug_slot(7, 0x0007)
-        hotplug_slot(8, 0x0008)
-        hotplug_slot(9, 0x0009)
-        hotplug_slot(10, 0x000a)
-        hotplug_slot(11, 0x000b)
-        hotplug_slot(12, 0x000c)
-        hotplug_slot(13, 0x000d)
-        hotplug_slot(14, 0x000e)
-        hotplug_slot(15, 0x000f)
-        hotplug_slot(16, 0x0010)
-        hotplug_slot(17, 0x0011)
-        hotplug_slot(18, 0x0012)
-        hotplug_slot(19, 0x0013)
-        hotplug_slot(20, 0x0014)
-        hotplug_slot(21, 0x0015)
-        hotplug_slot(22, 0x0016)
-        hotplug_slot(23, 0x0017)
-        hotplug_slot(24, 0x0018)
-        hotplug_slot(25, 0x0019)
-        hotplug_slot(26, 0x001a)
-        hotplug_slot(27, 0x001b)
-        hotplug_slot(28, 0x001c)
-        hotplug_slot(29, 0x001d)
-        hotplug_slot(30, 0x001e)
-        hotplug_slot(31, 0x001f)
-
-#define gen_pci_hotplug(nr)                                       \
-            If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) {          \
-                Notify(\_SB.PCI0.S##nr, 1)                        \
+           Name (_SUN, 0x##slot)              \
+        }
+
+        hotplug_slot(01)
+        hotplug_slot(02)
+        hotplug_slot(03)
+        hotplug_slot(04)
+        hotplug_slot(05)
+        hotplug_slot(06)
+        hotplug_slot(07)
+        hotplug_slot(08)
+        hotplug_slot(09)
+        hotplug_slot(0a)
+        hotplug_slot(0b)
+        hotplug_slot(0c)
+        hotplug_slot(0d)
+        hotplug_slot(0e)
+        hotplug_slot(0f)
+        hotplug_slot(10)
+        hotplug_slot(11)
+        hotplug_slot(12)
+        hotplug_slot(13)
+        hotplug_slot(14)
+        hotplug_slot(15)
+        hotplug_slot(16)
+        hotplug_slot(17)
+        hotplug_slot(18)
+        hotplug_slot(19)
+        hotplug_slot(1a)
+        hotplug_slot(1b)
+        hotplug_slot(1c)
+        hotplug_slot(1d)
+        hotplug_slot(1e)
+        hotplug_slot(1f)
+
+#define gen_pci_hotplug(slot)                                     \
+            If (And(\_SB.PCI0.PCIU, ShiftLeft(1, 0x##slot))) {    \
+                Notify(\_SB.PCI0.S##slot, 1)                      \
             }                                                     \
-            If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) {          \
-                Notify(\_SB.PCI0.S##nr, 3)                        \
+            If (And(\_SB.PCI0.PCID, ShiftLeft(1, 0x##slot))) {    \
+                Notify(\_SB.PCI0.S##slot, 3)                      \
             }
 
         /* PCI hotplug notify method */
         Method(PCNF, 0) {
-            gen_pci_hotplug(1)
-            gen_pci_hotplug(2)
-            gen_pci_hotplug(3)
-            gen_pci_hotplug(4)
-            gen_pci_hotplug(5)
-            gen_pci_hotplug(6)
-            gen_pci_hotplug(7)
-            gen_pci_hotplug(8)
-            gen_pci_hotplug(9)
+            gen_pci_hotplug(01)
+            gen_pci_hotplug(02)
+            gen_pci_hotplug(03)
+            gen_pci_hotplug(04)
+            gen_pci_hotplug(05)
+            gen_pci_hotplug(06)
+            gen_pci_hotplug(07)
+            gen_pci_hotplug(08)
+            gen_pci_hotplug(09)
+            gen_pci_hotplug(0a)
+            gen_pci_hotplug(0b)
+            gen_pci_hotplug(0c)
+            gen_pci_hotplug(0d)
+            gen_pci_hotplug(0e)
+            gen_pci_hotplug(0f)
             gen_pci_hotplug(10)
             gen_pci_hotplug(11)
             gen_pci_hotplug(12)
@@ -580,18 +586,12 @@ DefinitionBlock (
             gen_pci_hotplug(17)
             gen_pci_hotplug(18)
             gen_pci_hotplug(19)
-            gen_pci_hotplug(20)
-            gen_pci_hotplug(21)
-            gen_pci_hotplug(22)
-            gen_pci_hotplug(23)
-            gen_pci_hotplug(24)
-            gen_pci_hotplug(25)
-            gen_pci_hotplug(26)
-            gen_pci_hotplug(27)
-            gen_pci_hotplug(28)
-            gen_pci_hotplug(29)
-            gen_pci_hotplug(30)
-            gen_pci_hotplug(31)
+            gen_pci_hotplug(1a)
+            gen_pci_hotplug(1b)
+            gen_pci_hotplug(1c)
+            gen_pci_hotplug(1d)
+            gen_pci_hotplug(1e)
+            gen_pci_hotplug(1f)
 
             Return (0x01)
         }
@@ -1000,5 +1000,4 @@ DefinitionBlock (
             Return(0x01)
         }
     }
-
 }