diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2001-03-10 19:12:11 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2001-03-10 19:12:11 +0000 |
| commit | dc884645e6463fb181af816fdea3599713b0bd87 (patch) | |
| tree | c16bdd5583e05977a7893075e3b541e1a3afa073 /channels/chan_modem.c | |
| parent | ea452d3fd8f99256d987297e5afa8d1c226b465e (diff) | |
Version 0.1.7 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@236 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_modem.c')
| -rwxr-xr-x | channels/chan_modem.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/channels/chan_modem.c b/channels/chan_modem.c index fc45194d3..247149c26 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -227,7 +227,7 @@ int ast_modem_read_response(struct ast_modem_pvt *p, int timeout) timeout *= 1000; strncpy(p->response, "(No Response)", sizeof(p->response)); do { - res = ast_waitfor_n_fd(&p->fd, 1, &timeout); + res = ast_waitfor_n_fd(&p->fd, 1, &timeout, NULL); if (res < 0) { return -1; } @@ -244,7 +244,7 @@ int ast_modem_expect(struct ast_modem_pvt *p, char *result, int timeout) timeout *= 1000; strncpy(p->response, "(No Response)", sizeof(p->response)); do { - res = ast_waitfor_n_fd(&p->fd, 1, &timeout); + res = ast_waitfor_n_fd(&p->fd, 1, &timeout, NULL); if (res < 0) { return -1; } @@ -432,7 +432,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state) snprintf(tmp->name, sizeof(tmp->name), "Modem[%s]/%s", i->mc->name, i->dev + 5); tmp->type = type; tmp->fd = i->fd; - tmp->format = i->mc->formats; + tmp->nativeformats = i->mc->formats; tmp->state = state; if (state == AST_STATE_RING) tmp->rings = 1; @@ -855,3 +855,8 @@ char *description() return desc; } +char *key() +{ + return ASTERISK_GPL_KEY; +} + |