FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Move the contents of digits.h directly into dahdi-base.c

Browse Source 
Clarify that these definitions are not / no longer used outside
dahdi-base.c.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9597 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-01-03 18:27:23 +00:00
parent 89d96a16b5
commit 7a6d71f35c
2 changed files with 24 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/dahdi/dahdi-base.c
View File

@ -287,7 +287,30 @@ enum dahdi_digit_mode {
DIGIT_MODE_MFR2_REV,
};
#include "digits.h"
#define DEFAULT_DTMF_LENGTH (100 * DAHDI_CHUNKSIZE)
#define DEFAULT_MFR1_LENGTH (68 * DAHDI_CHUNKSIZE)
#define DEFAULT_MFR2_LENGTH (100 * DAHDI_CHUNKSIZE)
#define PAUSE_LENGTH (500 * DAHDI_CHUNKSIZE)
/* At the end of silence, the tone stops */
static struct dahdi_tone dtmf_silence = {
.tonesamples = DEFAULT_DTMF_LENGTH,
};
/* At the end of silence, the tone stops */
static struct dahdi_tone mfr1_silence = {
.tonesamples = DEFAULT_MFR1_LENGTH,
};
/* At the end of silence, the tone stops */
static struct dahdi_tone mfr2_silence = {
.tonesamples = DEFAULT_MFR2_LENGTH,
};
/* A pause in the dialing */
static struct dahdi_tone tone_pause = {
.tonesamples = PAUSE_LENGTH,
};
static struct dahdi_dialparams global_dialparams = {
.dtmf_tonelen = DEFAULT_DTMF_LENGTH,

47
drivers/dahdi/digits.h
View File

@ -1,47 +0,0 @@
/*
* DAHDI Telephony
*
*/
/*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
*
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2 as published by the
* Free Software Foundation. See the LICENSE file included with
* this program for more details.
*/
#ifndef _DIGITS_H
#define _DIGITS_H
#define DEFAULT_DTMF_LENGTH 100 * DAHDI_CHUNKSIZE
#define DEFAULT_MFR1_LENGTH 68 * DAHDI_CHUNKSIZE
#define DEFAULT_MFR2_LENGTH 100 * DAHDI_CHUNKSIZE
#define PAUSE_LENGTH 500 * DAHDI_CHUNKSIZE
/* At the end of silence, the tone stops */
static struct dahdi_tone dtmf_silence = {
.tonesamples = DEFAULT_DTMF_LENGTH,
};
/* At the end of silence, the tone stops */
static struct dahdi_tone mfr1_silence = {
.tonesamples = DEFAULT_MFR1_LENGTH,
};
/* At the end of silence, the tone stops */
static struct dahdi_tone mfr2_silence = {
.tonesamples = DEFAULT_MFR2_LENGTH,
};
/* A pause in the dialing */
static struct dahdi_tone tone_pause = {
.tonesamples = PAUSE_LENGTH,
};
#endif