Changeset 55436 in vbox for trunk/include

Timestamp:

Apr 27, 2015 9:13:02 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99782

Message:

Reverted bad commit r99781.

Location:

trunk/include

Files:

• VBox/sup.h (modified) (4 diffs)
• iprt/power.h (modified) (3 diffs)

trunk/include/VBox/sup.h

@@ -33 +33 @@
 #include <iprt/stdarg.h>
 #include <iprt/cpuset.h>
-#include <iprt/power.h>
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
 # include <iprt/asm-amd64-x86.h>
@@ -1071 +1070 @@
  * Initializes the support library.
  *
- * Each successful call to SUPR3Init() or SUPR3InitEx() must be countered by a
+ * Each successful call to SUPR3Init() or SUPR3InitEx must be countered by a
  * call to SUPR3Term(false).
  *
@@ -1083 +1082 @@
  * Initializes the support library, extended version.
  *
- * Each successful call to SUPR3Init() or SUPR3InitEx() must be countered by a
+ * Each successful call to SUPR3Init() or SUPR3InitEx must be countered by a
  * call to SUPR3Term(false).
  *
@@ -1745 +1744 @@
  */
 SUPR3DECL(int) SUPR3ReadTsc(uint64_t *puTsc, uint16_t *pidApic);
-
-
-/**
- * Waits for a host power event.
- *
- * This times out every few seconds, so caller is expected to retry if needed.
- *
- * @returns VBox status code.
- * @param   pEvent          Where to store the power event that occurs.
- */
-SUPR3DECL(int) SUPR3WaitForPowerEvent(RTPOWEREVENT *pEvent);
-
-
-/**
- * Acknowledges a host power event.
- *
- * @returns VBox status code.
- */
-SUPR3DECL(int) SUPR3AckPowerEvent(void);
 
 /** @} */

trunk/include/iprt/power.h

@@ -38 +38 @@
  */
 
+#ifdef IN_RING0
+
 /**
  * MP event, see FNRTPOWERNOTIFICATION.
@@ -43 +45 @@
 typedef enum RTPOWEREVENT
 {
-    /** Invalid power event. */
-    RTPOWEREVENT_INVALID = 1,
-    /** The system is preparing for a suspend operation.
-     *  If supported, this should arrive earlier than RTPOWEREVENT_SUSPEND. */
-    RTPOWEREVENT_PRE_SUSPEND,
     /** The system will go into suspend mode. */
-    RTPOWEREVENT_SUSPEND,
+    RTPOWEREVENT_SUSPEND = 1,
     /** The system has resumed. */
     RTPOWEREVENT_RESUME
 } RTPOWEREVENT;
-/** Pointer to a power event. */
-typedef RTPOWEREVENT *PRTPOWEREVENT;
-
-/**
- * Gets the descriptive power event name.
- *
- * @returns The name.
- * @param   enmEvent      The power event.
- */
-DECLINLINE(const char *) RTPowerGetEventName(RTPOWEREVENT enmEvent)
-{
-    switch (enmEvent)
-    {
-        case RTPOWEREVENT_INVALID:          return "Invalid";
-        case RTPOWEREVENT_PRE_SUSPEND:      return "Pre-suspend";
-        case RTPOWEREVENT_SUSPEND:          return "Suspend";
-        case RTPOWEREVENT_RESUME:           return "Resume";
-        default:                            return "???";
-    }
-}
-
-
-#ifdef IN_RING0
 
 /**
@@ -82 +56 @@
  * The context this is called in differs a bit from platform to
  * platform, so be careful while in here.
- *
- * On Linux, the pre-suspend, suspend and resume events fire with preemption
- * enabled on any CPU.
  *
  * @param   enmEvent    The event.