[zaptel-commits] sruffell: branch sruffell/voicebus r3875 - in /team/sruffell/voicebus: ./ wct...

[SVN commits to the Zaptel project]

Author: sruffell
Date: Mon Feb 25 11:19:42 2008
New Revision: 3875

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3875
Log:
- Added a missing CRLF for an error message.
- No need to incur the overhead of freeing and reallocating the rx buffer
  for the typical case. 

Modified:
    team/sruffell/voicebus/voicebus.c
    team/sruffell/voicebus/wctdm24xxp/base.c
    team/sruffell/voicebus/wcte12xp/base.c

Modified: team/sruffell/voicebus/voicebus.c
URL: http://svn.digium.com/view/zaptel/team/sruffell/voicebus/voicebus.c?view=diff&rev=3875&r1=3874&r2=3875
==============================================================================
--- team/sruffell/voicebus/voicebus.c (original)
+++ team/sruffell/voicebus/voicebus.c Mon Feb 25 11:19:42 2008
@@ -1196,7 +1196,7 @@
 			 */
 			VB_PRINTK(vb,ERR,
 				"ERROR: Unable to service card within %d ms "\
-				"and unable to further increase latency. ",
+				"and unable to further increase latency.\n",
 				DRING_SIZE-2);
 			__warn_once = 0;
 		}
@@ -1282,12 +1282,7 @@
 
 	while ((vbb = vb_get_completed_rxb(vb))) {
 		vb->handle_receive(vbb, vb->context);
-		vbb = voicebus_alloc(vb);
-		if (unlikely(NULL == vbb)) {
-			BUG_ON(1);
-		} else {
-			vb_submit_rxb(vb, vbb);
-		}
+		vb_submit_rxb(vb, vbb);
 	}
 
 	stop_vb_deferred(vb);

Modified: team/sruffell/voicebus/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/sruffell/voicebus/wctdm24xxp/base.c?view=diff&rev=3875&r1=3874&r2=3875
==============================================================================
--- team/sruffell/voicebus/wctdm24xxp/base.c (original)
+++ team/sruffell/voicebus/wctdm24xxp/base.c Mon Feb 25 11:19:42 2008
@@ -1549,7 +1549,6 @@
 	struct wctdm *wc = context;
 	wc->rxints++;
 	wctdm_receiveprep(wc, vbb);
-	voicebus_free(wc->vb, vbb);
 }
 
 void handle_transmit(void* vbb, void* context)

Modified: team/sruffell/voicebus/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/team/sruffell/voicebus/wcte12xp/base.c?view=diff&rev=3875&r1=3874&r2=3875
==============================================================================
--- team/sruffell/voicebus/wcte12xp/base.c (original)
+++ team/sruffell/voicebus/wcte12xp/base.c Mon Feb 25 11:19:42 2008
@@ -1579,7 +1579,6 @@
 	spin_lock(&wc->reglock);
 	t1_receiveprep(wc, vbb);
 	spin_unlock(&wc->reglock);
-	voicebus_free(wc->vb, vbb);
 }
 
 static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)