[aadk-commits] dbailey: tag uClinux/autotag_for_aadk-0.3.2 r225 - in
/uClinux/tags/autotag_f...
aadk-commits at lists.digium.com
aadk-commits at lists.digium.com
Mon Mar 12 09:36:08 MST 2007
Author: dbailey
Date: Mon Mar 12 11:36:07 2007
New Revision: 225
URL: http://svn.digium.com/view/aadk?view=rev&rev=225
Log:
Updated the zaptel.h files so that the appliance version of asterisk would build chan_zap
Modified:
uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/drivers/zaptel/zaptel.h
uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h
Modified: uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/drivers/zaptel/zaptel.h
URL: http://svn.digium.com/view/aadk/uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/drivers/zaptel/zaptel.h?view=diff&rev=225&r1=224&r2=225
==============================================================================
--- uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/drivers/zaptel/zaptel.h (original)
+++ uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/drivers/zaptel/zaptel.h Mon Mar 12 11:36:07 2007
@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: zaptel.h 1521 2006-10-20 01:29:25Z file $
+ * $Id: zaptel.h 2295 2007-03-08 00:50:35Z russell $
*/
#ifndef _LINUX_ZAPTEL_H
@@ -57,6 +57,16 @@
#define zap_pci_module pci_register_driver
#else
#define zap_pci_module pci_module_init
+#endif
+
+#ifdef LINUX26
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
+#else
+#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id, struct pt_regs *regs)
+#endif
+#else
+#define ZAP_IRQ_HANDLER(a) static void a(int irq, void *dev_id, struct pt_regs *regs)
#endif
#include "ecdis.h"
@@ -642,7 +652,7 @@
#define ZT_TONEDETECT _IOW (ZT_CODE, 91, int)
-/*
+/*
* Set polarity -- implemented by individual driver. 0 = forward, 1 = reverse
*/
#define ZT_SETPOLARITY _IOW (ZT_CODE, 92, int)
@@ -713,11 +723,14 @@
#define ZT_TCOP_RESET 1 /* Reset the channel state / codec selection */
#define ZT_TCOP_TRANSCODE 2 /* Begin transcoding a block */
#define ZT_TCOP_GETINFO 3 /* Get information (use zt_transcode_info) */
+#define ZT_TCOP_RELEASE 4 /* Release DTE channel */
+#define ZT_TCOP_TEST 5 /* Test DTE card */
typedef struct zt_transcode_info {
unsigned int op;
unsigned int tcnum;
char name[80];
+ int numchannels;
unsigned int srcfmts;
unsigned int dstfmts;
} ZT_TRANSCODE_INFO;
@@ -759,7 +772,7 @@
} ZT_TRANSCODE_HEADER;
struct zt_ring_cadence {
- int ringcadence [ZT_MAX_CADENCE];
+ int ringcadence[ZT_MAX_CADENCE];
};
struct zt_tone_def_header {
@@ -910,6 +923,9 @@
/* Echo can disabled event */
#define ZT_EVENT_EC_DISABLED 19
+
+/* Channel was disconnected. Hint user to close channel */
+#define ZT_EVENT_REMOVED 20
#define ZT_EVENT_PULSEDIGIT (1 << 16) /* This is OR'd with the digit received */
#define ZT_EVENT_DTMFDOWN (1 << 17) /* Ditto for DTMF key down event */
@@ -1104,7 +1120,7 @@
u_char swritechunk[ZT_MAX_CHUNKSIZE]; /* Buffer to be written */
u_char *readchunk; /* Actual place to read from */
u_char sreadchunk[ZT_MAX_CHUNKSIZE]; /* Preallocated static area */
-
+
/* Pointer to tx and rx gain tables */
u_char *rxgain;
u_char *txgain;
@@ -1363,6 +1379,11 @@
/* Opt: Enable maintenance modes */
int (*maint)(struct zt_span *span, int mode);
+#ifdef ZAPTEL_SYNC_TICK
+ /* Opt: send sync to spans */
+ int (*sync_tick)(struct zt_span *span, int is_master);
+#endif
+
/* ==== Channel Callback Operations ==== */
/* Opt: Set signalling type (if appropriate) */
int (*chanconfig)(struct zt_chan *chan, int sigtype);
@@ -1431,6 +1452,8 @@
unsigned int flags;
unsigned int srcfmt;
unsigned int dstfmt;
+ unsigned int chan_built;
+ unsigned int built_fmts;
struct zt_transcode_header *tch;
};
Modified: uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h
URL: http://svn.digium.com/view/aadk/uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h?view=diff&rev=225&r1=224&r2=225
==============================================================================
--- uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h (original)
+++ uClinux/tags/autotag_for_aadk-0.3.2/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h Mon Mar 12 11:36:07 2007
@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: zaptel.h 1374 2006-08-31 01:41:30Z file $
+ * $Id: zaptel.h 2295 2007-03-08 00:50:35Z russell $
*/
#ifndef _LINUX_ZAPTEL_H
@@ -32,8 +32,10 @@
#ifdef __KERNEL__
#include "zconfig.h"
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <linux/config.h>
-#include <linux/version.h>
+#endif
#include <linux/fs.h>
#include <linux/ioctl.h>
@@ -55,6 +57,16 @@
#define zap_pci_module pci_register_driver
#else
#define zap_pci_module pci_module_init
+#endif
+
+#ifdef LINUX26
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
+#else
+#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id, struct pt_regs *regs)
+#endif
+#else
+#define ZAP_IRQ_HANDLER(a) static void a(int irq, void *dev_id, struct pt_regs *regs)
#endif
#include "ecdis.h"
@@ -711,11 +723,14 @@
#define ZT_TCOP_RESET 1 /* Reset the channel state / codec selection */
#define ZT_TCOP_TRANSCODE 2 /* Begin transcoding a block */
#define ZT_TCOP_GETINFO 3 /* Get information (use zt_transcode_info) */
+#define ZT_TCOP_RELEASE 4 /* Release DTE channel */
+#define ZT_TCOP_TEST 5 /* Test DTE card */
typedef struct zt_transcode_info {
unsigned int op;
unsigned int tcnum;
char name[80];
+ int numchannels;
unsigned int srcfmts;
unsigned int dstfmts;
} ZT_TRANSCODE_INFO;
@@ -908,6 +923,9 @@
/* Echo can disabled event */
#define ZT_EVENT_EC_DISABLED 19
+
+/* Channel was disconnected. Hint user to close channel */
+#define ZT_EVENT_REMOVED 20
#define ZT_EVENT_PULSEDIGIT (1 << 16) /* This is OR'd with the digit received */
#define ZT_EVENT_DTMFDOWN (1 << 17) /* Ditto for DTMF key down event */
@@ -1361,6 +1379,11 @@
/* Opt: Enable maintenance modes */
int (*maint)(struct zt_span *span, int mode);
+#ifdef ZAPTEL_SYNC_TICK
+ /* Opt: send sync to spans */
+ int (*sync_tick)(struct zt_span *span, int is_master);
+#endif
+
/* ==== Channel Callback Operations ==== */
/* Opt: Set signalling type (if appropriate) */
int (*chanconfig)(struct zt_chan *chan, int sigtype);
@@ -1429,6 +1452,8 @@
unsigned int flags;
unsigned int srcfmt;
unsigned int dstfmt;
+ unsigned int chan_built;
+ unsigned int built_fmts;
struct zt_transcode_header *tch;
};
More information about the aadk-commits
mailing list