[Pkg-voip-commits] r7485 - in /dahdi-linux/trunk: debian/changelog debian/copyright debian/rules drivers/dahdi/opvxa1200.c

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Wed Aug  5 08:14:04 2009
New Revision: 7485

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7485
Log:
* New openvox drivers: r113 from their SVN.
* Fix copyright file for origin of OpenVox drivers.

Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/copyright
    dahdi-linux/trunk/debian/rules
    dahdi-linux/trunk/drivers/dahdi/opvxa1200.c

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=7485&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Wed Aug  5 08:14:04 2009
@@ -1,6 +1,8 @@
 dahdi-linux (1:2.2.0.2~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * New openvox drivers: r113 from their SVN.
+  * Fix copyright file for origin of OpenVox drivers.
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 24 Jun 2009 20:20:44 +0300
 

Modified: dahdi-linux/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/copyright?rev=7485&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/copyright (original)
+++ dahdi-linux/trunk/debian/copyright Wed Aug  5 08:14:04 2009
@@ -8,7 +8,7 @@
 florz' patch for the zaphfc driver was downloaded from
   http://zaphfc.florz.dyndns.org/
 OpenVox drivers were downloaded from
-  http://www.openvox.cn/download/drivers/dahdi/
+  http://www.openvox.cn/viewvc/dahdi/trunk/opvxa1200.c?view=co
 
 Upstream source has been modified to comply with the Debian Free 
 Software Guildlines (DFSG), by the removal of the firmware files:

Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=7485&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Wed Aug  5 08:14:04 2009
@@ -176,6 +176,10 @@
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
+
+# For the record: updating openvox drivers:
+# wget 'http://www.openvox.cn/viewvc/dahdi/trunk/opvxa1200.c?view=co' \
+#  | sed -e '\r$//' >drivers/dahdi/opvxa1200.c
 
 TARBALL_DIR=../tarballs/$(PACKAGE_SRC)-$(UPVERSION).tmp
 get-orig-source:

Modified: dahdi-linux/trunk/drivers/dahdi/opvxa1200.c
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/drivers/dahdi/opvxa1200.c?rev=7485&op=diff
==============================================================================
--- dahdi-linux/trunk/drivers/dahdi/opvxa1200.c (original)
+++ dahdi-linux/trunk/drivers/dahdi/opvxa1200.c Wed Aug  5 08:14:04 2009
@@ -366,11 +366,11 @@
 	int	 cid_history_ptr[MAX_NUM_CARDS];
 	int  cid_history_clone_cnt[MAX_NUM_CARDS];
 	enum cid_hook_state cid_state[MAX_NUM_CARDS];
- int 	cid_ring_on_time[MAX_NUM_CARDS];
+   int 	cid_ring_on_time[MAX_NUM_CARDS];
 };
 
-char* A1200P_Name = "A1200P";
-char* A800P_Name  = "A800P";
+static char* A1200P_Name = "A1200P";
+static char* A800P_Name  = "A800P";
 
 struct wctdm_desc {
 	char *name;
@@ -1033,15 +1033,18 @@
 	if (errors)
 		return;
 	if (!fxo->offhook) {
- if(fixedtimepolarity)
+ if(fixedtimepolarity) {
 			if ( wc->cid_state[card] == CID_STATE_RING_ON && wc->cid_ring_on_time[card]>0)
-				if(wc->cid_ring_on_time[card]>=fixedtimepolarity )
-				{
-					dahdi_qevent_lock(wc->chans[card], DAHDI_EVENT_POLARITY);
-					wc->cid_ring_on_time[card] = -1;	/* the polarity already sent */	
-				}
-				else
-					wc->cid_ring_on_time[card] += 16;
+			{
+ 	if(wc->cid_ring_on_time[card]>=fixedtimepolarity )
+			{
+			dahdi_qevent_lock(wc->chans[card], DAHDI_EVENT_POLARITY);
+			wc->cid_ring_on_time[card] = -1;	/* the polarity already sent */	
+			}
+			else
+		wc->cid_ring_on_time[card] += 16;
+    }
+}
 		if (fwringdetect) {
 			res = wc->reg0shadow[card] & 0x60;
 			if (fxo->ringdebounce) {
@@ -1057,7 +1060,7 @@
 							if(wc->cid_state[card] == CID_STATE_IDLE)
 							{
 								wc->cid_state[card] = CID_STATE_RING_ON;
-								wc->cid_ring_on_time[card] = 1;	/* check every 16ms */
+								wc->cid_ring_on_time[card] = 16;	/* check every 16ms */
 							}
 							else
 								dahdi_hooksig(wc->chans[card], DAHDI_RXSIG_RING);
@@ -1108,7 +1111,7 @@
 							if(wc->cid_state[card] == CID_STATE_IDLE)
 							{	
 								wc->cid_state[card] = CID_STATE_RING_ON;
-								wc->cid_ring_on_time[card] = 1;		/* check every 16ms */
+								wc->cid_ring_on_time[card] = 16;		/* check every 16ms */
 							}
 							else
 								dahdi_hooksig(wc->chans[card], DAHDI_RXSIG_RING);
@@ -2747,11 +2750,11 @@
 			}
 
 			if (wctdm_hardware_init(wc)) {
-				unsigned char x;
+				unsigned char w;
 
 				/* Set Reset Low */
-				x=inb(wc->ioaddr + WC_CNTL);
-				outb((~0x1)&x, wc->ioaddr + WC_CNTL);
+				w=inb(wc->ioaddr + WC_CNTL);
+				outb((~0x1)&w, wc->ioaddr + WC_CNTL);
 				/* Free Resources */
 				free_irq(pdev->irq, wc);
 				if (wc->freeregion & 0x01)