summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-11-11 16:42:38 +0000
committerjoerg <joerg@pkgsrc.org>2013-11-11 16:42:38 +0000
commit80d9f6e6f3c4b51b420892e3e506e07f19fe71bb (patch)
tree62b04e19c7124f599b7c0b446b1b83e5e3ad480c /sysutils
parentb155c81c915e9556239a89d508dc2b0762190606 (diff)
downloadpkgsrc-80d9f6e6f3c4b51b420892e3e506e07f19fe71bb.tar.gz
Remove unused functions.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/open-vm-tools/distinfo4
-rw-r--r--sysutils/open-vm-tools/patches/patch-checkvm_checkvm.c39
2 files changed, 37 insertions, 6 deletions
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index d0fffa72344..de34e13d723 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2013/04/01 12:25:16 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/11/11 16:42:38 joerg Exp $
SHA1 (open-vm-tools-2008.08.08-109361.tar.gz) = 1c44c3524cd9cbc5870f1c6065b03a6b31859a25
RMD160 (open-vm-tools-2008.08.08-109361.tar.gz) = 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411
@@ -52,7 +52,7 @@ SHA1 (patch-bv) = 180df7c4a5fb7544b6d9014f567a4f31e6c2a38d
SHA1 (patch-bw) = c242890caa3cc720d18eec612aca6e46c69c5b04
SHA1 (patch-bx) = deeea5eefae750b046d7a9c81679125e26fb82fa
SHA1 (patch-by) = c6018a330fdabefd3fc60d3e6e6c95bdf4f7f2bc
-SHA1 (patch-checkvm_checkvm.c) = 142e34b40937add51db4f2255f47da23402a3720
+SHA1 (patch-checkvm_checkvm.c) = 1da596cf11ccb9af1ba39013775a3a6b3a85345f
SHA1 (patch-configure.ac) = d39767cc2006088203341782fca7895c2710fd55
SHA1 (patch-guestd_Makefile.am) = 4855efa62b6633e23c11e3ea184f60f4c6952244
SHA1 (patch-hgfsclient_Makefile.am) = 3b6adf9e4d88bcce2c191260b669615537927e28
diff --git a/sysutils/open-vm-tools/patches/patch-checkvm_checkvm.c b/sysutils/open-vm-tools/patches/patch-checkvm_checkvm.c
index 70a8dc1e435..7f2c362509e 100644
--- a/sysutils/open-vm-tools/patches/patch-checkvm_checkvm.c
+++ b/sysutils/open-vm-tools/patches/patch-checkvm_checkvm.c
@@ -1,8 +1,39 @@
-$NetBSD: patch-checkvm_checkvm.c,v 1.1 2012/12/25 21:02:15 joerg Exp $
+$NetBSD: patch-checkvm_checkvm.c,v 1.2 2013/11/11 16:42:38 joerg Exp $
--- checkvm/checkvm.c.orig 2012-12-25 19:48:10.000000000 +0000
+++ checkvm/checkvm.c
-@@ -77,7 +77,7 @@ getVersion(uint32 *version)
+@@ -46,30 +46,6 @@ VM_EMBED_VERSION(CHECKVM_VERSION_STRING)
+ #ifdef __GNUC__
+
+ /*
+- * outl and inl: Output or input a 32-bit word
+- */
+-static __inline__ void
+-outl(
+- const uint32 port,
+- uint32 val
+-)
+-{
+- __asm__ volatile("out%L0 (%%dx)" : :"a" (val), "d" (port));
+-}
+-
+-static __inline__ uint32
+-inl(
+- const uint32 port
+-)
+-{
+- uint32 ret;
+-
+- __asm__ volatile("in%L0 (%%dx)" : "=a" (ret) : "d" (port));
+- return ret;
+-}
+-
+-
+-/*
+ * getVersion - Read VM version & product code through backdoor
+ */
+ void
+@@ -77,7 +53,7 @@ getVersion(uint32 *version)
{
uint32 eax, ebx, ecx, edx;
@@ -11,7 +42,7 @@ $NetBSD: patch-checkvm_checkvm.c,v 1.1 2012/12/25 21:02:15 joerg Exp $
"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
"0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETVERSION),
"2"(BDOOR_PORT) : "memory");
-@@ -94,7 +94,7 @@ getHWVersion(uint32 *hwVersion)
+@@ -94,7 +70,7 @@ getHWVersion(uint32 *hwVersion)
{
uint32 eax, ebx, ecx, edx;
@@ -20,7 +51,7 @@ $NetBSD: patch-checkvm_checkvm.c,v 1.1 2012/12/25 21:02:15 joerg Exp $
"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
"0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETHWVERSION),
"2"(BDOOR_PORT) : "memory");
-@@ -110,7 +110,7 @@ getScreenSize(uint32 *screensize)
+@@ -110,7 +86,7 @@ getScreenSize(uint32 *screensize)
{
uint32 eax, ebx, ecx, edx;