diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-11-12 20:02:24 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-11-12 20:02:24 +0000 |
| commit | d9c6c401a232b45b454316700aad63cf5d9f539a (patch) | |
| tree | 718b76da82f9e08657950cc050c183767cc51f1d /include | |
| parent | ecb48ce630aaf4754efb4159e4d9b8256f26148d (diff) | |
Merged revisions 7309,7348,7565-7571 via svnmerge from
https://origsvn.digium.com/svn/dahdi/linux/trunk
........
r7309 | mattf | 2009-10-02 11:31:58 -0500 (Fri, 02 Oct 2009) | 1 line
Implement API update to do per-channel companding selection for VPMADT032
........
r7348 | mattf | 2009-10-07 16:26:08 -0500 (Wed, 07 Oct 2009) | 1 line
Fix a logic error in the companding check. Duh....
........
r7565 | sruffell | 2009-11-12 13:22:06 -0600 (Thu, 12 Nov 2009) | 7 lines
voicebus: Fix race when enabling/disabling hardware echocan.
This closes a race condition where it was possible for the driver to
believe it has enabled the VPMADT032 when in fact, it really has not.
This fixes a regression introduced in dahdi-linux 2.2.0.
(issue #15724)
........
r7566 | sruffell | 2009-11-12 13:22:06 -0600 (Thu, 12 Nov 2009) | 1 line
wctdm24xxp, wcte12xp: We no longer have any DTMF events to check for.
........
r7567 | sruffell | 2009-11-12 13:22:07 -0600 (Thu, 12 Nov 2009) | 1 line
voicebus: Remove unused curtone from 'struct vpmadt032'
........
r7568 | sruffell | 2009-11-12 13:22:07 -0600 (Thu, 12 Nov 2009) | 1 line
voicebus: Remove redundant MAX_CHANNELS_FROM_SPAN
........
r7569 | sruffell | 2009-11-12 13:22:08 -0600 (Thu, 12 Nov 2009) | 3 lines
voicebus: Use dev_xxx macro when printing vpm messages.
We also do not need the unused context member of the vpmadt032 structure.
........
r7570 | sruffell | 2009-11-12 13:22:08 -0600 (Thu, 12 Nov 2009) | 4 lines
wcte12xp: Change serial port configuration setting for hw echocan.
The wcte12xp, like the wctdm24xpp, should have the PcmOutPortA set to
SerialPortNull.
........
r7571 | sruffell | 2009-11-12 13:56:49 -0600 (Thu, 12 Nov 2009) | 1 line
kernel.h: Define 'list_replace' for kernels < 2.6.18
........
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7572 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'include')
| -rw-r--r-- | include/dahdi/kernel.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 6058779..c07b45a 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1172,6 +1172,16 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss) #define kzalloc(a, b) kcalloc(1, a, b) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) +static inline void list_replace(struct list_head *old, struct list_head *new) +{ + new->next = old->next; + new->next->prev = new; + new->prev = old->prev; + new->prev->next = new; +} +#endif + #ifndef DMA_BIT_MASK #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) #endif |