xpp r5723: Includes, among others:

* New firmware protocol version: 3.0 .
* New numbers for the device types: (e.g. in card_init* scripts)
  - FXS: 1 (was: 3)
  - FXO: 2 (was: 4)
  - BRI: 3 (was: 6 for TE, 7 for NT)
  - PRI: 4 (was: 9)
* Init scripts of FXS and FXO modules are now written in Perl as well
  (be sure to have File::Basename, e.g: perl-modules in Debian).
* calibrate_slics merged into init_card_1_30 .
* Module parameter print_dbg replaced with debug . Same meaning.
* init_fxo_modes removed: content moved into init_card_2_30, verified
  at build time.
* Code tested with sparse. Most warnings were fixed.
* Set ZT_SIG_DACS for the bchans in the PRI and BRI modules to not get
  ignored by ztscan.
* Handle null config_desc we get from some crazy USB controllers.
* genzaptelconf: Fix reporting of empty slots in list mode.
* xpp_blink can now blink a single analog port.
* "slics" has been renamed "chipregs".
* Fixed a small typo in fpga_load(8).
* Fixed bashism in xpp_fxloader.

Merged revisions 4264 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4266 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 6 insertions, 17 deletions

diff --git a/kernel/xpp/utils/print_modes.c b/kernel/xpp/utils/print_modes.c
index e894b11..77e0e33 100644
--- a/kernel/xpp/utils/print_modes.c
+++ b/kernel/xpp/utils/print_modes.c
@@ -1,11 +1,10 @@
 #include <stdio.h>
 
-#include "fxo_modes.h"
+#include "wctdm_fxomodes.h"
 
 int main() {
 	size_t i;
 	
-	printf("case \"$mode\" in\n");
 	for (i=0; i<(sizeof(fxo_modes)/sizeof(struct fxo_mode)); i++) {
 		if (fxo_modes[i].name == NULL) break;
 		int reg16=0, reg26=0, reg30=0, reg31=0x20;
@@ -23,22 +22,12 @@ int main() {
 		
 		reg31 |= (fxo_modes[i].ohs2 << 3);
 
-		if (fxo_modes[i].ring_osc !=0 ) {
-			snprintf(ring_osc, BUFSIZ, "; ring_osc=\"%02X %02X\"",
-				(fxo_modes[i].ring_osc)>>8,
-				(fxo_modes[i].ring_osc)&&0xFF
-			);
-		}
-		if (fxo_modes[i].ring_x !=0 ) {
-			snprintf(ring_x, BUFSIZ, "; ring_x=\"%02X %02X\"",
-				(fxo_modes[i].ring_x)>>8,
-				(fxo_modes[i].ring_x)&&0xFF
-			);
-		}
-		
-		printf("%s)\treg16=%02X; reg26=%02X; reg30=%02X; reg31=%02X%s%s;;\n",
+		if (fxo_modes[i].ring_osc)
+			snprintf(ring_osc, BUFSIZ, "ring_osc=%04X", fxo_modes[i].ring_osc);
+		if (fxo_modes[i].ring_x)
+			snprintf(ring_x, BUFSIZ, "ring_x=%04X", fxo_modes[i].ring_x);
+		printf("%-15s\treg16=%02X\treg26=%02X\treg30=%02X\treg31=%02X\t%s\t%s\n",
 		       fxo_modes[i].name, reg16, reg26, reg30, reg31, ring_osc, ring_x);
 	}
-	printf("esac\n");
 	return 0;
 }