[Asterisk-cvs] asterisk/include/asterisk transcap.h, NONE, 1.1 channel.h, 1.80, 1.81

[mattf at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv635/include/asterisk

Modified Files:
	channel.h 
Added Files:
	transcap.h 
Log Message:
Merging in xylome's beaerer capabilty patch (bug 3547)


--- NEW FILE: transcap.h ---
/*
 * Asterisk -- A telephony toolkit for Linux.
 *
 * General Asterisk channel definitions.
 * 
 * Copyright (C) 1999 - 2005, Digium, Inc.
 *
 * Matthew Fredrickson <creslin at digium.com>
 *
 * This program is free software, distributed under the terms of
 * the GNU General Public License
 */

#ifndef _ASTERISK_TRANSCAP_H
#define _ASTERISK_TRANSCAP_H

/* These definitions are taken directly out of libpri.h and used here.
 * DO NOT change them as it will cause unexpected behavior in channels
 * that utilize these fields.
 */

#define AST_TRANS_CAP_SPEECH				0x0
#define AST_TRANS_CAP_DIGITAL				0x08
#define AST_TRANS_CAP_RESTRICTED_DIGITAL		0x09
#define AST_TRANS_CAP_3_1K_AUDIO			0x10
#define AST_TRANS_CAP_7K_AUDIO				0x11	/* Depriciated ITU Q.931 (05/1998)*/
#define AST_TRANS_CAP_DIGITAL_W_TONES			0x11
#define AST_TRANS_CAP_VIDEO				0x18

#define IS_DIGITAL(cap)\
	(cap) & AST_TRANS_CAP_DIGITAL ? 1 : 0

#endif /* _ASTERISK_TRANSCAP_H */

Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- channel.h	28 Mar 2005 20:48:24 -0000	1.80
+++ channel.h	1 Apr 2005 17:00:50 -0000	1.81
@@ -315,6 +315,9 @@
 	/*! channel flags of AST_FLAG_ type */
 	unsigned int flags;
 	
+	/* ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
+	unsigned short transfercapability;
+
 	struct ast_frame *readq;
 	int alertpipe[2];
 	/*! Write translation path */
@@ -338,7 +341,8 @@
 /* Channels have this property if they can accept input with jitter; i.e. most VoIP channels */
 #define AST_CHAN_TP_WANTSJITTER	(1 << 0)	
 
-#define AST_FLAG_DIGITAL	(1 << 0)	/* if the call is a digital ISDN call */
+/* This flag has been deprecated by the transfercapbilty data member in struct ast_channel */
+/* #define AST_FLAG_DIGITAL	(1 << 0) */	/* if the call is a digital ISDN call */
 #define AST_FLAG_DEFER_DTMF	(1 << 1)	/* if dtmf should be deferred */
 #define AST_FLAG_WRITE_INT	(1 << 2)	/* if write should be interrupt generator */
 #define AST_FLAG_BLOCKING	(1 << 3)	/* if we are blocking */
@@ -811,6 +815,15 @@
  */
 char *ast_state2str(int state);
 
+/*! Gives the string form of a given transfer capability */
+/*!
+ * \param transercapability transfercapabilty to get the name of
+ * Give a name to a transfercapbility
+ * See above
+ * Returns the text form of the binary transfer capbility
+ */
+char *ast_transfercapability2str(int transfercapability);
+
 /* Options: Some low-level drivers may implement "options" allowing fine tuning of the
    low level channel.  See frame.h for options.  Note that many channel drivers may support
    none or a subset of those features, and you should not count on this if you want your