Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 05 Dec 2007 14:51:58 +0200
From:      Ian FREISLICH <ianf@clue.co.za>
To:        current@freebsd.org
Subject:   Zaptel port
Message-ID:  <E1IztjK-000BXU-G6@clue.co.za>

next in thread | raw e-mail | index | archive | help
This is a multipart MIME message.

--==_Exmh_1196858998_573910
Content-Type: text/plain; charset=us-ascii

Hi

Folling my previous post about zaptel and asterisk, I've done a lot
of searching and the following patch from a very recent post to the
asterisk-bsd digium list solves the asterisk/zaptel lockup at least
for the 7.0 case.  I'd suggest this patch making it into the
7-RELEASE cycle otherwise the latest branch that Asterisk with zaptel 
will work on is 6.x.

The first chunk of this patch is already in the ports system.

Ian

--
Ian Freislich


--==_Exmh_1196858998_573910
Content-Type: text/plain ; name="patch-zaptel::zaptel.c"; charset=us-ascii
Content-Description: patch-zaptel::zaptel.c
Content-Disposition: attachment; filename="patch-zaptel::zaptel.c"

--- zaptel/zaptel.c.orig	Sun Jun 25 14:21:49 2006
+++ zaptel/zaptel.c	Fri Aug 11 11:56:20 2006
@@ -397,7 +397,7 @@
 
 int schluffen(void *q)
 {
-	int rc = tsleep(q, PZERO | PCATCH, "schluffen", 0);
+	int rc = tsleep(q, PZERO | PCATCH, "schluffen", 10);
 	switch(rc)
 	{
 		case EINTR:
--- zaptel/zaptel.c.orig	2007-12-05 14:39:49.000000000 +0200
+++ zaptel/zaptel.c	2007-12-05 14:40:10.000000000 +0200
@@ -675,7 +675,7 @@
 	/* Free dev_info, if exist */
 	if(dev->si_drv2) free(dev->si_drv2, M_ZAP);
 	dev->si_drv2 = NULL;
-	destroy_dev(dev);	
+	destroy_dev_sched(dev);	
 	return res;
 }
 
@@ -1290,7 +1290,7 @@
 		ZAP_LOCK_DESTROY(toselwakeup_lock);
 
 		if(dev_ctl)
-			destroy_dev(dev_ctl);
+			destroy_dev_sched(dev_ctl);
 
 		break;		  /* Success*/
 

--==_Exmh_1196858998_573910--






Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1IztjK-000BXU-G6>