[Pkg-voip-commits] r5126 - in /zaptel/trunk: debian/changelog oslec/oslec_wrap.c

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu Dec 27 16:42:50 2007
New Revision: 5126

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5126
Log:
* Fix OSLEC so that audio works again on x86_64 systems. (Closes: #447245)

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/oslec/oslec_wrap.c

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5126&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Thu Dec 27 16:42:50 2007
@@ -26,8 +26,9 @@
   * Correctly detect udev/devfsd and chrooted environments at postinst time.
   * Fix debian/watch by using a pkg-voip wrapper to avoid upstream's silly
     redirections. (Closes: #449673)
-
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 11 Dec 2007 23:50:42 +0200
+  * Fix OSLEC so that audio works again on x86_64 systems. (Closes: #447245)
+
+ -- Faidon Liambotis <paravoid at debian.org>  Thu, 27 Dec 2007 18:39:46 +0200
 
 zaptel (1:1.4.5.1~dfsg-2) unstable; urgency=low
 

Modified: zaptel/trunk/oslec/oslec_wrap.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/oslec/oslec_wrap.c?rev=5126&op=diff
==============================================================================
--- zaptel/trunk/oslec/oslec_wrap.c (original)
+++ zaptel/trunk/oslec/oslec_wrap.c Thu Dec 27 16:42:50 2007
@@ -88,9 +88,10 @@
 }
 #else
 static __inline__ uint64_t cycles(void) {
-  uint64_t x;
-  __asm__ volatile ("rdtsc\n\t" : "=A" (x));
-  return x;
+  uint32_t lo, hi;
+  /* We cannot use "=A", since this would use %rax on x86_64 */
+  __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
+  return (uint64_t)hi << 32 | lo;
 }
 
 #endif