[svn-commits] sruffell: branch linux/sruffell/dahdi-linux-nodummy r6861 - /linux/team/sruff...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Jul 21 10:50:46 2009
New Revision: 6861

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6861
Log:
dahdi-base: Fix some constant declarations.

Modified:
    linux/team/sruffell/dahdi-linux-nodummy/drivers/dahdi/dahdi-base.c

Modified: linux/team/sruffell/dahdi-linux-nodummy/drivers/dahdi/dahdi-base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/team/sruffell/dahdi-linux-nodummy/drivers/dahdi/dahdi-base.c?view=diff&rev=6861&r1=6860&r2=6861
==============================================================================
--- linux/team/sruffell/dahdi-linux-nodummy/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/sruffell/dahdi-linux-nodummy/drivers/dahdi/dahdi-base.c Tue Jul 21 10:50:46 2009
@@ -7954,8 +7954,8 @@
 	unsigned long ms_since_start;
 	struct timespec now;
 	const unsigned long MAX_INTERVAL = 100000L;
-	const unsigned long 4MS_INTERVAL = HZ/250;
-	const unsigned long 1S_INTERVAL = HZ;
+	const unsigned long FOURMS_INTERVAL = HZ/250;
+	const unsigned long ONESEC_INTERVAL = HZ;
 
 	now = current_kernel_time();
 
@@ -7967,7 +7967,7 @@
 		 * perform the master span processing itself. */
 
 		if (!atomic_read(&core_timer.shutdown))
-			mod_timer(&core_timer.timer, jiffies + 4MS_INTERVAL);
+			mod_timer(&core_timer.timer, jiffies + FOURMS_INTERVAL);
 
 		ms_since_start = core_diff_ms(&core_timer.start_interval, &now);
 		while (ms_since_start > atomic_read(&core_timer.count))
@@ -7990,7 +7990,7 @@
 		atomic_set(&core_timer.last_count, 0);
 		core_timer.start_interval = now;
 		if (!atomic_read(&core_timer.shutdown))
-			mod_timer(&core_timer.timer, jiffies + 1S_INTERVAL);
+			mod_timer(&core_timer.timer, jiffies + ONESEC_INTERVAL);
 	}
 }