---

yaml --- r: 297989 b: refs/heads/master c: 2feec47 h: refs/heads/master i: 297987: 0a50bba v: v3
git-mirror · Mar 22, 2012 · 05416f7 · 05416f7
1 parent 9ff5bd9
commit 05416f7
Show file tree

Hide file tree

Showing 6 changed files with 702 additions and 270 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 384fe875efdc99f367a58920acb89c63f7465479
+refs/heads/master: 2feec47d4c5f80b05f1650f5a24865718978eea4
diff --git a/trunk/drivers/acpi/acpica/Makefile b/trunk/drivers/acpi/acpica/Makefile
@@ -73,7 +73,8 @@ acpi-y +=		\
 	hwregs.o	\
 	hwsleep.o	\
 	hwvalid.o	\
-	hwxface.o
+	hwxface.o	\
+	hwxfsleep.o
 
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 

diff --git a/trunk/drivers/acpi/acpica/achware.h b/trunk/drivers/acpi/acpica/achware.h
@@ -80,6 +80,23 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value);
 
 acpi_status acpi_hw_clear_acpi_status(void);
 
+/*
+ * hwsleep - sleep/wake support
+ */
+void acpi_hw_execute_SST(u32 value);
+
+acpi_status acpi_hw_extended_sleep(u8 sleep_state);
+
+acpi_status acpi_hw_legacy_sleep(u8 sleep_state);
+
+acpi_status acpi_hw_extended_wake_prep(u8 sleep_state);
+
+acpi_status acpi_hw_extended_wake(u8 sleep_state);
+
+acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state);
+
+acpi_status acpi_hw_legacy_wake(u8 sleep_state);
+
 /*
  * hwvalid - Port I/O with validation
  */