[Pkg-voip-commits] r8234 - in /dahdi-linux/trunk/debian: changelog control patches/series patches/wcb4xxp_extra_trunk
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Thu Mar 25 16:07:45 UTC 2010
Author: tzafrir-guest
Date: Thu Mar 25 16:07:44 2010
New Revision: 8234
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8234
Log:
* New upstream minor release: 2.2.1.1
* Updated copyrights file.
* Standards version 3.8.4: no change needed.
* Patch wcb4xxp_extra_trunk: backport extra PCI IDs for wcb4xxp
(more HFC-[248]S cards).
Added:
dahdi-linux/trunk/debian/patches/wcb4xxp_extra_trunk
Modified:
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/control
dahdi-linux/trunk/debian/patches/series
Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8234&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Thu Mar 25 16:07:44 2010
@@ -1,12 +1,15 @@
-dahdi-linux (1:2.2.1+dfsg-2) UNRELEASED; urgency=low
-
- [ Mark Purcell ]
+dahdi-linux (1:2.2.1.1+dfsg-2) UNRELEASED; urgency=low
+
* NOT RELEASED YET
[ Tzafrir Cohen ]
- * Updated copyrights file
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Sun, 14 Mar 2010 21:23:30 +0200
+ * New upstream minor release.
+ * Updated copyrights file.
+ * Standards version 3.8.4: no change needed.
+ * Patch wcb4xxp_extra_trunk: backport extra PCI IDs for wcb4xxp
+ (more HFC-[248]S cards).
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Thu, 25 Mar 2010 18:04:38 +0200
dahdi-linux (1:2.2.1+dfsg-1) unstable; urgency=low
Modified: dahdi-linux/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/control?rev=8234&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/control (original)
+++ dahdi-linux/trunk/debian/control Thu Mar 25 16:07:44 2010
@@ -4,7 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Mark Purcell <msp at debian.org>
Build-Depends: debhelper (>= 7), quilt, bzip2, asciidoc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.asterisk.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/dahdi-linux/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/?op=log
Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=8234&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Thu Mar 25 16:07:44 2010
@@ -5,3 +5,4 @@
uk_rotary
chanmute
no_dummy
+wcb4xxp_extra_trunk
Added: dahdi-linux/trunk/debian/patches/wcb4xxp_extra_trunk
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/wcb4xxp_extra_trunk?rev=8234&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/wcb4xxp_extra_trunk (added)
+++ dahdi-linux/trunk/debian/patches/wcb4xxp_extra_trunk Thu Mar 25 16:07:44 2010
@@ -1,0 +1,87 @@
+Subject: extra HFC-[248]S cards support to wcb4xxp from dahdi trunk
+Origin: http://svnview.digium.com/svn/dahdi?view=revision&revision=8423
+Last-Update: 2010-03-25
+
+This patch is a backport of minor changes to the wcb4xxp driver of DAHDI
+that are already included in the DAHDI trunk. Mostly extra PCI IDs.
+
+This patch includes code from DAHDI trunk. Will be included in 2.3 .
+
+--- a/drivers/dahdi/wcb4xxp/base.c
++++ b/drivers/dahdi/wcb4xxp/base.c
+@@ -130,13 +130,16 @@ struct devtype {
+ static struct devtype wcb4xxp = {"Wildcard B410P", .ports = 4, .card_type = B410P };
+ static struct devtype hfc2s = {"HFC-2S Junghanns.NET duoBRI PCI", .ports = 2, .card_type = DUOBRI };
+ static struct devtype hfc4s = {"HFC-4S Junghanns.NET quadBRI PCI", .ports = 4, .card_type = QUADBRI };
+-static struct devtype hfc8s = {"HFC-4S Junghanns.NET octoBRI PCI", .ports = 8, .card_type = OCTOBRI };
++static struct devtype hfc8s = {"HFC-8S Junghanns.NET octoBRI PCI", .ports = 8, .card_type = OCTOBRI };
+ static struct devtype hfc2s_OV = {"OpenVox B200P", .ports = 2, .card_type = B200P_OV };
+ static struct devtype hfc4s_OV = {"OpenVox B400P", .ports = 4, .card_type = B400P_OV };
+ static struct devtype hfc8s_OV = {"OpenVox B800P", .ports = 8, .card_type = B800P_OV };
+ static struct devtype hfc2s_BN = {"BeroNet BN2S0", .ports = 2, .card_type = BN2S0 };
+ static struct devtype hfc4s_BN = {"BeroNet BN4S0", .ports = 4, .card_type = BN4S0 };
+ static struct devtype hfc8s_BN = {"BeroNet BN8S0", .ports = 8, .card_type = BN8S0 };
++static struct devtype hfc4s_SW = {"Swyx 4xS0 SX2 QuadBri", .ports = 4, .card_type = BSWYX_SX2 };
++static struct devtype hfc4s_EV = {"CCD HFC-4S Eval. Board", .ports = 4,
++ .card_type = QUADBRI_EVAL };
+
+ #define CARD_HAS_EC(card) ((card)->card_type == B410P)
+
+@@ -1828,13 +1831,14 @@ static void b4xxp_init_stage1(struct b4x
+ b4xxp_setreg8(b4, R_SCI_MSK, 0x00); /* mask off all S/T interrupts */
+ b4xxp_setreg8(b4, R_IRQMSK_MISC, 0x00); /* nothing else can generate an interrupt */
+
+-/*
+- * set up the clock controller
+- * B410P has a 24.576MHz crystal, so the PCM clock is 2x the incoming clock.
+- * Other cards have a 49.152Mhz crystal, so the PCM clock equals incoming clock.
+- */
++ /*
++ * set up the clock controller B410P & Cologne Eval Board have a
++ * 24.576MHz crystal, so the PCM clock is 2x the incoming clock.
++ * Other cards have a 49.152Mhz crystal, so the PCM clock equals
++ * incoming clock.
++ */
+
+- if (b4->card_type == B410P)
++ if ((b4->card_type == B410P) || (b4->card_type == QUADBRI_EVAL))
+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x02);
+ else
+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, V_PCM_CLK);
+@@ -2883,15 +2887,22 @@ static void __devexit b4xxp_remove(struc
+ static struct pci_device_id b4xx_ids[] __devinitdata =
+ {
+ { 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp },
+- { 0x1397, 0x16b8, 0x1397, 0xe552, 0, 0, (unsigned long)&hfc8s },
++ { 0x1397, 0x16b8, 0x1397, 0xb552, 0, 0, (unsigned long)&hfc8s },
++ { 0x1397, 0x16b8, 0x1397, 0xb55b, 0, 0, (unsigned long)&hfc8s },
+ { 0x1397, 0x08b4, 0x1397, 0xb520, 0, 0, (unsigned long)&hfc4s },
++ { 0x1397, 0x08b4, 0x1397, 0xb550, 0, 0, (unsigned long)&hfc4s },
+ { 0x1397, 0x08b4, 0x1397, 0xb556, 0, 0, (unsigned long)&hfc2s },
+ { 0x1397, 0x08b4, 0x1397, 0xe884, 0, 0, (unsigned long)&hfc2s_OV },
+ { 0x1397, 0x08b4, 0x1397, 0xe888, 0, 0, (unsigned long)&hfc4s_OV },
+ { 0x1397, 0x16b8, 0x1397, 0xe998, 0, 0, (unsigned long)&hfc8s_OV },
+ { 0x1397, 0x08b4, 0x1397, 0xb566, 0, 0, (unsigned long)&hfc2s_BN },
++ { 0x1397, 0x08b4, 0x1397, 0xb761, 0, 0, (unsigned long)&hfc2s_BN },
+ { 0x1397, 0x08b4, 0x1397, 0xb560, 0, 0, (unsigned long)&hfc4s_BN },
++ { 0x1397, 0x08b4, 0x1397, 0xb550, 0, 0, (unsigned long)&hfc4s_BN },
+ { 0x1397, 0x16b8, 0x1397, 0xb562, 0, 0, (unsigned long)&hfc8s_BN },
++ { 0x1397, 0x16b8, 0x1397, 0xb56b, 0, 0, (unsigned long)&hfc8s_BN },
++ { 0x1397, 0x08b4, 0x1397, 0xb540, 0, 0, (unsigned long)&hfc4s_SW },
++ { 0x1397, 0x08b4, 0x1397, 0x08b4, 0, 0, (unsigned long)&hfc4s_EV },
+ {0, }
+
+ };
+--- a/drivers/dahdi/wcb4xxp/wcb4xxp.h
++++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h
+@@ -425,7 +425,9 @@ enum cards_ids { /* Cards ==> Brand & Mo
+ OCTOBRI, /* HFC-8S Junghanns.NET octoBRI PCI */
+ BN2S0, /* BeroNet BN2S0 */
+ BN4S0, /* Beronet BN4S0 */
+- BN8S0 /* BeroNet BN8S0 */
++ BN8S0, /* BeroNet BN8S0 */
++ BSWYX_SX2, /* Swyx 4xS0 SX2 QuadBri */
++ QUADBRI_EVAL /* HFC-4S CCD Eval. Board */
+ };
+
+ /* This structure exists one per card */
More information about the Pkg-voip-commits
mailing list