[Pkg-voip-commits] r5128 - in /zaptel/trunk: cwain/cwain.c debian/changelog debian/patches/zaphfc-florz.dpatch qozap/qozap.c zaphfc/zaphfc.c ztgsm/ztgsm.c

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Thu Dec 27 23:49:01 UTC 2007 

Author: tzafrir-guest
Date: Thu Dec 27 23:49:01 2007
New Revision: 5128

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5128
Log:
Updates to bristuff zap modules from bristuff-0.3.0-1y-l .

Modified:
    zaptel/trunk/cwain/cwain.c
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/zaphfc-florz.dpatch
    zaptel/trunk/qozap/qozap.c
    zaptel/trunk/zaphfc/zaphfc.c
    zaptel/trunk/ztgsm/ztgsm.c

Modified: zaptel/trunk/cwain/cwain.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/cwain/cwain.c?rev=5128&op=diff
==============================================================================
--- zaptel/trunk/cwain/cwain.c (original)
+++ zaptel/trunk/cwain/cwain.c Thu Dec 27 23:49:01 2007
@@ -850,11 +850,7 @@
     return 0;
 }
 
-#ifdef LINUX26
-static irqreturn_t cwain_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#else
-static void cwain_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#endif
+ZAP_IRQ_HANDLER(cwain_dummy_interrupt) {
     struct zt_cwain_card *cwaintmp = dev_id;
     if (!cwaintmp) {
 #ifdef LINUX26
@@ -1354,16 +1350,16 @@
     cwaintmp->irq = cwaintmp->span[0]->irq;
     
     if (cwaintmp->spans == 2) {
-	if (request_irq(cwaintmp->irq, cwain_interrupt, ZAP_IRQ_SHARED_DISABLED, "cwain2", cwaintmp)) {
+	if (request_irq(cwaintmp->irq, cwain_interrupt, ZAP_IRQ_SHARED, "cwain2", cwaintmp)) {
     	    printk(KERN_WARNING "cwain: unable to register irq\n");
 	    return -1;
 	}
-	if (request_irq(cwaintmp->span[1]->irq, cwain_dummy_interrupt, ZAP_IRQ_SHARED_DISABLED, "cwaindummy", cwaintmp)) {
+	if (request_irq(cwaintmp->span[1]->irq, cwain_dummy_interrupt, ZAP_IRQ_SHARED, "cwaindummy", cwaintmp)) {
     	    printk(KERN_WARNING "cwain: unable to register irq\n");
 	    return -1;
 	}
     } else {
-	if (request_irq(cwaintmp->irq, cwain_interrupt, ZAP_IRQ_SHARED_DISABLED, "cwain", cwaintmp)) {
+	if (request_irq(cwaintmp->irq, cwain_interrupt, ZAP_IRQ_SHARED, "cwain", cwaintmp)) {
     	    printk(KERN_WARNING "cwain: unable to register irq\n");
 	    return -1;
 	}
@@ -1402,7 +1398,7 @@
     unsigned char dips=0;
     int cid=0;
     int modes=0;
-    tmp = pci_find_device(PCI_VENDOR_ID_CCD,pcidid,multi_cwain);
+    tmp = pci_get_device(PCI_VENDOR_ID_CCD,pcidid,multi_cwain);
     while (tmp != NULL) {
 	multi_cwain = tmp;	// skip this next time.
 
@@ -1508,7 +1504,7 @@
 
 	cwain_register_span(cwaintmp);
 
-	tmp = pci_find_device(PCI_VENDOR_ID_CCD,pcidid,multi_cwain);
+	tmp = pci_get_device(PCI_VENDOR_ID_CCD,pcidid,multi_cwain);
     }
     return 0;
 }

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5128&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Thu Dec 27 23:49:01 2007
@@ -19,6 +19,7 @@
     (Closes: #407996).
   * Don't build wcopenpci on big endian platforms (Module gives #error there).
   * Actually fix building xpp with M instead of SUBDIRS.
+  * Updates to bristuff zap modules from bristuff-0.3.0-1y-l .
 
   [ Faidon Liambotis ]
   * Don't delete old device nodes on installations since it's needed only for

Modified: zaptel/trunk/debian/patches/zaphfc-florz.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/zaphfc-florz.dpatch?rev=5128&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/zaphfc-florz.dpatch (original)
+++ zaptel/trunk/debian/patches/zaphfc-florz.dpatch Thu Dec 27 23:49:01 2007
@@ -199,7 +199,7 @@
  
      /* clear pending ints */
      hfc_inb(hfctmp, hfc_INT_S1); 
-@@ -232,370 +236,219 @@
+@@ -232,370 +236,215 @@
      spin_unlock(&registerlock);
  }
  
@@ -664,12 +664,10 @@
 -    unsigned char stat;
 +/*<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 +
-+#ifdef LINUX26
-+static irqreturn_t hfc_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
- #else
++ZAP_IRQ_HANDLER(hfc_interrupt) {
+-#else
 -static void hfc_service(struct hfc_card *hfctmp) {
-+static void hfc_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
- #endif
+-#endif
 +    struct hfc_card *hfctmp = dev_id;
 +    struct hfc_card *hfctmp2;
      struct zt_hfc *zthfc;
@@ -1007,7 +1005,7 @@
 -	/* we need no stinking irq */
 -	hfctmp->irq = 0;
 -#else
- 	if (request_irq(hfctmp->irq, &hfc_interrupt, ZAP_IRQ_SHARED_DISABLED, "zaphfc", hfctmp)) {
+ 	if (request_irq(hfctmp->irq, &hfc_interrupt, ZAP_IRQ_SHARED, "zaphfc", hfctmp)) {
  	    printk(KERN_WARNING "zaphfc: unable to register irq\n");
 -	    kfree(hfctmp->fifomem);
 -	    kfree(hfctmp);

Modified: zaptel/trunk/qozap/qozap.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/qozap/qozap.c?rev=5128&op=diff
==============================================================================
--- zaptel/trunk/qozap/qozap.c (original)
+++ zaptel/trunk/qozap/qozap.c Thu Dec 27 23:49:01 2007
@@ -1566,7 +1566,7 @@
     unsigned char dips=0;
     int cid=0;
     int modes=0;
-    tmp = pci_find_device(PCI_VENDOR_ID_CCD,pcidid,multi_qoz);
+    tmp = pci_get_device(PCI_VENDOR_ID_CCD,pcidid,multi_qoz);
     while (tmp != NULL) {
 	multi_qoz = tmp;	// skip this next time.
 
@@ -1624,7 +1624,7 @@
 	    return -EIO;
 	}
 	
-	if (request_irq(qoztmp->irq, qoz_interrupt, ZAP_IRQ_SHARED_DISABLED, "qozap", qoztmp)) {
+	if (request_irq(qoztmp->irq, qoz_interrupt, ZAP_IRQ_SHARED, "qozap", qoztmp)) {
 	    printk(KERN_WARNING "qozap: unable to register irq\n");
 	    kfree(qoztmp);
 	    pci_disable_device(tmp);
@@ -1842,7 +1842,7 @@
 		    free_irq(qoztmp->irq,qoztmp);
 		    kfree(qoztmp);
 		    qoztmp = NULL;
-		    tmp = pci_find_device(PCI_VENDOR_ID_CCD,pcidid,multi_qoz);
+		    tmp = pci_get_device(PCI_VENDOR_ID_CCD,pcidid,multi_qoz);
 		    continue;
 		break;		
 	    } 
@@ -1866,7 +1866,7 @@
 	printk(" ]\n");
 	
 	qoz_registerCard(qoztmp);
-	tmp = pci_find_device(PCI_VENDOR_ID_CCD,pcidid,multi_qoz);
+	tmp = pci_get_device(PCI_VENDOR_ID_CCD,pcidid,multi_qoz);
     }
     return 0;
 }

Modified: zaptel/trunk/zaphfc/zaphfc.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/zaphfc/zaphfc.c?rev=5128&op=diff
==============================================================================
--- zaptel/trunk/zaphfc/zaphfc.c (original)
+++ zaptel/trunk/zaphfc/zaphfc.c Thu Dec 27 23:49:01 2007
@@ -949,7 +949,7 @@
     struct hfc_card *hfctmp = NULL;
     struct zt_hfc *zthfc = NULL;
 
-    tmp = pci_find_device(pcivendor, pcidevice, multi_hfc);
+    tmp = pci_get_device(pcivendor, pcidevice, multi_hfc);
     while (tmp != NULL) {
 	multi_hfc = tmp;	// skip this next time.
 
@@ -1006,7 +1006,7 @@
 	/* we need no stinking irq */
 	hfctmp->irq = 0;
 #else
-	if (request_irq(hfctmp->irq, &hfc_interrupt, ZAP_IRQ_SHARED_DISABLED, "zaphfc", hfctmp)) {
+	if (request_irq(hfctmp->irq, &hfc_interrupt, ZAP_IRQ_SHARED, "zaphfc", hfctmp)) {
 	    printk(KERN_WARNING "zaphfc: unable to register irq\n");
 	    kfree(hfctmp->fifomem);
 	    kfree(hfctmp);
@@ -1074,7 +1074,7 @@
 
 	hfc_registerCard(hfctmp);
 	hfc_resetCard(hfctmp);
-	tmp = pci_find_device(pcivendor, pcidevice, multi_hfc);
+	tmp = pci_get_device(pcivendor, pcidevice, multi_hfc);
     }
     return 0;
 }

Modified: zaptel/trunk/ztgsm/ztgsm.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/ztgsm/ztgsm.c?rev=5128&op=diff
==============================================================================
--- zaptel/trunk/ztgsm/ztgsm.c (original)
+++ zaptel/trunk/ztgsm/ztgsm.c Thu Dec 27 23:49:01 2007
@@ -995,7 +995,7 @@
     unsigned int ioport_size = 0;
     int i=0;
     int cid=0;
-    tmp = pci_find_device(PCI_VENDOR_ID_CCD,pcidid,NULL);
+    tmp = pci_get_device(PCI_VENDOR_ID_CCD,pcidid,NULL);
     while (tmp != NULL) {
 	multi_gsm = tmp;
 
@@ -1057,7 +1057,7 @@
 	    return -EIO;
 	}
 	
-	if (request_irq(gsmtmp->irq, ztgsm_interrupt, ZAP_IRQ_SHARED_DISABLED, "ztgsm", gsmtmp)) {
+	if (request_irq(gsmtmp->irq, ztgsm_interrupt, ZAP_IRQ_SHARED, "ztgsm", gsmtmp)) {
 	    printk(KERN_WARNING "ztgsm: unable to register irq\n");
 	    release_region(gsmtmp->ioport, 0x100);
 	    release_mem_region(gsmtmp->pci_io_phys, gsmtmp->iomem_size);
@@ -1141,7 +1141,7 @@
 	    ztgsm_switch_on_all(gsmtmp, 1);
 	}
 	
-	tmp = pci_find_device(PCI_VENDOR_ID_CCD,pcidid,multi_gsm);
+	tmp = pci_get_device(PCI_VENDOR_ID_CCD,pcidid,multi_gsm);
     }
     return 0;
 }

More information about the Pkg-voip-commits mailing list