[Pkg-voip-commits] r5335 - in /zaptel/trunk/debian: changelog patches/zaphfc-florz

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Mar 20 14:33:25 2008
New Revision: 5335

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5335
Log:
Remove some unnecessary changes from the florz zaphfc patch - fixes
zaphfc warning.

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/zaphfc-florz

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5335&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Thu Mar 20 14:33:25 2008
@@ -1,3 +1,10 @@
+zaptel (1:1.4.9.2~dfsg-2) UNRELEASED; urgency=low
+
+  * Remove some unnecessary changes from the florz zaphfc patch - fixes zaphfc
+    warning.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 20 Mar 2008 16:31:25 +0200
+
 zaptel (1:1.4.9.2~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #464900).

Modified: zaptel/trunk/debian/patches/zaphfc-florz
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/zaphfc-florz?rev=5335&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/zaphfc-florz (original)
+++ zaptel/trunk/debian/patches/zaphfc-florz Thu Mar 20 14:33:25 2008
@@ -968,7 +968,7 @@
  	hfctmp->pcidev = tmp;
  	hfctmp->pcibus = tmp->bus->number;
  	hfctmp->pcidevfn = tmp->devfn; 
-@@ -982,49 +776,39 @@
+@@ -982,44 +776,34 @@
  	hfctmp->pci_io = (char *) tmp->resource[1].start;
  	if (!hfctmp->pci_io) {
  	    printk(KERN_WARNING "zaphfc: no iomem!\n");
@@ -1019,16 +1019,8 @@
 -	rtai_register_hfc(hfctmp);
 -#endif
  	printk(KERN_INFO
--		       "zaphfc: %s %s configured at mem %lx fifo %lx(%#x) IRQ %d HZ %d\n",
-+		       "zaphfc: %s %s configured at mem %#x fifo %#x(%#x) IRQ %d HZ %d\n",
+		       "zaphfc: %s %s configured at mem %lx fifo %lx(%#x) IRQ %d HZ %d\n",
  			vendor_name, card_name,
--		       (unsigned long) hfctmp->pci_io,
--		       (unsigned long) hfctmp->fifos,
-+		       (u_int) hfctmp->pci_io,
-+		       (u_int) hfctmp->fifos,
- 		       (u_int) virt_to_bus(hfctmp->fifos),
- 		       hfctmp->irq, HZ); 
- 	pci_write_config_word(hfctmp->pcidev, PCI_COMMAND, PCI_COMMAND_MEMORY);	// enable memio
 @@ -1041,11 +825,21 @@
  	    hfctmp->regs.nt_mode = 0;
  	}
@@ -1054,14 +1046,6 @@
  	    multi_hfc = NULL;
  	    return -ENOMEM;
  	}
-@@ -1071,7 +865,6 @@
- 	memset(hfctmp->btransbuf[1], 0x0, sizeof(hfctmp->btransbuf[1]));
- 	hfctmp->ztdev->chans[1].writechunk = hfctmp->btransbuf[1];
- 
--
- 	hfc_registerCard(hfctmp);
- 	hfc_resetCard(hfctmp);
- 	tmp = pci_find_device(pcivendor, pcidevice, multi_hfc);
 @@ -1079,58 +872,42 @@
      return 0;
  }