diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-01 20:17:23 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-01 20:17:23 +0000 |
commit | b2af10d896f48ec605ada4af4df70f53bca6badb (patch) | |
tree | cb33562d0111d965cee0aae1088ff2be7b794433 /zaptel.h | |
parent | 13179eb2fc4b2384550a1681513986584634bfd6 (diff) |
revert some code that appears to be causing crashes
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2078 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel.h')
-rw-r--r-- | zaptel.h | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -49,7 +49,6 @@ #endif #include <linux/fs.h> -#include <linux/list.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #define LINUX26 @@ -709,7 +708,7 @@ struct zt_transcode_header { __u32 magic; /* Magic value -- ZT_TRANSCODE_MAGIC, read by user */ __u32 config; /* Read/write by user */ - __u32 busy:1; /* Read/write by user */ + __u32 busy:1; /* Read/write by user */ __u8 userhdr[ZT_TRANSCODE_HDRLEN - (sizeof(__u32) * 10)]; /* Storage for user parameters */ __u8 srcdata[ZT_TRANSCODE_BUFSIZ / 2]; /* Storage of source data */ __u8 dstdata[ZT_TRANSCODE_BUFSIZ / 2]; /* Storage of destination data */ @@ -1379,19 +1378,20 @@ struct zt_transcoder_channel { wait_queue_head_t ready; int errorstatus; int offset; - unsigned int chan_built:1; - unsigned int have_reference:1; - unsigned int busy:1; - unsigned int transient:1; + struct { + unsigned int chan_built:1; + unsigned int busy:1; + unsigned int transient:1; + unsigned int have_reference:1; + } flags; unsigned int built_fmts; - unsigned int flags; unsigned int srcfmt; unsigned int dstfmt; struct zt_transcode_header *tch; }; struct zt_transcoder { - struct list_head list; + struct zt_transcoder *next; struct module *owner; char name[80]; int numchannels; @@ -1456,7 +1456,7 @@ struct zt_transcoder *zt_transcoder_alloc(int numchans); void zt_transcoder_free(struct zt_transcoder *ztc); /* Register a transcoder */ -int zt_transcoder_register(struct zt_transcoder *tc, struct module *owner); +int zt_transcoder_register(struct zt_transcoder *tc); /* Unregister a transcoder */ int zt_transcoder_unregister(struct zt_transcoder *tc); |