[Asterisk-cvs] zaptel wcfxs.c,1.70,1.71

[markster at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv15369

Modified Files:
	wcfxs.c 
Log Message:
Move DC/DC calibration to better location


Index: wcfxs.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxs.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- wcfxs.c	21 Jun 2004 21:54:15 -0000	1.70
+++ wcfxs.c	21 Jun 2004 22:11:59 -0000	1.71
@@ -810,7 +810,6 @@
 static int wcfxs_powerup_proslic(struct wcfxs *wc, int card, int fast)
 {
 	unsigned char vbat;
-	unsigned char r19;
 	unsigned long origjiffies;
 
 	/* Set period of DC-DC converter to 1/64 khz */
@@ -844,15 +843,7 @@
 	}
 
 	/* Engage DC-DC converter */
-	wcfxs_setreg(wc, card, 93, 0x99 /* was 0x19 */);
-
-	r19 = wcfxs_getreg(wc, card, 107);
-	if ((r19 < 0x2) || (r19 > 0xd)) {
-		if (debug)
-			printk("DC-DC cal has a surprising direct 107 of 0x%02x!\n", r19);
-		wcfxs_setreg(wc, card, 107, 0x8);
-	}
-
+	wcfxs_setreg(wc, card, 93, 0x19 /* was 0x19 */);
 #if 0
 	origjiffies = jiffies;
 	while(0x80 & wcfxs_getreg(wc, card, 93)) {
@@ -1040,6 +1031,7 @@
 {
 
 	unsigned short tmp[5];
+	unsigned char r19;
 	int x;
 
 	/* By default, don't send on hook */
@@ -1121,6 +1113,14 @@
 				printk("Proslic Passed Auto Calibration on Second Attempt\n");
 			}
 		}
+		/* Perform DC-DC calibration */
+		wcfxs_setreg(wc, card, 93, 0x99);
+		r19 = wcfxs_getreg(wc, card, 107);
+		if ((r19 < 0x2) || (r19 > 0xd)) {
+			printk("DC-DC cal has a surprising direct 107 of 0x%02x!\n", r19);
+			wcfxs_setreg(wc, card, 107, 0x8);
+		}
+
 		/* Save calibration vectors */
 		for (x=0;x<NUM_CAL_REGS;x++)
 			wc->mod.fxs.calregs[card].vals[x] = wcfxs_getreg(wc, card, 96 + x);