[Pkg-voip-commits] r6683 - in /zaptel/trunk/debian: changelog patches/hrtimer_2628 patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Jan 20 14:14:12 2009
New Revision: 6683

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6683
Log:
Patch hrtimer_2628: Fix building ztdummy with kernel 2.6.28.

Added:
    zaptel/trunk/debian/patches/hrtimer_2628
Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/series

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=6683&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Tue Jan 20 14:14:12 2009
@@ -2,8 +2,9 @@
 
   * Fix typo 'status' init.d command. It now does something useful 
     (By Lars Bensmann)
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 11 Dec 2008 09:59:39 +0200
+  * Patch hrtimer_2628: Fix building ztdummy with kernel 2.6.28.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 20 Jan 2009 15:54:04 +0200
 
 zaptel (1:1.4.11~dfsg-3) unstable; urgency=high
 

Added: zaptel/trunk/debian/patches/hrtimer_2628
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/hrtimer_2628?rev=6683&op=file
==============================================================================
--- zaptel/trunk/debian/patches/hrtimer_2628 (added)
+++ zaptel/trunk/debian/patches/hrtimer_2628 Tue Jan 20 14:14:12 2009
@@ -1,0 +1,43 @@
+Adjust ztdummy to the new timers interface of kernel 2.6.28
+
+http://svn.digium.com/svn-view/zaptel?view=rev&rev=4617 
+
+--- a/kernel/ztdummy.c
++++ b/kernel/ztdummy.c
+@@ -91,6 +91,18 @@
+ #endif
+ #include "ztdummy.h"
+ 
++#if defined(USE_HIGHRESTIMER) && ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) )
++/* compatibility with new hrtimer interface */
++static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer)
++{
++       return timer->expires;
++}
++
++static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
++{
++       timer->expires = time;
++}
++#endif
+ 
+ static struct ztdummy *ztd;
+ 
+@@ -200,7 +212,7 @@ static enum hrtimer_restart ztdummy_hr_i
+ 	 * expired.
+ 	 * We should worry if overrun is 2 or more; then we really missed 
+ 	 * a tick */
+-	overrun = hrtimer_forward(&zaptimer, htmr->expires, 
++	overrun = hrtimer_forward(&zaptimer, hrtimer_get_expires(htmr),
+ 			ktime_set(0, ZAPTEL_TIME_NS));
+ 	if(overrun > 1) {
+ 		if(printk_ratelimit())
+@@ -223,7 +235,7 @@ static enum hrtimer_restart ztdummy_hr_i
+ /* use kernel system tick timer if PC architecture RTC is not available */
+ static void ztdummy_timer(unsigned long param)
+ {
+-	timer.expires = jiffies + 1;
++	hrtimer_set_expires(timer, jiffies + 1);
+ 	add_timer(&timer);
+ 
+ 	ztd->counter += ZAPTEL_TIME;

Modified: zaptel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/series?rev=6683&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/series (original)
+++ zaptel/trunk/debian/patches/series Tue Jan 20 14:14:12 2009
@@ -16,3 +16,4 @@
 vzaphfc_proc_root_dir
 wcte12xp_flags 
 fix_sync_validation
+hrtimer_2628