[Pkg-voip-commits] r9646 - in /dahdi-linux/trunk/debian: changelog patches/dahdi_linux_extra patches/series
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Sun Apr 8 12:43:53 UTC 2012
Author: tzafrir
Date: Sun Apr 8 12:43:52 2012
New Revision: 9646
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9646
Log:
New upstream release candidate: 2.6.1-rc2
Patch oslec_auto removed: merged upstream
Modified:
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/patches/dahdi_linux_extra
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=9646&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Sun Apr 8 12:43:52 2012
@@ -1,14 +1,15 @@
-dahdi-linux (1:2.6.0+dfsg-1) UNRELEASED; urgency=low
+dahdi-linux (1:2.6.1~rc2+dfsg-1) unstable; urgency=low
* NOT RELEASED YET
- * New upstream release:
- - Patch xpp_fix_2fxs6fxo removed: merged upstream.
+ * New upstream release candidate:
+ - Patch xpp_fix_2fxs6fxo removed: merged upstream.
+ - Patch oslec_auto removed: merged upstream.
* Removed all EXTRA_* build variables:
- wcopenpci builds on big-endial (sort of).
- All other logic is set through Kbuild.
* Do apply stripping to all kernels (3.x included).
- -- Tzafrir Cohen <tzafrir at debian.org> Tue, 17 Jan 2012 17:27:06 +0200
+ -- Tzafrir Cohen <tzafrir at debian.org> Sun, 08 Apr 2012 15:42:54 +0300
dahdi-linux (1:2.5.0.1+dfsg-1) unstable; urgency=low
Modified: dahdi-linux/trunk/debian/patches/dahdi_linux_extra
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/dahdi_linux_extra?rev=9646&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/dahdi_linux_extra (original)
+++ dahdi-linux/trunk/debian/patches/dahdi_linux_extra Sun Apr 8 12:43:52 2012
@@ -1,14 +1,14 @@
Subject: dahdi-extra: out-of-tree DAHDI drivers
Origin: http://gitorious.org/dahdi-extra/dahdi-linux-extra
Forwarded: No
-Last-Update: 2012-01-17
+Last-Update: 2012-03-06
This patch includes a number of out-of-tree DAHDI drivers from the
dahdi-extra repository. They are all out-of-tree and are highly likely
not to be included in DAHDI-linux in the forseeable future.
-Git-Commit: 64c3652f8923ae19c59b74e86a8f7ee3b315dcfa
-Dahdi: tags/2.6.0
+Git-Commit: f1fc13f5aad78e7d110f34d61b5a60dc83c119ff
+Dahdi: branches/2.6 at 10442
---
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index 8bbfea0..9fed863 100644
@@ -28,7 +28,7 @@
+
obj-m += $(DAHDI_MODULES_EXTRA)
- # Only enable this if you think you know what you're doing. This is not
+ # If you want to build OSLEC, include the code in the standard location:
diff --git a/drivers/dahdi/Kconfig b/drivers/dahdi/Kconfig
index 6952c6a..4275775 100644
--- a/drivers/dahdi/Kconfig
@@ -6225,10 +6225,10 @@
+endif
diff --git a/drivers/dahdi/opvxd115/base.c b/drivers/dahdi/opvxd115/base.c
new file mode 100644
-index 0000000..479eacc
+index 0000000..d3f37a2
--- /dev/null
+++ b/drivers/dahdi/opvxd115/base.c
-@@ -0,0 +1,4911 @@
+@@ -0,0 +1,4908 @@
+/*
+ * OpenVox D115P/D115E PCI/PCI-E Driver version 0.1 01/07/2011
+ *
@@ -6461,7 +6461,6 @@
+#define FLAG_OCTOPT (1 << 6)
+#define FLAG_3RDGEN (1 << 7)
+#define FLAG_BURST (1 << 8)
-+#define FLAG_EXPRESS (1 << 9)
+#define FLAG_5THGEN (1 << 10)
+
+#define CANARY 0xc0de
@@ -8303,9 +8302,7 @@
+ "Board ID Switch %d", wc->order);
+ else
+ wc->ddev->location = kasprintf(GFP_KERNEL,
-+ "PCI%s Bus %02d Slot %02d",
-+ (ts->spanflags & FLAG_EXPRESS) ?
-+ " Express" : " ",
++ "PCI Bus %02d Slot %02d",
+ wc->dev->bus->number,
+ PCI_SLOT(wc->dev->devfn) + 1);
+ if (!wc->ddev->location)
@@ -14237,7 +14234,7 @@
+
diff --git a/drivers/dahdi/zaphfc/base.c b/drivers/dahdi/zaphfc/base.c
new file mode 100644
-index 0000000..bbf5c3e
+index 0000000..65c6dae
--- /dev/null
+++ b/drivers/dahdi/zaphfc/base.c
@@ -0,0 +1,1719 @@
@@ -14314,10 +14311,10 @@
+#define TRUE (!FALSE)
+#endif
+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-+#define SET_PROC_DIRENTRY_OWNER(p) do { (p)->owner = THIS_MODULE; } while(0);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
++#define SET_PROC_DIRENTRY_OWNER(p) do { (p)->owner = THIS_MODULE; } while (0);
+#else
-+#define SET_PROC_DIRENTRY_OWNER(p) do { } while(0);
++#define SET_PROC_DIRENTRY_OWNER(p) do { } while (0);
+#endif
+
+static struct pci_device_id hfc_pci_ids[] = {
@@ -14835,9 +14832,9 @@
+
+static int hfc_zap_startup(struct file *file, struct dahdi_span *span)
+{
-+ struct dahdi_hfc *zthfc = dahdi_hfc_from_span(span);
-+ struct hfc_card *hfctmp = zthfc->card;
-+ int alreadyrunning;
++ struct dahdi_hfc *zthfc = dahdi_hfc_from_span(span);
++ struct hfc_card *hfctmp = zthfc->card;
++ int alreadyrunning;
+
+ if (!hfctmp) {
+ printk(KERN_INFO hfc_DRIVER_PREFIX
@@ -14945,7 +14942,7 @@
+
+ if (i == hfccard->span.channels - 1) {
+ hfccard->chans[i].sigcap = DAHDI_SIG_HARDHDLC;
-+ hfccard->sigchan = &hfccard->chans[D];
++ hfccard->sigchan = &hfccard->chans[DAHDI_D];
+ hfccard->sigactive = 0;
+ atomic_set(&hfccard->hdlc_pending, 0);
+ } else {
@@ -16488,7 +16485,7 @@
+#endif
diff --git a/drivers/dahdi/zaphfc/zaphfc.h b/drivers/dahdi/zaphfc/zaphfc.h
new file mode 100644
-index 0000000..d1d20be
+index 0000000..d3cceef
--- /dev/null
+++ b/drivers/dahdi/zaphfc/zaphfc.h
@@ -0,0 +1,419 @@
@@ -16580,7 +16577,7 @@
+
+#define hfc_MST_EMOD 0xB4
+#define hfc_MST_MODE 0xB8
-+#define hfc_CONNECT 0xBC
++#define hfc_CONNECT 0xBC
+
+
+/* Interrupt and status registers */
@@ -16589,22 +16586,22 @@
+#define hfc_TRM 0x48
+#define hfc_B_MODE 0x4C
+#define hfc_CHIP_ID 0x58
-+#define hfc_CIRM 0x60
++#define hfc_CIRM 0x60
+#define hfc_CTMT 0x64
-+#define hfc_INT_M1 0x68
-+#define hfc_INT_M2 0x6C
-+#define hfc_INT_S1 0x78
-+#define hfc_INT_S2 0x7C
-+#define hfc_STATUS 0x70
++#define hfc_INT_M1 0x68
++#define hfc_INT_M2 0x6C
++#define hfc_INT_S1 0x78
++#define hfc_INT_S2 0x7C
++#define hfc_STATUS 0x70
+
+/* S/T section registers */
+
-+#define hfc_STATES 0xC0
-+#define hfc_SCTRL 0xC4
++#define hfc_STATES 0xC0
++#define hfc_SCTRL 0xC4
+#define hfc_SCTRL_E 0xC8
+#define hfc_SCTRL_R 0xCC
-+#define hfc_SQ 0xD0
-+#define hfc_CLKDEL 0xDC
++#define hfc_SQ 0xD0
++#define hfc_CLKDEL 0xDC
+#define hfc_B1_REC 0xF0
+#define hfc_B1_SEND 0xF0
+#define hfc_B2_REC 0xF4
@@ -16616,12 +16613,12 @@
+/* Bits and values in various HFC PCI registers */
+
+/* bits in status register (READ) */
-+#define hfc_STATUS_PCI_PROC 0x02
++#define hfc_STATUS_PCI_PROC 0x02
+#define hfc_STATUS_NBUSY 0x04
-+#define hfc_STATUS_TIMER_ELAP 0x10
-+#define hfc_STATUS_STATINT 0x20
-+#define hfc_STATUS_FRAMEINT 0x40
-+#define hfc_STATUS_ANYINT 0x80
++#define hfc_STATUS_TIMER_ELAP 0x10
++#define hfc_STATUS_STATINT 0x20
++#define hfc_STATUS_FRAMEINT 0x40
++#define hfc_STATUS_ANYINT 0x80
+
+/* bits in CTMT (Write) */
+#define hfc_CTMT_TRANSB1 0x01
@@ -16638,72 +16635,72 @@
+#define hfc_CTMT_AUTO_TIMER 0x20
+
+/* bits in CIRM (Write) */
-+#define hfc_CIRM_AUX_MSK 0x07
-+#define hfc_CIRM_RESET 0x08
-+#define hfc_CIRM_B1_REV 0x40
-+#define hfc_CIRM_B2_REV 0x80
++#define hfc_CIRM_AUX_MSK 0x07
++#define hfc_CIRM_RESET 0x08
++#define hfc_CIRM_B1_REV 0x40
++#define hfc_CIRM_B2_REV 0x80
+
+/* bits in INT_M1 and INT_S1 */
-+#define hfc_INTS_B1TRANS 0x01
-+#define hfc_INTS_B2TRANS 0x02
-+#define hfc_INTS_DTRANS 0x04
-+#define hfc_INTS_B1REC 0x08
-+#define hfc_INTS_B2REC 0x10
-+#define hfc_INTS_DREC 0x20
-+#define hfc_INTS_L1STATE 0x40
-+#define hfc_INTS_TIMER 0x80
++#define hfc_INTS_B1TRANS 0x01
++#define hfc_INTS_B2TRANS 0x02
++#define hfc_INTS_DTRANS 0x04
++#define hfc_INTS_B1REC 0x08
++#define hfc_INTS_B2REC 0x10
++#define hfc_INTS_DREC 0x20
++#define hfc_INTS_L1STATE 0x40
++#define hfc_INTS_TIMER 0x80
+
+/* bits in INT_M2 */
-+#define hfc_M2_PROC_TRANS 0x01
-+#define hfc_M2_GCI_I_CHG 0x02
-+#define hfc_M2_GCI_MON_REC 0x04
-+#define hfc_M2_IRQ_ENABLE 0x08
-+#define hfc_M2_PMESEL 0x80
++#define hfc_M2_PROC_TRANS 0x01
++#define hfc_M2_GCI_I_CHG 0x02
++#define hfc_M2_GCI_MON_REC 0x04
++#define hfc_M2_IRQ_ENABLE 0x08
++#define hfc_M2_PMESEL 0x80
+
+/* bits in STATES */
-+#define hfc_STATES_STATE_MASK 0x0F
-+#define hfc_STATES_LOAD_STATE 0x10
-+#define hfc_STATES_ACTIVATE 0x20
-+#define hfc_STATES_DO_ACTION 0x40
-+#define hfc_STATES_NT_G2_G3 0x80
++#define hfc_STATES_STATE_MASK 0x0F
++#define hfc_STATES_LOAD_STATE 0x10
++#define hfc_STATES_ACTIVATE 0x20
++#define hfc_STATES_DO_ACTION 0x40
++#define hfc_STATES_NT_G2_G3 0x80
+
+/* bits in HFCD_MST_MODE */
-+#define hfc_MST_MODE_MASTER 0x01
-+#define hfc_MST_MODE_SLAVE 0x00
++#define hfc_MST_MODE_MASTER 0x01
++#define hfc_MST_MODE_SLAVE 0x00
+/* remaining bits are for codecs control */
+
+/* bits in HFCD_SCTRL */
-+#define hfc_SCTRL_B1_ENA 0x01
-+#define hfc_SCTRL_B2_ENA 0x02
-+#define hfc_SCTRL_MODE_TE 0x00
-+#define hfc_SCTRL_MODE_NT 0x04
-+#define hfc_SCTRL_LOW_PRIO 0x08
-+#define hfc_SCTRL_SQ_ENA 0x10
-+#define hfc_SCTRL_TEST 0x20
-+#define hfc_SCTRL_NONE_CAP 0x40
-+#define hfc_SCTRL_PWR_DOWN 0x80
++#define hfc_SCTRL_B1_ENA 0x01
++#define hfc_SCTRL_B2_ENA 0x02
++#define hfc_SCTRL_MODE_TE 0x00
++#define hfc_SCTRL_MODE_NT 0x04
++#define hfc_SCTRL_LOW_PRIO 0x08
++#define hfc_SCTRL_SQ_ENA 0x10
++#define hfc_SCTRL_TEST 0x20
++#define hfc_SCTRL_NONE_CAP 0x40
++#define hfc_SCTRL_PWR_DOWN 0x80
+
+/* bits in SCTRL_E */
-+#define hfc_SCTRL_E_AUTO_AWAKE 0x01
-+#define hfc_SCTRL_E_DBIT_1 0x04
-+#define hfc_SCTRL_E_IGNORE_COL 0x08
-+#define hfc_SCTRL_E_CHG_B1_B2 0x80
++#define hfc_SCTRL_E_AUTO_AWAKE 0x01
++#define hfc_SCTRL_E_DBIT_1 0x04
++#define hfc_SCTRL_E_IGNORE_COL 0x08
++#define hfc_SCTRL_E_CHG_B1_B2 0x80
+
+/* bits in SCTRL_R */
-+#define hfc_SCTRL_R_B1_ENA 0x01
-+#define hfc_SCTRL_R_B2_ENA 0x02
++#define hfc_SCTRL_R_B1_ENA 0x01
++#define hfc_SCTRL_R_B2_ENA 0x02
+
+/* bits in FIFO_EN register */
-+#define hfc_FIFOEN_B1TX 0x01
-+#define hfc_FIFOEN_B1RX 0x02
-+#define hfc_FIFOEN_B2TX 0x04
-+#define hfc_FIFOEN_B2RX 0x08
-+#define hfc_FIFOEN_DTX 0x10
-+#define hfc_FIFOEN_DRX 0x20
-+
-+#define hfc_FIFOEN_B1 (hfc_FIFOEN_B1TX|hfc_FIFOEN_B1RX)
-+#define hfc_FIFOEN_B2 (hfc_FIFOEN_B2TX|hfc_FIFOEN_B2RX)
-+#define hfc_FIFOEN_D (hfc_FIFOEN_DTX|hfc_FIFOEN_DRX)
++#define hfc_FIFOEN_B1TX 0x01
++#define hfc_FIFOEN_B1RX 0x02
++#define hfc_FIFOEN_B2TX 0x04
++#define hfc_FIFOEN_B2RX 0x08
++#define hfc_FIFOEN_DTX 0x10
++#define hfc_FIFOEN_DRX 0x20
++
++#define hfc_FIFOEN_B1 (hfc_FIFOEN_B1TX|hfc_FIFOEN_B1RX)
++#define hfc_FIFOEN_B2 (hfc_FIFOEN_B2TX|hfc_FIFOEN_B2RX)
++#define hfc_FIFOEN_D (hfc_FIFOEN_DTX|hfc_FIFOEN_DRX)
+
+/* bits in the CONNECT register */
+#define hfc_CONNECT_B1_HFC_from_ST 0x00
@@ -16736,12 +16733,12 @@
+
+/* FIFO memory definitions */
+
-+#define hfc_FIFO_SIZE 0x8000
-+
-+#define hfc_UGLY_FRAMEBUF 0x2000
-+
-+#define hfc_TX_FIFO_PRELOAD (DAHDI_CHUNKSIZE + 2)
-+#define hfc_RX_FIFO_PRELOAD 4
++#define hfc_FIFO_SIZE 0x8000
++
++#define hfc_UGLY_FRAMEBUF 0x2000
++
++#define hfc_TX_FIFO_PRELOAD (DAHDI_CHUNKSIZE + 2)
++#define hfc_RX_FIFO_PRELOAD 4
+
+/* HDLC STUFF */
+#define hfc_HDLC_BUF_LEN 32
@@ -16859,55 +16856,55 @@
+
+ int debug_event;
+
-+ spinlock_t lock;
-+ unsigned int irq;
-+ unsigned int iomem;
-+ int ticks;
-+ int clicks;
-+ unsigned char *pci_io;
-+ void *fifomem; /* start of the shared mem */
-+
-+ unsigned int pcibus;
-+ unsigned int pcidevfn;
-+
-+ int drecinframe;
-+
-+ unsigned char cardno;
-+ struct hfc_card *next;
++ spinlock_t lock;
++ unsigned int irq;
++ unsigned int iomem;
++ int ticks;
++ int clicks;
++ unsigned char *pci_io;
++ void *fifomem; /* start of the shared mem */
++
++ unsigned int pcibus;
++ unsigned int pcidevfn;
++
++ int drecinframe;
++
++ unsigned char cardno;
++ struct hfc_card *next;
+
+} hfc_card;
+
+typedef struct dahdi_hfc {
-+ unsigned int usecount;
-+ struct dahdi_device *ddev;
-+ struct dahdi_span span;
-+ struct dahdi_chan chans[3];
-+ struct dahdi_chan *_chans[3];
-+ struct hfc_card *card;
-+
-+ /* pointer to the signalling channel for this span */
-+ struct dahdi_chan *sigchan;
-+ /* nonzero means we're in the middle of sending an HDLC frame */
-+ int sigactive;
-+ /* hdlc_hard_xmit() increments, hdlc_tx_frame() decrements */
-+ atomic_t hdlc_pending;
-+ int frames_out;
-+ int frames_in;
-+
++ unsigned int usecount;
++ struct dahdi_device *ddev;
++ struct dahdi_span span;
++ struct dahdi_chan chans[3];
++ struct dahdi_chan *_chans[3];
++ struct hfc_card *card;
++
++ /* pointer to the signalling channel for this span */
++ struct dahdi_chan *sigchan;
++ /* nonzero means we're in the middle of sending an HDLC frame */
++ int sigactive;
++ /* hdlc_hard_xmit() increments, hdlc_tx_frame() decrements */
++ atomic_t hdlc_pending;
++ int frames_out;
++ int frames_in;
+} dahdi_hfc;
+
-+static inline struct dahdi_hfc* dahdi_hfc_from_span(struct dahdi_span *span) {
++static inline struct dahdi_hfc *dahdi_hfc_from_span(struct dahdi_span *span)
++{
+ return container_of(span, struct dahdi_hfc, span);
+}
+
+static inline u8 hfc_inb(struct hfc_card *card, int offset)
+{
-+ return readb(card->io_mem + offset);
++ return readb(card->io_mem + offset);
+}
+
+static inline void hfc_outb(struct hfc_card *card, int offset, u8 value)
+{
-+ writeb(value, card->io_mem + offset);
++ writeb(value, card->io_mem + offset);
+}
+
+#endif
Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=9646&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Sun Apr 8 12:43:52 2012
@@ -1,4 +1,3 @@
-oslec_auto
# Mega-patch of extra drivers:
dahdi_linux_extra
no_firmware_download
More information about the Pkg-voip-commits
mailing list