1 files changed, 44 insertions, 165 deletions
diff --git a/src/ec/system76/ec/acpi/ec_ram.asl b/src/ec/system76/ec/acpi/ec_ram.asl
index d5f97edbd7..6ef54540b6 100644
--- a/src/ec/system76/ec/acpi/ec_ram.asl
+++ b/src/ec/system76/ec/acpi/ec_ram.asl
@@ -3,173 +3,52 @@
 OperationRegion (ERAM, EmbeddedControl, Zero, 0xFF)
 Field (ERAM, ByteAcc, Lock, Preserve)
 {
-	NMSG,   8,
-	SLED,   4,
-	Offset (0x02),
-	MODE,   1,
-	FAN0,   1,
-	TME0,   1,
-	TME1,   1,
-	FAN1,   1,
-		,   2,
 	Offset (0x03),
-	LSTE,   1,
-	LSW0,   1,
-	LWKE,   1,
-	WAKF,   1,
-		,   2,
-	PWKE,   1,
-	MWKE,   1,
-	AC0,    8,
-	PSV,    8,
-	CRT,    8,
-	TMP,    8,
-	AC1,    8,
-	BBST,   8,
-	Offset (0x0B),
-	Offset (0x0C),
-	Offset (0x0D),
-	Offset (0x0E),
-	SLPT,   8,
-	SWEJ,   1,
-	SWCH,   1,
+	LSTE, 1,	// Lid is open
+	, 1,
+	LWKE, 1,	// Lid wake
+	, 5,
+	Offset (0x07),
+	TMP1, 8,	// CPU temperature
 	Offset (0x10),
-	ADP,    1,
-	AFLT,   1,
-	BAT0,   1,
-	BAT1,   1,
-		,   3,
-	PWOF,   1,
-	WFNO,   8,
-	BPU0,   32,
-	BDC0,   32,
-	BFC0,   32,
-	BTC0,   32,
-	BDV0,   32,
-	BST0,   32,
-	BPR0,   32,
-	BRC0,   32,
-	BPV0,   32,
-	BTP0,   16,
-	BRS0,   16,
-	BCW0,   32,
-	BCL0,   32,
-	BCG0,   32,
-	BG20,   32,
-	BMO0,   64,
-	BIF0,   64,
-	BSN0,   32,
-	BTY0,   64,
-	Offset (0x67),
+	ADP, 1,		// AC adapter connected
+	, 1,
+	BAT0, 1,	// Battery connected
+	, 5,
+	WFNO, 8,	// Wake cause (not implemented)
+	Offset (0x16),
+	BDC0, 32,	// Battery design capacity
+	BFC0, 32,	// Battery full capacity
+	Offset (0x22),
+	BDV0, 32,	// Battery design voltage
+	BST0, 32,	// Battery status
+	BPR0, 32,	// Battery current
+	BRC0, 32,	// Battery remaining capacity
+	BPV0, 32,	// Battery voltage
+	Offset (0x3A),
+	BCW0, 32,
+	BCL0, 32,
 	Offset (0x68),
-	ECOS,   8,
-	LNXD,   8,
-	ECPS,   8,
-	Offset (0x6C),
-	BTMP,   16,
-	EVTN,   8,
-	Offset (0x72),
-	PRCL,   8,
-	PRC0,   8,
-	PRC1,   8,
-	PRCM,   8,
-	PRIN,   8,
-	PSTE,   8,
-	PCAD,   8,
-	PEWL,   8,
-	PWRL,   8,
-	PECD,   8,
-	PEHI,   8,
-	PECI,   8,
-	PEPL,   8,
-	PEPM,   8,
-	PWFC,   8,
-	PECC,   8,
-	PDT0,   8,
-	PDT1,   8,
-	PDT2,   8,
-	PDT3,   8,
-	PRFC,   8,
-	PRS0,   8,
-	PRS1,   8,
-	PRS2,   8,
-	PRS3,   8,
-	PRS4,   8,
-	PRCS,   8,
-	PEC0,   8,
-	PEC1,   8,
-	PEC2,   8,
-	PEC3,   8,
-	CMDR,   8,
-	CVRT,   8,
-	GTVR,   8,
-	FANT,   8,
-	SKNT,   8,
-	AMBT,   8,
-	MCRT,   8,
-	DIM0,   8,
-	DIM1,   8,
-	PMAX,   8,
-	PPDT,   8,
-	PECH,   8,
-	PMDT,   8,
-	TSD0,   8,
-	TSD1,   8,
-	TSD2,   8,
-	TSD3,   8,
-	CPUP,   16,
-	MCHP,   16,
-	SYSP,   16,
-	CPAP,   16,
-	MCAP,   16,
-	SYAP,   16,
-	CFSP,   16,
-	CPUE,   16,
-	Offset (0xC6),
-	Offset (0xC7),
-	VGAT,   8,
-	OEM1,   8,
-	OEM2,   8,
-	OEM3,   16,
-	OEM4,   8,
-	Offset (0xCE),
-	DUT1,   8,
-	DUT2,   8,
-	RPM1,   16,
-	RPM2,   16,
-	RPM4,   16,
-	Offset (0xD7),
-	DTHL,   8,
-	DTBP,   8,
-	AIRP,   8,
-	WINF,   8,
-	RINF,   8,
-	Offset (0xDD),
-	INF2,   8,
-	MUTE,   1,
-	Offset (0xE0),
-	RPM3,   16,
-	ECKS,   8,
-	Offset (0xE4),
-		,   4,
-	XTUF,   1,
-	EP12,   1,
-	Offset (0xE5),
-	INF3,   8,
-	Offset (0xE7),
-	GFOF,   8,
-	Offset (0xE9),
-	KPCR,   1,
-	Offset (0xEA),
-	Offset (0xF0),
-	PL1T,   16,
-	PL2T,   16,
-	TAUT,   8,
+	ECOS, 8,	// Detected OS, 0 = no ACPI, 1 = ACPI but no driver, 2 = ACPI with driver
+	Offset (0xC8),
+	OEM1, 8,
+	OEM2, 8,
+	OEM3, 16,
+	OEM4, 8,	// Extra SCI data
+	Offset (0xCD),
+	TMP2, 8,	// GPU temperature
+	DUT1, 8,	// Fan 1 duty
+	DUT2, 8,	// Fan 2 duty
+	RPM1, 16,	// Fan 1 RPM
+	RPM2, 16,	// Fan 2 RPM
+	Offset (0xD9),
+	AIRP, 8,	// Airplane mode LED
+	WINF, 8,	// Enable ACPI brightness controls
 	Offset (0xF8),
-	FCMD,   8,
-	FDAT,   8,
-	FBUF,   8,
-	FBF1,   8,
-	FBF2,   8,
-	FBF3,   8
+	FCMD, 8,
+	FDAT, 8,
+	FBUF, 8,
+	FBF1, 8,
+	FBF2, 8,
+	FBF3, 8,
 }