1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
From 2a379aa2490218d3f15585a8d77b13a17d9eed6b Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 18 Jun 2024 19:41:38 +0100
Subject: [PATCH 2/2] configure hook state machine timing
introduce a bunch of new config options to configure hook state
machine timing parameters:
* digit_low_time_min
* digit_low_time_max
* digit_high_time_min
* digit_high_time_max
* flash_time_min
* flash_time_max
* hook_off_time
* hook_on_time
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
src/channels/chan_lantiq.c | 114 +++++++++++++++++++++++++
src/configs/samples/lantiq.conf.sample | 11 +++
2 files changed, 125 insertions(+)
--- a/src/channels/chan_lantiq.c
+++ b/src/channels/chan_lantiq.c
@@ -168,6 +168,14 @@ static struct lantiq_ctx {
char ch_led[TAPI_AUDIO_PORT_NUM_MAX][LED_NAME_LENGTH]; /* FXS LED names */
int interdigit_timeout; /* Timeout in ms between dialed digits */
int numsign_complete; /* If nonzero, then the pound/hash key signifies that dialed number is complete */
+ int digit_low_time_min;
+ int digit_low_time_max;
+ int digit_high_time_min;
+ int digit_high_time_max;
+ int flash_time_min;
+ int flash_time_max;
+ int hook_off_time;
+ int hook_on_time;
} dev_ctx;
static int ast_digit_begin(struct ast_channel *ast, char digit);
@@ -1885,6 +1893,7 @@ static int load_module(void)
struct ast_tone_zone *tz;
struct ast_flags config_flags = { 0 };
int c;
+ int tval;
if(!(lantiq_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
ast_log(LOG_ERROR, "Unable to allocate format capabilities.\n");
@@ -1919,6 +1928,16 @@ static int load_module(void)
goto cfg_error;
}
+ /* Hook state machine default values (in ms) */
+ dev_ctx.digit_low_time_min = 30;
+ dev_ctx.digit_low_time_max = 80;
+ dev_ctx.digit_high_time_min = 30;
+ dev_ctx.digit_high_time_max = 80;
+ dev_ctx.hook_off_time = 40;
+ dev_ctx.hook_on_time = 400;
+ dev_ctx.flash_time_min = 80;
+ dev_ctx.flash_time_max = 200;
+
for (v = ast_variable_browse(cfg, "interfaces"); v; v = v->next) {
if (!strcasecmp(v->name, "channels")) {
dev_ctx.channels = atoi(v->value);
@@ -2070,6 +2089,54 @@ static int load_module(void)
dev_ctx.interdigit_timeout = DEFAULT_INTERDIGIT_TIMEOUT;
ast_log(LOG_WARNING, "Invalid interdigit timeout: %s, using default.\n", v->value);
}
+ } else if (!strcasecmp(v->name, "digit_low_time_min")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.digit_low_time_min = tval;
+ ast_log(LOG_DEBUG, "Setting digit low time (min) to %s.\n", v->value);
+ }
+ } else if (!strcasecmp(v->name, "digit_low_time_max")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.digit_low_time_max = tval;
+ ast_log(LOG_DEBUG, "Setting digit low time (max) to %s.\n", v->value);
+ }
+ } else if (!strcasecmp(v->name, "digit_high_time_min")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.digit_high_time_min = tval;
+ ast_log(LOG_DEBUG, "Setting digit high time (min) to %s.\n", v->value);
+ }
+ } else if (!strcasecmp(v->name, "digit_high_time_max")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.digit_high_time_max = tval;
+ ast_log(LOG_DEBUG, "Setting digit high time (max) to %s.\n", v->value);
+ }
+ } else if (!strcasecmp(v->name, "flash_time_min")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.flash_time_min = tval;
+ ast_log(LOG_DEBUG, "Setting hookflash time (min) to %s.\n", v->value);
+ }
+ } else if (!strcasecmp(v->name, "flash_time_max")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.flash_time_max = tval;
+ ast_log(LOG_DEBUG, "Setting hookflash time (max) to %s.\n", v->value);
+ }
+ } else if (!strcasecmp(v->name, "hook_off_time")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.hook_off_time = tval;
+ ast_log(LOG_DEBUG, "Setting off-hook time to %s.\n", v->value);
+ }
+ } else if (!strcasecmp(v->name, "hook_on_time")) {
+ tval = atoi(v->value);
+ if (tval > 0) {
+ dev_ctx.hook_on_time = tval;
+ ast_log(LOG_DEBUG, "Setting on-hook time to %s.\n", v->value);
+ }
} else if (!strcasecmp(v->name, "numsign_complete")) {
dev_ctx.numsign_complete = ast_true(v->value);
ast_log(LOG_DEBUG, "Setting numsign_complete to '%s'.\n", dev_ctx.numsign_complete ? "on" : "off");
@@ -2126,6 +2193,7 @@ static int load_module(void)
IFX_TAPI_WLEC_CFG_t wlec_cfg;
IFX_TAPI_JB_CFG_t jb_cfg;
IFX_TAPI_CID_CFG_t cid_cfg;
+ IFX_TAPI_LINE_HOOK_VT_t line_hook_vt;
/* open device */
dev_ctx.dev_fd = lantiq_dev_open(base_path, 0);
@@ -2303,6 +2371,52 @@ static int load_module(void)
goto load_error_st;
}
+ /* Configure hook state machine timing */
+ memset(&line_hook_vt, 0, sizeof(line_hook_vt));
+ line_hook_vt.nType = IFX_TAPI_LINE_HOOK_VT_HOOKON_TIME;
+ line_hook_vt.nMinTime = dev_ctx.hook_on_time;
+ line_hook_vt.nMaxTime = dev_ctx.hook_on_time;
+ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_HOOK_VT_SET, &line_hook_vt)) {
+ ast_log(LOG_ERROR, "IFX_TAPI_LINE_HOOK_VT_HOOKON_TIME %d failed\n", c);
+ goto load_error_st;
+ }
+
+ memset(&line_hook_vt, 0, sizeof(line_hook_vt));
+ line_hook_vt.nType = IFX_TAPI_LINE_HOOK_VT_HOOKOFF_TIME;
+ line_hook_vt.nMinTime = dev_ctx.hook_off_time;
+ line_hook_vt.nMaxTime = dev_ctx.hook_off_time;
+ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_HOOK_VT_SET, &line_hook_vt)) {
+ ast_log(LOG_ERROR, "IFX_TAPI_LINE_HOOK_VT_HOOKOFF_TIME %d failed\n", c);
+ goto load_error_st;
+ }
+
+ memset(&line_hook_vt, 0, sizeof(line_hook_vt));
+ line_hook_vt.nType = IFX_TAPI_LINE_HOOK_VT_HOOKFLASH_TIME;
+ line_hook_vt.nMinTime = dev_ctx.flash_time_min;
+ line_hook_vt.nMaxTime = dev_ctx.flash_time_max;
+ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_HOOK_VT_SET, &line_hook_vt)) {
+ ast_log(LOG_ERROR, "IFX_TAPI_LINE_HOOK_VT_HOOKFLASH_TIME %d failed\n", c);
+ goto load_error_st;
+ }
+
+ memset(&line_hook_vt, 0, sizeof(line_hook_vt));
+ line_hook_vt.nType = IFX_TAPI_LINE_HOOK_VT_DIGITLOW_TIME;
+ line_hook_vt.nMinTime = dev_ctx.digit_low_time_min;
+ line_hook_vt.nMaxTime = dev_ctx.digit_low_time_max;
+ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_HOOK_VT_SET, &line_hook_vt)) {
+ ast_log(LOG_ERROR, "IFX_TAPI_LINE_HOOK_VT_DIGITLOW_TIME %d failed\n", c);
+ goto load_error_st;
+ }
+
+ memset(&line_hook_vt, 0, sizeof(line_hook_vt));
+ line_hook_vt.nType = IFX_TAPI_LINE_HOOK_VT_DIGITHIGH_TIME;
+ line_hook_vt.nMinTime = dev_ctx.digit_high_time_min;
+ line_hook_vt.nMaxTime = dev_ctx.digit_high_time_max;
+ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_HOOK_VT_SET, &line_hook_vt)) {
+ ast_log(LOG_ERROR, "IFX_TAPI_LINE_HOOK_VT_DIGITHIGH_TIME %d failed\n", c);
+ goto load_error_st;
+ }
+
/* Configure Caller ID type */
memset(&cid_cfg, 0, sizeof(cid_cfg));
cid_cfg.nStandard = cid_type;
--- a/src/configs/samples/lantiq.conf.sample
+++ b/src/configs/samples/lantiq.conf.sample
@@ -143,6 +143,17 @@ channels = 2
;interdigit = 4000
;
;
+; Hook state machine timing
+;
+;digit_low_time_min = 30
+;digit_low_time_max = 80
+;digit_high_time_min = 30
+;digit_high_time_max = 80
+;flash_time_min = 80
+;flash_time_max = 200
+;hook_off_time = 40
+;hook_on_time = 400
+;
;
; When dialing, the user may not want to wait for the interdigit timeout to elapse
; after entering the last digit. Pressing the number sign key ("hash key", "pound key")
|
