diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-17 17:17:05 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-17 17:17:05 +0000 |
| commit | 4a4d140d0bc76d50d822bf8342c0785391cacbb0 (patch) | |
| tree | 46595ec6679a3b3b9663458ce27ea123295966db /drivers/dahdi/xpp/xpd.h | |
| parent | cd044d09e2ec611bf2ad35c13a1df01598b81f2d (diff) | |
Make the xpp drivers build with dahdi.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4370 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xpd.h')
| -rw-r--r-- | drivers/dahdi/xpp/xpd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dahdi/xpp/xpd.h b/drivers/dahdi/xpp/xpd.h index 8c7c514..506a935 100644 --- a/drivers/dahdi/xpp/xpd.h +++ b/drivers/dahdi/xpp/xpd.h @@ -42,7 +42,7 @@ #endif #endif /* __KERNEL__ */ -#include <zaptel.h> +#include <dahdi/kernel.h> #ifdef __KERNEL__ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) @@ -139,8 +139,8 @@ static struct xpd_counters { */ struct xpd { char xpdname[XPD_NAMELEN]; - struct zt_span span; - struct zt_chan *chans; + struct dahdi_span span; + struct dahdi_chan *chans; int channels; xpd_type_t type; const char *type_name; @@ -167,7 +167,7 @@ struct xpd { xbus_t *xbus; /* The XBUS we are connected to */ spinlock_t lock; - atomic_t zt_registered; /* Am I fully registered with zaptel */ + atomic_t dahdi_registered; /* Am I fully registered with zaptel */ atomic_t open_counter; /* Number of open channels */ int flags; @@ -197,8 +197,8 @@ struct xpd { struct list_head xpd_list; unsigned int timer_count; /* Echo cancelation */ - u_char ec_chunk1[CHANNELS_PERXPD][ZT_CHUNKSIZE]; - u_char ec_chunk2[CHANNELS_PERXPD][ZT_CHUNKSIZE]; + u_char ec_chunk1[CHANNELS_PERXPD][DAHDI_CHUNKSIZE]; + u_char ec_chunk2[CHANNELS_PERXPD][DAHDI_CHUNKSIZE]; }; #define for_each_line(xpd,i) for((i) = 0; (i) < (xpd)->channels; (i)++) |