Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / telephony / ixj.h

diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 65d837d..fbea454 100644 (file)
--- a/drivers/telephony/ixj.h
+++ b/drivers/telephony/ixj.h
@@ -38,11 +38,8 @@
  * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  *****************************************************************************/
-static char ixj_h_rcsid[] = "$Id: ixj.h,v 4.1 2001/08/04 14:49:27 craigs Exp $";
-
 #define IXJ_VERSION 3031
 
-#include <linux/version.h>
 #include <linux/types.h>
 
 #include <linux/ixjuser.h>
@@ -1166,6 +1163,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 +1185,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 +1223,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;