X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Ftelephony%2Fixj.h;h=143818a5612116102ca271fe615466ae63a37409;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=65d837d5ff828a81a80625d5db5edf03f7c9d8fa;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git

diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 65d837d5f..143818a56 100644
--- 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;
@@ -1182,12 +1188,12 @@ typedef struct {
 	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;
-	char play_mode;
+	signed char play_mode;
 	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;
-	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;