Jump to content

Problem with nVidia and dual screens


someh4x0r
 Share

1 post in this topic

Recommended Posts

I successfully enabled my nVidia card using DSDT editing, but I can only use one screen. I have an nVidia GeForce GT 230 (G92 core), which has DVI, VGA, and HDMI connectors. The "primary" screen (that BIOS messages appear on) is the DVI screen. If I boot with only the DVI screen connected, everything works. When i boot with both DVI and HDMI, the HDMI shows no signal and the DVI screen remains blank. When I boot with the DVI screen and plug in the HDMI screen, the computer hangs. My changes are below (in order). Can anybody help? NVinject also doesn't work.

 

--- DSDT.orig.dsl	2010-10-03 14:39:12.000000000 -0700
+++ DSDT.dsl	2010-10-09 15:46:25.000000000 -0700
@@ -1,35 +1,24 @@
-/*
- * Intel ACPI Component Architecture
- * AML Disassembler version 20090521
- *
- * Disassembly of DSDT.dat, Sun Oct  3 14:39:12 2010
- *
- *
- * Original Table Header:
- *	 Signature		"DSDT"
- *	 Length		   0x00004E91 (20113)
- *	 Revision		 0x01 **** ACPI 1.0, no 64-bit math support
- *	 Checksum		 0x4C
- *	 OEM ID		   "HPQOEM"
- *	 OEM Table ID	 "SLIC-CPC"
- *	 OEM Revision	 0x00000000 (0)
- *	 Compiler ID	  "INTL"
- *	 Compiler Version 0x20051117 (537202967)
- */
DefinitionBlock ("DSDT.aml", "DSDT", 1, "HPQOEM", "SLIC-CPC", 0x00000000)
{
 Scope (_PR)
 {
-		Processor (P001, 0x01, 0x00000810, 0x06) {}
+		Processor (P001, 0x01, 0x00000810, 0x06)
+		{
+		}
	 Alias (P001, CPU1)
-		Processor (P002, 0x02, 0x00000000, 0x00) {}
+		Processor (P002, 0x02, 0x00000000, 0x00)
+		{
+		}
	 Alias (P002, CPU2)
-		Processor (P003, 0x03, 0x00000000, 0x00) {}
+		Processor (P003, 0x03, 0x00000000, 0x00)
+		{
+		}
	 Alias (P003, CPU3)
-		Processor (P004, 0x04, 0x00000000, 0x00) {}
+		Processor (P004, 0x04, 0x00000000, 0x00)
+		{
+		}
	 Alias (P004, CPU4)
 }
-
 Name (DP80, 0x80)
 Name (DP90, 0x90)
 Name (SPIO, 0x2E)
@@ -91,17 +80,14 @@
	 MH1L,   32, 
	 BDID,   8
 }
-
 Method (RRIO, 4, NotSerialized)
 {
	 Store ("RRIO", Debug)
 }
-
 Method (RDMA, 3, NotSerialized)
 {
	 Store ("rDMA", Debug)
 }
-
 Name (PICM, Zero)
 Method (_PIC, 1, NotSerialized)
 {
@@ -113,10 +99,8 @@
	 {
		 Store (0xAC, DBG8)
	 }
-
	 Store (Arg0, PICM)
 }
-
 Name (OSVR, Ones)
 Method (OSFL, 0, NotSerialized)
 {
@@ -124,12 +108,10 @@
	 {
		 Return (OSVR)
	 }
-
	 If (LEqual (PICM, Zero))
	 {
		 Store (0xAC, DBG8)
	 }
-
	 Store (One, OSVR)
	 If (CondRefOf (_OSI, Local1))
	 {
@@ -137,32 +119,26 @@
		 {
			 Store (0x04, OSVR)
		 }
-
		 If (_OSI ("Windows 2001"))
		 {
			 Store (Zero, OSVR)
		 }
-
		 If (_OSI ("Windows 2001 SP1"))
		 {
			 Store (Zero, OSVR)
		 }
-
		 If (_OSI ("Windows 2001 SP2"))
		 {
			 Store (Zero, OSVR)
		 }
-
		 If (_OSI ("Windows 2001.1"))
		 {
			 Store (Zero, OSVR)
		 }
-
		 If (_OSI ("Windows 2001.1 SP1"))
		 {
			 Store (Zero, OSVR)
		 }
-
		 If (_OSI ("Windows 2006"))
		 {
			 Store (Zero, OSVR)
@@ -180,24 +156,20 @@
			 {
				 Store (0x02, OSVR)
			 }
-
			 If (MCTH (_OS, "Linux"))
			 {
				 Store (0x03, OSVR)
			 }
		 }
	 }
-
	 Return (OSVR)
 }
-
 Method (MCTH, 2, NotSerialized)
 {
	 If (LLess (SizeOf (Arg0), SizeOf (Arg1)))
	 {
		 Return (Zero)
	 }
-
	 Add (SizeOf (Arg0), One, Local0)
	 Name (BUF0, Buffer (Local0) {})
	 Name (BUF1, Buffer (Local0) {})
@@ -212,10 +184,8 @@
			 Return (Zero)
		 }
	 }
-
	 Return (One)
 }
-
 Name (PRWP, Package (0x02)
 {
	 Zero, 
@@ -244,10 +214,8 @@
			 FindSetRightBit (Local0, Index (PRWP, One))
		 }
	 }
-
	 Return (PRWP)
 }
-
 Name (WAKP, Package (0x02)
 {
	 Zero, 
@@ -258,13 +226,11 @@
 {
	 DBG8,   8
 }
-
 OperationRegion (DEB1, SystemIO, DP90, 0x02)
 Field (DEB1, WordAcc, NoLock, Preserve)
 {
	 DBG9,   16
 }
-
 Scope (_SB)
 {
	 Name (PR00, Package (0x15)
@@ -276,7 +242,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x0001FFFF, 
@@ -284,7 +249,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x0001FFFF, 
@@ -292,7 +256,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x0001FFFF, 
@@ -300,7 +263,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001FFFFF, 
@@ -308,7 +270,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001FFFFF, 
@@ -316,7 +277,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001FFFFF, 
@@ -324,7 +284,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -332,7 +291,6 @@
			 LNKH, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -340,7 +298,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -348,7 +305,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -356,7 +312,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001AFFFF, 
@@ -364,7 +319,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001AFFFF, 
@@ -372,7 +326,6 @@
			 LNKF, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001AFFFF, 
@@ -380,7 +333,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001BFFFF, 
@@ -388,7 +340,6 @@
			 LNKG, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x0019FFFF, 
@@ -396,7 +347,6 @@
			 LNKE, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -404,7 +354,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -412,7 +361,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -420,7 +368,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -428,7 +375,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x0002FFFF, 
@@ -446,7 +392,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0x0001FFFF, 
@@ -454,7 +399,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0x0001FFFF, 
@@ -462,7 +406,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0x0001FFFF, 
@@ -470,7 +413,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0x001FFFFF, 
@@ -478,7 +420,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0x001FFFFF, 
@@ -486,7 +427,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0x001FFFFF, 
@@ -494,7 +434,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -502,7 +441,6 @@
			 Zero, 
			 0x17
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -510,7 +448,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -518,7 +455,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0x001DFFFF, 
@@ -526,7 +462,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0x001AFFFF, 
@@ -534,7 +469,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0x001AFFFF, 
@@ -542,7 +476,6 @@
			 Zero, 
			 0x15
		 }, 
-
		 Package (0x04)
		 {
			 0x001AFFFF, 
@@ -550,7 +483,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0x001BFFFF, 
@@ -558,7 +490,6 @@
			 Zero, 
			 0x16
		 }, 
-
		 Package (0x04)
		 {
			 0x0019FFFF, 
@@ -566,7 +497,6 @@
			 Zero, 
			 0x14
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -574,7 +504,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -582,7 +511,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -590,7 +518,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0x001CFFFF, 
@@ -598,7 +525,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0x0002FFFF, 
@@ -616,7 +542,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -624,7 +549,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -632,7 +556,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -650,7 +573,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -658,7 +580,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -666,7 +587,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -684,7 +604,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -692,7 +611,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -700,7 +618,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -718,7 +635,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -726,7 +642,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -734,7 +649,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -752,7 +666,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -760,7 +673,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -768,7 +680,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -786,7 +697,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -794,7 +704,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -802,7 +711,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -820,7 +728,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -828,7 +735,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -836,7 +742,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -854,7 +759,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -862,7 +766,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -870,7 +773,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -888,7 +790,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -896,7 +797,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -904,7 +804,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -922,7 +821,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -930,7 +828,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -938,7 +835,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -956,7 +852,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -964,7 +859,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -972,7 +866,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -990,7 +883,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -998,7 +890,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1006,7 +897,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1024,7 +914,6 @@
			 LNKB, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1032,7 +921,6 @@
			 LNKC, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1040,7 +928,6 @@
			 LNKD, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1048,7 +935,6 @@
			 LNKA, 
			 Zero
		 }, 
-
		 Package (0x04)
		 {
			 0x0005FFFF, 
@@ -1066,7 +952,6 @@
			 Zero, 
			 0x11
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1074,7 +959,6 @@
			 Zero, 
			 0x12
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1082,7 +966,6 @@
			 Zero, 
			 0x13
		 }, 
-
		 Package (0x04)
		 {
			 0xFFFF, 
@@ -1090,7 +973,6 @@
			 Zero, 
			 0x10
		 }, 
-
		 Package (0x04)
		 {
			 0x0005FFFF, 
@@ -1119,12 +1001,10 @@
		 {
			 Return (Zero)
		 }
-
		 Method (_BBN, 0, NotSerialized)
		 {
			 Return (BN00 ())
		 }
-
		 Name (_UID, Zero)
		 Method (_PRT, 0, NotSerialized)
		 {
@@ -1132,10 +1012,8 @@
			 {
				 Return (AR00)
			 }
-
			 Return (PR00)
		 }
-
		 Method (_S3D, 0, NotSerialized)
		 {
			 If (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02)))
@@ -1147,7 +1025,6 @@
				 Return (0x03)
			 }
		 }
-
		 Name (_CID, EisaId ("PNP0A03"))
		 Device (MCH)
		 {
@@ -1161,15 +1038,12 @@
					 )
			 })
		 }
-
		 Method (NPTS, 1, NotSerialized)
		 {
		 }
-
		 Method (NWAK, 1, NotSerialized)
		 {
		 }
-
		 Device (P0P2)
		 {
			 Name (_ADR, 0x00010000)
@@ -1178,7 +1052,6 @@
				 Return (GPRW (0x09, 0x04))
			 }
		 }
-
		 Device (P0P1)
		 {
			 Name (_ADR, 0x001E0000)
@@ -1186,18 +1059,15 @@
			 {
				 Return (GPRW (0x0B, 0x04))
			 }
-
			 Method (_PRT, 0, NotSerialized)
			 {
				 If (PICM)
				 {
					 Return (AR01)
				 }
-
				 Return (PR01)
			 }
		 }
-
		 Device (SBRG)
		 {
			 Name (_ADR, 0x001F0000)
@@ -1220,13 +1090,11 @@
					 ELEN,   1, 
							 Offset (0x14)
				 }
-
				 Method (\_GPE._L0A, 0, NotSerialized)
				 {
					 Notify (\_SB.PCI0.SBRG.IELK, 0x81)
					 Store (One, \_SB.PCI0.SBRG.IELK.PMCS)
				 }
-
				 Method (_STA, 0, NotSerialized)
				 {
					 If (ELEN)
@@ -1238,24 +1106,20 @@
						 Return (Zero)
					 }
				 }
-
				 Method (SMOD, 1, NotSerialized)
				 {
				 }
-
				 Method (GPBS, 0, NotSerialized)
				 {
					 Return (XOr (PBLV, One))
				 }
			 }
-
			 Method (SPTS, 1, NotSerialized)
			 {
				 Store (One, PS1S)
				 Store (One, PS1E)
				 Store (One, SLPS)
			 }
-
			 Method (SWAK, 1, NotSerialized)
			 {
				 Store (Zero, SLPS)
@@ -1270,21 +1134,18 @@
					 }
				 }
			 }
-
			 OperationRegion (APMP, SystemIO, SMIP, 0x02)
			 Field (APMP, ByteAcc, NoLock, Preserve)
			 {
				 APMC,   8, 
				 APMS,   8
			 }
-
			 Field (APMP, ByteAcc, NoLock, Preserve)
			 {
						 Offset (0x01), 
					 ,   1, 
				 BRTC,   1
			 }
-
			 OperationRegion (PMS0, SystemIO, PMBS, 0x04)
			 Field (PMS0, ByteAcc, NoLock, Preserve)
			 {
@@ -1296,7 +1157,6 @@
				 PWBT,   1, 
						 Offset (0x04)
			 }
-
			 OperationRegion (SMIE, SystemIO, PM30, 0x08)
			 Field (SMIE, ByteAcc, NoLock, Preserve)
			 {
@@ -1306,7 +1166,6 @@
				 PS1S,   1, 
						 Offset (0x08)
			 }
-
			 Scope (\_SB)
			 {
				 Name (SLPS, Zero)
@@ -1319,10 +1178,8 @@
						 {
							 Return (0x0F)
						 }
-
						 Return (Zero)
					 }
-
					 Method (SBEV, 0, NotSerialized)
					 {
						 If (SLPS)
@@ -1334,7 +1191,6 @@
							 Notify (SLPB, 0x80)
						 }
					 }
-
					 Method (_PRW, 0, NotSerialized)
					 {
						 Return (Package (0x02)
@@ -1345,7 +1201,6 @@
					 }
				 }
			 }
-
			 Device (PIC)
			 {
				 Name (_HID, EisaId ("PNP0000"))
@@ -1367,7 +1222,6 @@
						 {2}
				 })
			 }
-
			 Device (DMAD)
			 {
				 Name (_HID, EisaId ("PNP0200"))
@@ -1413,7 +1267,6 @@
						 )
				 })
			 }
-
			 Device (TMR)
			 {
				 Name (_HID, EisaId ("PNP0100"))
@@ -1429,7 +1282,6 @@
						 {0}
				 })
			 }
-
			 Device (RTC0)
			 {
				 Name (_HID, EisaId ("PNP0B00"))
@@ -1445,7 +1297,6 @@
						 {8}
				 })
			 }
-
			 Device (SPKR)
			 {
				 Name (_HID, EisaId ("PNP0800"))
@@ -1459,7 +1310,6 @@
						 )
				 })
			 }
-
			 Device (COPR)
			 {
				 Name (_HID, EisaId ("PNP0C04"))
@@ -1475,7 +1325,6 @@
						 {13}
				 })
			 }
-
			 Device (FDC)
			 {
				 Name (_HID, EisaId ("PNP0700"))
@@ -1493,20 +1342,16 @@
					 {
						 Store (One, Index (FDEP, Zero))
					 }
-
					 Return (FDEP)
				 }
-
				 Method (_STA, 0, NotSerialized)
				 {
					 Return (DSTA (0x03))
				 }
-
				 Method (_DIS, 0, NotSerialized)
				 {
					 DCNT (0x03, Zero)
				 }
-
				 Method (_CRS, 0, NotSerialized)
				 {
					 DCRS (0x03, One)
@@ -1520,7 +1365,6 @@
					 Store (One, LEN3)
					 Return (CRS2)
				 }
-
				 Method (_SRS, 1, NotSerialized)
				 {
					 DSRS (Arg0, 0x03)
@@ -1536,7 +1380,6 @@
					 {
						 Store (Zero, INTR)
					 }
-
					 If (DMAE)
					 {
						 FindSetRightBit (DMAE, Local0)
@@ -1546,10 +1389,8 @@
					 {
						 Store (0x04, DMCH)
					 }
-
					 EXFG ()
				 }
-
				 Name (_PRS, ResourceTemplate ()
				 {
					 StartDependentFn (0x00, 0x00)
@@ -1612,7 +1453,6 @@
					 EndDependentFn ()
				 })
			 }
-
			 Device (RMSC)
			 {
				 Name (_HID, EisaId ("PNP0C02"))
@@ -1747,7 +1587,6 @@
						 Store (SMBS, GP11)
						 Store (SMBL, GP1L)
					 }
-
					 If (GPBS)
					 {
						 CreateWordField (CRS, \_SB.PCI0.SBRG.RMSC._Y02._MIN, GP20)
@@ -1757,11 +1596,9 @@
						 Store (GPBS, GP21)
						 Store (GPLN, GP2L)
					 }
-
					 Return (CRS)
				 }
			 }
-
			 Device (HPET)
			 {
				 Name (_HID, EisaId ("PNP0103"))
@@ -1780,7 +1617,6 @@
					 HPTE,   1, 
							 Offset (0x04)
				 }
-
				 Method (_STA, 0, NotSerialized)
				 {
					 If (LEqual (OSFL (), Zero))
@@ -1797,10 +1633,8 @@
							 Return (0x0B)
						 }
					 }
-
					 Return (Zero)
				 }
-
				 Method (_CRS, 0, NotSerialized)
				 {
					 CreateDWordField (CRS, \_SB.PCI0.SBRG.HPET._Y03._BAS, HPT)
@@ -1809,7 +1643,6 @@
					 Return (CRS)
				 }
			 }
-
			 OperationRegion (RX80, PCI_Config, Zero, 0xFF)
			 Field (RX80, ByteAcc, NoLock, Preserve)
			 {
@@ -1817,7 +1650,6 @@
				 LPCD,   16, 
				 LPCE,   16
			 }
-
			 Name (DBPT, Package (0x04)
			 {
				 Package (0x08)
@@ -1831,7 +1663,6 @@
					 0x0338, 
					 0x03E8
				 }, 
-
				 Package (0x08)
				 {
					 0x03F8, 
@@ -1843,14 +1674,12 @@
					 0x0338, 
					 0x03E8
				 }, 
-
				 Package (0x03)
				 {
					 0x0378, 
					 0x0278, 
					 0x03BC
				 }, 
-
				 Package (0x02)
				 {
					 0x03F0, 
@@ -1864,19 +1693,16 @@
					 Zero, 
					 0xFFF8
				 }, 
-
				 Package (0x02)
				 {
					 0x04, 
					 0xFF8F
				 }, 
-
				 Package (0x02)
				 {
					 0x08, 
					 0xFCFF
				 }, 
-
				 Package (0x02)
				 {
					 0x0C, 
@@ -1901,7 +1727,6 @@
						 WX82 (Arg0, Arg1)
					 }
				 }
-
				 If (LEqual (Arg0, 0x08))
				 {
					 If (LEqual (Arg2, 0x0200))
@@ -1916,13 +1741,11 @@
						 }
					 }
				 }
-
				 If (LAnd (LLessEqual (Arg0, 0x0D), LGreaterEqual (Arg0, 0x0A)))
				 {
					 WX82 (Arg0, Arg1)
				 }
			 }
-
			 Method (WX82, 2, NotSerialized)
			 {
				 ShiftLeft (One, Arg0, Local0)
@@ -1936,11 +1759,9 @@
					 And (LPCE, Local0, LPCE)
				 }
			 }
-
			 Method (RDMA, 3, NotSerialized)
			 {
			 }
-
			 Device (^PCIE)
			 {
				 Name (_HID, EisaId ("PNP0C02"))
@@ -1961,7 +1782,6 @@
					 Return (CRS)
				 }
			 }
-
			 Device (OMSC)
			 {
				 Name (_HID, EisaId ("PNP0C02"))
@@ -1990,11 +1810,9 @@
						 Store (0xFEE00000, MB02)
						 Store (0x1000, ML02)
					 }
-
					 Return (CRS)
				 }
			 }
-
			 Device (^^RMEM)
			 {
				 Name (_HID, EisaId ("PNP0C01"))
@@ -2047,21 +1865,18 @@
							 Store (0x000C0000, BAS1)
							 Store (0x00020000, LEN1)
						 }
-
						 If (Add (MG1B, MG1L, Local0))
						 {
							 Store (Local0, BAS2)
							 Subtract (0x00100000, BAS2, LEN2)
						 }
					 }
-
					 Subtract (MG2B, 0x00100000, LEN3)
					 Store (MH1B, BAS4)
					 Subtract (Zero, BAS4, LEN4)
					 Return (CRS)
				 }
			 }
-
			 Device (PS2K)
			 {
				 Name (_HID, EisaId ("PNP0303"))
@@ -2073,10 +1888,8 @@
					 {
						 Return (0x0F)
					 }
-
					 Return (Zero)
				 }
-
				 Name (_CRS, ResourceTemplate ()
				 {
					 IO (Decode16,
@@ -2095,12 +1908,10 @@
						 {1}
				 })
			 }
-
			 Method (PS2K._PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x1A, 0x03))
			 }
-
			 Device (PS2M)
			 {
				 Method (_HID, 0, NotSerialized)
@@ -2114,7 +1925,6 @@
						 Return (0x030FD041)
					 }
				 }
-
				 Name (_CID, EisaId ("PNP0F13"))
				 Method (_STA, 0, NotSerialized)
				 {
@@ -2123,10 +1933,8 @@
					 {
						 Return (0x0F)
					 }
-
					 Return (Zero)
				 }
-
				 Name (CRS1, ResourceTemplate ()
				 {
					 IRQNoFlags ()
@@ -2162,12 +1970,10 @@
					 }
				 }
			 }
-
			 Method (PS2M._PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x1A, 0x03))
			 }
-
			 Device (SIOR)
			 {
				 Name (_HID, EisaId ("PNP0C02"))
@@ -2175,7 +1981,6 @@
				 {
					 Return (SPIO)
				 }
-
				 Name (CRS, ResourceTemplate ()
				 {
					 IO (Decode16,
@@ -2202,7 +2007,6 @@
						 Store (SPIO, GP11)
						 Store (0x02, GPL1)
					 }
-
					 If (IOHB)
					 {
						 CreateWordField (CRS, \_SB.PCI0.SBRG.SIOR._Y0C._MIN, GP20)
@@ -2212,11 +2016,9 @@
						 Store (IOHB, GP21)
						 Store (IOHL, GPL2)
					 }
-
					 Return (CRS)
				 }
			 }
-
			 Name (DCAT, Package (0x16)
			 {
				 0xFF, 
@@ -2248,12 +2050,10 @@
				 Store (0x87, INDX)
				 Store (Arg0, LDN)
			 }
-
			 Method (EXFG, 0, NotSerialized)
			 {
				 Store (0xAA, INDX)
			 }
-
			 Method (LPTM, 1, NotSerialized)
			 {
				 ENFG (CGLD (Arg0))
@@ -2261,7 +2061,6 @@
				 EXFG ()
				 Return (Local0)
			 }
-
			 Method (UHID, 1, NotSerialized)
			 {
				 If (LEqual (Arg0, One))
@@ -2274,10 +2073,8 @@
						 Return (0x1005D041)
					 }
				 }
-
				 Return (0x0105D041)
			 }
-
			 Name (KBFG, One)
			 Name (MSFG, One)
			 Method (PS2K._PSW, 1, NotSerialized)
@@ -2294,7 +2091,6 @@
					 }
				 }
			 }
-
			 Method (PS2M._PSW, 1, NotSerialized)
			 {
				 If (LNot (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02))))
@@ -2309,7 +2105,6 @@
					 }
				 }
			 }
-
			 Method (SIOS, 1, NotSerialized)
			 {
				 ENFG (0x0A)
@@ -2318,17 +2113,14 @@
				 {
					 Or (OPT0, 0x04, OPT0)
				 }
-
				 If (MSFG)
				 {
					 Or (OPT0, 0x08, OPT0)
				 }
-
				 Store (0xFF, OPT1)
				 Store (One, ACTR)
				 EXFG ()
			 }
-
			 Method (SIOW, 1, NotSerialized)
			 {
				 ENFG (0x0A)
@@ -2338,18 +2130,15 @@
				 Store (0x47, LEDS)
				 EXFG ()
			 }
-
			 Method (SIOH, 0, NotSerialized)
			 {
			 }
-
			 OperationRegion (IOID, SystemIO, SPIO, 0x02)
			 Field (IOID, ByteAcc, NoLock, Preserve)
			 {
				 INDX,   8, 
				 DATA,   8
			 }
-
			 IndexField (INDX, DATA, ByteAcc, NoLock, Preserve)
			 {
						 Offset (0x07), 
@@ -2387,12 +2176,10 @@
				 OPT4,   8, 
				 OPT5,   8
			 }
-
			 Method (CGLD, 1, NotSerialized)
			 {
				 Return (DerefOf (Index (DCAT, Arg0)))
			 }
-
			 Method (DSTA, 1, NotSerialized)
			 {
				 ENFG (CGLD (Arg0))
@@ -2402,7 +2189,6 @@
				 {
					 Return (Zero)
				 }
-
				 And (Local0, One, Local0)
				 Or (IOST, ShiftLeft (Local0, Arg0), IOST)
				 If (Local0)
@@ -2421,7 +2207,6 @@
					 }
				 }
			 }
-
			 Method (DCNT, 2, NotSerialized)
			 {
				 ENFG (CGLD (Arg0))
@@ -2432,12 +2217,10 @@
				 {
					 RDMA (Arg0, Arg1, Increment (Local1))
				 }
-
				 Store (Arg1, ACTR)
				 RRIO (Arg0, Arg1, Local1, 0x08)
				 EXFG ()
			 }
-
			 Name (CRS1, ResourceTemplate ()
			 {
				 IO (Decode16,
@@ -2499,7 +2282,6 @@
				 {
					 Store (Zero, IRQM)
				 }
-
				 If (LOr (LGreater (DMCH, 0x03), LEqual (Arg1, Zero)))
				 {
					 Store (Zero, DMAM)
@@ -2509,11 +2291,9 @@
					 And (DMCH, 0x03, Local1)
					 ShiftLeft (One, Local1, DMAM)
				 }
-
				 EXFG ()
				 Return (CRS1)
			 }
-
			 Method (DSRS, 2, NotSerialized)
			 {
				 CreateWordField (Arg0, 0x09, IRQM)
@@ -2535,7 +2315,6 @@
				 {
					 Store (Zero, INTR)
				 }
-
				 If (DMAM)
				 {
					 FindSetRightBit (DMAM, Local0)
@@ -2545,11 +2324,9 @@
				 {
					 Store (0x04, DMCH)
				 }
-
				 EXFG ()
				 DCNT (Arg1, One)
			 }
-
			 Device (FWH)
			 {
				 Name (_HID, EisaId ("INT0800"))
@@ -2577,7 +2354,6 @@
					 {
						 Multiply (Local1, 0x00080000, Local1)
					 }
-
					 Add (Local0, Local1, Local2)
					 Store (Local2, BS00)
					 Add (BS00, 0x00400000, BS10)
@@ -2586,7 +2362,6 @@
					 Return (CRS)
				 }
			 }
-
			 Device (FWHE)
			 {
				 Name (_HID, EisaId ("PNP0C02"))
@@ -2606,13 +2381,11 @@
					 {
						 ^^FWH._CRS ()
					 }
-
					 Add (^^FWH.BS00, ^^FWH.BL00, BS00)
					 Subtract (^^FWH.BS10, BS00, BL00)
					 Return (CRS)
				 }
			 }
-
			 OperationRegion (FHR0, PCI_Config, 0xD8, 0x02)
			 Field (FHR0, ByteAcc, NoLock, Preserve)
			 {
@@ -2621,7 +2394,6 @@
				 FHD0,   8
			 }
		 }
-
		 Device (SATA)
		 {
			 Name (_ADR, 0x001F0002)
@@ -2641,7 +2413,6 @@
					 Store (Arg1, REGF)
				 }
			 }
-
			 Name (TIM0, Package (0x08)
			 {
				 Package (0x04)
@@ -2651,7 +2422,6 @@
					 0xF0, 
					 0x0384
				 }, 
-
				 Package (0x04)
				 {
					 0x23, 
@@ -2659,7 +2429,6 @@
					 0x10, 
					 Zero
				 }, 
-
				 Package (0x04)
				 {
					 0x0B, 
@@ -2667,7 +2436,6 @@
					 0x04, 
					 Zero
				 }, 
-
				 Package (0x06)
				 {
					 0x78, 
@@ -2677,7 +2445,6 @@
					 0x1E, 
					 0x14
				 }, 
-
				 Package (0x06)
				 {
					 Zero, 
@@ -2687,7 +2454,6 @@
					 0x02, 
					 One
				 }, 
-
				 Package (0x06)
				 {
					 Zero, 
@@ -2697,7 +2463,6 @@
					 One, 
					 One
				 }, 
-
				 Package (0x04)
				 {
					 0x04, 
@@ -2705,7 +2470,6 @@
					 0x02, 
					 Zero
				 }, 
-
				 Package (0x04)
				 {
					 0x02, 
@@ -2762,7 +2526,6 @@
				 SMAE,   1, 
				 SSAE,   1
			 }
-
			 Name (GMPT, Zero)
			 Name (GMUE, Zero)
			 Name (GMUT, Zero)
@@ -2792,7 +2555,6 @@
					 Or (Local2, Local3, Local2)
					 Return (GTM (PMRI, Local1, PMUT, PSRI, Local2, PSUT, Local0))
				 }
-
				 Method (_STM, 3, NotSerialized)
				 {
					 Store (Arg0, Debug)
@@ -2833,7 +2595,6 @@
					 {
						 Store (Zero, PM3E)
					 }
-
					 If (And (Local0, 0x02))
					 {
						 Store (One, PM6E)
@@ -2842,7 +2603,6 @@
					 {
						 Store (Zero, PM6E)
					 }
-
					 If (And (Local0, 0x04))
					 {
						 Store (One, PMAE)
@@ -2851,7 +2611,6 @@
					 {
						 Store (Zero, PMAE)
					 }
-
					 If (And (Local1, One))
					 {
						 Store (One, PS3E)
@@ -2860,7 +2619,6 @@
					 {
						 Store (Zero, PS3E)
					 }
-
					 If (And (Local1, 0x02))
					 {
						 Store (One, PS6E)
@@ -2869,7 +2627,6 @@
					 {
						 Store (Zero, PS6E)
					 }
-
					 If (And (Local1, 0x04))
					 {
						 Store (One, PSAE)
@@ -2878,11 +2635,9 @@
					 {
						 Store (Zero, PSAE)
					 }
-
					 Store (GTF (Zero, Arg1), ATA0)
					 Store (GTF (One, Arg2), ATA1)
				 }
-
				 Device (DRV0)
				 {
					 Name (_ADR, Zero)
@@ -2891,7 +2646,6 @@
						 Return (RATA (ATA0))
					 }
				 }
-
				 Device (DRV1)
				 {
					 Name (_ADR, One)
@@ -2901,7 +2655,6 @@
					 }
				 }
			 }
-
			 Device (CHN1)
			 {
				 Name (_ADR, One)
@@ -2923,7 +2676,6 @@
					 Or (Local2, Local3, Local2)
					 Return (GTM (SMRI, Local1, SMUT, SSRI, Local2, SSUT, Local0))
				 }
-
				 Method (_STM, 3, NotSerialized)
				 {
					 Store (Arg0, Debug)
@@ -2964,7 +2716,6 @@
					 {
						 Store (Zero, SM3E)
					 }
-
					 If (And (Local0, 0x02))
					 {
						 Store (One, SM6E)
@@ -2973,7 +2724,6 @@
					 {
						 Store (Zero, SM6E)
					 }
-
					 If (And (Local0, 0x04))
					 {
						 Store (One, SMAE)
@@ -2982,7 +2732,6 @@
					 {
						 Store (Zero, SMAE)
					 }
-
					 If (And (Local1, One))
					 {
						 Store (One, SS3E)
@@ -2991,7 +2740,6 @@
					 {
						 Store (Zero, SS3E)
					 }
-
					 If (And (Local1, 0x02))
					 {
						 Store (One, SS6E)
@@ -3000,7 +2748,6 @@
					 {
						 Store (Zero, SS6E)
					 }
-
					 If (And (Local1, 0x04))
					 {
						 Store (One, SSAE)
@@ -3009,11 +2756,9 @@
					 {
						 Store (Zero, SSAE)
					 }
-
					 Store (GTF (Zero, Arg1), ATA2)
					 Store (GTF (One, Arg2), ATA3)
				 }
-
				 Device (DRV0)
				 {
					 Name (_ADR, Zero)
@@ -3022,7 +2767,6 @@
						 Return (RATA (ATA2))
					 }
				 }
-
				 Device (DRV1)
				 {
					 Name (_ADR, One)
@@ -3032,7 +2776,6 @@
					 }
				 }
			 }
-
			 Method (GTM, 7, Serialized)
			 {
				 Store (Ones, PIO0)
@@ -3045,12 +2788,10 @@
				 {
					 Return (TMD0)
				 }
-
				 If (And (Arg1, 0x20))
				 {
					 Or (CHNF, 0x02, CHNF)
				 }
-
				 Store (Match (DerefOf (Index (TIM0, One)), MEQ, Arg0, MTR, 
					 Zero, Zero), Local6)
				 Store (DerefOf (Index (DerefOf (Index (TIM0, Zero)), Local6)), 
@@ -3061,7 +2802,6 @@
				 {
					 Or (CHNF, 0x08, CHNF)
				 }
-
				 Store (Match (DerefOf (Index (TIM0, 0x02)), MEQ, Arg3, MTR, 
					 Zero, Zero), Local6)
				 Store (DerefOf (Index (DerefOf (Index (TIM0, Zero)), Local6)), 
@@ -3075,17 +2815,14 @@
					 {
						 Add (Local5, 0x02, Local5)
					 }
-
					 If (And (Arg1, 0x04))
					 {
						 Add (Local5, 0x04, Local5)
					 }
-
					 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x03)), Local5)), 
						 DMA0)
					 Or (CHNF, One, CHNF)
				 }
-
				 If (And (Arg4, 0x07))
				 {
					 Store (Arg5, Local5)
@@ -3093,21 +2830,17 @@
					 {
						 Add (Local5, 0x02, Local5)
					 }
-
					 If (And (Arg4, 0x04))
					 {
						 Add (Local5, 0x04, Local5)
					 }
-
					 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x03)), Local5)), 
						 DMA1)
					 Or (CHNF, 0x04, CHNF)
				 }
-
				 Store (TMD0, Debug)
				 Return (TMD0)
			 }
-
			 Method (STM, 0, Serialized)
			 {
				 If (REGF)
@@ -3124,7 +2857,6 @@
						 {
							 Store (0x05, Local0)
						 }
-
						 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x04)), Local0)), 
							 GMUT)
						 Or (GMUE, One, GMUE)
@@ -3132,7 +2864,6 @@
						 {
							 Or (GMUE, 0x02, GMUE)
						 }
-
						 If (LGreater (Local0, 0x04))
						 {
							 And (GMUE, 0xFD, GMUE)
@@ -3150,7 +2881,6 @@
							 }
						 }
					 }
-
					 If (And (CHNF, 0x04))
					 {
						 Store (Match (DerefOf (Index (TIM0, 0x03)), MLE, DMA1, MTR, 
@@ -3159,7 +2889,6 @@
						 {
							 Store (0x05, Local0)
						 }
-
						 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x04)), Local0)), 
							 GSUT)
						 Or (GSUE, One, GSUE)
@@ -3167,7 +2896,6 @@
						 {
							 Or (GSUE, 0x02, GSUE)
						 }
-
						 If (LGreater (Local0, 0x04))
						 {
							 And (GSUE, 0xFD, GSUE)
@@ -3185,17 +2913,14 @@
							 }
						 }
					 }
-
					 If (And (CHNF, 0x02))
					 {
						 Or (GMUE, 0x20, GMUE)
					 }
-
					 If (And (CHNF, 0x08))
					 {
						 Or (GSUE, 0x20, GSUE)
					 }
-
					 And (Match (DerefOf (Index (TIM0, Zero)), MGE, PIO0, MTR, 
						 Zero, Zero), 0x03, Local0)
					 Store (DerefOf (Index (DerefOf (Index (TIM0, One)), Local0)), 
@@ -3205,7 +2930,6 @@
					 {
						 Or (GMUE, 0x50, GMUE)
					 }
-
					 And (Match (DerefOf (Index (TIM0, Zero)), MGE, PIO1, MTR, 
						 Zero, Zero), 0x03, Local0)
					 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x02)), Local0)), 
@@ -3217,7 +2941,6 @@
					 }
				 }
			 }
-
			 Name (AT01, Buffer (0x07)
			 {
				 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEF
@@ -3253,7 +2976,6 @@
				 Store (Arg2, A005)
				 Increment (CMDC)
			 }
-
			 Method (GTF, 2, Serialized)
			 {
				 Store (Arg1, Debug)
@@ -3279,7 +3001,6 @@
					 CreateWordField (Arg1, 0xB0, IW88)
					 Store (IW88, ID88)
				 }
-
				 Store (0xA0, Local7)
				 If (Arg0)
				 {
@@ -3293,7 +3014,6 @@
					 {
						 Store (PIO0, PIOT)
					 }
-
					 If (And (CHNF, 0x04))
					 {
						 If (And (CHNF, 0x10))
@@ -3315,7 +3035,6 @@
						 Store (DMA0, DMAT)
					 }
				 }
-
				 If (LAnd (LAnd (And (ID53, 0x04), And (ID88, 0xFF00
					 )), DMAT))
				 {
@@ -3325,7 +3044,6 @@
					 {
						 Store (0x05, Local1)
					 }
-
					 GTFB (AT01, Or (0x40, Local1), Local7)
				 }
				 Else
@@ -3339,7 +3057,6 @@
						 GTFB (AT01, Local1, Local7)
					 }
				 }
-
				 If (IRDY)
				 {
					 And (Match (DerefOf (Index (TIM0, Zero)), MGE, PIOT, MTR, 
@@ -3355,16 +3072,13 @@
						 GTFB (AT01, One, Local7)
					 }
				 }
-
				 If (LAnd (And (ID59, 0x0100), And (ID59, 0xFF)))
				 {
					 GTFB (AT03, And (ID59, 0xFF), Local7)
				 }
-
				 Store (ATAB, Debug)
				 Return (ATAB)
			 }
-
			 Method (RATA, 1, NotSerialized)
			 {
				 CreateByteField (Arg0, Zero, CMDN)
@@ -3374,7 +3088,6 @@
				 Return (Concatenate (RETB, FZTF))
			 }
		 }
-
		 Device (SAT1)
		 {
			 Name (_ADR, 0x001F0005)
@@ -3386,7 +3099,6 @@
					 Store (Arg1, REGF)
				 }
			 }
-
			 Name (TIM0, Package (0x08)
			 {
				 Package (0x04)
@@ -3396,7 +3108,6 @@
					 0xF0, 
					 0x0384
				 }, 
-
				 Package (0x04)
				 {
					 0x23, 
@@ -3404,7 +3115,6 @@
					 0x10, 
					 Zero
				 }, 
-
				 Package (0x04)
				 {
					 0x0B, 
@@ -3412,7 +3122,6 @@
					 0x04, 
					 Zero
				 }, 
-
				 Package (0x06)
				 {
					 0x78, 
@@ -3422,7 +3131,6 @@
					 0x1E, 
					 0x14
				 }, 
-
				 Package (0x06)
				 {
					 Zero, 
@@ -3432,7 +3140,6 @@
					 0x02, 
					 One
				 }, 
-
				 Package (0x06)
				 {
					 Zero, 
@@ -3442,7 +3149,6 @@
					 One, 
					 One
				 }, 
-
				 Package (0x04)
				 {
					 0x04, 
@@ -3450,7 +3156,6 @@
					 0x02, 
					 Zero
				 }, 
-
				 Package (0x04)
				 {
					 0x02, 
@@ -3507,7 +3212,6 @@
				 SMAE,   1, 
				 SSAE,   1
			 }
-
			 Name (GMPT, Zero)
			 Name (GMUE, Zero)
			 Name (GMUT, Zero)
@@ -3537,7 +3241,6 @@
					 Or (Local2, Local3, Local2)
					 Return (GTM (PMRI, Local1, PMUT, PSRI, Local2, PSUT, Local0))
				 }
-
				 Method (_STM, 3, NotSerialized)
				 {
					 Store (Arg0, Debug)
@@ -3578,7 +3281,6 @@
					 {
						 Store (Zero, PM3E)
					 }
-
					 If (And (Local0, 0x02))
					 {
						 Store (One, PM6E)
@@ -3587,7 +3289,6 @@
					 {
						 Store (Zero, PM6E)
					 }
-
					 If (And (Local0, 0x04))
					 {
						 Store (One, PMAE)
@@ -3596,7 +3297,6 @@
					 {
						 Store (Zero, PMAE)
					 }
-
					 If (And (Local1, One))
					 {
						 Store (One, PS3E)
@@ -3605,7 +3305,6 @@
					 {
						 Store (Zero, PS3E)
					 }
-
					 If (And (Local1, 0x02))
					 {
						 Store (One, PS6E)
@@ -3614,7 +3313,6 @@
					 {
						 Store (Zero, PS6E)
					 }
-
					 If (And (Local1, 0x04))
					 {
						 Store (One, PSAE)
@@ -3623,11 +3321,9 @@
					 {
						 Store (Zero, PSAE)
					 }
-
					 Store (GTF (Zero, Arg1), ATA0)
					 Store (GTF (One, Arg2), ATA1)
				 }
-
				 Device (DRV0)
				 {
					 Name (_ADR, Zero)
@@ -3636,7 +3332,6 @@
						 Return (RATA (ATA0))
					 }
				 }
-
				 Device (DRV1)
				 {
					 Name (_ADR, One)
@@ -3646,7 +3341,6 @@
					 }
				 }
			 }
-
			 Device (CHN1)
			 {
				 Name (_ADR, One)
@@ -3668,7 +3362,6 @@
					 Or (Local2, Local3, Local2)
					 Return (GTM (SMRI, Local1, SMUT, SSRI, Local2, SSUT, Local0))
				 }
-
				 Method (_STM, 3, NotSerialized)
				 {
					 Store (Arg0, Debug)
@@ -3709,7 +3402,6 @@
					 {
						 Store (Zero, SM3E)
					 }
-
					 If (And (Local0, 0x02))
					 {
						 Store (One, SM6E)
@@ -3718,7 +3410,6 @@
					 {
						 Store (Zero, SM6E)
					 }
-
					 If (And (Local0, 0x04))
					 {
						 Store (One, SMAE)
@@ -3727,7 +3418,6 @@
					 {
						 Store (Zero, SMAE)
					 }
-
					 If (And (Local1, One))
					 {
						 Store (One, SS3E)
@@ -3736,7 +3426,6 @@
					 {
						 Store (Zero, SS3E)
					 }
-
					 If (And (Local1, 0x02))
					 {
						 Store (One, SS6E)
@@ -3745,7 +3434,6 @@
					 {
						 Store (Zero, SS6E)
					 }
-
					 If (And (Local1, 0x04))
					 {
						 Store (One, SSAE)
@@ -3754,11 +3442,9 @@
					 {
						 Store (Zero, SSAE)
					 }
-
					 Store (GTF (Zero, Arg1), ATA2)
					 Store (GTF (One, Arg2), ATA3)
				 }
-
				 Device (DRV0)
				 {
					 Name (_ADR, Zero)
@@ -3767,7 +3453,6 @@
						 Return (RATA (ATA2))
					 }
				 }
-
				 Device (DRV1)
				 {
					 Name (_ADR, One)
@@ -3777,7 +3462,6 @@
					 }
				 }
			 }
-
			 Method (GTM, 7, Serialized)
			 {
				 Store (Ones, PIO0)
@@ -3790,12 +3474,10 @@
				 {
					 Return (TMD0)
				 }
-
				 If (And (Arg1, 0x20))
				 {
					 Or (CHNF, 0x02, CHNF)
				 }
-
				 Store (Match (DerefOf (Index (TIM0, One)), MEQ, Arg0, MTR, 
					 Zero, Zero), Local6)
				 Store (DerefOf (Index (DerefOf (Index (TIM0, Zero)), Local6)), 
@@ -3806,7 +3488,6 @@
				 {
					 Or (CHNF, 0x08, CHNF)
				 }
-
				 Store (Match (DerefOf (Index (TIM0, 0x02)), MEQ, Arg3, MTR, 
					 Zero, Zero), Local6)
				 Store (DerefOf (Index (DerefOf (Index (TIM0, Zero)), Local6)), 
@@ -3820,17 +3501,14 @@
					 {
						 Add (Local5, 0x02, Local5)
					 }
-
					 If (And (Arg1, 0x04))
					 {
						 Add (Local5, 0x04, Local5)
					 }
-
					 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x03)), Local5)), 
						 DMA0)
					 Or (CHNF, One, CHNF)
				 }
-
				 If (And (Arg4, 0x07))
				 {
					 Store (Arg5, Local5)
@@ -3838,21 +3516,17 @@
					 {
						 Add (Local5, 0x02, Local5)
					 }
-
					 If (And (Arg4, 0x04))
					 {
						 Add (Local5, 0x04, Local5)
					 }
-
					 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x03)), Local5)), 
						 DMA1)
					 Or (CHNF, 0x04, CHNF)
				 }
-
				 Store (TMD0, Debug)
				 Return (TMD0)
			 }
-
			 Method (STM, 0, Serialized)
			 {
				 If (REGF)
@@ -3869,7 +3543,6 @@
						 {
							 Store (0x05, Local0)
						 }
-
						 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x04)), Local0)), 
							 GMUT)
						 Or (GMUE, One, GMUE)
@@ -3877,7 +3550,6 @@
						 {
							 Or (GMUE, 0x02, GMUE)
						 }
-
						 If (LGreater (Local0, 0x04))
						 {
							 And (GMUE, 0xFD, GMUE)
@@ -3895,7 +3567,6 @@
							 }
						 }
					 }
-
					 If (And (CHNF, 0x04))
					 {
						 Store (Match (DerefOf (Index (TIM0, 0x03)), MLE, DMA1, MTR, 
@@ -3904,7 +3575,6 @@
						 {
							 Store (0x05, Local0)
						 }
-
						 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x04)), Local0)), 
							 GSUT)
						 Or (GSUE, One, GSUE)
@@ -3912,7 +3582,6 @@
						 {
							 Or (GSUE, 0x02, GSUE)
						 }
-
						 If (LGreater (Local0, 0x04))
						 {
							 And (GSUE, 0xFD, GSUE)
@@ -3930,17 +3599,14 @@
							 }
						 }
					 }
-
					 If (And (CHNF, 0x02))
					 {
						 Or (GMUE, 0x20, GMUE)
					 }
-
					 If (And (CHNF, 0x08))
					 {
						 Or (GSUE, 0x20, GSUE)
					 }
-
					 And (Match (DerefOf (Index (TIM0, Zero)), MGE, PIO0, MTR, 
						 Zero, Zero), 0x03, Local0)
					 Store (DerefOf (Index (DerefOf (Index (TIM0, One)), Local0)), 
@@ -3950,7 +3616,6 @@
					 {
						 Or (GMUE, 0x50, GMUE)
					 }
-
					 And (Match (DerefOf (Index (TIM0, Zero)), MGE, PIO1, MTR, 
						 Zero, Zero), 0x03, Local0)
					 Store (DerefOf (Index (DerefOf (Index (TIM0, 0x02)), Local0)), 
@@ -3962,7 +3627,6 @@
					 }
				 }
			 }
-
			 Name (AT01, Buffer (0x07)
			 {
				 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEF
@@ -3998,7 +3662,6 @@
				 Store (Arg2, A005)
				 Increment (CMDC)
			 }
-
			 Method (GTF, 2, Serialized)
			 {
				 Store (Arg1, Debug)
@@ -4024,7 +3687,6 @@
					 CreateWordField (Arg1, 0xB0, IW88)
					 Store (IW88, ID88)
				 }
-
				 Store (0xA0, Local7)
				 If (Arg0)
				 {
@@ -4038,7 +3700,6 @@
					 {
						 Store (PIO0, PIOT)
					 }
-
					 If (And (CHNF, 0x04))
					 {
						 If (And (CHNF, 0x10))
@@ -4060,7 +3721,6 @@
						 Store (DMA0, DMAT)
					 }
				 }
-
				 If (LAnd (LAnd (And (ID53, 0x04), And (ID88, 0xFF00
					 )), DMAT))
				 {
@@ -4070,7 +3730,6 @@
					 {
						 Store (0x05, Local1)
					 }
-
					 GTFB (AT01, Or (0x40, Local1), Local7)
				 }
				 Else
@@ -4084,7 +3743,6 @@
						 GTFB (AT01, Local1, Local7)
					 }
				 }
-
				 If (IRDY)
				 {
					 And (Match (DerefOf (Index (TIM0, Zero)), MGE, PIOT, MTR, 
@@ -4100,16 +3758,13 @@
						 GTFB (AT01, One, Local7)
					 }
				 }
-
				 If (LAnd (And (ID59, 0x0100), And (ID59, 0xFF)))
				 {
					 GTFB (AT03, And (ID59, 0xFF), Local7)
				 }
-
				 Store (ATAB, Debug)
				 Return (ATAB)
			 }
-
			 Method (RATA, 1, NotSerialized)
			 {
				 CreateByteField (Arg0, Zero, CMDN)
@@ -4119,7 +3774,6 @@
				 Return (Concatenate (RETB, FZTF))
			 }
		 }
-
		 Device (USB0)
		 {
			 Name (_ADR, 0x001D0000)
@@ -4129,7 +3783,6 @@
				 USBW,   2, 
						 Offset (0x01)
			 }
-
			 Method (_S3D, 0, NotSerialized)
			 {
				 If (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02)))
@@ -4141,7 +3794,6 @@
					 Return (0x03)
				 }
			 }
-
			 Method (_PSW, 1, NotSerialized)
			 {
				 If (Arg0)
@@ -4153,13 +3805,11 @@
					 Store (Zero, USBW)
				 }
			 }
-
			 Method (_PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x03, 0x03))
			 }
		 }
-
		 Device (USB1)
		 {
			 Name (_ADR, 0x001D0001)
@@ -4169,7 +3819,6 @@
				 USBW,   2, 
						 Offset (0x01)
			 }
-
			 Method (_S3D, 0, NotSerialized)
			 {
				 If (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02)))
@@ -4181,7 +3830,6 @@
					 Return (0x03)
				 }
			 }
-
			 Method (_PSW, 1, NotSerialized)
			 {
				 If (Arg0)
@@ -4193,13 +3841,11 @@
					 Store (Zero, USBW)
				 }
			 }
-
			 Method (_PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x04, 0x03))
			 }
		 }
-
		 Device (USB2)
		 {
			 Name (_ADR, 0x001D0002)
@@ -4209,7 +3855,6 @@
				 USBW,   2, 
						 Offset (0x01)
			 }
-
			 Method (_S3D, 0, NotSerialized)
			 {
				 If (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02)))
@@ -4221,7 +3866,6 @@
					 Return (0x03)
				 }
			 }
-
			 Method (_PSW, 1, NotSerialized)
			 {
				 If (Arg0)
@@ -4233,13 +3877,11 @@
					 Store (Zero, USBW)
				 }
			 }
-
			 Method (_PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x0C, 0x03))
			 }
		 }
-
		 Device (USB5)
		 {
			 Name (_ADR, 0x001D0003)
@@ -4249,7 +3891,6 @@
				 USBW,   2, 
						 Offset (0x01)
			 }
-
			 Method (_S3D, 0, NotSerialized)
			 {
				 If (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02)))
@@ -4261,7 +3902,6 @@
					 Return (0x03)
				 }
			 }
-
			 Method (_PSW, 1, NotSerialized)
			 {
				 If (Arg0)
@@ -4273,13 +3913,11 @@
					 Store (Zero, USBW)
				 }
			 }
-
			 Method (_PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x20, 0x03))
			 }
		 }
-
		 Device (EUSB)
		 {
			 Name (_ADR, 0x001D0007)
@@ -4288,7 +3926,6 @@
				 Return (GPRW (0x0D, 0x03))
			 }
		 }
-
		 Device (USB3)
		 {
			 Name (_ADR, 0x001A0000)
@@ -4298,7 +3935,6 @@
				 USBW,   2, 
						 Offset (0x01)
			 }
-
			 Method (_S3D, 0, NotSerialized)
			 {
				 If (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02)))
@@ -4310,7 +3946,6 @@
					 Return (0x03)
				 }
			 }
-
			 Method (_PSW, 1, NotSerialized)
			 {
				 If (Arg0)
@@ -4322,13 +3957,11 @@
					 Store (Zero, USBW)
				 }
			 }
-
			 Method (_PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x0E, 0x03))
			 }
		 }
-
		 Device (USB4)
		 {
			 Name (_ADR, 0x001A0001)
@@ -4338,7 +3971,6 @@
				 USBW,   2, 
						 Offset (0x01)
			 }
-
			 Method (_S3D, 0, NotSerialized)
			 {
				 If (LOr (LEqual (OSFL (), One), LEqual (OSFL (), 0x02)))
@@ -4350,7 +3982,6 @@
					 Return (0x03)
				 }
			 }
-
			 Method (_PSW, 1, NotSerialized)
			 {
				 If (Arg0)
@@ -4362,13 +3993,11 @@
					 Store (Zero, USBW)
				 }
			 }
-
			 Method (_PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x05, 0x03))
			 }
		 }
-
		 Device (USBE)
		 {
			 Name (_ADR, 0x001A0007)
@@ -4377,7 +4006,6 @@
				 Return (GPRW (0x0D, 0x03))
			 }
		 }
-
		 Device (GBE)
		 {
			 Name (_ADR, 0x00190000)
@@ -4386,7 +4014,6 @@
				 Return (GPRW (0x0D, 0x04))
			 }
		 }
-
		 Device (P0P4)
		 {
			 Name (_ADR, 0x001C0000)
@@ -4394,18 +4021,15 @@
			 {
				 Return (GPRW (0x09, 0x04))
			 }
-
			 Method (_PRT, 0, NotSerialized)
			 {
				 If (PICM)
				 {
					 Return (AR04)
				 }
-
				 Return (PR04)
			 }
		 }
-
		 Device (P0P5)
		 {
			 Name (_ADR, 0x001C0001)
@@ -4413,18 +4037,15 @@
			 {
				 Return (GPRW (0x09, 0x04))
			 }
-
			 Method (_PRT, 0, NotSerialized)
			 {
				 If (PICM)
				 {
					 Return (AR05)
				 }
-
				 Return (PR05)
			 }
		 }
-
		 Device (P0P6)
		 {
			 Name (_ADR, 0x001C0002)
@@ -4432,18 +4053,15 @@
			 {
				 Return (GPRW (0x09, 0x04))
			 }
-
			 Method (_PRT, 0, NotSerialized)
			 {
				 If (PICM)
				 {
					 Return (AR06)
				 }
-
				 Return (PR06)
			 }
		 }
-
		 Device (P0P7)
		 {
			 Name (_ADR, 0x001C0003)
@@ -4451,18 +4069,15 @@
			 {
				 Return (GPRW (0x09, 0x04))
			 }
-
			 Method (_PRT, 0, NotSerialized)
			 {
				 If (PICM)
				 {
					 Return (AR07)
				 }
-
				 Return (PR07)
			 }
		 }
-
		 Device (P0P8)
		 {
			 Name (_ADR, 0x001C0004)
@@ -4470,18 +4085,15 @@
			 {
				 Return (GPRW (0x09, 0x04))
			 }
-
			 Method (_PRT, 0, NotSerialized)
			 {
				 If (PICM)
				 {
					 Return (AR08)
				 }
-
				 Return (PR08)
			 }
		 }
-
		 Device (P0P9)
		 {
			 Name (_ADR, 0x001C0005)
@@ -4489,19 +4101,16 @@
			 {
				 Return (GPRW (0x09, 0x04))
			 }
-
			 Method (_PRT, 0, NotSerialized)
			 {
				 If (PICM)
				 {
					 Return (AR09)
				 }
-
				 Return (PR09)
			 }
		 }
	 }
-
	 Scope (\_GPE)
	 {
		 Method (_L09, 0, NotSerialized)
@@ -4515,42 +4124,35 @@
			 Notify (\_SB.PCI0.P0P9, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L0B, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.P0P1, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L1A, 0, NotSerialized)
		 {
			 \_SB.PCI0.SBRG.SIOH ()
		 }
-
		 Method (_L03, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.USB0, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L04, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.USB1, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L0C, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.USB2, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L20, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.USB5, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L0D, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.EUSB, 0x02)
@@ -4558,20 +4160,17 @@
			 Notify (\_SB.PCI0.GBE, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L0E, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.USB3, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
-
		 Method (_L05, 0, NotSerialized)
		 {
			 Notify (\_SB.PCI0.USB4, 0x02)
			 Notify (\_SB.PWRB, 0x02)
		 }
	 }
-
	 Device (PWRB)
	 {
		 Name (_HID, EisaId ("PNP0C0C"))
@@ -4579,7 +4178,6 @@
		 Name (_STA, 0x0B)
	 }
 }
-
 OperationRegion (_SB.PCI0.SBRG.PIX0, PCI_Config, 0x60, 0x0C)
 Field (\_SB.PCI0.SBRG.PIX0, ByteAcc, NoLock, Preserve)
 {
@@ -4593,7 +4191,6 @@
	 PIRG,   8, 
	 PIRH,   8
 }
-
 Scope (_SB)
 {
	 Name (BUFA, ResourceTemplate ()
@@ -4618,24 +4215,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSA)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRA, 0x80, PIRA)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRA, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4644,7 +4237,6 @@
			 Store (Local0, PIRA)
		 }
	 }
-
	 Device (LNKB)
	 {
		 Name (_HID, EisaId ("PNP0C0F"))
@@ -4661,24 +4253,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSB)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRB, 0x80, PIRB)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRB, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4687,7 +4275,6 @@
			 Store (Local0, PIRB)
		 }
	 }
-
	 Device (LNKC)
	 {
		 Name (_HID, EisaId ("PNP0C0F"))
@@ -4704,24 +4291,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSC)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRC, 0x80, PIRC)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRC, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4730,7 +4313,6 @@
			 Store (Local0, PIRC)
		 }
	 }
-
	 Device (LNKD)
	 {
		 Name (_HID, EisaId ("PNP0C0F"))
@@ -4747,24 +4329,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSD)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRD, 0x80, PIRD)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRD, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4773,7 +4351,6 @@
			 Store (Local0, PIRD)
		 }
	 }
-
	 Device (LNKE)
	 {
		 Name (_HID, EisaId ("PNP0C0F"))
@@ -4790,24 +4367,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSE)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRE, 0x80, PIRE)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRE, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4816,7 +4389,6 @@
			 Store (Local0, PIRE)
		 }
	 }
-
	 Device (LNKF)
	 {
		 Name (_HID, EisaId ("PNP0C0F"))
@@ -4833,24 +4405,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSF)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRF, 0x80, PIRF)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRF, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4859,7 +4427,6 @@
			 Store (Local0, PIRF)
		 }
	 }
-
	 Device (LNKG)
	 {
		 Name (_HID, EisaId ("PNP0C0F"))
@@ -4876,24 +4443,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSG)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRG, 0x80, PIRG)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRG, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4902,7 +4465,6 @@
			 Store (Local0, PIRG)
		 }
	 }
-
	 Device (LNKH)
	 {
		 Name (_HID, EisaId ("PNP0C0F"))
@@ -4919,24 +4481,20 @@
				 Return (0x0B)
			 }
		 }
-
		 Method (_PRS, 0, NotSerialized)
		 {
			 Return (PRSH)
		 }
-
		 Method (_DIS, 0, NotSerialized)
		 {
			 Or (PIRH, 0x80, PIRH)
		 }
-
		 Method (_CRS, 0, NotSerialized)
		 {
			 And (PIRH, 0x0F, Local0)
			 ShiftLeft (One, Local0, IRA0)
			 Return (BUFA)
		 }
-
		 Method (_SRS, 1, NotSerialized)
		 {
			 CreateWordField (Arg0, One, IRA)
@@ -4946,7 +4504,6 @@
		 }
	 }
 }
-
 Scope (_SB)
 {
	 Name (XCPD, Zero)
@@ -4972,11 +4529,9 @@
		 {
			 XCFG,   8
		 }
-
		 Release (MUTE)
		 Return (XCFG)
	 }
-
	 Method (RWPE, 1, NotSerialized)
	 {
		 Acquire (MUTE, 0x03E8)
@@ -4987,11 +4542,9 @@
		 {
			 XCFG,   16
		 }
-
		 Release (MUTE)
		 Return (XCFG)
	 }
-
	 Method (RDPE, 1, NotSerialized)
	 {
		 Acquire (MUTE, 0x03E8)
@@ -5002,11 +4555,9 @@
		 {
			 XCFG,   32
		 }
-
		 Release (MUTE)
		 Return (XCFG)
	 }
-
	 Method (WBPE, 2, NotSerialized)
	 {
		 Acquire (MUTE, 0x0FFF)
@@ -5016,11 +4567,9 @@
		 {
			 XCFG,   8
		 }
-
		 Store (Arg1, XCFG)
		 Release (MUTE)
	 }
-
	 Method (WWPE, 2, NotSerialized)
	 {
		 Acquire (MUTE, 0x03E8)
@@ -5031,11 +4580,9 @@
		 {
			 XCFG,   16
		 }
-
		 Store (Arg1, XCFG)
		 Release (MUTE)
	 }
-
	 Method (WDPE, 2, NotSerialized)
	 {
		 Acquire (MUTE, 0x03E8)
@@ -5046,11 +4593,9 @@
		 {
			 XCFG,   32
		 }
-
		 Store (Arg1, XCFG)
		 Release (MUTE)
	 }
-
	 Method (RWDP, 3, NotSerialized)
	 {
		 Acquire (MUTE, 0x03E8)
@@ -5061,12 +4606,10 @@
		 {
			 XCFG,   32
		 }
-
		 And (XCFG, Arg2, Local1)
		 Or (Local1, Arg1, XCFG)
		 Release (MUTE)
	 }
-
	 Method (RPME, 1, NotSerialized)
	 {
		 Add (Arg0, 0x84, Local0)
@@ -5082,375 +4625,10 @@
				 WDPE (Local0, And (Local1, 0x00010000))
				 Return (One)
			 }
-
-				Return (Zero)
-			}
-		}
-	}
-
-	Scope (_SB.PCI0)
-	{
-		Device (GFX0)
-		{
-			Name (_ADR, 0x00020000)
-			OperationRegion (IGDM, SystemMemory, 0xCFFBE0E4, 0x2000)
-			Field (IGDM, AnyAcc, NoLock, Preserve)
-			{
-				SIGN,   128, 
-				SIZE,   32, 
-				OVER,   32, 
-				SVER,   256, 
-				VVER,   128, 
-				GVER,   128, 
-				MBOX,   32, 
-						Offset (0xF0), 
-				IBTT,   4, 
-				IPSC,   2, 
-				IPAT,   4, 
-				IBIA,   3, 
-				IBLC,   2, 
-						Offset (0xF2), 
-				ITVF,   4, 
-				ITVM,   4, 
-				IDVM,   1, 
-				IDVS,   2, 
-				ISSC,   1, 
-						Offset (0xF4), 
-						Offset (0x200), 
-				SCIE,   1, 
-				GEFC,   4, 
-				GXFC,   3, 
-				GESF,   8, 
-						Offset (0x204), 
-				PARM,   32
-			}
-
-			OperationRegion (TCOI, SystemIO, TOBS, 0x08)
-			Field (TCOI, WordAcc, NoLock, Preserve)
-			{
-						Offset (0x04), 
-					,   9, 
-				SCIS,   1, 
-						Offset (0x06)
-			}
-
-			Method (GSCI, 0, NotSerialized)
-			{
-				If (LEqual (GEFC, 0x04))
-				{
-					Store (GBDA (), GXFC)
-				}
-
-				If (LEqual (GEFC, 0x06))
-				{
-					Store (SBCB (), GXFC)
-				}
-
-				Store (One, SCIS)
-				Store (Zero, GEFC)
-				Store (Zero, GSSE)
-				Store (Zero, SCIE)
			 Return (Zero)
		 }
-
-			Method (GBDA, 0, NotSerialized)
-			{
-				If (LEqual (GESF, Zero))
-				{
-					Store (0x037B, PARM)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, One))
-				{
-					Store (Zero, PARM)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x04))
-				{
-					Name (LOOP, Zero)
-					And (PARM, 0xFFFFFF00, PARM)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x05))
-				{
-					Store (IPSC, PARM)
-					Or (PARM, ShiftLeft (IPAT, 0x08), PARM)
-					Add (PARM, 0x0100, PARM)
-					Or (PARM, ShiftLeft (LIDS, 0x10), PARM)
-					XOr (PARM, 0x00010000, PARM)
-					Or (PARM, ShiftLeft (IBIA, 0x14), PARM)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x06))
-				{
-					Store (ITVF, PARM)
-					Or (PARM, ShiftLeft (ITVM, 0x04), PARM)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x07))
-				{
-					Name (MEMS, 0x0D)
-					Store (GIVD, PARM)
-					XOr (PARM, One, PARM)
-					Or (PARM, ShiftLeft (GMFN, One), PARM)
-					Or (PARM, 0x1000, PARM)
-					Or (ShiftLeft (CDCT, 0x15), PARM, PARM)
-					If (LEqual (IDVM, One))
-					{
-						Store (0x11, MEMS)
-					}
-
-					If (LLess (TASM, M512))
-					{
-						Or (PARM, ShiftLeft (One, MEMS), PARM)
-					}
-					Else
-					{
-						If (LLess (TASM, M1GB))
-						{
-							If (LLess (IDVS, 0x03))
-							{
-								Or (PARM, ShiftLeft (IDVS, MEMS), PARM)
-							}
-							Else
-							{
-								Or (PARM, ShiftLeft (0x02, MEMS), PARM)
-							}
-						}
-						Else
-						{
-							Or (PARM, ShiftLeft (IDVS, MEMS), PARM)
-						}
-					}
-
-					Store (One, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x0A))
-				{
-					Store (Zero, PARM)
-					If (ISSC)
-					{
-						Or (0x03, PARM)
-					}
-
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				Store (Zero, GESF)
-				Return (CRIT)
-			}
-
-			Method (SBCB, 0, NotSerialized)
-			{
-				If (LEqual (GESF, Zero))
-				{
-					Store (0x20, PARM)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, One))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				If (LEqual (GESF, 0x03))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				If (LEqual (GESF, 0x04))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				If (LEqual (GESF, 0x05))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				If (LEqual (GESF, 0x06))
-				{
-					ShiftRight (PARM, 0x1C, Local0)
-					If (LEqual (Local0, Zero))
-					{
-						And (PARM, 0x0F, ITVF)
-						And (PARM, 0xF0, ITVM)
-						Store (Zero, GESF)
-						Return (SUCC)
-					}
-
-					Store (Zero, GESF)
-					Return (NVLD)
-				}
-
-				If (LEqual (GESF, 0x07))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				If (LEqual (GESF, 0x08))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				If (LEqual (GESF, 0x09))
-				{
-					Store (CRIT, GXFC)
-					Return (Zero)
-				}
-
-				If (LEqual (GESF, 0x0A))
-				{
-					ShiftRight (PARM, 0x1C, Local0)
-					If (LEqual (Local0, Zero))
-					{
-						And (PARM, 0xFF, IPSC)
-						Subtract (And (ShiftRight (PARM, 0x08), 0xFF), One, IPAT)
-						And (ShiftRight (PARM, 0x12), 0x03, IBLC)
-						And (ShiftRight (PARM, 0x14), 0x07, IBIA)
-					}
-
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x0B))
-				{
-					If (LEqual (And (ShiftRight (PARM, 0x0B), 0x03), 0x02))
-					{
-						And (ShiftRight (PARM, 0x0D), 0x0F, Local0)
-						And (ShiftRight (PARM, 0x11), 0x0F, Local1)
-						If (Local0)
-						{
-							Store (Zero, IDVM)
-							Store (Local0, IDVS)
-						}
-
-						If (Local1)
-						{
-							Store (One, IDVM)
-							Store (Local1, IDVS)
-						}
-					}
-
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x10))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				If (LEqual (GESF, 0x11))
-				{
-					Or (PARM, ShiftLeft (LIDS, 0x08), PARM)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x12))
-				{
-					And (PARM, One, ISSC)
-					Store (Zero, GESF)
-					Return (SUCC)
-				}
-
-				If (LEqual (GESF, 0x13))
-				{
-					Store (Zero, GESF)
-					Return (CRIT)
-				}
-
-				Store (Zero, GESF)
-				Return (CRIT)
-			}
-
-			Scope (^^PCI0)
-			{
-				OperationRegion (MCHP, PCI_Config, 0x40, 0xC0)
-				Field (MCHP, AnyAcc, NoLock, Preserve)
-				{
-							Offset (0x60), 
-					TASM,   10, 
-							Offset (0x62)
-				}
-			}
-
-			OperationRegion (IGDP, PCI_Config, 0x40, 0xC0)
-			Field (IGDP, AnyAcc, NoLock, Preserve)
-			{
-						Offset (0x12), 
-					,   1, 
-				GIVD,   1, 
-					,   2, 
-				GUMA,   3, 
-						Offset (0x14), 
-					,   4, 
-				GMFN,   1, 
-						Offset (0x18), 
-						Offset (0x8C), 
-				CDCT,   10, 
-						Offset (0x8E), 
-						Offset (0xA8), 
-				GSSE,   1, 
-				GSSB,   14, 
-				GSES,   1, 
-						Offset (0xBC), 
-				ASLS,   32
-			}
-
-			Name (M512, 0x08)
-			Name (M1GB, 0x10)
-			Scope (\_GPE)
-			{
-				Method (_L06, 0, NotSerialized)
-				{
-					\_SB.PCI0.GFX0.GSCI ()
-				}
-			}
-
-			Name (OPBS, 0xFFFFFF00)
-			Method (OPTS, 1, NotSerialized)
-			{
-				If (LEqual (Arg0, 0x03))
-				{
-					Store (ASLS, OPBS)
-				}
-			}
-
-			Method (OWAK, 1, NotSerialized)
-			{
-				If (LEqual (Arg0, 0x03))
-				{
-					Store (OPBS, ASLS)
-					Store (One, GSES)
-				}
-			}
	 }
 }
-
 Scope (_SB)
 {
	 Scope (PCI0)
@@ -5503,14 +4681,14 @@
				 0x00000000,		 // Range Minimum
				 0x00000000,		 // Range Maximum
				 0x00000000,		 // Translation Offset
-					0x00000000,		 // Length
+					0x00000001,		 // Length
				 ,, _Y18, AddressRangeMemory, TypeStatic)
			 DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
				 0x00000000,		 // Granularity
				 0x00000000,		 // Range Minimum
				 0x00000000,		 // Range Maximum
				 0x00000000,		 // Translation Offset
-					0x00000000,		 // Length
+					0x00000001,		 // Length
				 ,, _Y19, AddressRangeMemory, TypeStatic)
		 })
		 CreateDWordField (CRS, \_SB.PCI0._Y17._MIN, MIN5)
@@ -5531,7 +4709,6 @@
				 Store (MG1L, LEN5)
				 Add (MIN5, Decrement (Local0), MAX5)
			 }
-
			 Store (MG2B, MIN6)
			 Store (MG2L, LEN6)
			 Store (MG2L, Local0)
@@ -5544,7 +4721,6 @@
		 }
	 }
 }
-
 Name (WOTB, Zero)
 Name (WSSB, Zero)
 Name (WAXB, Zero)
@@ -5558,7 +4734,6 @@
	 {
		 Sleep (0x0BB8)
	 }
-
	 Store (ASSB, WSSB)
	 Store (AOTB, WOTB)
	 Store (AAXB, WAXB)
@@ -5566,7 +4741,6 @@
	 Store (OSFL (), AOTB)
	 Store (Zero, AAXB)
 }
-
 Method (_WAK, 1, NotSerialized)
 {
	 ShiftLeft (Arg0, 0x04, DBG8)
@@ -5577,7 +4751,6 @@
		 Store (WOTB, AOTB)
		 Store (WAXB, AAXB)
	 }
-
	 If (DerefOf (Index (WAKP, Zero)))
	 {
		 Store (Zero, Index (WAKP, One))
@@ -5586,10 +4759,8 @@
	 {
		 Store (Arg0, Index (WAKP, One))
	 }
-
	 Return (WAKP)
 }
-
 Name (_S0, Package (0x04)
 {
	 Zero, 
@@ -5607,7 +4778,6 @@
		 Zero
	 })
 }
-
 If (SS3)
 {
	 Name (_S3, Package (0x04)
@@ -5618,7 +4788,6 @@
		 Zero
	 })
 }
-
 If (SS4)
 {
	 Name (_S4, Package (0x04)
@@ -5629,7 +4798,6 @@
		 Zero
	 })
 }
-
 Name (_S5, Package (0x04)
 {
	 0x07, 
@@ -5644,16 +4812,12 @@
		 \_SB.PCI0.SBRG.SIOS (Arg0)
		 \_SB.PCI0.NPTS (Arg0)
		 \_SB.PCI0.SBRG.SPTS (Arg0)
-			\_SB.PCI0.GFX0.OPTS (Arg0)
	 }
 }
-
 Method (WAK, 1, NotSerialized)
 {
	 \_SB.PCI0.SBRG.SIOW (Arg0)
	 \_SB.PCI0.NWAK (Arg0)
	 \_SB.PCI0.SBRG.SWAK (Arg0)
-		\_SB.PCI0.GFX0.OWAK (Arg0)
 }
}
-

 

--- DSDT.step0.dsl	2010-10-09 15:46:25.000000000 -0700
+++ DSDT.dsl	2010-10-09 15:51:49.000000000 -0700
@@ -4520,6 +4520,36 @@
	 Name (XSST, 0x1A)
	 Name (XRCT, 0x1C)
	 Mutex (MUTE, 0x00)
+		Method (DTGP, 5, NotSerialized)
+		{
+			If (LEqual (Arg0, Buffer (0x10)
+			{
+				/* 0000 */	0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44, 
+				/* 0008 */	0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9B
+			}))
+			{
+				If (LEqual (Arg1, One))
+				{
+					If (LEqual (Arg2, Zero))
+					{
+						Store (Buffer (One)
+							{
+								0x03
+							}, Arg4)
+						Return (One)
+					}
+					If (LEqual (Arg2, One))
+					{
+						Return (One)
+					}
+				}
+			}
+			Store (Buffer (One)
+			{
+				0x00
+			}, Arg4)
+			Return (Zero)
+		}
	 Method (RBPE, 1, NotSerialized)
	 {
		 Acquire (MUTE, 0x03E8)

 

--- DSDT.step1.dsl	2010-10-09 15:51:49.000000000 -0700
+++ DSDT.dsl	2010-10-09 16:02:15.000000000 -0700
@@ -1044,13 +1044,93 @@
		 Method (NWAK, 1, NotSerialized)
		 {
		 }
-			Device (P0P2)
+			Device (PEGP)
		 {
			 Name (_ADR, 0x00010000)
			 Method (_PRW, 0, NotSerialized)
			 {
				 Return (GPRW (0x09, 0x04))
			 }
+				Device (GFX0)
+				{
+					Name (_ADR, Zero)
+					Name (_SUN, One)
+					Method (_DSM, 4, NotSerialized)
+					{
+						Store (Package (0x1A)
+							{
+								"@0,compatible", 
+								Buffer (0x0B)
+								{
+									"NVDA,NVMac"
+								}, 
+								"@0,device_type", 
+								Buffer (0x08)
+								{
+									"display"
+								}, 
+								"@0,display_cfg", 
+								Buffer (0x08)
+								{
+									0x03, 0x01, 0x00, 0x00
+								}, 
+								"@0,name", 
+								Buffer (0x0F)
+								{
+									"NVDA,Display-A"
+								}, 
+								"@1,compatible", 
+								Buffer (0x0B)
+								{
+									"NVDA,NVMac"
+								}, 
+								"@1,device_type", 
+								Buffer (0x08)
+								{
+									"display"
+								}, 
+								"@1,display_cfg", 
+								Buffer (0x08)
+								{
+									0xFF, 0xFF, 0x00, 0x01
+								}, 
+								"@1,name", 
+								Buffer (0x0F)
+								{
+									"NVDA,Display-B"
+								}, 
+								"NVCAP", 
+								Buffer (0x14)
+								{
+									/* 0000 */	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 
+									/* 0008 */	0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+									/* 0010 */	0x00, 0x00, 0x00, 0x00
+								}, 
+								"VRAM,totalsize", 
+								Buffer (0x04)
+								{
+									0x00, 0x00, 0x00, 0x60
+								}, 
+								"device_type", 
+								Buffer (0x0D)
+								{
+									"NVDA,GeForce"
+								}, 
+								"model", 
+								Buffer (0x16)
+								{
+									"nVidia GeForce GT 230"
+								}, 
+								"rom-revision", 
+								Buffer (0x24)
+								{
+									"nVidia GeForce GT 230 OpenGL Engine"
+								}
+							}, Local0)
+						DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
+						Return (Local0)
+					}
+				}
		 }
		 Device (P0P1)
		 {
@@ -4115,7 +4195,7 @@
	 {
		 Method (_L09, 0, NotSerialized)
		 {
-				Notify (\_SB.PCI0.P0P2, 0x02)
+				Notify (\_SB.PCI0.PEGP, 0x02)
			 Notify (\_SB.PCI0.P0P4, 0x02)
			 Notify (\_SB.PCI0.P0P5, 0x02)
			 Notify (\_SB.PCI0.P0P6, 0x02)

Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

 Share

×
×
  • Create New...