[svn-commits] tzafrir: branch tools/2.4 r9739 - in /tools/branches/2.4: ./ dahdi_scan.c

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Feb  8 07:30:23 2011
New Revision: 9739

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9739
Log:
dahdi_scan: Show CAS framing on the framing line.

Also, always append "/CRC4" on any span where that was specified as an
option.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>

Merged revisions 9473 via svnmerge from 
http://svn.digium.com/svn/dahdi/tools/trunk

Modified:
    tools/branches/2.4/   (props changed)
    tools/branches/2.4/dahdi_scan.c

Propchange: tools/branches/2.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  8 07:30:23 2011
@@ -1,1 +1,1 @@
-/tools/trunk:1-9220,9313,9426,9452,9458
+/tools/trunk:1-9220,9313,9426,9452,9458,9473

Modified: tools/branches/2.4/dahdi_scan.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.4/dahdi_scan.c?view=diff&rev=9739&r1=9738&r2=9739
==============================================================================
--- tools/branches/2.4/dahdi_scan.c (original)
+++ tools/branches/2.4/dahdi_scan.c Tue Feb  8 07:30:23 2011
@@ -196,7 +196,8 @@
 			if (s.lineconfig & DAHDI_CONFIG_ESF) fprintf(stdout, "ESF");
 			else if (s.lineconfig & DAHDI_CONFIG_D4) fprintf(stdout, "D4");
 			else if (s.lineconfig & DAHDI_CONFIG_CCS) fprintf(stdout, "CCS");
-			else if (s.lineconfig & DAHDI_CONFIG_CRC4) fprintf(stdout, "/CRC4");
+			else fprintf(stdout, "CAS");
+			if (s.lineconfig & DAHDI_CONFIG_CRC4) fprintf(stdout, "/CRC4");
 			fprintf(stdout, "\n");
 		} else {
 			/* this is an analog span */