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

dahdi: Move the default tone lengths into include/dahdi/dahdi_config.h

Browse Source 
The default tone lengths are compile time options and they were in
digits.h to make it easy for users to patch.  Most of these settings are
potentially overridden from user space via the DAHDI_SET_DIALPARAMS
ioctl currently regardless of these settings.

In r9597 I moved digits.h directly into dahdi-base.c since I thought it
was broken out for sharing between compilation units as opposed to
ease patching.

I also changed the units of the default options to ms instead of in
samples.  This way if the sampling frequency changes the user will not
need to update the defaults.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
asterisk-dev-reference: 4D236FD7.30707@digium.com

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9616 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-01-05 15:52:03 +00:00
parent d4c047f5d9
commit a45f853395
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,35 +287,30 @@ enum dahdi_digit_mode {
DIGIT_MODE_MFR2_REV, DIGIT_MODE_MFR2_REV,
}; };
#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 */ /* At the end of silence, the tone stops */
static struct dahdi_tone dtmf_silence = { static struct dahdi_tone dtmf_silence = {
.tonesamples = DEFAULT_DTMF_LENGTH, .tonesamples = DAHDI_MS_TO_SAMPLES(DAHDI_CONFIG_DEFAULT_DTMF_LENGTH),
}; };
/* At the end of silence, the tone stops */ /* At the end of silence, the tone stops */
static struct dahdi_tone mfr1_silence = { static struct dahdi_tone mfr1_silence = {
.tonesamples = DEFAULT_MFR1_LENGTH, .tonesamples = DAHDI_MS_TO_SAMPLES(DAHDI_CONFIG_DEFAULT_MFR1_LENGTH),
}; };
/* At the end of silence, the tone stops */ /* At the end of silence, the tone stops */
static struct dahdi_tone mfr2_silence = { static struct dahdi_tone mfr2_silence = {
.tonesamples = DEFAULT_MFR2_LENGTH, .tonesamples = DAHDI_MS_TO_SAMPLES(DAHDI_CONFIG_DEFAULT_MFR2_LENGTH),
}; };
/* A pause in the dialing */ /* A pause in the dialing */
static struct dahdi_tone tone_pause = { static struct dahdi_tone tone_pause = {
.tonesamples = PAUSE_LENGTH, .tonesamples = DAHDI_MS_TO_SAMPLES(DAHDI_CONFIG_PAUSE_LENGTH),
}; };
static struct dahdi_dialparams global_dialparams = { static struct dahdi_dialparams global_dialparams = {
.dtmf_tonelen = DEFAULT_DTMF_LENGTH, .dtmf_tonelen = DAHDI_MS_TO_SAMPLES(DAHDI_CONFIG_DEFAULT_DTMF_LENGTH),
.mfv1_tonelen = DEFAULT_MFR1_LENGTH, .mfv1_tonelen = DAHDI_MS_TO_SAMPLES(DAHDI_CONFIG_DEFAULT_MFR1_LENGTH),
.mfr2_tonelen = DEFAULT_MFR2_LENGTH, .mfr2_tonelen = DAHDI_MS_TO_SAMPLES(DAHDI_CONFIG_DEFAULT_MFR2_LENGTH),
}; };
static int dahdi_chan_ioctl(struct file *file, unsigned int cmd, unsigned long data); static int dahdi_chan_ioctl(struct file *file, unsigned int cmd, unsigned long data);

6
include/dahdi/dahdi_config.h
View File

@ -28,6 +28,12 @@
/* DAHDI compile time options */ /* DAHDI compile time options */
/* These default tone lengths are in units of milliseconds. */
#define DAHDI_CONFIG_DEFAULT_DTMF_LENGTH 100
#define DAHDI_CONFIG_DEFAULT_MFR1_LENGTH 68
#define DAHDI_CONFIG_DEFAULT_MFR2_LENGTH 100
#define DAHDI_CONFIG_PAUSE_LENGTH 500
/* /*
* Uncomment if you have a European phone, or any other phone with a * Uncomment if you have a European phone, or any other phone with a
* short flash time. * short flash time.

5
include/dahdi/kernel.h
View File

@ -100,7 +100,10 @@
#define DAHDI_MAX_CHUNKSIZE DAHDI_CHUNKSIZE #define DAHDI_MAX_CHUNKSIZE DAHDI_CHUNKSIZE
#define DAHDI_CB_SIZE 2 #define DAHDI_CB_SIZE 2
#define DAHDI_MSECS_PER_CHUNK (DAHDI_CHUNKSIZE/8) /* DAHDI operates at 8Khz by default */
#define DAHDI_MS_TO_SAMPLES(ms) ((ms) * 8)
#define DAHDI_MSECS_PER_CHUNK (DAHDI_CHUNKSIZE/DAHDI_MS_TO_SAMPLES(1))
#define RING_DEBOUNCE_TIME 2000 /*!< 2000 ms ring debounce time */ #define RING_DEBOUNCE_TIME 2000 /*!< 2000 ms ring debounce time */