summaryrefslogtreecommitdiff
path: root/misc/zaptel/files/patch-zaptel::zaptel.c
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2008-12-09 07:57:16 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2008-12-09 07:57:16 +0000
commit7e53ba4e34f3c3d536c3fd5ddd1d27d69c65b62d (patch)
tree1ed4bdb9b9aff69545e24349088dcad539d8fd9f /misc/zaptel/files/patch-zaptel::zaptel.c
parentSpecify required perl version in PERL_CONFIGURE (diff)
Update to 1.4.11. The port is much less tested and complete as the previous
1.4.6, but we have no choice since new asterisk depends on this version. Submitted by: Oleksandr Tymoshenko <gonzo@bluezbox.com>
Notes
Notes: svn path=/head/; revision=224019
Diffstat (limited to 'misc/zaptel/files/patch-zaptel::zaptel.c')
-rw-r--r--misc/zaptel/files/patch-zaptel::zaptel.c50
1 files changed, 0 insertions, 50 deletions
diff --git a/misc/zaptel/files/patch-zaptel::zaptel.c b/misc/zaptel/files/patch-zaptel::zaptel.c
deleted file mode 100644
index 1827ef7359ab..000000000000
--- a/misc/zaptel/files/patch-zaptel::zaptel.c
+++ /dev/null
@@ -1,50 +0,0 @@
-
-$FreeBSD$
-
---- zaptel/zaptel.c.orig 2007-01-26 09:51:48.000000000 +0100
-+++ zaptel/zaptel.c 2008-03-31 15:44:58.000000000 +0200
-@@ -254,7 +254,11 @@
- while (1) {
- if (kthread_must_exit) {
- wakeup(cookie);
-+#if (__FreeBSD_version >= 800002)
-+ kthread_exit();
-+#else
- kthread_exit(0);
-+#endif
- }
-
- ZAP_LOCK(toselwakeup_lock);
-@@ -396,7 +400,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:
-@@ -675,7 +679,11 @@
- /* Free dev_info, if exist */
- if(dev->si_drv2) free(dev->si_drv2, M_ZAP);
- dev->si_drv2 = NULL;
-+#if (__FreeBSD_version >= 700050)
-+ destroy_dev_sched(dev);
-+#else
- destroy_dev(dev);
-+#endif
- return res;
- }
-
-@@ -1254,7 +1262,11 @@
- ZAP_LOCK_INIT(toselwakeup_lock, "toselwakeup_lock");
-
- kthread_must_exit = 0;
-+#if (__FreeBSD_version >= 800002)
-+ if (kproc_create(selwakeup_thread_handler, (void *)toselwakeup, &kthread, 0, 0, "zt_selwakeup_thread"))
-+#else
- if (kthread_create(selwakeup_thread_handler, (void *)toselwakeup, &kthread, 0, 0, "zt_selwakeup_thread"))
-+#endif
- {
- printf("Failed to create kthread\n");
- }