[svn-commits] rmudgett: branch rmudgett/mcid r1726 - in /team/rmudgett/mcid: ./ libpri.h

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri May 28 11:07:17 2010
New Revision: 1726

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1726
Log:
Merged revisions 1725 via svnmerge from 
https://origsvn.digium.com/svn/libpri/team/rmudgett/call_waiting

................
  r1725 | rmudgett | 2010-05-28 11:04:22 -0500 (Fri, 28 May 2010) | 9 lines
  
  Merged revisions 1724 via svnmerge from 
  https://origsvn.digium.com/svn/libpri/team/rmudgett/aoc_event
  
  ........
    r1724 | rmudgett | 2010-05-28 11:02:21 -0500 (Fri, 28 May 2010) | 1 line
    
    Reserve SUBCMD values for more AOC events.
  ........
................

Modified:
    team/rmudgett/mcid/   (props changed)
    team/rmudgett/mcid/libpri.h

Propchange: team/rmudgett/mcid/
------------------------------------------------------------------------------
--- call_waiting-integrated (original)
+++ call_waiting-integrated Fri May 28 11:07:17 2010
@@ -1,1 +1,1 @@
-/team/rmudgett/aoc_event:1-1718
+/team/rmudgett/aoc_event:1-1724

Propchange: team/rmudgett/mcid/
------------------------------------------------------------------------------
--- mcid-integrated (original)
+++ mcid-integrated Fri May 28 11:07:17 2010
@@ -1,1 +1,1 @@
-/team/rmudgett/call_waiting:1-1719
+/team/rmudgett/call_waiting:1-1725

Modified: team/rmudgett/mcid/libpri.h
URL: http://svnview.digium.com/svn/libpri/team/rmudgett/mcid/libpri.h?view=diff&rev=1726&r1=1725&r2=1726
==============================================================================
--- team/rmudgett/mcid/libpri.h (original)
+++ team/rmudgett/mcid/libpri.h Fri May 28 11:07:17 2010
@@ -543,8 +543,10 @@
 #define PRI_SUBCMD_AOC_S					18	/*!< Advice Of Charge Start information (Rate list) */
 #define PRI_SUBCMD_AOC_D					19	/*!< Advice Of Charge During information */
 #define PRI_SUBCMD_AOC_E					20	/*!< Advice Of Charge End information */
-#define PRI_SUBCMD_MCID_REQ					21	/*!< Malicious Call ID Request */
-#define PRI_SUBCMD_MCID_RSP					22	/*!< Malicious Call ID Request response */
+//#define PRI_SUBCMD_AOC_CHARGING_REQ			21	/*!< Advice Of Charge Request information */
+//#define PRI_SUBCMD_AOC_CHARGING_REQ_RSP		22	/*!< Advice Of Charge Request Response information */
+#define PRI_SUBCMD_MCID_REQ					23	/*!< Malicious Call ID Request */
+#define PRI_SUBCMD_MCID_RSP					24	/*!< Malicious Call ID Request response */
 
 #if defined(STATUS_REQUEST_PLACE_HOLDER)
 struct pri_subcmd_status_request {