diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-07-21 18:11:53 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-07-21 18:11:53 +0000 |
| commit | 75ff751f904456c4e92991e005c06307b88c886c (patch) | |
| tree | 32db9ddf6d6052f95ae61b446315e94a5ddd8c47 /include | |
| parent | 131eae4b7f1087e2a739ef799985875d6fdc2354 (diff) | |
Merged revisions 6844,6852,6862-6863 via svnmerge from
https://origsvn.digium.com/svn/dahdi/linux/trunk
........
r6844 | sruffell | 2009-07-16 12:29:53 -0500 (Thu, 16 Jul 2009) | 10 lines
wcte12xp: Disable vpmadt032 companding by default.
This fixes a regression in 2.2.0 where certain configurations will fail
patloop test or have repeated HDLC aborts because the VPMADT032 is modifying
the clear channel or d channel data streams. This restores the behavior to
how it was in dahdi-linux 2.1.0.4.
(closes issue #15498)
Reported by: alecdavis
Tested by: alecdavis
........
r6852 | tzafrir | 2009-07-19 10:45:40 -0500 (Sun, 19 Jul 2009) | 12 lines
tor2: allow using port4 as timing source
Fix a silly regression introduced when strict check on the timing
parameter was added (sync-1 is the array index, not sync itself. And 0
is a special case).
(closes issue #15408)
Reported by: dferrer
Patches:
tor2-4th_sync.patch uploaded by dferrer (license 525)
........
r6862 | sruffell | 2009-07-21 12:52:59 -0500 (Tue, 21 Jul 2009) | 4 lines
Revert "wct4xxp, wcte11xp: Use the default configuration by default at startup."
This reverts the change introduced by revision 6712. This change can cause
problems when there is a VPM module installed on the quad-span digital cards.
........
r6863 | sruffell | 2009-07-21 12:53:02 -0500 (Tue, 21 Jul 2009) | 12 lines
dahdi-base: Add support for core timing.
This essentially moves the function of dahdi_dummy into the core of DAHDI. It
ensures that if DAHDI is loaded, it will always be able to provide timing,
regardless of whether there are board drivers loaded, or if the board drivers
are properly calling dahdi_receive.
If there is a master span loaded which is calling dahdi_receive, then the
behavior will be like it is normally.
This functionality is off by default, uncomment CONFIG_DAHDI_CORE_TIMER in
include/dahdi/config_dahdi.h in order to enable it.
........
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@6864 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'include')
| -rw-r--r-- | include/dahdi/dahdi_config.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/dahdi/dahdi_config.h b/include/dahdi/dahdi_config.h index 865439d..68547f1 100644 --- a/include/dahdi/dahdi_config.h +++ b/include/dahdi/dahdi_config.h @@ -115,6 +115,12 @@ */ /* #define CONFIG_CAC_GROUNDSTART */ +/* + * Define CONFIG_DAHDI_CORE_TIMER if you would like dahdi to always provide a + * timing source regardless of which spans / drivers are configured. + */ +/* #define CONFIG_DAHDI_CORE_TIMER */ + /* * Uncomment if you happen have an early TDM400P Rev H which * sometimes forgets its PCI ID to have wcfxs match essentially all @@ -167,4 +173,6 @@ */ /* #define OPTIMIZE_CHANMUTE */ + + #endif |