packages: zaptel-alt/zaptel-alt.spec, zaptel-alt/zaptel-alt-pciid.patch - r...

[arekm]

Author: arekm                        Date: Tue Jan 19 09:19:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore alt-pciid.patch

---- Files affected:
packages/zaptel-alt:
   zaptel-alt.spec (1.19 -> 1.20) , zaptel-alt-pciid.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/zaptel-alt/zaptel-alt.spec
diff -u packages/zaptel-alt/zaptel-alt.spec:1.19 packages/zaptel-alt/zaptel-alt.spec:1.20
--- packages/zaptel-alt/zaptel-alt.spec:1.19	Mon Oct  5 12:02:26 2009
+++ packages/zaptel-alt/zaptel-alt.spec	Tue Jan 19 10:19:12 2010
@@ -55,6 +55,8 @@
 Patch2:		%{name}-bristuff.patch
 Patch3:		%{name}-sparc.patch
 Patch4:		%{name}-kernel.patch
+# in theory this patch is wrong but my E-only card works fine with both T and E modes with this patch
+Patch5:		%{name}-alt-pciid.patch
 URL:		http://www.asterisk.org/
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires:	kernel%{_alt_kernel}-module-build
@@ -185,6 +187,7 @@
 %{?with_bristuff:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if %{with kernel}
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do
@@ -335,6 +338,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/01/19 09:19:12  arekm
+- restore alt-pciid.patch
+
 Revision 1.19  2009/10/05 10:02:26  arekm
 - pciid patch reverted, 0x4000 devices driven by T400P driver (see ZAPTEL_ALT_T400P branch)
 

================================================================
Index: packages/zaptel-alt/zaptel-alt-pciid.patch
diff -u /dev/null packages/zaptel-alt/zaptel-alt-pciid.patch:1.5
--- /dev/null	Tue Jan 19 10:19:18 2010
+++ packages/zaptel-alt/zaptel-alt-pciid.patch	Tue Jan 19 10:19:12 2010
@@ -0,0 +1,10 @@
+--- zaptel-1.4.12.1/tor2-hw.h	2009-09-12 18:03:12.000000000 +0200
++++ zaptel-1.4.4/tor2-hw.h	2007-11-02 19:16:33.525949050 +0100
+@@ -124,6 +124,7 @@
+ #endif /* __KERNEL__ */
+ {
+ 	{ PCI_VENDOR_ID_PLX, 0x3000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)"Tormenta 2 Quad E1/PRA - TE400P" }, /* Tormenta 2 */
++	{ PCI_VENDOR_ID_PLX, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)"Tormenta 2 Quad E1/PRA - TE400P" }, /* Tormenta 2 */
+ 	{ 0, }
+ };
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zaptel-alt/zaptel-alt.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zaptel-alt/zaptel-alt-pciid.patch?r1=1.4&r2=1.5&f=u