[asterisk-commits] rmudgett: trunk r251821 - in /trunk/channels: chan_dahdi.c sig_pri.h

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Mar 11 12:07:16 2010
New Revision: 251821

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251821
Log:
Minor tweaks and comment updates to chan_dahdi.

Modified:
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_pri.h

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=251821&r1=251820&r2=251821
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Thu Mar 11 12:07:16 2010
@@ -16859,7 +16859,7 @@
 		}
 	}
 
-	/* It's a little silly to lock it, but we mind as well just to be sure */
+	/* It's a little silly to lock it, but we might as well just to be sure */
 	ast_mutex_lock(&iflock);
 #ifdef HAVE_PRI
 	if (reload != 1) {

Modified: trunk/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.h?view=diff&rev=251821&r1=251820&r2=251821
==============================================================================
--- trunk/channels/sig_pri.h (original)
+++ trunk/channels/sig_pri.h Thu Mar 11 12:07:16 2010
@@ -124,15 +124,14 @@
 	unsigned int hidecallerid:1;
 	unsigned int hidecalleridname:1;      /*!< Hide just the name not the number for legacy PBX use */
 	unsigned int immediate:1;			/*!< Answer before getting digits? */
-	unsigned int inalarm:1;
 	unsigned int priexclusive:1;			/*!< Whether or not to override and use exculsive mode for channel selection */
 	unsigned int priindication_oob:1;
 	unsigned int use_callerid:1;			/*!< Whether or not to use caller id on this channel */
 	unsigned int use_callingpres:1;			/*!< Whether to use the callingpres the calling switch sends */
 	char context[AST_MAX_CONTEXT];
-	int channel;					/*!< Channel Number or CRV */
 	char mohinterpret[MAX_MUSICCLASS];
 	int stripmsd;
+	int channel;					/*!< Channel Number or CRV */
 
 	/* Options to be checked by user */
 	int cid_ani2;						/*!< Automatic Number Identification number (Alternate PRI caller ID number) */
@@ -152,6 +151,7 @@
 	char keypad_digits[AST_MAX_EXTENSION];
 #endif	/* defined(HAVE_PRI_SETUP_KEYPAD) */
 
+	unsigned int inalarm:1;
 	unsigned int alerting:1;		/*!< TRUE if channel is alerting/ringing */
 	unsigned int alreadyhungup:1;	/*!< TRUE if the call has already gone/hungup */
 	unsigned int isidlecall:1;		/*!< TRUE if this is an idle call */
@@ -181,6 +181,13 @@
 	struct sig_pri_callback *calls;
 	void *chan_pvt;					/*!< Private structure of the user of this module. */
 #if defined(HAVE_PRI_REVERSE_CHARGE)
+	/*!
+	 * \brief Reverse charging indication
+	 * \details
+	 * -1 - No reverse charging,
+	 *  1 - Reverse charging,
+	 * 0,2-7 - Reserved for future use
+	 */
 	int reverse_charging_indication;
 #endif
 };