From 252233cc30eb23e051afc3edc70c5b5faa7aacc9 Mon Sep 17 00:00:00 2001 From: Tyler Nguyen Date: Tue, 17 Nov 2020 14:32:44 -0600 Subject: [PATCH] Minor Cleanup --- EFI-OpenCore/EFI/OC/ACPI/SSDT-Battery.aml | Bin 7089 -> 7172 bytes EFI-OpenCore/EFI/OC/ACPI/SSDT-TB-DSB0.aml | Bin 16796 -> 16608 bytes .../EFI/OC/ACPI/SSDT-TB-DSB2-XHC2.aml | Bin 2820 -> 2768 bytes EFI-OpenCore/EFI/OC/ACPI/SSDT-XHC1.aml | Bin 2332 -> 3017 bytes EFI-OpenCore/EFI/OC/config.plist | 109 ++++- README.md | 13 +- docs/1_README-HARDWAREandBIOS.md | 4 +- docs/3_README-other.md | 10 +- docs/CHANGELOG.md | 7 + patches/SSDT-Battery.dsl | 69 +++- patches/SSDT-TB-DSB0.dsl | 49 +-- patches/SSDT-TB-DSB1.dsl | 32 +- patches/SSDT-TB-DSB2-XHC2.dsl | 4 +- patches/SSDT-TB-DSB3.dsl | 32 +- patches/SSDT-TB-DSB4.dsl | 32 +- patches/SSDT-TB-DSB5.dsl | 33 +- patches/SSDT-TB-DSB6.dsl | 2 +- patches/SSDT-XHC1.dsl | 377 ++++++++++++------ 18 files changed, 508 insertions(+), 265 deletions(-) diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-Battery.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Battery.aml index 0fa90e7658ca80ca031515cd28ea2fcac25cce37..d75f7203a2bf498563308029508c0fe844c5e16c 100644 GIT binary patch delta 391 zcmdmJ-eRF19PARpBE!JIG^?aCC$)$n-YK!9B(tjXfivj9XVbR7Ty delta 291 zcmZp%*l4aE9PARZQJR5)DWjw^C$)$n-YK!9B(#;+hN#q|tz`&9tG{Dc05kwksF>PjI)?wjtYw+~*3}IN{SHIbU z{W?3N>SRHFmCd{YQsV4As~7_!f+HpiTANP}Gj7@ZQeBIi+u@B%u#*8tyrWCdWC3f7 z&0)rCSeP8=Zf3ElCkSHQJR;MT9lNZQ{tSTmzJ5%AgIix iz`!KKz{J4H%*en3B$*hP!E6QwW+0o9foU?YV?O{I^*)sV delta 430 zcmaFR$T+8&kt;aZC1j2x0|QgaL@sG2Kc$K46XZhN0)jahL}T>g-2+@BLfj%b7(tw1 zr}z*jw}6ei|1cVMzhRy*Im9U>m=Q<@yK->~biQVe(PsuJ3UKx`2nsN;!~^7UUO|D1fwBDKLO2 zpt;C8a*Gwp6EjOvQ>+ve7)n64Fl-j*mlbDkUCtN~5gajD&dPjpvQf+CZ)#fH+@3F7 zf}IRF;vHRrCd*n`Y)&>>!@}e>bF-j%B?pg_K)g$^FH3=t4yCBLH9PAQufs28Gsb(UVG?TOJM0Jmi%exqb-FqiY4si+zW(1PKu3Ve~ZatHA z8O52So4hB-F*$3yvBn1k8*mixhB#Td1Ung7MR+(HS%JhDq79>!xK1oE@eg(h4{&yM OnJmq$v-t~?00#gc7$3U; delta 115 zcmca0+9Jjk9PARp!p*?I^m`(gG?TZ&M0F1_*7#tj_yA{5gP;Hd%YcaBh!7{2P`1ej z8AUljtOyV1_>EcpjAG8c6DEf^g#IlsiSmNc~f;!wZVp5NF!AkQ%oC!#oz=fsD`9gpaJ4?QIu_; z#F6|Q-S=Jk4(W`6a0xR+q-+MC<8RK)&wmaGDdj&A0Q{Z)ZOiHcv!Z51fIm?H@`dv8 zTke(Me9eKaY7r@?5U)x(r^CQjb!W{)vZ-hCag3NjoY~=~BPG?4y=Y)Qs-n2)WrB+` z6+_REIy;LviONY#E9a+-jDZPR!3X&z<-$NZk<9?mbYDLBHdiJ3fdBe~PqHm_wC@PU?SxzIeR*uU$ zsjcZ+hOD~w8IjdEP2)2~)oztkJ^Q7E4J22fnN~`G&q7l{8fV9fLAY^+6R2fbwtn61 zX9nG_)#)EM+s!_RB!}74`jtgZj?f#ciw3scx&@KHFTFj7)J(iareCA^vnGg%Xmn>3m5fP%laKT{&{NX()toGM7OUhUGFrnJA#dW{GMQS>gQNoa>3yx;N%icew}Da-x(sLo3XH;6p%o8 z4L_UH&%7F#$l!b;o6Q?u0(R_;f5YgVXNchngZ4T8SAG1RI4ff@f|W=v((xJR=jP7O z{m1i5bLZ#q`F9tc|9+zXxL-n^#{ljarmgmtZO8KD{&V1iRpBC$A+?Mijg6}nseZ%=Q?C$Z?KS*pN AE&u=k literal 2332 zcmb_cO>f#j5M98)Vj7hoN9mylU(%|I8o=bchZbWBh!`vuCsBiBlhi6SKwLf)li}8(CDgb4UlnM%4ZOK353ek#=%?e zmFQI7p_OKhC`TAprBT#yc%_*N8ALX;d^rtAj0hkpZrV~W>9S`H-?x@XI>SUHCX!_$ zn@nVjiEJ~G9VW8NMD|!nCjBr%m>dAY-~bQ?2Y@g*0EEE-AU+2(UDFg<4bSybEvT|* zjokLKuBG>MjmQd-CFs9@<0uPNYl=>1=Was$^VLk?A*)2K4LL{XdVJ8(Xl_+g^K{kJ z&xEe}Q4a2us8~&!_2ier>qI`rMoy_Cp@0pAsGOawMex!&0HkYKwstWX<;R18)gK*n zdYuu9|Bid;QS01df|H|{)_{y{yL*M=Ki8&C&Dc$@a>&6{Ixhdx zMG5uG#;szoQPc{2Pgt)vw0z7SE&+}E^j|z{b-UJA@v<{&i><-8;l7C4=p^GJL5+A! z+5yuka3{%T>QTm#{T~N&l9dJ(--~r?IPQ)hn@O{oiAsfPII&LkiVa=MCo#w0@F9eR z)d{`9z)Z!Sue6}=r)3D76>1S08aYL;Am)G}+apMqY8qVi?4oD4`kjluXhTnjqSbGm z0%veevzzULCIAh#MH1i5#My91sYCIYt{0V0%6QYwD=`&ePm?7kBr{*_-!&QaPFQd;nHC z>+m!$EI9C8RB*)zIA^ESNt=R=x_XFQgv-S$Je;dUE*-`k+_nSMa2>S~U4?iN?AWFM xSkDqA{%5Lt!P)-P`)}S$^H{B0Pw?Gd%vZpwOcdk>oDYkr9S3~1`x?33{RJ(fS|0!a diff --git a/EFI-OpenCore/EFI/OC/config.plist b/EFI-OpenCore/EFI/OC/config.plist index 05bbca9..617976a 100755 --- a/EFI-OpenCore/EFI/OC/config.plist +++ b/EFI-OpenCore/EFI/OC/config.plist @@ -712,6 +712,15 @@ Add + PciRoot(0x0)/Pci(0x0,0x0) + + AAPL,slot-name + Internal@0,0,0 + device_type + Host bridge + model + Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers + PciRoot(0x0)/Pci(0x14,0x0) acpi-wake-type @@ -756,18 +765,74 @@ AAQAAAAAAAA= - PciRoot(0x0)/Pci(0x1D,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0) + PciRoot(0x0)/Pci(0x1D,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0) + AAPL,slot-name + Internal@0,29,0/0,0/0,0 ThunderboltUUID bYT/DabNYl2Vq0VgT/Xr3w== device_type - System peripheral + PCI bridge model - JHL6540 Thunderbolt 3 NHI (C step) [Alpine Ridge 4C 2016] + JHL6540 Thunderbolt 3 Bridge (C step) [Alpine Ridge 4C 2016] - PciRoot(0x0)/Pci(0x1f,0x3) + PciRoot(0x0)/Pci(0x1D,0x0)/Pci(0x0,0x0)/Pci(0x1,0x0) + + AAPL,slot-name + Internal@0,29,0/0,0/1,0 + device_type + PCI bridge + model + JHL6540 Thunderbolt 3 Bridge (C step) [Alpine Ridge 4C 2016] + + PciRoot(0x0)/Pci(0x1D,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0) + + AAPL,slot-name + Internal@0,29,0/0,0/2,0 + device_type + PCI bridge + model + JHL6540 Thunderbolt 3 Bridge (C step) [Alpine Ridge 4C 2016] + + PciRoot(0x0)/Pci(0x1D,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0) + + AAPL,slot-name + Internal@0,29,0/0,0/2,0/0,0 + device_type + USB controller + model + JHL6540 Thunderbolt 3 USB Controller (C step) [Alpine Ridge 4C 2016] + + PciRoot(0x0)/Pci(0x1D,0x0)/Pci(0x0,0x0)/Pci(0x4,0x0) + + AAPL,slot-name + Internal@0,29,0/0,0/4,0 + device_type + PCI bridge + model + JHL6540 Thunderbolt 3 Bridge (C step) [Alpine Ridge 4C 2016] + + PciRoot(0x0)/Pci(0x1F,0x0) + + AAPL,slot-name + Internal@0,31,0 + device_type + ISA bridge + model + Sunrise Point LPC Controller/eSPI Controller + + PciRoot(0x0)/Pci(0x1F,0x2) + + AAPL,slot-name + Internal@0,31,2 + device_type + Memory controller + model + Sunrise Point-LP PMC + + PciRoot(0x0)/Pci(0x1F,0x3) AAPL,slot-name Internal@0,31,3 @@ -782,6 +847,24 @@ model Sunrise Point-LP HD Audio + PciRoot(0x0)/Pci(0x1F,0x4) + + AAPL,slot-name + Internal@0,31,4 + device_type + SMBus + model + Sunrise Point-LP SMBus + + PciRoot(0x0)/Pci(0x1F,0x6) + + AAPL,slot-name + Internal@0,31,6 + device_type + Ethernet controller + model + Ethernet Connection (4) I219-V + PciRoot(0x0)/Pci(0x2,0x0) AAPL,ig-platform-id @@ -813,6 +896,24 @@ AQAAAA== + PciRoot(0x0)/Pci(0x4,0x0) + + AAPL,slot-name + Internal@0,4,0 + device_type + Signal processing controller + model + Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem + + PciRoot(0x0)/Pci(0x8,0x0) + + AAPL,slot-name + Internal@0,8,0 + device_type + System peripheral + model + Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model + Delete diff --git a/README.md b/README.md index 940ac3e..02cc546 100644 --- a/README.md +++ b/README.md @@ -26,19 +26,12 @@ ##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/CHANGELOG.md) -> ### 2020-11-14 - -#### Added - -- `SSDT-PWRB` to patch power button. +> ### 2020-11-17 #### Changed -- Parition TB3 patch into smaller, more readable chunks. - - `SSDT-XHC2` is also now apart of this. -- Removed experimental stuff from `SSDT-Sleep` -- Updated to `SSDT-Battery` to rev8, thanks @benbender -- Updated some documenation, with more detailed documentation coming. +- Updated various TB3 patches and instructions. +- Added misc. DeviceProperties to `config.plist`
SUMMARY diff --git a/docs/1_README-HARDWAREandBIOS.md b/docs/1_README-HARDWAREandBIOS.md index 4221340..7701ce7 100644 --- a/docs/1_README-HARDWAREandBIOS.md +++ b/docs/1_README-HARDWAREandBIOS.md @@ -50,11 +50,13 @@ At the minimum, these BIOS settings must be made to install and run macOS withou | | | | Thunderbolt(TM) Device `Enabled` | * If you do do want to use Thunderbolt 3 hotplug in macOS (at the expense of idle power consumption): +- NOTE: If you do have a modded BIOS firmware, please reset all settings relating to Thunderbolt 3 to default, all that's needed are settings detailed below or in [1_README-HARDWAREandBIOS.md](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/1_README-HARDWAREandBIOS.md) | Main Menu | Sub 1 | Sub 2 | Sub 3 | | --------- | ----------- | --------------------------------------------- | ------------------------------------------------------------------ | | | >> Config | >> Thunderbolt (TM) 3 | Thunderbolt BIOS Assist Mode `Disabled` | -| | | | Thunderbolt(TM) Device `Disabled` | +| | | | Security Level `No Security` | +| | | | Support in Pre Boot Environment: Thunderbolt(TM) Device `Disabled` | > ## Modding the BIOS: diff --git a/docs/3_README-other.md b/docs/3_README-other.md index a1fb0a7..383bb8a 100644 --- a/docs/3_README-other.md +++ b/docs/3_README-other.md @@ -38,10 +38,14 @@ > ## Thunderbolt 3 Hotplug - Native-like integration with macOS in System Report without the need of flashing a modded firmware. Thank you @benbender +- NOTE: If you do have a modded BIOS firmware, please reset all settings relating to Thunderbolt 3 to default, all that's needed are settings detailed below or in [1_README-HARDWAREandBIOS.md](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/1_README-HARDWAREandBIOS.md) - Please make sure of these settings in BIOS: - - Thunderbolt BIOS Assist Mode `Disabled` - - Thunderbolt(TM) Device `Disabled` -- USB 3.1 Gen2 hotplug still WIP. +| Main Menu | Sub 1 | Sub 2 | Sub 3 | +| --------- | ----------- | --------------------------------------------- | ------------------------------------------------------------------ | +| | >> Config | >> Thunderbolt (TM) 3 | Thunderbolt BIOS Assist Mode `Disabled` | +| | | | Security Level `No Security` | +| | | | Support in Pre Boot Environment: Thunderbolt(TM) Device `Disabled` | +- Note: USB 3.1 Gen2 hotplug still Work-in-progress. > ## Keyboard: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 54b7798..b172385 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +> ### 2020-11-17 + +#### Changed + +- Updated various TB3 patches and instructions. +- Added misc. DeviceProperties to `config.plist` + > ### 2020-11-14 #### Added diff --git a/patches/SSDT-Battery.dsl b/patches/SSDT-Battery.dsl index 04dbdf9..cbff8f5 100644 --- a/patches/SSDT-Battery.dsl +++ b/patches/SSDT-Battery.dsl @@ -1,7 +1,7 @@ // Depends on /patches/OpenCore Patches/ Battery.plist // // SSDT-BATX -// Revision 8 +// Revision 10 // // Copyleft (c) 2020 by bb. No rights reserved. // @@ -32,7 +32,6 @@ // Additionally, as this implementation is more straight-forward and according to specs, it may reveal bugs and glitches // in other parts of the system. // -// // Compatibility: // // - Lenovo Thinkpad X1 Carbon generation 6 (X1C6) @@ -94,6 +93,8 @@ // // Changelog: // +// Revision 10 - Maybe fix that stupid race condition which leads to 20hrs battery time, fix quickpoll-handling +// Revision 9 - Fix serials for batteries with broken values // Revision 8 - Fix battery-state handling, small corrections // Revision 7 - Smaller fixes, adds Notify-patches as EC won't update without them in edge-cases, replaces fake serials with battery-serial // Revision 6 - fixes, make the whole system more configureable, adds technical backround-documentation @@ -106,7 +107,7 @@ // // Credits @benbender -DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) +DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00010000) { // Please ensure that your LPC bus-device is available at \_SB.PCI0.LPCB (check your DSDT). // Some older Thinkpads provide the LPC on \_SB.PCI0.LPC and if thats the case for you, @@ -125,6 +126,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) External (_SB.PCI0.LPCB.EC.BAT1._STA, MethodObj) External (_SB.PCI0.LPCB.EC.BAT1._HID, IntObj) + External (H8DR, FieldUnitObj) Scope (\_SB.PCI0.LPCB.EC) { @@ -519,7 +521,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) */ Method (SBSN, 0, NotSerialized) { - Return (B1B2 (SN00, SN01)) + Return (ToDecimalString (B1B2 (SN00, SN01))) } /** @@ -631,21 +633,36 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) */ Method (_STA, 0, NotSerialized) { + Local0 = Zero + // call original _STA for BAT0 and BAT1 // result is bitwise OR between them If (_OSI ("Darwin")) { - If (CondRefOf (^^BAT1._STA) && CondRefOf (^^BAT1._STA)) - { - Return (^^BAT0._STA() | ^^BAT1._STA()) - } - If (CondRefOf (^^BAT1._STA)) { - Return (^^BAT1._STA()) + If (CondRefOf (^^BAT0._STA)) + { + Local0 = (^^BAT0._STA () | ^^BAT1._STA ()) + } + Else + { + Local0 = (^^BAT1._STA ()) + } + } + Else + { + Local0 = (^^BAT0._STA ()) } - Return (^^BAT0._STA()) + If (\H8DR) + { + Return (Local0) + } + Else + { + Return (0x0F) + } } Return (Zero) @@ -732,7 +749,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) // If battery available If (Local5) { - // If battery ok + // If battery not ok, wait If (((Local4 & 0x07) == 0x07)) { // decrease timer and wait for battery to be ready @@ -741,7 +758,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) } Else { - // Battery error + // Battery ok Local7 = One } } @@ -832,7 +849,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) Arg1 [0x05] = SBDV /* \_SB_.PCI0.LPCB.EC__.BATX.SBDV */ // Serial Number - Arg1 [0x11] = ToString (SBSN) /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ + Arg1 [0x11] = SBSN /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ // @@ -1405,7 +1422,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) /** * Battery Information Supplement pack layout */ - Name (PBIS, Package (0x07) + Name (PBIS, Package () { 0x007F007F, // 0x00: BISConfig - config // double check if you have valid AverageRate before disabling QuicPoll @@ -1441,20 +1458,30 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_Battery", 0x00008000) Return (PBIS) } + // Check your _BST method for similiar condition of EC accessibility + If (!HB0A) + { + Debug = "BATX:CBIS - Error HB0A not ready yet. Returning defaults." + + Return (PBIS) + } + // // Information Page 2 - // - HIID = (0x00 | 0x02) + HIID = (0x02) // 0x01: ManufactureDate (0x1), AppleSmartBattery format PBIS [0x01] = SBDT + Local6 = ToDecimalString (SBSN) /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ + // Serial Number - PBIS [0x02] = SBSN /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ - PBIS [0x03] = SBSN /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ - PBIS [0x04] = SBSN /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ - PBIS [0x05] = SBSN /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ - PBIS [0x06] = SBSN /* \_SB_.PCI0.LPCB.EC__.BATX.SBSN */ + PBIS [0x02] = Local6 + PBIS [0x03] = Local6 + PBIS [0x04] = Local6 + PBIS [0x05] = Local6 + PBIS [0x06] = Local6 Release (BAXM) diff --git a/patches/SSDT-TB-DSB0.dsl b/patches/SSDT-TB-DSB0.dsl index eb591b1..66ec4cb 100644 --- a/patches/SSDT-TB-DSB0.dsl +++ b/patches/SSDT-TB-DSB0.dsl @@ -2,7 +2,7 @@ * Part of a series of patches: DSB0 - DSB6 * Depends on /patches/OpenCore Patches/ Thunderbolt3.plist * - * Thunderbolt For Alpine Ridge on X1C6: + * Thunderbolt For Alpine Ridge on X1C6 * * Large parts (link training and enumeration) * taken from decompiled Mac AML. @@ -42,10 +42,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) External (_SB.PCI0.GPCB, MethodObj) // 0 Arguments - External (_GPE.TBFF, MethodObj) // detect TB root port - External (_GPE.TFPS, MethodObj) // TB force status External (_GPE.XTFY, MethodObj) // Notify TB-controller on hotplug - External (_SB.TBFP, MethodObj) // 1 Arguments External (MMRP, MethodObj) // Memory mapped root port External (MMTB, MethodObj) // Memory mapped TB port @@ -112,8 +109,8 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) { Scope (\_SB.PCI0.RP09) { - Name (UPN1, 0x02) // USBCPortNumber of SSP1/HS03 - Name (UPN2, 0x01) // USBCPortNumber of SSP2/HS04 + Name (UPN1, 0x01) // USBCPortNumber of SSP1/HS03 + Name (UPN2, 0x02) // USBCPortNumber of SSP2/HS04 Name (R020, Zero) Name (R024, Zero) @@ -449,27 +446,6 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) Else { Debug = "TB:INIT: TB bios-assist enabled" - - If (\_GPE.TFPS ()) - { - Debug = "TB:INIT: TB Force Power alread enabled" - } - Else - { - Debug = "TB:INIT: enabling TB Force Power" - - \_SB.TBFP (One) // force power - - Local0 = 10000 // 10 seconds - While (Local0 > 0 && RPVD == 0xFFFFFFFF) - { - Sleep (1) - Local0-- - } - - Debug = Concatenate ("TB:INIT: TB-Controller root-port RPVD: ", RPVD) - Debug = Concatenate ("TB:INIT: ms waited: ", (10000 - Local0)) - } } } } @@ -1353,7 +1329,6 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) // CIO force power back to 0 // SGOV (0x02060000, Zero) // SGDO (0x02060000) - // \_SB.TBFP (Zero) Sleep (0x03E8) } @@ -1929,10 +1904,6 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) { Local1 = One - // If (((GGDV (0x02060000) == One) || (GGDV (0x02060001) == One)) && - // If (((GGDV (0x02060000) == One)) && - // (\_SB.PCI0.RP09.PXSX.AVND != 0xFFFFFFFF)) - // If ((\_GPE.TFPS () == One) && (\_SB.PCI0.RP09.PXSX.AVND != 0xFFFFFFFF)) If (\_SB.PCI0.RP09.PSTA () == One && AVND != 0xFFFFFFFF) { Local3 = Zero @@ -2439,7 +2410,6 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) // SGOV (0x02060000, Zero) // SGDO (0x02060000) - // \_SB.TBFP (Zero) } Else { @@ -2460,7 +2430,6 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) \_SB.PCI0.RP09.PON () // SGDI (0x02060000) - // \_SB.TBFP (One) Local1 = Zero Local2 = (Timer + 0x00989680) While (Timer <= Local2) @@ -2507,7 +2476,6 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) // SGOV (0x02060000, Zero) // SGDO (0x02060000) - // \_SB.TBFP (Zero) Sleep (0x03E8) } @@ -2590,6 +2558,15 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) /* 0x63 2 */ 0x0c, 0x02, 0x58, 0x31, 0x20, 0x43, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x00, // Device Name: "X1 Carbon" }, + "ThunderboltConfig", + Buffer (0x20) + { + /* 0000 */ 0x00, 0x02, 0x1C, 0x00, 0x02, 0x00, 0x05, 0x03, // ........ + /* 0008 */ 0x01, 0x00, 0x04, 0x00, 0x05, 0x03, 0x02, 0x00, // ........ + /* 0010 */ 0x03, 0x00, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, // ........ + /* 0018 */ 0x03, 0x03, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00 // ........ + }, + "TBTDPLowToHigh", Buffer (One) { @@ -2612,7 +2589,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB0", 0x00002000) Buffer () { 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - }, + }, "power-save", One, diff --git a/patches/SSDT-TB-DSB1.dsl b/patches/SSDT-TB-DSB1.dsl index e9aa2aa..4c382ef 100644 --- a/patches/SSDT-TB-DSB1.dsl +++ b/patches/SSDT-TB-DSB1.dsl @@ -80,7 +80,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -136,7 +136,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -185,7 +185,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -236,7 +236,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB3.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB3.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -275,7 +275,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB3.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB3.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -324,7 +324,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB3.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB3.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -373,7 +373,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB3.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB3.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -407,7 +407,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB3.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB3.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -443,7 +443,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -493,7 +493,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB4.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB4.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -537,7 +537,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB4.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB4.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -586,7 +586,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB4.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB4.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -635,7 +635,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB4.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB4.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -669,7 +669,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB4.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB4.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -705,7 +705,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -739,7 +739,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB1", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB1.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB1.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status diff --git a/patches/SSDT-TB-DSB2-XHC2.dsl b/patches/SSDT-TB-DSB2-XHC2.dsl index e90456b..38fb9bb 100644 --- a/patches/SSDT-TB-DSB2-XHC2.dsl +++ b/patches/SSDT-TB-DSB2-XHC2.dsl @@ -14,8 +14,6 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBXHC2", 0x00003000) External (_SB.PCI0.RP09.PXSX, DeviceObj) External (_SB.PCI0.RP09.PXSX.DSB0.NHI0, DeviceObj) - External (_SB.PCI0.RP09.PXSX.TBDU, DeviceObj) - External (_SB.PCI0.RP09.PXSX.TBDU.XHC, DeviceObj) External (_SB.PCI0.RP09.TBST, MethodObj) // 0 Arguments External (_SB.PCI0.RP09.UGIO, MethodObj) // 0 Arguments @@ -112,7 +110,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBXHC2", 0x00003000) "AAPL,xhci-clock-id", One, "UsbCompanionControllerPresent", - Zero + Zero, } If (CondRefOf (\_SB.PCI0.RP09.PXSX.DSB0.NHI0) && \USME == One) diff --git a/patches/SSDT-TB-DSB3.dsl b/patches/SSDT-TB-DSB3.dsl index 357fe62..4136a40 100644 --- a/patches/SSDT-TB-DSB3.dsl +++ b/patches/SSDT-TB-DSB3.dsl @@ -78,7 +78,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -132,7 +132,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -179,7 +179,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -228,7 +228,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB3.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB3.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -265,7 +265,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB3.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB3.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -312,7 +312,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB3.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB3.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -359,7 +359,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB3.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB3.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -392,7 +392,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB3.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB3.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -427,7 +427,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -476,7 +476,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB4.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB4.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -518,7 +518,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB4.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB4.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -565,7 +565,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB4.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB4.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -612,7 +612,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB4.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB4.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -645,7 +645,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB4.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB4.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -680,7 +680,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -713,7 +713,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB3", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB3.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB3.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status diff --git a/patches/SSDT-TB-DSB4.dsl b/patches/SSDT-TB-DSB4.dsl index 117909d..42eded1 100644 --- a/patches/SSDT-TB-DSB4.dsl +++ b/patches/SSDT-TB-DSB4.dsl @@ -79,7 +79,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -133,7 +133,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -180,7 +180,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -229,7 +229,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB3.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB3.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -266,7 +266,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB3.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB3.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -313,7 +313,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB3.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB3.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -360,7 +360,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB3.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB3.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -393,7 +393,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB3.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB3.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -428,7 +428,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -477,7 +477,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB4.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB4.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -519,7 +519,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB4.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB4.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -566,7 +566,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB4.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB4.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -613,7 +613,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB4.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB4.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -646,7 +646,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB4.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB4.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -681,7 +681,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -714,7 +714,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB4", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB4.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB4.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status diff --git a/patches/SSDT-TB-DSB5.dsl b/patches/SSDT-TB-DSB5.dsl index 3888330..a49df01 100644 --- a/patches/SSDT-TB-DSB5.dsl +++ b/patches/SSDT-TB-DSB5.dsl @@ -23,6 +23,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Device (DSB5) { Name (_ADR, 0x00050000) // _ADR: Address + OperationRegion (A1E0, PCI_Config, Zero, 0x40) Field (A1E0, ByteAcc, NoLock, Preserve) { @@ -78,7 +79,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -132,7 +133,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -179,7 +180,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -228,7 +229,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB3.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB3.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -265,7 +266,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB3.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB3.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -312,7 +313,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB3.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB3.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -359,7 +360,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB3.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB3.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -392,7 +393,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB3.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB3.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -427,7 +428,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -476,7 +477,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB4.UPS0.DSB0.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB4.UPS0.DSB0.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -518,7 +519,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB4.UPS0.DSB3.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB4.UPS0.DSB3.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -565,7 +566,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB4.UPS0.DSB4.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB4.UPS0.DSB4.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -612,7 +613,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB4.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB4.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -645,7 +646,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB4.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB4.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -680,7 +681,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB5.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB5.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status @@ -713,7 +714,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB5", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB5.UPS0.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB5.UPS0.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status diff --git a/patches/SSDT-TB-DSB6.dsl b/patches/SSDT-TB-DSB6.dsl index 85bbc26..94c53e3 100644 --- a/patches/SSDT-TB-DSB6.dsl +++ b/patches/SSDT-TB-DSB6.dsl @@ -79,7 +79,7 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_TBDSB6", 0x00001000) Method (_BBN, 0, NotSerialized) // _BBN: BIOS Bus Number { - Return (SECB) /* \_SB_.PCI0.RP09.UPSB.DSB6.SECB */ + Return (SECB) /* \_SB_.PCI0.RP09.PXSX.DSB6.SECB */ } Method (_STA, 0, NotSerialized) // _STA: Status diff --git a/patches/SSDT-XHC1.dsl b/patches/SSDT-XHC1.dsl index 222816a..f3017eb 100644 --- a/patches/SSDT-XHC1.dsl +++ b/patches/SSDT-XHC1.dsl @@ -18,28 +18,44 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { - // External method from SSDT-UTILS.dsl + // External method from SSDT-Darwin.dsl External (OSDW, MethodObj) // 0 Arguments External (DTGP, MethodObj) // 5 Arguments External (_SB.PCI0.XHC_, DeviceObj) External (_SB.PCI0.XHC_.RHUB, DeviceObj) External (_SB.PCI0.XHC_.RHUB.HS01, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS01.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS02, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS02.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS03, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS03.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS04, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS04.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS05, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS05.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS06, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS06.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS07, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS07.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS08, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS08.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS09, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS09.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.HS10, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.HS10.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.SS01, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.SS01.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.SS02, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.SS02.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.SS03, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.SS03.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.SS04, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.SS04.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.SS05, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.SS05.XUPC, MethodObj) External (_SB.PCI0.XHC_.RHUB.SS06, DeviceObj) + External (_SB.PCI0.XHC_.RHUB.SS06.XUPC, MethodObj) External (_SB.PCI0.XHC_.PDBM, FieldUnitObj) External (_SB.PCI0.XHC_.MEMB, FieldUnitObj) @@ -72,13 +88,13 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Local0 = Package () { "kUSBSleepPortCurrentLimit", - 3000, + 2100, "kUSBWakePortCurrentLimit", - 3000, + 2100, "kUSBSleepPowerSupply", - 9600, + 5100, "kUSBWakePowerSupply", - 9600, + 5100, } DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0)) Return (Local0) @@ -390,13 +406,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Scope (HS01) // Right USB-A-Port, 480 Mbit/s { - Name (_UPC, Package () // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0x03, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0x03, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { @@ -408,13 +434,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (HS02) // Left USB-A-Port, 480 Mbit/s { - Name (_UPC, Package () // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0x03, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0x03, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { @@ -426,33 +462,28 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (HS03) // Upper USB-C-Port, weired config, needs investigation { + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - If (CondRefOf (\_SB_.PCI0.RP09.PXSX.DSB2.XHC2)) + If (OSDW ()) { - Debug = "XHC:U2OP - companion ports enabled" - } - - If (\TBAS) - { - Local0 = Package (0x04) { - 0xFF, - 0x08, - Zero, - Zero + If (CondRefOf (\_SB_.PCI0.RP09.PXSX.DSB2.XHC2)) + { + Debug = "XHC:U2OP - companion ports enabled" } + + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0x08, + Zero, + Zero + }) } Else { - Local0 = Package (0x04) { - One, - 0x09, - Zero, - Zero - } + Return (^XUPC ()) } - - Return (Local0) } If (CondRefOf (\_SB_.PCI0.RP09.PXSX.DSB2.XHC2)) @@ -490,26 +521,20 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - If (\TBAS) + If (OSDW ()) { - Local0 = Package (0x04) { + Return (Package () // _UPC: USB Port Capabilities + { 0xFF, - 0x08, - Zero, + 0x08, + Zero, Zero - } + }) } Else { - Local0 = Package (0x04) { - One, - 0x09, - Zero, - Zero - } + Return (^XUPC ()) } - - Return (Local0) } If (CondRefOf (\_SB_.PCI0.RP09.PXSX.DSB2.XHC2)) @@ -548,12 +573,20 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - Return (Package (0x04) { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } } Method (_STA, 0, NotSerialized) // _STA: Status @@ -578,12 +611,20 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - Return (Package (0x04) { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method @@ -598,12 +639,20 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - Return (Package (0x04) { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method @@ -618,12 +667,20 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - Return (Package (0x04) { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method @@ -638,12 +695,20 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - Return (Package (0x04) { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } } Method (_STA, 0, NotSerialized) // _STA: Status @@ -668,12 +733,20 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) { Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - Return (Package (0x04) { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method @@ -686,13 +759,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (SS01) // Right USB-A-Port, 5 Gbit/s { - Name (_UPC, Package (0x04) // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0x03, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0x03, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { @@ -704,13 +787,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (SS02) // Left USB-A-Port, 5 Gbit/s { - Name (_UPC, Package (0x04) // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0x03, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0x03, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { @@ -722,13 +815,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (SS03) // Cardreader, internal { - Name (_UPC, Package (0x04) // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_RMV, 0, NotSerialized) // _RMV: Removal Status { @@ -768,13 +871,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (SS04) // Unused, internal { - Name (_UPC, Package (0x04) // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { @@ -786,13 +899,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (SS05) // Unused, internal { - Name (_UPC, Package (0x04) // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { @@ -804,13 +927,23 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) Scope (SS06) // Unused, internal { - Name (_UPC, Package (0x04) // _UPC: USB Port Capabilities + Method (_UPC, 0, NotSerialized) // _UPC: USB Port Capabilities { - 0xFF, - 0xFF, - Zero, - Zero - }) + If (OSDW ()) + { + Return (Package () // _UPC: USB Port Capabilities + { + 0xFF, + 0xFF, + Zero, + Zero + }) + } + Else + { + Return (^XUPC ()) + } + } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { @@ -840,4 +973,4 @@ DefinitionBlock ("", "SSDT", 2, "tyler", "_XHC1", 0x00001000) } } } -} +} \ No newline at end of file