summaryrefslogtreecommitdiff
path: root/misc/zaptel/files
diff options
context:
space:
mode:
Diffstat (limited to 'misc/zaptel/files')
-rw-r--r--misc/zaptel/files/patch-Makefile12
-rw-r--r--misc/zaptel/files/patch-qozap::Makefile14
-rw-r--r--misc/zaptel/files/patch-qozap::qozap_freebsd.c21
-rw-r--r--misc/zaptel/files/patch-tau32pci::tau32pci.c24
-rw-r--r--misc/zaptel/files/patch-test::Makefile14
-rw-r--r--misc/zaptel/files/patch-wcfxo::wcfxo.c31
-rw-r--r--misc/zaptel/files/patch-wcfxs::wcfxs.c29
-rw-r--r--misc/zaptel/files/patch-wct1xxp::wct1xxp.c30
-rw-r--r--misc/zaptel/files/patch-wct4xxp::wct4xxp.c35
-rw-r--r--misc/zaptel/files/patch-wcte11xp::wcte11xp.c30
-rw-r--r--misc/zaptel/files/patch-zaphfc::Makefile16
-rw-r--r--misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c32
12 files changed, 26 insertions, 262 deletions
diff --git a/misc/zaptel/files/patch-Makefile b/misc/zaptel/files/patch-Makefile
new file mode 100644
index 000000000000..66912ce6d81e
--- /dev/null
+++ b/misc/zaptel/files/patch-Makefile
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- Makefile
++++ Makefile
+@@ -1,5 +1,5 @@
+ # $Id: Makefile,v 1.1 2007/04/25 23:15:33 root Exp root $
+-HWMODULES=zaptel tools oct612x qozap zaphfc wcfxs wcfxo wct1xxp wcte11xp wct4xxp ztdummy
++HWMODULES=zaptel tools qozap zaphfc wcfxs wcfxo wct1xxp wcte11xp wct4xxp ztdummy
+ USERLAND=ztcfg test
+ HWMODULES+=tau32pci
+ # This is for testing purposes
diff --git a/misc/zaptel/files/patch-qozap::Makefile b/misc/zaptel/files/patch-qozap::Makefile
deleted file mode 100644
index 96e2efe5d9da..000000000000
--- a/misc/zaptel/files/patch-qozap::Makefile
+++ /dev/null
@@ -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
diff --git a/misc/zaptel/files/patch-qozap::qozap_freebsd.c b/misc/zaptel/files/patch-qozap::qozap_freebsd.c
deleted file mode 100644
index db868dcbd5f1..000000000000
--- a/misc/zaptel/files/patch-qozap::qozap_freebsd.c
+++ /dev/null
@@ -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);
diff --git a/misc/zaptel/files/patch-tau32pci::tau32pci.c b/misc/zaptel/files/patch-tau32pci::tau32pci.c
deleted file mode 100644
index 5267618eb052..000000000000
--- a/misc/zaptel/files/patch-tau32pci::tau32pci.c
+++ /dev/null
@@ -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
- }
-
-
diff --git a/misc/zaptel/files/patch-test::Makefile b/misc/zaptel/files/patch-test::Makefile
new file mode 100644
index 000000000000..bcfcca2f2809
--- /dev/null
+++ b/misc/zaptel/files/patch-test::Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- test/Makefile
++++ test/Makefile
+@@ -1,7 +1,7 @@
+ # $Id: Makefile,v 1.1 2007/04/25 23:17:23 root Exp root $
+
+ LOCALBASE?=/usr/local
+-CFLAGS+=-I../zaptel -I../ztcfg -I${LOCALBASE}/include
++CFLAGS+=-I../ -I../zaptel -I../ztcfg -I${LOCALBASE}/include
+ PREFIX?=/usr/local
+ BSD_INSTALL_PROGRAM?=${INSTALL} -o root -g wheel -m 755 -s
+
diff --git a/misc/zaptel/files/patch-wcfxo::wcfxo.c b/misc/zaptel/files/patch-wcfxo::wcfxo.c
deleted file mode 100644
index 2a79e3aff51c..000000000000
--- a/misc/zaptel/files/patch-wcfxo::wcfxo.c
+++ /dev/null
@@ -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) {
diff --git a/misc/zaptel/files/patch-wcfxs::wcfxs.c b/misc/zaptel/files/patch-wcfxs::wcfxs.c
deleted file mode 100644
index 201d03a59753..000000000000
--- a/misc/zaptel/files/patch-wcfxs::wcfxs.c
+++ /dev/null
@@ -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");
diff --git a/misc/zaptel/files/patch-wct1xxp::wct1xxp.c b/misc/zaptel/files/patch-wct1xxp::wct1xxp.c
deleted file mode 100644
index 99b2d0642341..000000000000
--- a/misc/zaptel/files/patch-wct1xxp::wct1xxp.c
+++ /dev/null
@@ -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
- }
-
-
diff --git a/misc/zaptel/files/patch-wct4xxp::wct4xxp.c b/misc/zaptel/files/patch-wct4xxp::wct4xxp.c
deleted file mode 100644
index ac7129627565..000000000000
--- a/misc/zaptel/files/patch-wct4xxp::wct4xxp.c
+++ /dev/null
@@ -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
-+
-
- }
-
diff --git a/misc/zaptel/files/patch-wcte11xp::wcte11xp.c b/misc/zaptel/files/patch-wcte11xp::wcte11xp.c
deleted file mode 100644
index bf2da4cf83e1..000000000000
--- a/misc/zaptel/files/patch-wcte11xp::wcte11xp.c
+++ /dev/null
@@ -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) {
diff --git a/misc/zaptel/files/patch-zaphfc::Makefile b/misc/zaptel/files/patch-zaphfc::Makefile
deleted file mode 100644
index b25a413eb9bb..000000000000
--- a/misc/zaptel/files/patch-zaphfc::Makefile
+++ /dev/null
@@ -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 <bsd.kmod.mk>
diff --git a/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c b/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c
deleted file mode 100644
index 00741ab87f3b..000000000000
--- a/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c
+++ /dev/null
@@ -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",
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-10 17:47:56 +0000