Merged revisions 179937 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r179937 | mmichelson | 2009-03-03 14:59:16 -0600 (Tue, 03 Mar 2009) | 20 lines
  
  Add documentation for timing modules used in Asterisk
  
  This document specifies the timing modules available in Asterisk beginning
  with Asterisk 1.6.1. The document goes into detail about the differences
  between each and gives a general overview of what timing is used for in
  Asterisk. There is also a section which can be used to help customize
  your setup or to troubleshoot timing issues you may have.
  
  I also added messages to the DAHDI timing test used in res_timing_dahdi.c
  that points to this new documentation if people experience problems.
  
  Big thanks to all who contributed comments on this.
  
  (closes issue #14490)
  Reported by: mmichelson
  Patches:
        timing.txt uploaded by mmichelson (license 60)
  
  Review: http://reviewboard.digium.com/r/164/
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@179939 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 3 deletions

diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c
index bb0b72679..bc65bbdcf 100644
--- a/res/res_timing_dahdi.c
+++ b/res/res_timing_dahdi.c
@@ -137,6 +137,8 @@ static unsigned int dahdi_timer_get_max_rate(int handle)
 	return 1000;
 }
 
+#define SEE_TIMING "For more information on Asterisk timing modules, including ways to potentially fix this problem, please see doc/timing.txt\n"
+
 static int dahdi_test_timer(void)
 {
 	int fd;
@@ -149,13 +151,13 @@ static int dahdi_test_timer(void)
 	}
 
 	if (ioctl(fd, DAHDI_TIMERCONFIG, &x)) {
-		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer test failed to set DAHDI_TIMERCONFIG to %d.\n", x);
+		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer test failed to set DAHDI_TIMERCONFIG to %d.\n" SEE_TIMING, x);
 		close(fd);
 		return -1;
 	}
 
 	if ((x = ast_wait_for_input(fd, 300)) < 0) {
-		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer could not be polled during the DAHDI timer test.\n");
+		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer could not be polled during the DAHDI timer test.\n" SEE_TIMING);
 		close(fd);
 		return -1;
 	}
@@ -167,7 +169,7 @@ static int dahdi_test_timer(void)
 			"\n\t2. You only have to load DAHDI drivers if you want to take advantage of DAHDI services.  One option is to unload DAHDI modules if you don't need them."
 			"\n\t3. If you need DAHDI services, you must correctly configure DAHDI."
 		};
-		ast_log(LOG_ERROR, "%s\n", dahdi_timer_error);
+		ast_log(LOG_ERROR, "%s\n" SEE_TIMING, dahdi_timer_error);
 		usleep(100);
 		close(fd);
 		return -1;