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.3
[linux-2.6.git]
/
drivers
/
telephony
/
ixj.h
diff --git
a/drivers/telephony/ixj.h
b/drivers/telephony/ixj.h
index
65d837d
..
143818a
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;
@@
-1182,12
+1188,12
@@
typedef struct {
unsigned int cid_rec_codec;
unsigned int cid_rec_volume;
unsigned char cid_rec_flag;
unsigned int cid_rec_codec;
unsigned int cid_rec_volume;
unsigned char cid_rec_flag;
- char rec_mode;
+
signed
char rec_mode;
unsigned int play_codec;
unsigned int cid_play_codec;
unsigned int cid_play_volume;
unsigned char cid_play_flag;
unsigned int play_codec;
unsigned int cid_play_codec;
unsigned int cid_play_volume;
unsigned char cid_play_flag;
- char play_mode;
+
signed
char play_mode;
IXJ_FLAGS flags;
unsigned long busyflags;
unsigned int rec_frame_size;
IXJ_FLAGS flags;
unsigned long busyflags;
unsigned int rec_frame_size;
@@
-1220,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;