From d9c6c401a232b45b454316700aad63cf5d9f539a Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Thu, 12 Nov 2009 20:02:24 +0000 Subject: 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 --- drivers/dahdi/voicebus/GpakCust.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'drivers/dahdi/voicebus/GpakCust.h') diff --git a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h index 0546bfb..3a493e1 100644 --- a/drivers/dahdi/voicebus/GpakCust.h +++ b/drivers/dahdi/voicebus/GpakCust.h @@ -105,10 +105,8 @@ struct vpmadt032_options { struct GpakChannelConfig; -#define MAX_CHANNELS_PER_SPAN 32 struct vpmadt032 { - void *context; - const struct dahdi_span *span; + struct voicebus *vb; struct work_struct work; struct workqueue_struct *wq; int dspid; @@ -116,8 +114,10 @@ struct vpmadt032 { unsigned long control; unsigned char curpage; unsigned short version; - struct adt_lec_params curecstate[MAX_CHANNELS_PER_SPAN]; - struct adt_lec_params desiredecstate[MAX_CHANNELS_PER_SPAN]; + enum adt_companding companding; + struct adt_lec_params curecstate[MAX_CHANNELS]; + spinlock_t change_list_lock; + struct list_head change_list; spinlock_t list_lock; /* Commands that are ready to be used. */ struct list_head free_cmds; @@ -125,7 +125,6 @@ struct vpmadt032 { struct list_head pending_cmds; /* Commands that are currently in progress by the VPM module */ struct list_head active_cmds; - unsigned char curtone[MAX_CHANNELS_PER_SPAN]; struct vpmadt032_options options; void (*setchanconfig_from_state)(struct vpmadt032 *vpm, int channel, struct GpakChannelConfig *chanconfig); /* This must be last */ -- cgit v1.2.3