[Pkg-voip-commits] r4242 - in zaptel/trunk: . debian debian/patches vzaphfc

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Thu Aug 23 07:10:12 UTC 2007 

Author: tzafrir-guest
Date: 2007-08-23 07:10:12 +0000 (Thu, 23 Aug 2007)
New Revision: 4242

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/rules
   zaptel/trunk/ds1x1f.c
   zaptel/trunk/opvxa1200.c
   zaptel/trunk/vzaphfc/vzaphfc_main.c
Log:
* New upstream release: 1.4.5.1.
* Pass extra modules / subdirs to modules make.
* Fixed building vzaphfc, opvx1200p and ds1x1f of kernel >=2.6.22 
  (>= 2.6.19?).


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-08-23 06:18:48 UTC (rev 4241)
+++ zaptel/trunk/debian/changelog	2007-08-23 07:10:12 UTC (rev 4242)
@@ -1,4 +1,4 @@
-zaptel (1:1.4.5~dfsg-2) UNRELEASED; urgency=low
+zaptel (1:1.4.5.1~dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
@@ -6,13 +6,17 @@
   * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version
 
   [ Tzafrir Cohen ]
+  * New upstream release.
+  * Pass extra modules / subdirs to modules make.
   * Re-add zaptel_perl.dpatch. Clarified patch's description in hope to aviod
     re-re-re-removal of this patch.
   * There's now an HTML version of README.Astribank . And upstream Makefile is
     better at cleaning.
   * Don't install man pages. 'make install' does that already (Closes: #422943)
+  * Fixed building vzaphfc, opvx1200p and ds1x1f of kernel >=2.6.22 
+    (>= 2.6.19?).
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 18 Aug 2007 23:58:25 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 23 Aug 2007 09:49:29 +0300
 
 zaptel (1:1.4.5~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2007-08-23 06:18:48 UTC (rev 4241)
+++ zaptel/trunk/debian/patches/00list	2007-08-23 07:10:12 UTC (rev 4242)
@@ -2,5 +2,4 @@
 oslec_zaptel
 bristuff
 zaphfc-florz
-inlcude
 zaptel_perl

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2007-08-23 06:18:48 UTC (rev 4241)
+++ zaptel/trunk/debian/rules	2007-08-23 07:10:12 UTC (rev 4242)
@@ -41,14 +41,21 @@
 # the generated headers as part of the source:
 GENERATED_SOURCES := version.h radfw.h tor2fw.h tones.h 
 
+EXTRA_MODS=ds1x1f opvxa1200
+EXTRA_SUBDIRS=oslec
+
 MOD_EXAMPLES_DIR:=modexamples
 ifeq (1,$(USE_BRISTUFF))
   BRISTUFF_EXAMPLES:=$(MOD_EXAMPLES_DIR)/*
   # bristuff modules that are copied from a subdirectory to the current 
   # directory.
   GENERATED_SOURCES+=$(BRISTUFF_MODULES:%=%.c) $(BRISTUFF_MODULES:%=%.h)
+  EXTRA_MODS+=$(BRISTUFF_MODULES)
+  EXTRA_SUBDIRS=vzaphfc
 endif
 
+MOD_ARGS=MODULES_EXTRA="$(EXTRA_MODS)" SUBDIRS_EXTRA="$(EXTRA_SUBDIRS)"
+
 kdist_clean: clean-unpatched
 
 kdist_config: prep-deb-files
@@ -59,8 +66,8 @@
 	dh_clean -k
 	cp -a $(CURDIR)/debian/generated/* .
 	./configure
-	make modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS)
-	make install-modules KERNELRELEASE=$(KVERS) DESTDIR=$(CURDIR)/debian/$(PKGNAME)
+	make $(MOD_ARGS) modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS) 
+	make $(MOD_ARGS) install-modules KERNELRELEASE=$(KVERS) DESTDIR=$(CURDIR)/debian/$(PKGNAME)
 ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
 	# The 2.6 modules are way too big. This is only in kernel 2.6
 	find debian/$(PKGNAME)/lib/modules -name '*.ko' |xargs strip -g
@@ -89,8 +96,7 @@
 	
 	./configure
 	$(MAKE) $(GENERATED_SOURCES)
-	$(MAKE) programs README.html xpp/README.html
-	cp xpp/README.html xpp/README.Astribank.html
+	$(MAKE) programs README.html xpp/README.Astribank.html
 	touch $@
 
 clean: clean-unpatched unpatch
@@ -102,7 +108,6 @@
 	# Add here commands to clean up after the build process.
 	rm -rf $(MOD_EXAMPLES_DIR)
 	rm -f tonezones.txt
-	rm -f xpp/README.Astribank.html
 	rm -f $(GENERATED_SOURCES)
 	-$(MAKE) clean
 	

Modified: zaptel/trunk/ds1x1f.c
===================================================================
--- zaptel/trunk/ds1x1f.c	2007-08-23 06:18:48 UTC (rev 4241)
+++ zaptel/trunk/ds1x1f.c	2007-08-23 07:10:12 UTC (rev 4242)
@@ -1693,7 +1693,7 @@
 }
 
 ///--------------------------------------------------------------------------------------------------------------------------------
-static irqreturn_t ds1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ZAP_IRQ_HANDLER(ds1_interrupt)
 {
 	struct t1 *wc = dev_id;
 	unsigned long flags;
@@ -1974,7 +1974,7 @@
 			
 			pci_set_drvdata(pdev, wc);					 	// keep track of our device - i.e. for later removal
 
-                        if (request_irq(pdev->irq, ds1_interrupt, SA_INTERRUPT | SA_SHIRQ, "ds1x1f", wc))
+                        if (request_irq(pdev->irq, ds1_interrupt, ZAP_IRQ_SHARED_DISABLED, "ds1x1f", wc))
                         {
                                 printk("DS1x1F: Unable to request IRQ %d\n", pdev->irq);
                                 kfree(wc);

Modified: zaptel/trunk/opvxa1200.c
===================================================================
--- zaptel/trunk/opvxa1200.c	2007-08-23 06:18:48 UTC (rev 4241)
+++ zaptel/trunk/opvxa1200.c	2007-08-23 07:10:12 UTC (rev 4242)
@@ -1219,11 +1219,7 @@
 	wc->mod[card].fxs.lastrxhook = hook;
 }
 
-#ifdef LINUX26
-static irqreturn_t wctdm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-#else
-static void wctdm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-#endif
+ZAP_IRQ_HANDLER(wctdm_interrupt)
 {
 	struct wctdm *wc = dev_id;
 	unsigned char ints;
@@ -2473,7 +2469,7 @@
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wctdm_interrupt, SA_SHIRQ, "opvxa1200", wc)) {
+			if (request_irq(pdev->irq, wctdm_interrupt, ZAP_IRQ_SHARED, "opvxa1200", wc)) {
 				printk("opvxa1200: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion & 0x01)
 					release_region(wc->ioaddr, 0xff);

Modified: zaptel/trunk/vzaphfc/vzaphfc_main.c
===================================================================
--- zaptel/trunk/vzaphfc/vzaphfc_main.c	2007-08-23 06:18:48 UTC (rev 4241)
+++ zaptel/trunk/vzaphfc/vzaphfc_main.c	2007-08-23 07:10:12 UTC (rev 4242)
@@ -21,7 +21,6 @@
 
 #include <linux/spinlock.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
@@ -1054,7 +1053,7 @@
 static void hfc_frame_arrived(struct hfc_chan_duplex *chan);
 static void hfc_handle_voice(struct hfc_card *card);
 
-static irqreturn_t hfc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ZAP_IRQ_HANDLER(hfc_interrupt)
 {
 	struct hfc_card *card = dev_id;
 	unsigned long flags;
@@ -1681,7 +1680,7 @@
 	pci_write_config_dword(card->pcidev, hfc_PCI_MWBA, card->fifo_bus_mem);
 
 	if ((err = request_irq(card->pcidev->irq, &hfc_interrupt,
-		SA_SHIRQ, hfc_DRIVER_NAME, card))) {
+		ZAP_IRQ_SHARED, hfc_DRIVER_NAME, card))) {
 		printk(KERN_CRIT hfc_DRIVER_PREFIX
 			"card %d: "
 			"unable to register irq\n",
@@ -1970,7 +1969,7 @@
 
 	hfc_proc_zaphfc_dir = proc_mkdir(hfc_DRIVER_NAME, proc_root_driver);
 
-	ret = pci_module_init(&hfc_driver);
+	ret = zap_pci_module(&hfc_driver);
 	return ret;
 }

More information about the Pkg-voip-commits mailing list