Index: head/misc/libpri2/pkg-descr =================================================================== --- head/misc/libpri2/pkg-descr (revision 191028) +++ head/misc/libpri2/pkg-descr (nonexistent) @@ -1,4 +0,0 @@ -The libpri is a C implementation of the Primary Rate ISDN specification. -It was based on the Bellcore specification SR-NWT-002343 for National -ISDN. As of May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, -and Lucent 5E C ustom protocols on switches from Nortel and Lucent. Property changes on: head/misc/libpri2/pkg-descr ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/misc/libpri2/distinfo =================================================================== --- head/misc/libpri2/distinfo (revision 191028) +++ head/misc/libpri2/distinfo (nonexistent) @@ -1,3 +0,0 @@ -MD5 (libpri-1.2.4.tar.gz) = 2bc348d8363027736ccbf5998d85d317 -SHA256 (libpri-1.2.4.tar.gz) = bbfaf5dff54934d844b3785e3fbd19817f0d80b1aa84153e5be40802c6b00d93 -SIZE (libpri-1.2.4.tar.gz) = 76663 Property changes on: head/misc/libpri2/distinfo ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.9 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/misc/libpri2/Makefile =================================================================== --- head/misc/libpri2/Makefile (revision 191028) +++ head/misc/libpri2/Makefile (nonexistent) @@ -1,30 +0,0 @@ -# New ports collection makefile for: libpri -# Date created: 25 Oct 2004 -# Whom: Alexander Timoshenko -# -# $FreeBSD$ -# - -PORTNAME= libpri -PORTVERSION= 1.2.4 -CATEGORIES= misc -MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \ - ftp://ftp.digium.com/pub/libpri/old/ - -MAINTAINER= gonzo@univ.kiev.ua -COMMENT= A C implementation of the Primary Rate ISDN specification - -#PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz -#PATCH_SITES= ${MASTER_SITE_LOCAL} -#PATCH_SITE_SUBDIR= fjoe -#PATCH_DIST_STRIP= -p1 -#BRIVER= bristuff-0.3.0-PRE-1l - -USE_GMAKE= yes -USE_LDCONFIG= yes -PLIST_FILES= include/libpri.h lib/libpri.a lib/libpri.a lib/libpri.so \ - lib/libpri.so.1 - -NOT_FOR_ARCHS= alpha - -.include Property changes on: head/misc/libpri2/Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.12 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/misc/libpri2/files/patch-mkdep =================================================================== --- head/misc/libpri2/files/patch-mkdep (revision 191028) +++ head/misc/libpri2/files/patch-mkdep (nonexistent) @@ -1,8 +0,0 @@ ---- mkdep.orig Wed Nov 30 22:55:54 2005 -+++ mkdep Wed Nov 30 22:56:00 2005 -@@ -1,4 +1,4 @@ --#!/bin/bash - -+#!/bin/sh - - # - # $OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $ - # $NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $ Property changes on: head/misc/libpri2/files/patch-mkdep ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/misc/libpri2/files/patch-Makefile =================================================================== --- head/misc/libpri2/files/patch-Makefile (revision 191028) +++ head/misc/libpri2/files/patch-Makefile (nonexistent) @@ -1,62 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -27,7 +27,7 @@ - # Uncomment if you want libpri to count number of Q921/Q931 sent/received - #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS - --CC=gcc -+CC?=gcc - - OSARCH=$(shell uname -s) - PROC?=$(shell uname -m) -@@ -35,13 +35,13 @@ - TOBJS=testpri.o - T2OBJS=testprilib.o - STATIC_LIBRARY=libpri.a --DYNAMIC_LIBRARY=libpri.so.1.0 -+DYNAMIC_LIBRARY=libpri.so.1 - STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o - DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) --INSTALL_PREFIX=$(DESTDIR) --INSTALL_BASE=/usr --SOFLAGS = -Wl,-hlibpri.so.1.0 -+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -+INSTALL_PREFIX=$(PREFIX) -+INSTALL_BASE= -+SOFLAGS = -Wl,-hlibpri.so.1 - LDCONFIG = /sbin/ldconfig - ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD)) - LDCONFIG_FLAGS=-n -@@ -84,12 +84,11 @@ - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include - ifneq (${OSARCH},SunOS) -- install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include -- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -- if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi -- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 ) -- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi -+ echo installing libpri.h -+ $(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)/include -+ $(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/lib -+ ( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ) -+ $(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib - else - install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h - install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) -@@ -130,10 +129,6 @@ - - $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) - $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) -- $(LDCONFIG) $(LDCONFIG_FLAGS) . -- ln -sf libpri.so.1.0 libpri.so -- ln -sf libpri.so.1.0 libpri.so.1 -- $(SOSLINK) - - clean: - rm -f *.o *.so *.lo *.so.1 *.so.1.0 Property changes on: head/misc/libpri2/files/patch-Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.6 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/pkg-descr =================================================================== --- head/net/zaptel12/pkg-descr (revision 191028) +++ head/net/zaptel12/pkg-descr (nonexistent) @@ -1,3 +0,0 @@ -A FreeBSD Driver for FXO, FXS, BRI and PRI Telephony Cards. - -WWW: http://www.digium.com/index.php?menu=hardware_products Property changes on: head/net/zaptel12/pkg-descr ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/zaptel12/distinfo =================================================================== --- head/net/zaptel12/distinfo (revision 191028) +++ head/net/zaptel12/distinfo (nonexistent) @@ -1,3 +0,0 @@ -MD5 (zaptel-bsd-1.2.13.tar.gz) = d5d01a5c367969c302d1d70620e9c236 -SHA256 (zaptel-bsd-1.2.13.tar.gz) = c2032a94514016df28f788986aef7d099987aa1d4a62c4ea232af79c3b42a4c4 -SIZE (zaptel-bsd-1.2.13.tar.gz) = 363975 Property changes on: head/net/zaptel12/distinfo ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.14 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/zaptel12/pkg-plist =================================================================== --- head/net/zaptel12/pkg-plist (revision 191028) +++ head/net/zaptel12/pkg-plist (nonexistent) @@ -1,21 +0,0 @@ -bin/fxo_test -bin/ztcfg -bin/ztmonitor -bin/zttest -bin/zttool -include/tonezone.h -include/zaptel -include/zaptel.h -lib/libtonezone.a -lib/zaptel/linker.hints -lib/zaptel/qozap.ko -lib/zaptel/tau32pci.ko -lib/zaptel/wcfxo.ko -lib/zaptel/wcfxs.ko -lib/zaptel/wct1xxp.ko -lib/zaptel/wct4xxp.ko -lib/zaptel/wcte11xp.ko -lib/zaptel/zaphfc.ko -lib/zaptel/zaptel.ko -lib/zaptel/ztdummy.ko -@dirrm lib/zaptel Property changes on: head/net/zaptel12/pkg-plist ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.8 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/zaptel12/Makefile =================================================================== --- head/net/zaptel12/Makefile (revision 191028) +++ head/net/zaptel12/Makefile (nonexistent) @@ -1,53 +0,0 @@ -# Ports collection makefile for: zaptel -# Date created: 29 April 2004 -# Whom: Maxim Sobolev -# -# $FreeBSD$ -# - -PORTNAME= zaptel -PORTVERSION= 1.2.13 -CATEGORIES= misc -MASTER_SITES= http://www.pbxpress.com/~gonzo/ -DISTNAME= ${PORTNAME}-bsd-${PORTVERSION} - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= A FreeBSD Driver for FXO, FXS, BRI and PRI Telephony Cards - -LIB_DEPENDS= newt.51:${PORTSDIR}/devel/newt - -NO_PACKAGE= Should be in sync with the kernel to work correctly - -ONLY_FOR_ARCHS= i386 - -MAKE_ENV= KMODDIR=${PREFIX}/lib/zaptel -SUB_FILES= pkg-message -USE_RC_SUBR= zaptel - -.include - -.if ${OSVERSION} < 500000 -IGNORE= does not build on FreeBSD \< 5.x -.endif - -pre-everything:: - @if [ ! -f /usr/src/sys/Makefile ]; then \ - ${ECHO_MSG} ">> The zaptel port needs FreeBSD kernel source code to compile."; \ - ${ECHO_MSG} ">> Please install FreeBSD kernel source code in /usr/src/sys."; \ - ${FALSE}; \ - fi - -post-patch: - @${REINPLACE_CMD} -e "s|||g" \ - ${WRKSRC}/test/ztmonitor.c ${WRKSRC}/test/zttool.c \ - ${WRKSRC}/ztcfg/ztcfg.c - -pre-su-install: - @${MKDIR} ${PREFIX}/lib/zaptel - -post-install: - @${LN} -sfh ${PREFIX}/include ${PREFIX}/include/zaptel - @${TOUCH} ${PREFIX}/lib/zaptel/linker.hints - @${CAT} ${PKGMESSAGE} - -.include Property changes on: head/net/zaptel12/Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.26 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-zaphfc::Makefile =================================================================== --- head/net/zaptel12/files/patch-zaphfc::Makefile (revision 191028) +++ head/net/zaptel12/files/patch-zaphfc::Makefile (nonexistent) @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- zaphfc/Makefile.orig -+++ zaphfc/Makefile -@@ -7,9 +7,7 @@ - KMOD= zaphfc - SRCS= zaphfc.c zaphfc_freebsd.c - SRCS+= device_if.h bus_if.h isa_if.h pci_if.h --CFLAGS+=-I../zaptel -+CFLAGS+=-I../zaptel -DCONFIG_PCI=1 -g - WERROR= -Wall -- --DEBUG_FLAGS= -g - - .include Property changes on: head/net/zaptel12/files/patch-zaphfc::Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-zaphfc::zaphfc_freebsd.c =================================================================== --- head/net/zaptel12/files/patch-zaphfc::zaphfc_freebsd.c (revision 191028) +++ head/net/zaptel12/files/patch-zaphfc::zaphfc_freebsd.c (nonexistent) @@ -1,32 +0,0 @@ - -$FreeBSD$ - ---- zaphfc/zaphfc_freebsd.c -+++ zaphfc/zaphfc_freebsd.c -@@ -328,14 +328,26 @@ - zaphfc_free(sc); - return (ENXIO); - } -+#if __FreeBSD_version < 700031 - error = bus_setup_intr( - dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST, - hfc_interrupt, sc, &sc->irq_handle); -+#else -+ error = bus_setup_intr( -+ dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST, NULL, -+ hfc_interrupt, sc, &sc->irq_handle); -+#endif - - if(error) -+#if __FreeBSD_version < 700031 - error = bus_setup_intr( - dev, sc->irq_res, INTR_TYPE_CLK, - hfc_interrupt, sc, &sc->irq_handle); -+#else -+ error = bus_setup_intr( -+ dev, sc->irq_res, INTR_TYPE_CLK, NULL, -+ hfc_interrupt, sc, &sc->irq_handle); -+#endif - - if (error) { - device_printf(dev, "Can't setup interrupt handler (error %d)\n", Property changes on: head/net/zaptel12/files/patch-zaphfc::zaphfc_freebsd.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/pkg-message.in =================================================================== --- head/net/zaptel12/files/pkg-message.in (revision 191028) +++ head/net/zaptel12/files/pkg-message.in (nonexistent) @@ -1,28 +0,0 @@ -------------------------------------------------------------------------------- -IMPORTANT! MAKE SURE TO READ THE FOLLOWING! - -To use the driver set zaptel_enable="YES" in your rc.conf. - -To load the driver run (as root): - -# %%PREFIX%%/etc/rc.d/zaptel start - -To unload it: - -# %%PREFIX%%/etc/rc.d/zaptel stop - -It'll also load the driver automatically when the system is started. - -Report problems to Alexander Timoshenko . Please note that -it is still "work in progress" so that your bug reports are welcome and will -help to improve quality of the drivers. - -Great thanks to all companies and individuals who made this driver happen, -including but not limited to, John Todd, Chris Coleman, Alexander Timoshenko, -PBXpress, Inc, Max Khon, LF.net, Luigi Rizzo, Dinesh Nair, Yuri Saltikov and -others contributors. - -Thanks and enjoy! - --Maxim -------------------------------------------------------------------------------- Property changes on: head/net/zaptel12/files/pkg-message.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/zaptel12/files/patch-qozap::Makefile =================================================================== --- head/net/zaptel12/files/patch-qozap::Makefile (revision 191028) +++ head/net/zaptel12/files/patch-qozap::Makefile (nonexistent) @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- qozap/Makefile -+++ qozap/Makefile -@@ -7,7 +7,7 @@ - KMOD= qozap - SRCS= qozap.c qozap_freebsd.c - SRCS+= device_if.h bus_if.h isa_if.h pci_if.h --CFLAGS+=-I../zaptel -+CFLAGS+=-I../zaptel -DCONFIG_PCI=1 - WERROR= -Wall - - #DEBUG_FLAGS= -g Property changes on: head/net/zaptel12/files/patch-qozap::Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-wcfxo::wcfxo.c =================================================================== --- head/net/zaptel12/files/patch-wcfxo::wcfxo.c (revision 191028) +++ head/net/zaptel12/files/patch-wcfxo::wcfxo.c (nonexistent) @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- wcfxo/wcfxo.c -+++ wcfxo/wcfxo.c -@@ -1285,14 +1285,25 @@ - - /* Now we should set up the interrupt handler */ - -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, - (void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL, -+ (void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler)); -+#endif - - if(error) - { - printf("Can't use fast interrupts, falling back to normal\n"); -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, - (void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL, -+ (void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler)); -+#endif -+ - } - - if (error) { Property changes on: head/net/zaptel12/files/patch-wcfxo::wcfxo.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-wct1xxp::wct1xxp.c =================================================================== --- head/net/zaptel12/files/patch-wct1xxp::wct1xxp.c (revision 191028) +++ head/net/zaptel12/files/patch-wct1xxp::wct1xxp.c (nonexistent) @@ -1,30 +0,0 @@ - -$FreeBSD$ - ---- wct1xxp/wct1xxp.c -+++ wct1xxp/wct1xxp.c -@@ -1746,14 +1746,24 @@ - - /* Now we should set up the interrupt handler */ - -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, - (void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL, -+ (void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler)); -+#endif - - if(error) - { - printf("Can not use fast interrupts, switching to generic\n"); -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, - (void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL, -+ (void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler)); -+#endif - } - - Property changes on: head/net/zaptel12/files/patch-wct1xxp::wct1xxp.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-wcfxs::wcfxs.c =================================================================== --- head/net/zaptel12/files/patch-wcfxs::wcfxs.c (revision 191028) +++ head/net/zaptel12/files/patch-wcfxs::wcfxs.c (nonexistent) @@ -1,29 +0,0 @@ - -$FreeBSD$ - ---- wcfxs/wcfxs.c -+++ wcfxs/wcfxs.c -@@ -2764,12 +2764,23 @@ - - /* Now we should set up the interrupt handler */ - -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, - (void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL, -+ (void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler)); -+#endif -+ - if (error) { - printf("Can't use fast interrupts, falling back to normal\n"); -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, - (void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL, -+ (void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler)); -+#endif - if(error) - { - printf("Couldn't set up irq\n"); Property changes on: head/net/zaptel12/files/patch-wcfxs::wcfxs.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-wct4xxp::wct4xxp.c =================================================================== --- head/net/zaptel12/files/patch-wct4xxp::wct4xxp.c (revision 191028) +++ head/net/zaptel12/files/patch-wct4xxp::wct4xxp.c (nonexistent) @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- wct4xxp/wct4xxp.c -+++ wct4xxp/wct4xxp.c -@@ -3800,15 +3800,29 @@ - return ENXIO; - } - -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK | INTR_FAST, - (void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ? - t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL, -+ (void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ? -+ t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler)); -+#endif -+ - if(error) - { - printf("Can't use fast interrupts falling back to normal\n"); -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK, - (void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ? - t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK, NULL, -+ (void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ? -+ t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler)); -+#endif -+ - - } - Property changes on: head/net/zaptel12/files/patch-wct4xxp::wct4xxp.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-qozap::qozap_freebsd.c =================================================================== --- head/net/zaptel12/files/patch-qozap::qozap_freebsd.c (revision 191028) +++ head/net/zaptel12/files/patch-qozap::qozap_freebsd.c (nonexistent) @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- qozap/qozap_freebsd.c -+++ qozap/qozap_freebsd.c -@@ -175,9 +175,15 @@ - qozap_free(sc); - return (ENXIO); - } -+#if __FreeBSD_version < 700031 - error = bus_setup_intr( - dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST, qoz_interrupt, - sc, &sc->irq_handle); -+#else -+ error = bus_setup_intr( -+ dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST, NULL, qoz_interrupt, -+ sc, &sc->irq_handle); -+#endif - if (error) { - device_printf(dev, "Can't setup interrupt handler (error %d)\n", - error); Property changes on: head/net/zaptel12/files/patch-qozap::qozap_freebsd.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-zaptel::zaptel.c =================================================================== --- head/net/zaptel12/files/patch-zaptel::zaptel.c (revision 191028) +++ head/net/zaptel12/files/patch-zaptel::zaptel.c (nonexistent) @@ -1,11 +0,0 @@ ---- 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: Property changes on: head/net/zaptel12/files/patch-zaptel::zaptel.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-tau32pci::tau32pci.c =================================================================== --- head/net/zaptel12/files/patch-tau32pci::tau32pci.c (revision 191028) +++ head/net/zaptel12/files/patch-tau32pci::tau32pci.c (nonexistent) @@ -1,24 +0,0 @@ - -$FreeBSD$ - ---- tau32pci/tau32pci.c -+++ tau32pci/tau32pci.c -@@ -2785,10 +2785,18 @@ - } - - /* set interrupt handler */ -+#if __FreeBSD_version < 700031 - error = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK | INTR_FAST, tau32_intr, board, &board->tau32_intrhand); -+#else -+ error = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK | INTR_FAST, NULL, tau32_intr, board, &board->tau32_intrhand); -+#endif - if(error) { - printf ("tau32_%d: Can't use fast interrupts, switching to generic\n", unit); -+#if __FreeBSD_version < 700031 - error = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK, tau32_intr, board, &(board->tau32_intrhand)); -+#else -+ error = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK, NULL, tau32_intr, board, &(board->tau32_intrhand)); -+#endif - } - - Property changes on: head/net/zaptel12/files/patch-tau32pci::tau32pci.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/zaptel.in =================================================================== --- head/net/zaptel12/files/zaptel.in (revision 191028) +++ head/net/zaptel12/files/zaptel.in (nonexistent) @@ -1,51 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: zaptel -# REQUIRE: NETWORKING -# KEYWORD: shutdown -# BEFORE: asterisk -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# zaptel_enable (bool): Set to NO by default. -# Set it to YES to enable zaptel. -# - -. %%RC_SUBR%% - -kmod_dir=%%PREFIX%%/lib/zaptel - -kmod_load="zaptel.ko qozap.ko tau32pci.ko wcfxo.ko wcfxs.ko wct1xxp.ko wct4xxp.ko wcte11xp.ko" -kmod_unload="wcte11xp.ko wct4xxp.ko wct1xxp.ko wcfxs.ko wcfxo.ko tau32pci.ko qozap.ko zaptel.ko" -name="zaptel" -rcvar=${name}_enable - -start_cmd="zaptel_start" -stop_cmd="zaptel_stop" - -zaptel_start() -{ - echo -n " ${name}" - for kmod in ${kmod_load} - do - kldload ${kmod_dir}/${kmod} || exit 1 - done - %%PREFIX%%/bin/ztcfg -} - -zaptel_stop() -{ - echo -n " ${name}" - for kmod in ${kmod_unload} - do - kldunload ${kmod} - done -} -load_rc_config $name - -: ${zaptel_enable="NO"} - -run_rc_command "$1" Property changes on: head/net/zaptel12/files/zaptel.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net/zaptel12/files/patch-wcte11xp::wcte11xp.c =================================================================== --- head/net/zaptel12/files/patch-wcte11xp::wcte11xp.c (revision 191028) +++ head/net/zaptel12/files/patch-wcte11xp::wcte11xp.c (nonexistent) @@ -1,30 +0,0 @@ - -$FreeBSD$ - ---- wcte11xp/wcte11xp.c -+++ wcte11xp/wcte11xp.c -@@ -1953,14 +1953,24 @@ - - /* Now we should set up the interrupt handler */ - -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, - (void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL, -+ (void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler)); -+#endif - - if(error) - { - printf("Can not use fast interrupts, switching to generic\n"); -+#if __FreeBSD_version < 700031 - error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, - (void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler)); -+#else -+ error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL, -+ (void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler)); -+#endif - } - - if (error) { Property changes on: head/net/zaptel12/files/patch-wcte11xp::wcte11xp.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property