--- dsdt.dsl.original	2008-10-07 17:21:43.000000000 +0200
+++ dsdt.dsl	2008-10-07 23:21:49.000000000 +0200
@@ -20,8 +20,8 @@
     External (PDC1)
     External (PDC0)
     External (CFGD)
-    External (^CPU0._PPC)
-    External (^^^PEGP.EGFX._PSC)
+    External (\_PR_.CPU0._PPC)
+    External (\_SB_.PCI0.PEGP.EGFX._PSC)
     External (\_SB_.PCI0.GFX0.DD05)
     External (\_SB_.PCI0.GFX0.DD04)
     External (\_SB_.PCI0.GFX0.DD03)
@@ -1133,7 +1133,6 @@
             Method (GETV, 1, NotSerialized)
             {
                 Return (WMAB (Arg0, One, Zero))
-                Return (Zero)
             }
 
             Method (FIRE, 2, NotSerialized)
@@ -1468,6 +1467,8 @@
 
                     Return (Local0)
                 }
+
+		Return (Zero)
             }
 
             Method (WMBB, 3, NotSerialized)
@@ -1476,9 +1477,9 @@
                 Z00I (Local0, 0x08, 0x80000001)
                 If (LOr (LEqual (Arg1, One), LEqual (Arg1, 0x02)))
                 {
-                    Name (_T_0, Zero)
-                    Store (Z00J (Local0, Zero), _T_0)
-                    If (LEqual (_T_0, 0x0100))
+                    Name (T_0, Zero)
+                    Store (Z00J (Local0, Zero), T_0)
+                    If (LEqual (T_0, 0x0100))
                     {
                         If (LEqual (Z00K (Local0, 0x04), 0x02))
                         {
@@ -1493,12 +1494,12 @@
                     }
                     Else
                     {
-                        If (LEqual (_T_0, 0x0108))
+                        If (LEqual (T_0, 0x0108))
                         {
                             Z00I (Local0, 0x08, Zero)
-                            Name (_T_1, Zero)
-                            Store (Z00K (Local0, 0x04), _T_1)
-                            If (LEqual (_T_1, 0x0100))
+                            Name (T_1, Zero)
+                            Store (Z00K (Local0, 0x04), T_1)
+                            If (LEqual (T_1, 0x0100))
                             {
                                 Z00L (Local0, 0x10, ^^PCI0.LPCB.EC.ECC0)
                                 Z00L (Local0, 0x11, ^^PCI0.LPCB.EC.FMOD)
@@ -1509,7 +1510,7 @@
                             }
                             Else
                             {
-                                If (LEqual (_T_1, 0x0101))
+                                If (LEqual (T_1, 0x0101))
                                 {
                                     If (And (Z00M (Local0, 0x0C), One))
                                     {
@@ -1533,13 +1534,13 @@
                                 }
                                 Else
                                 {
-                                    If (LEqual (_T_1, 0x0102))
+                                    If (LEqual (T_1, 0x0102))
                                     {
                                         Acquire (MUTX, 0xFFFF)
                                         And (^^PCI0.LPCB.EC.SMST, 0x40, ^^PCI0.LPCB.EC.SMST)
-                                        Name (_T_2, Zero)
-                                        Store (Z00M (Local0, 0x0C), _T_2)
-                                        If (LEqual (_T_2, 0x0B))
+                                        Name (T_2, Zero)
+                                        Store (Z00M (Local0, 0x0C), T_2)
+                                        If (LEqual (T_2, 0x0B))
                                         {
                                             Store (Z00M (Local0, 0x0D), ^^PCI0.LPCB.EC.SMAD)
                                             Store (Z00M (Local0, 0x0E), ^^PCI0.LPCB.EC.SMCM)
@@ -1592,7 +1593,7 @@
                                         }
                                         Else
                                         {
-                                            If (LEqual (_T_2, 0x0A))
+                                            If (LEqual (T_2, 0x0A))
                                             {
                                                 Store (Z00M (Local0, 0x10), ^^PCI0.LPCB.EC.SDA0)
                                                 Store (Z00M (Local0, 0x11), ^^PCI0.LPCB.EC.SDA1)
@@ -1650,7 +1651,7 @@
                                     }
                                     Else
                                     {
-                                        If (LEqual (_T_1, 0x0103))
+                                        If (LEqual (T_1, 0x0103))
                                         {
                                             Z019 (Local0, 0x10, Zero)
                                             Z019 (Local0, 0x14, Zero)
@@ -1728,6 +1729,8 @@
 
                     Return (Local0)
                 }
+
+		Return (Zero)
             }
 
             Method (Z00J, 2, NotSerialized)
@@ -2670,7 +2673,6 @@
                     If (LEqual (MAR0, 0xE6))
                     {
                         Return (0x80000001)
-                        Return (0x80000002)
                     }
 
                     If (LEqual (MAR0, 0xE7))
@@ -2712,6 +2714,8 @@
 
                     Return (0x80000001)
                 }
+
+		Return (Zero)
             }
 
             Method (Z01H, 2, NotSerialized)
@@ -2872,7 +2876,6 @@
                         Store (Local1, GP38)
                         SWPS (And (Local0, 0x07))
                         Return (Local0)
-                        Return (Zero)
                     }
                 }