git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
telephony
/
ixj.h
diff --git
a/drivers/telephony/ixj.h
b/drivers/telephony/ixj.h
index
aa51222
..
ad23b28
100644
(file)
--- a/
drivers/telephony/ixj.h
+++ b/
drivers/telephony/ixj.h
@@
-1166,6
+1166,12
@@
typedef struct {
*
******************************************************************************/
*
******************************************************************************/
+typedef struct {
+ int elements_used;
+ IXJ_CADENCE_TERM termination;
+ IXJ_CADENCE_ELEMENT *ce;
+} ixj_cadence;
+
typedef struct {
struct phone_device p;
struct timer_list timer;
typedef struct {
struct phone_device p;
struct timer_list timer;
@@
-1198,22
+1204,13
@@
typedef struct {
int aec_level;
int cid_play_aec_level;
int readers, writers;
int aec_level;
int cid_play_aec_level;
int readers, writers;
-#if LINUX_VERSION_CODE < 0x020400
- struct wait_queue *poll_q;
- struct wait_queue *read_q;
-#else
wait_queue_head_t poll_q;
wait_queue_head_t read_q;
wait_queue_head_t poll_q;
wait_queue_head_t read_q;
-#endif
char *read_buffer, *read_buffer_end;
char *read_convert_buffer;
size_t read_buffer_size;
unsigned int read_buffer_ready;
char *read_buffer, *read_buffer_end;
char *read_convert_buffer;
size_t read_buffer_size;
unsigned int read_buffer_ready;
-#if LINUX_VERSION_CODE < 0x020400
- struct wait_queue *write_q;
-#else
wait_queue_head_t write_q;
wait_queue_head_t write_q;
-#endif
char *write_buffer, *write_buffer_end;
char *write_convert_buffer;
size_t write_buffer_size;
char *write_buffer, *write_buffer_end;
char *write_convert_buffer;
size_t write_buffer_size;
@@
-1229,8
+1226,8
@@
typedef struct {
char tone_index;
char tone_state;
char maxrings;
char tone_index;
char tone_state;
char maxrings;
-
IXJ_CADENCE
*cadence_t;
-
IXJ_CADENCE
*cadence_r;
+
ixj_cadence
*cadence_t;
+
ixj_cadence
*cadence_r;
int tone_cadence_state;
IXJ_CADENCE_F cadence_f[6];
DTMF dtmf;
int tone_cadence_state;
IXJ_CADENCE_F cadence_f[6];
DTMF dtmf;