diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-01-03 18:27:23 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-01-03 18:27:23 +0000 |
| commit | d8b83e4a7af25ead6d6ae629ba73df4ed1b558ef (patch) | |
| tree | 4a3e678039ec44cf31283e0783633ebd3df0f734 /drivers/dahdi | |
| parent | e3fba682231169d81c66e9275658c3cee8226353 (diff) | |
dahdi: Move the contents of digits.h directly into dahdi-base.c
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
Diffstat (limited to 'drivers/dahdi')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 25 | ||||
| -rw-r--r-- | drivers/dahdi/digits.h | 47 |
2 files changed, 24 insertions, 48 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 1c976d8..7223f26 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -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, diff --git a/drivers/dahdi/digits.h b/drivers/dahdi/digits.h deleted file mode 100644 index 94bd1fc..0000000 --- a/drivers/dahdi/digits.h +++ /dev/null @@ -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 |