Merge UK + DTMF Caller*ID stuff and fix app_test description

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-09-19 16:17:18 +00:00
parent 27e4a2ee57
commit 5dad6f4319
8 changed files with 396 additions and 15 deletions

View File

@@ -3,9 +3,9 @@
*
* General Asterisk channel definitions.
*
* Copyright (C) 1999, Mark Spencer
* Copyright (C) 1999-2004, Digium, Inc.
*
* Mark Spencer <markster@linux-support.net>
* Mark Spencer <markster@digium.com>
*
* This program is free software, distributed under the terms of
* the GNU General Public License
@@ -338,6 +338,8 @@ struct outgoing_helper {
#define AST_STATE_BUSY 7
/*! Digits (or equivalent) have been dialed while offhook */
#define AST_STATE_DIALING_OFFHOOK 8
/*! Channel has detected an incoming call and is waiting for ring */
#define AST_STATE_PRERING 9
/* Bits 16-32 of state are reserved for flags */
/*! Do not transmit voice data */