From c8673a011e78a722817d1eff0d464ff9f6ae3a95 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Sat, 2 Oct 2004 17:16:36 +0000 Subject: [PATCH] Don't set state to UP state within the driver, but instead allow ast_read to do so. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3884 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 2 -- config.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 27d26a6bc3..cc0e3eace8 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3867,7 +3867,6 @@ struct ast_frame *zt_read(struct ast_channel *ast) p->subs[index].needanswer = 0; p->subs[index].f.frametype = AST_FRAME_CONTROL; p->subs[index].f.subclass = AST_CONTROL_ANSWER; - ast_setstate(ast, AST_STATE_UP); ast_mutex_unlock(&p->lock); return &p->subs[index].f; } @@ -4019,7 +4018,6 @@ struct ast_frame *zt_read(struct ast_channel *ast) of a DTMF digit */ p->subs[index].f.frametype = AST_FRAME_CONTROL; p->subs[index].f.subclass = AST_CONTROL_ANSWER; - ast_setstate(ast, AST_STATE_UP); f = &p->subs[index].f; } else if (p->callwaitcas) { if ((f->subclass == 'A') || (f->subclass == 'D')) { diff --git a/config.c b/config.c index 41c53b6b6f..bc9de3018a 100755 --- a/config.c +++ b/config.c @@ -3,9 +3,9 @@ * * Configuration File Parser * - * Copyright (C) 1999, Mark Spencer + * Copyright (C) 1999-2004, Digium, Inc. * - * Mark Spencer + * Mark Spencer * * This program is free software, distributed under the terms of * the GNU General Public License