From: VMware, Inc <>
Date: Mon, 21 May 2012 22:19:08 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2012.05.21-724730~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f6de78089977e33c8ce29783a6f4fa0f05d9bc0;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/include/backdoor_def.h b/open-vm-tools/lib/include/backdoor_def.h
index 89524cf27..72d2e1900 100644
--- a/open-vm-tools/lib/include/backdoor_def.h
+++ b/open-vm-tools/lib/include/backdoor_def.h
@@ -143,6 +143,7 @@
 #  define BDOOR_CMD_FAS_GET_PCIE_OSC_MASK     3
 #  define BDOOR_CMD_FAS_GET_APIC_ROUTING      4
 #  define BDOOR_CMD_FAS_GET_TABLE_SKIP        5
+#  define BDOOR_CMD_FAS_GET_SLEEP_ENABLES     6
 #define   BDOOR_CMD_SENDPSHAREHINTS          66
 #define   BDOOR_CMD_ENABLE_USB_MOUSE         67
 #define   BDOOR_CMD_GET_VCPU_INFO            68
diff --git a/open-vm-tools/lib/include/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
index ef3bccc9a..25d906d66 100644
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -125,6 +125,9 @@
 
 #define RANK_usbArbCliClientLock     (RANK_libLockBase + 0x6505)
 #define RANK_usbArbCliGlobalLock     (RANK_libLockBase + 0x6506)
+#define RANK_usbEnumClientsLock      (RANK_libLockBase + 0x6507)
+#define RANK_usbEnumBackendsLock     (RANK_libLockBase + 0x6508)
+#define RANK_usbEnumBackendLock      (RANK_libLockBase + 0x6509)
 
 
 /*
@@ -143,6 +146,7 @@
  *    licenseCheck < preference
  */
 
+#define RANK_vigorConnLock           (RANK_libLockBase + 0x7010)
 #define RANK_getSafeTmpDirLock       (RANK_libLockBase + 0x7020)
 #define RANK_batteryLock             (RANK_libLockBase + 0x7030)
 #define RANK_buttonLock              (RANK_libLockBase + 0x7040)
diff --git a/open-vm-tools/lib/include/panic.h b/open-vm-tools/lib/include/panic.h
index 1b37e42a3..969aff983 100644
--- a/open-vm-tools/lib/include/panic.h
+++ b/open-vm-tools/lib/include/panic.h
@@ -70,7 +70,6 @@ EXTERN void Panic_LoopOnPanic(void);
 EXTERN void Panic_SetCoreDumpOnPanic(Bool dumpCore);
 EXTERN Bool Panic_GetCoreDumpOnPanic(void);
 EXTERN void Panic_SetCoreDumpFileName(const char *fileName);
-EXTERN const char *Panic_GetCoreDumpFileName(void);
 EXTERN int  Panic_GetCoreDumpFlags(void);
 EXTERN void Panic_SetCoreDumpFlags(int flags);
 
diff --git a/open-vm-tools/lib/include/util.h b/open-vm-tools/lib/include/util.h
index 7212cb236..d79bdf81f 100644
--- a/open-vm-tools/lib/include/util.h
+++ b/open-vm-tools/lib/include/util.h
@@ -121,6 +121,11 @@ void Util_BacktraceWithFunc(int bugNr,
 void Util_BacktraceToBuffer(uintptr_t *basePtr,
                             uintptr_t *buffer, int len);
 
+// sleep functions
+
+void Util_Usleep(long usec);
+void Util_Sleep(unsigned int sec);
+
 int Util_CompareDotted(const char *s1, const char *s2);
 
 /*