[asterisk-commits] tilghman: branch 1.6.2 r264250 - in /branches/1.6.2: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed May 19 12:49:44 2010
New Revision: 264250

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=264250
Log:
Merged revisions 264249 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r264249 | tilghman | 2010-05-19 12:48:31 -0500 (Wed, 19 May 2010) | 24 lines
  
  Merged revisions 264248 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r264248 | tilghman | 2010-05-19 12:41:29 -0500 (Wed, 19 May 2010) | 17 lines
    
    Internal timing is now on by default, if you're using DAHDI 2.3 or above.
    
    The reason for ensuring DAHDI 2.3 or above is that this version ensures that
    a timer is always available, whereas in previous versions, it was possible
    for DAHDI to be loaded, but have no drivers to actually generate timing.  If
    internal_timing was turned on in this circumstance, a complete lack of audio
    would result.  This is the reason why internal_timing was not on by default.
    However, now that DAHDI ensures the availability of a timer, there is no
    reason for this setting to be off (and in fact, it solves a great many initial
    user problems).
    
    (closes issue #15932)
     Reported by: dimas
     Patches: 
           20100519__issue15932.diff.txt uploaded by tilghman (license 14)
     Tested by: tilghman
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configure
    branches/1.6.2/configure.ac
    branches/1.6.2/include/asterisk/autoconfig.h.in
    branches/1.6.2/include/asterisk/options.h

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=264250&r1=264249&r2=264250
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Wed May 19 12:49:44 2010
@@ -763,7 +763,9 @@
   AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
 fi
 
-AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
+AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230])
+AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220])
+AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h], [200])
 
 AST_C_DEFINE_CHECK([DAHDI_HALF_FULL], [DAHDI_POLICY_HALF_FULL], [dahdi/user.h])
 

Modified: branches/1.6.2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/autoconfig.h.in?view=diff&rev=264250&r1=264249&r2=264250
==============================================================================
--- branches/1.6.2/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.2/include/asterisk/autoconfig.h.in Wed May 19 12:49:44 2010
@@ -150,6 +150,9 @@
 
 /* Define if your system has the DAHDI_LINEREVERSE_VMWI headers. */
 #undef HAVE_DAHDI_LINEREVERSE_VMWI
+
+/* Define DAHDI headers version */
+#undef HAVE_DAHDI_VERSION
 
 /* Define to 1 if your system has /dev/urandom. */
 #undef HAVE_DEV_URANDOM

Modified: branches/1.6.2/include/asterisk/options.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/options.h?view=diff&rev=264250&r1=264249&r2=264250
==============================================================================
--- branches/1.6.2/include/asterisk/options.h (original)
+++ branches/1.6.2/include/asterisk/options.h Wed May 19 12:49:44 2010
@@ -22,6 +22,8 @@
 
 #ifndef _ASTERISK_OPTIONS_H
 #define _ASTERISK_OPTIONS_H
+
+#include "asterisk/autoconfig.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -93,7 +95,11 @@
 };
 
 /*! These are the options that set by default when Asterisk starts */
+#if (defined(HAVE_DAHDI_VERSION) && HAVE_DAHDI_VERSION >= 230)
+#define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN | AST_OPT_FLAG_INTERNAL_TIMING
+#else
 #define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN
+#endif
 
 #define ast_opt_exec_includes		ast_test_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES)
 #define ast_opt_no_fork			ast_test_flag(&ast_options, AST_OPT_FLAG_NO_FORK)