[svn-commits] bmd: branch group/newcdr r118170 - /team/group/newcdr/include/asterisk/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri May 23 17:18:50 CDT 2008


Author: bmd
Date: Fri May 23 17:18:50 2008
New Revision: 118170

URL: http://svn.digium.com/view/asterisk?view=rev&rev=118170
Log:
renumber event IEs to better honor existing precedent in trunk, and to fix a bunch of event IE overlaps

Modified:
    team/group/newcdr/include/asterisk/event_defs.h

Modified: team/group/newcdr/include/asterisk/event_defs.h
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/include/asterisk/event_defs.h?view=diff&rev=118170&r1=118169&r2=118170
==============================================================================
--- team/group/newcdr/include/asterisk/event_defs.h (original)
+++ team/group/newcdr/include/asterisk/event_defs.h Fri May 23 17:18:50 2008
@@ -85,138 +85,12 @@
 	 * Payload type: UINT
 	 */
 	AST_EVENT_IE_EVENTTYPE = 0x05,
-	/*! 
-	 * \brief Channel Event Type
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: UINT
-	 */
-	AST_EVENT_IE_CEL_EVENT_TYPE = 0x06,
-	/*! 
-	 * \brief Channel Event Time (seconds)
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: UINT
-	 */
-	AST_EVENT_IE_CEL_EVENT_TIME = 0x07,
-	/*! 
-	 * \brief Channel Event Time (micro-seconds)
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: UINT
-	 */
-	AST_EVENT_IE_CEL_EVENT_TIME_USEC = 0x18,
-	/*! 
-	 * \brief Channel Event User Event Name
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: UINT
-	 */
-	AST_EVENT_IE_CEL_USEREVENT_NAME = 0x08,
-	/*! 
-	 * \brief Channel Event CID name
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_CIDNAME = 0x09,
-	/*! 
-	 * \brief Channel Event CID num
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_CIDNUM = 0x0a,
-	/*! 
-	 * \brief Channel Event extension name
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_EXTEN = 0x0b,
-	/*! 
-	 * \brief Channel Event context name
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_CONTEXT = 0x0c,
-	/*! 
-	 * \brief Channel Event channel name
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_CHANNAME = 0x0d,
-	/*! 
-	 * \brief Channel Event app name
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_APPNAME = 0x0e,
-	/*! 
-	 * \brief Channel Event app args/data
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_APPDATA = 0x0f,
-	/*! 
-	 * \brief Channel Event AMA flags
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_AMAFLAGS = 0x10,
-	/*! 
-	 * \brief Channel Event AccountCode
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: UINT
-	 */
-	AST_EVENT_IE_CEL_ACCTCODE = 0x11,
-	/*! 
-	 * \brief Channel Event UniqueID
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_UNIQUEID = 0x12,
-	/*! 
-	 * \brief Channel Event Userfield
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_USERFIELD = 0x13,
-	/*! 
-	 * \brief Channel Event CID ANI field
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_CIDANI = 0x14,
-	/*! 
-	 * \brief Channel Event CID RDNIS field
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_CIDRDNIS = 0x15,
-	/*! 
-	 * \brief Channel Event CID dnid
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_CIDDNID = 0x16,
-	/*! 
-	 * \brief Channel Event Peer -- for Things involving multiple channels, like BRIDGE
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_PEER = 0x17,
 	/*!
 	 * \brief Hint that someone cares that an IE exists
 	 * Used by: AST_EVENT_SUB
 	 * Payload type: UINT (ast_event_ie_type)
 	 */
-	AST_EVENT_IE_EXISTS    = 0x18,
-	/*! 
-	 * \brief Channel Event LinkedID
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_LINKEDID = 0x19,
-	/*! 
-	 * \brief Channel Event peeraccount
-	 * Used by: AST_EVENT_CEL
-	 * Payload type: STR
-	 */
-	AST_EVENT_IE_CEL_PEERACCT = 0x20,
+	AST_EVENT_IE_EXISTS    = 0x6,
 	/*!
 	 * \brief Device Name
 	 * Used by AST_EVENT_DEVICE_STATE
@@ -237,6 +111,132 @@
 	  * Payload type: str
 	  */
 	 AST_EVENT_IE_CONTEXT  = 0x09,
+	/*! 
+	 * \brief Channel Event Type
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: UINT
+	 */
+	AST_EVENT_IE_CEL_EVENT_TYPE = 0x0a,
+	/*! 
+	 * \brief Channel Event Time (seconds)
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: UINT
+	 */
+	AST_EVENT_IE_CEL_EVENT_TIME = 0x0b,
+	/*! 
+	 * \brief Channel Event Time (micro-seconds)
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: UINT
+	 */
+	AST_EVENT_IE_CEL_EVENT_TIME_USEC = 0x0c,
+	/*! 
+	 * \brief Channel Event User Event Name
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: UINT
+	 */
+	AST_EVENT_IE_CEL_USEREVENT_NAME = 0x0d,
+	/*! 
+	 * \brief Channel Event CID name
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_CIDNAME = 0x0e,
+	/*! 
+	 * \brief Channel Event CID num
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_CIDNUM = 0x0f,
+	/*! 
+	 * \brief Channel Event extension name
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_EXTEN = 0x10,
+	/*! 
+	 * \brief Channel Event context name
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_CONTEXT = 0x11,
+	/*! 
+	 * \brief Channel Event channel name
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_CHANNAME = 0x12,
+	/*! 
+	 * \brief Channel Event app name
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_APPNAME = 0x13,
+	/*! 
+	 * \brief Channel Event app args/data
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_APPDATA = 0x14,
+	/*! 
+	 * \brief Channel Event AMA flags
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_AMAFLAGS = 0x15,
+	/*! 
+	 * \brief Channel Event AccountCode
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: UINT
+	 */
+	AST_EVENT_IE_CEL_ACCTCODE = 0x16,
+	/*! 
+	 * \brief Channel Event UniqueID
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_UNIQUEID = 0x17,
+	/*! 
+	 * \brief Channel Event Userfield
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_USERFIELD = 0x18,
+	/*! 
+	 * \brief Channel Event CID ANI field
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_CIDANI = 0x19,
+	/*! 
+	 * \brief Channel Event CID RDNIS field
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_CIDRDNIS = 0x1a,
+	/*! 
+	 * \brief Channel Event CID dnid
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_CIDDNID = 0x1b,
+	/*! 
+	 * \brief Channel Event Peer -- for Things involving multiple channels, like BRIDGE
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_PEER = 0x1c,
+	/*! 
+	 * \brief Channel Event LinkedID
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_LINKEDID = 0x1d,
+	/*! 
+	 * \brief Channel Event peeraccount
+	 * Used by: AST_EVENT_CEL
+	 * Payload type: STR
+	 */
+	AST_EVENT_IE_CEL_PEERACCT = 0x1e
 };
 
 /*!




More information about the svn-commits mailing list