diff options
26 files changed, 478 insertions, 26 deletions
diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile index 7c2bc363a5de..93cbe102298c 100644 --- a/misc/zaptel/Makefile +++ b/misc/zaptel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zaptel -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.13 CATEGORIES= misc MASTER_SITES= http://www.pbxpress.com/~gonzo/ DISTNAME= ${PORTNAME}-bsd-${PORTVERSION} diff --git a/misc/zaptel/distinfo b/misc/zaptel/distinfo index f88ee37f8f33..2d4f7187a634 100644 --- a/misc/zaptel/distinfo +++ b/misc/zaptel/distinfo @@ -1,3 +1,3 @@ -MD5 (zaptel-bsd-1.1.tar.gz) = a92b917287595ae6d48dff30f8dfa4dd -SHA256 (zaptel-bsd-1.1.tar.gz) = 7d6af428a56de91d9460899c71111664f0a360960d0e0fe5e39baaac76b37565 -SIZE (zaptel-bsd-1.1.tar.gz) = 352744 +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 diff --git a/misc/zaptel/files/patch-qozap::qozap_freebsd.c b/misc/zaptel/files/patch-qozap::qozap_freebsd.c new file mode 100644 index 000000000000..db868dcbd5f1 --- /dev/null +++ b/misc/zaptel/files/patch-qozap::qozap_freebsd.c @@ -0,0 +1,21 @@ + +$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); diff --git a/misc/zaptel/files/patch-tau32pci::tau32pci.c b/misc/zaptel/files/patch-tau32pci::tau32pci.c new file mode 100644 index 000000000000..5267618eb052 --- /dev/null +++ b/misc/zaptel/files/patch-tau32pci::tau32pci.c @@ -0,0 +1,24 @@ + +$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 + } + + diff --git a/misc/zaptel/files/patch-wcfxo::wcfxo.c b/misc/zaptel/files/patch-wcfxo::wcfxo.c new file mode 100644 index 000000000000..2a79e3aff51c --- /dev/null +++ b/misc/zaptel/files/patch-wcfxo::wcfxo.c @@ -0,0 +1,31 @@ + +$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) { diff --git a/misc/zaptel/files/patch-wcfxs::wcfxs.c b/misc/zaptel/files/patch-wcfxs::wcfxs.c new file mode 100644 index 000000000000..201d03a59753 --- /dev/null +++ b/misc/zaptel/files/patch-wcfxs::wcfxs.c @@ -0,0 +1,29 @@ + +$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"); diff --git a/misc/zaptel/files/patch-wct1xxp::wct1xxp.c b/misc/zaptel/files/patch-wct1xxp::wct1xxp.c new file mode 100644 index 000000000000..99b2d0642341 --- /dev/null +++ b/misc/zaptel/files/patch-wct1xxp::wct1xxp.c @@ -0,0 +1,30 @@ + +$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 + } + + diff --git a/misc/zaptel/files/patch-wct4xxp::wct4xxp.c b/misc/zaptel/files/patch-wct4xxp::wct4xxp.c new file mode 100644 index 000000000000..ac7129627565 --- /dev/null +++ b/misc/zaptel/files/patch-wct4xxp::wct4xxp.c @@ -0,0 +1,35 @@ + +$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 ++ + + } + diff --git a/misc/zaptel/files/patch-wcte11xp::wcte11xp.c b/misc/zaptel/files/patch-wcte11xp::wcte11xp.c new file mode 100644 index 000000000000..bf2da4cf83e1 --- /dev/null +++ b/misc/zaptel/files/patch-wcte11xp::wcte11xp.c @@ -0,0 +1,30 @@ + +$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) { diff --git a/misc/zaptel/files/patch-zaphfc::Makefile b/misc/zaptel/files/patch-zaphfc::Makefile index be960a601cff..b25a413eb9bb 100644 --- a/misc/zaptel/files/patch-zaphfc::Makefile +++ b/misc/zaptel/files/patch-zaphfc::Makefile @@ -3,12 +3,6 @@ $FreeBSD$ --- zaphfc/Makefile.orig +++ zaphfc/Makefile -@@ -1,4 +1,4 @@ --# $Id$ -+# $Id: Makefile,v 1.1 2006/07/06 05:51:19 root Exp root $ - - - # CWARNFLAGS= -D__nothing_because_have_cplusplus_comments__ @@ -7,9 +7,7 @@ KMOD= zaphfc SRCS= zaphfc.c zaphfc_freebsd.c diff --git a/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c b/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c new file mode 100644 index 000000000000..00741ab87f3b --- /dev/null +++ b/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c @@ -0,0 +1,32 @@ + +$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", diff --git a/misc/zaptel/files/patch-zaptel::Makefile b/misc/zaptel/files/patch-zaptel::Makefile.orig index 6d166350a44e..14565f36fdce 100644 --- a/misc/zaptel/files/patch-zaptel::Makefile +++ b/misc/zaptel/files/patch-zaptel::Makefile.orig @@ -1,5 +1,5 @@ -$FreeBSD$ +$FreeBSD: /tmp/pcvs/ports/misc/zaptel/files/Attic/patch-zaptel::Makefile.orig,v 1.1 2007-04-13 06:43:57 sobomax Exp $ --- zaptel/Makefile +++ zaptel/Makefile diff --git a/misc/zaptel/files/pkg-message.in b/misc/zaptel/files/pkg-message.in index 2865d845bc78..f0c0ce3aca83 100644 --- a/misc/zaptel/files/pkg-message.in +++ b/misc/zaptel/files/pkg-message.in @@ -19,7 +19,8 @@ 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 and others contributors. +PBXpress, Inc, Max Khon, LF.net, Luigi Rizzo, Dinesh Nair, Yuri Saltikov and +others contributors. Thanks and enjoy! diff --git a/net/zaptel12/Makefile b/net/zaptel12/Makefile index 7c2bc363a5de..93cbe102298c 100644 --- a/net/zaptel12/Makefile +++ b/net/zaptel12/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zaptel -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.13 CATEGORIES= misc MASTER_SITES= http://www.pbxpress.com/~gonzo/ DISTNAME= ${PORTNAME}-bsd-${PORTVERSION} diff --git a/net/zaptel12/distinfo b/net/zaptel12/distinfo index f88ee37f8f33..2d4f7187a634 100644 --- a/net/zaptel12/distinfo +++ b/net/zaptel12/distinfo @@ -1,3 +1,3 @@ -MD5 (zaptel-bsd-1.1.tar.gz) = a92b917287595ae6d48dff30f8dfa4dd -SHA256 (zaptel-bsd-1.1.tar.gz) = 7d6af428a56de91d9460899c71111664f0a360960d0e0fe5e39baaac76b37565 -SIZE (zaptel-bsd-1.1.tar.gz) = 352744 +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 diff --git a/net/zaptel12/files/patch-qozap::qozap_freebsd.c b/net/zaptel12/files/patch-qozap::qozap_freebsd.c new file mode 100644 index 000000000000..db868dcbd5f1 --- /dev/null +++ b/net/zaptel12/files/patch-qozap::qozap_freebsd.c @@ -0,0 +1,21 @@ + +$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); diff --git a/net/zaptel12/files/patch-tau32pci::tau32pci.c b/net/zaptel12/files/patch-tau32pci::tau32pci.c new file mode 100644 index 000000000000..5267618eb052 --- /dev/null +++ b/net/zaptel12/files/patch-tau32pci::tau32pci.c @@ -0,0 +1,24 @@ + +$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 + } + + diff --git a/net/zaptel12/files/patch-wcfxo::wcfxo.c b/net/zaptel12/files/patch-wcfxo::wcfxo.c new file mode 100644 index 000000000000..2a79e3aff51c --- /dev/null +++ b/net/zaptel12/files/patch-wcfxo::wcfxo.c @@ -0,0 +1,31 @@ + +$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) { diff --git a/net/zaptel12/files/patch-wcfxs::wcfxs.c b/net/zaptel12/files/patch-wcfxs::wcfxs.c new file mode 100644 index 000000000000..201d03a59753 --- /dev/null +++ b/net/zaptel12/files/patch-wcfxs::wcfxs.c @@ -0,0 +1,29 @@ + +$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"); diff --git a/net/zaptel12/files/patch-wct1xxp::wct1xxp.c b/net/zaptel12/files/patch-wct1xxp::wct1xxp.c new file mode 100644 index 000000000000..99b2d0642341 --- /dev/null +++ b/net/zaptel12/files/patch-wct1xxp::wct1xxp.c @@ -0,0 +1,30 @@ + +$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 + } + + diff --git a/net/zaptel12/files/patch-wct4xxp::wct4xxp.c b/net/zaptel12/files/patch-wct4xxp::wct4xxp.c new file mode 100644 index 000000000000..ac7129627565 --- /dev/null +++ b/net/zaptel12/files/patch-wct4xxp::wct4xxp.c @@ -0,0 +1,35 @@ + +$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 ++ + + } + diff --git a/net/zaptel12/files/patch-wcte11xp::wcte11xp.c b/net/zaptel12/files/patch-wcte11xp::wcte11xp.c new file mode 100644 index 000000000000..bf2da4cf83e1 --- /dev/null +++ b/net/zaptel12/files/patch-wcte11xp::wcte11xp.c @@ -0,0 +1,30 @@ + +$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) { diff --git a/net/zaptel12/files/patch-zaphfc::Makefile b/net/zaptel12/files/patch-zaphfc::Makefile index be960a601cff..b25a413eb9bb 100644 --- a/net/zaptel12/files/patch-zaphfc::Makefile +++ b/net/zaptel12/files/patch-zaphfc::Makefile @@ -3,12 +3,6 @@ $FreeBSD$ --- zaphfc/Makefile.orig +++ zaphfc/Makefile -@@ -1,4 +1,4 @@ --# $Id$ -+# $Id: Makefile,v 1.1 2006/07/06 05:51:19 root Exp root $ - - - # CWARNFLAGS= -D__nothing_because_have_cplusplus_comments__ @@ -7,9 +7,7 @@ KMOD= zaphfc SRCS= zaphfc.c zaphfc_freebsd.c diff --git a/net/zaptel12/files/patch-zaphfc::zaphfc_freebsd.c b/net/zaptel12/files/patch-zaphfc::zaphfc_freebsd.c new file mode 100644 index 000000000000..00741ab87f3b --- /dev/null +++ b/net/zaptel12/files/patch-zaphfc::zaphfc_freebsd.c @@ -0,0 +1,32 @@ + +$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", diff --git a/net/zaptel12/files/patch-zaptel::Makefile b/net/zaptel12/files/patch-zaptel::Makefile.orig index 6d166350a44e..d1593a53c7a0 100644 --- a/net/zaptel12/files/patch-zaptel::Makefile +++ b/net/zaptel12/files/patch-zaptel::Makefile.orig @@ -1,5 +1,5 @@ -$FreeBSD$ +$FreeBSD: /tmp/pcvs/ports/net/zaptel12/files/Attic/patch-zaptel::Makefile.orig,v 1.1 2007-04-13 06:43:57 sobomax Exp $ --- zaptel/Makefile +++ zaptel/Makefile diff --git a/net/zaptel12/files/pkg-message.in b/net/zaptel12/files/pkg-message.in index 2865d845bc78..f0c0ce3aca83 100644 --- a/net/zaptel12/files/pkg-message.in +++ b/net/zaptel12/files/pkg-message.in @@ -19,7 +19,8 @@ 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 and others contributors. +PBXpress, Inc, Max Khon, LF.net, Luigi Rizzo, Dinesh Nair, Yuri Saltikov and +others contributors. Thanks and enjoy! |