1 files changed, 266 insertions, 204 deletions

diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 729edcdb6dac..d34f0023ac74 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -1,11 +1,16 @@
-/* Siemens Gigaset 307x driver
+/*
+ * Siemens Gigaset 307x driver
  * Common header file for all connection variants
  *
  * Written by Stefan Eilers <Eilers.Stefan@epost.de>
  *        and Hansjoerg Lipp <hjlipp@web.de>
  *
- * Version: $Id: gigaset.h,v 1.97.4.26 2006/02/04 18:28:16 hjlipp Exp $
- * ===========================================================================
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
  */
 
 #ifndef GIGASET_H
@@ -15,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
-#include <asm/atomic.h>
 #include <linux/spinlock.h>
 #include <linux/isdnif.h>
 #include <linux/usb.h>
@@ -27,21 +31,22 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/list.h>
+#include <asm/atomic.h>
 
 #define GIG_VERSION {0,5,0,0}
 #define GIG_COMPAT  {0,4,0,0}
 
-#define MAX_REC_PARAMS 10                         /* Max. number of params in response string */
-#define MAX_RESP_SIZE 512                         /* Max. size of a response string */
-#define HW_HDR_LEN 2                              /* Header size used to store ack info */
+#define MAX_REC_PARAMS 10       /* Max. number of params in response string */
+#define MAX_RESP_SIZE 512       /* Max. size of a response string */
+#define HW_HDR_LEN 2            /* Header size used to store ack info */
 
-#define MAX_EVENTS 64                          /* size of event queue */
+#define MAX_EVENTS 64           /* size of event queue */
 
 #define RBUFSIZE 8192
-#define SBUFSIZE 4096                           /* sk_buff payload size */
+#define SBUFSIZE 4096           /* sk_buff payload size */
 
-#define MAX_BUF_SIZE (SBUFSIZE - 2)             /* Max. size of a data packet from LL */
-#define TRANSBUFSIZE 768                        /* bytes per skb for transparent receive */
+#define TRANSBUFSIZE 768        /* bytes per skb for transparent receive */
+#define MAX_BUF_SIZE (SBUFSIZE - 2)     /* Max. size of a data packet from LL */
 
 /* compile time options */
 #define GIG_MAJOR 0
@@ -67,68 +72,108 @@
 
 #define MAXACT 3
 
-#define IFNULL(a)         if (unlikely(!(a)))
-#define IFNULLRET(a)      if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); return; }
-#define IFNULLRETVAL(a,b) if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); return (b); }
-#define IFNULLCONT(a)     if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); continue; }
-#define IFNULLGOTO(a,b)   if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); goto b; }
+#define IFNULL(a) \
+        if (unlikely(!(a)))
+
+#define IFNULLRET(a) \
+        if (unlikely(!(a))) { \
+                err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); \
+                return; \
+        }
+
+#define IFNULLRETVAL(a,b) \
+        if (unlikely(!(a))) { \
+                err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); \
+                return (b); \
+        }
+
+#define IFNULLCONT(a) \
+        if (unlikely(!(a))) { \
+                err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); \
+                continue; \
+        }
+
+#define IFNULLGOTO(a,b) \
+        if (unlikely(!(a))) { \
+                err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); \
+                goto b; \
+        }
 
 extern int gigaset_debuglevel;  /* "needs" cast to (enum debuglevel) */
 
-/* any combination of these can be given with the 'debug=' parameter to insmod, e.g.
- * 'insmod usb_gigaset.o debug=0x2c' will set DEBUG_OPEN, DEBUG_CMD and DEBUG_INTR. */
+/* any combination of these can be given with the 'debug=' parameter to insmod,
+ * e.g. 'insmod usb_gigaset.o debug=0x2c' will set DEBUG_OPEN, DEBUG_CMD and
+ * DEBUG_INTR.
+ */
 enum debuglevel { /* up to 24 bits (atomic_t) */
-        DEBUG_REG         = 0x0002, /* serial port I/O register operations */
+        DEBUG_REG         = 0x0002,/* serial port I/O register operations */
         DEBUG_OPEN        = 0x0004, /* open/close serial port */
         DEBUG_INTR        = 0x0008, /* interrupt processing */
-        DEBUG_INTR_DUMP   = 0x0010, /* Activating hexdump debug output on interrupt
-                                      requests, not available as run-time option */
+        DEBUG_INTR_DUMP   = 0x0010, /* Activating hexdump debug output on
+                                       interrupt requests, not available as
+                                       run-time option */
         DEBUG_CMD         = 0x00020, /* sent/received LL commands */
         DEBUG_STREAM      = 0x00040, /* application data stream I/O events */
         DEBUG_STREAM_DUMP = 0x00080, /* application data stream content */
         DEBUG_LLDATA      = 0x00100, /* sent/received LL data */
-        DEBUG_INTR_0      = 0x00200, /* serial port output interrupt processing */
+        DEBUG_INTR_0      = 0x00200, /* serial port interrupt processing */
         DEBUG_DRIVER      = 0x00400, /* driver structure */
         DEBUG_HDLC        = 0x00800, /* M10x HDLC processing */
         DEBUG_WRITE       = 0x01000, /* M105 data write */
-        DEBUG_TRANSCMD    = 0x02000, /*AT-COMMANDS+RESPONSES*/
-        DEBUG_MCMD        = 0x04000, /*COMMANDS THAT ARE SENT VERY OFTEN*/
-        DEBUG_INIT        = 0x08000, /* (de)allocation+initialization of data structures */
+        DEBUG_TRANSCMD    = 0x02000, /* AT-COMMANDS+RESPONSES */
+        DEBUG_MCMD        = 0x04000, /* COMMANDS THAT ARE SENT VERY OFTEN */
+        DEBUG_INIT        = 0x08000, /* (de)allocation+initialization of data
+                                        structures */
         DEBUG_LOCK        = 0x10000, /* semaphore operations */
         DEBUG_OUTPUT      = 0x20000, /* output to device */
         DEBUG_ISO         = 0x40000, /* isochronous transfers */
         DEBUG_IF          = 0x80000, /* character device operations */
-        DEBUG_USBREQ      = 0x100000, /* USB communication (except payload data) */
-        DEBUG_LOCKCMD     = 0x200000, /* AT commands and responses when MS_LOCKED */
+        DEBUG_USBREQ      = 0x100000, /* USB communication (except payload
+                                         data) */
+        DEBUG_LOCKCMD     = 0x200000, /* AT commands and responses when
+                                         MS_LOCKED */
 
-        DEBUG_ANY         = 0x3fffff, /* print message if any of the others is activated */
+        DEBUG_ANY         = 0x3fffff, /* print message if any of the others is
+                                         activated */
 };
 
 #ifdef CONFIG_GIGASET_DEBUG
 #define DEBUG_DEFAULT (DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUG_USBREQ)
-//#define DEBUG_DEFAULT (DEBUG_LOCK | DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUF_IF | DEBUG_DRIVER | DEBUG_OUTPUT | DEBUG_INTR)
 #else
 #define DEBUG_DEFAULT 0
 #endif
 
-/* redefine syslog macros to prepend module name instead of entire source path */
-/* The space before the comma in ", ##" is needed by gcc 2.95 */
+/* redefine syslog macros to prepend module name instead of entire
+ * source path */
 #undef info
-#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+#define info(format, arg...) \
+        printk(KERN_INFO "%s: " format "\n", \
+               THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
 
 #undef notice
-#define notice(format, arg...) printk(KERN_NOTICE "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+#define notice(format, arg...) \
+        printk(KERN_NOTICE "%s: " format "\n", \
+               THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
 
 #undef warn
-#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+#define warn(format, arg...) \
+        printk(KERN_WARNING "%s: " format "\n", \
+               THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
 
 #undef err
-#define err(format, arg...) printk(KERN_ERR "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+#define err(format, arg...) \
+        printk(KERN_ERR "%s: " format "\n", \
+               THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
 
 #undef dbg
 #ifdef CONFIG_GIGASET_DEBUG
-#define dbg(level, format, arg...) do { if (unlikely(((enum debuglevel)gigaset_debuglevel) & (level))) \
-        printk(KERN_DEBUG "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg); } while (0)
+#define dbg(level, format, arg...) \
+        do { \
+                if (unlikely(((enum debuglevel)gigaset_debuglevel) & (level))) \
+                        printk(KERN_DEBUG "%s: " format "\n", \
+                               THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" \
+                               , ## arg); \
+        } while (0)
 #else
 #define dbg(level, format, arg...) do {} while (0)
 #endif
@@ -148,13 +193,14 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define ZSAU_UNKNOWN                    -1
 
 /* USB control transfer requests */
-#define OUT_VENDOR_REQ                  (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
-#define IN_VENDOR_REQ                   (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
+#define OUT_VENDOR_REQ  (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
+#define IN_VENDOR_REQ   (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
 
 /* int-in-events 3070 */
 #define HD_B1_FLOW_CONTROL              0x80
 #define HD_B2_FLOW_CONTROL              0x81
-#define HD_RECEIVEATDATA_ACK            (0x35)          // 3070         // att: HD_RECEIVE>>AT<<DATA_ACK
+#define HD_RECEIVEATDATA_ACK            (0x35)          // 3070
+                                                // att: HD_RECEIVE>>AT<<DATA_ACK
 #define HD_READY_SEND_ATDATA            (0x36)          // 3070
 #define HD_OPEN_ATCHANNEL_ACK           (0x37)          // 3070
 #define HD_CLOSE_ATCHANNEL_ACK          (0x38)          // 3070
@@ -181,17 +227,18 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define HD_CLOSE_ATCHANNEL              (0x29)          // 3070
 
 /* USB frames for isochronous transfer */
-#define BAS_FRAMETIME   1               /* number of milliseconds between frames */
-#define BAS_NUMFRAMES   8               /* number of frames per URB */
-#define BAS_MAXFRAME    16              /* allocated bytes per frame */
-#define BAS_NORMFRAME   8               /* send size without flow control */
-#define BAS_HIGHFRAME   10              /* "    "    with positive flow control */
-#define BAS_LOWFRAME    5               /* "    "    with negative flow control */
-#define BAS_CORRFRAMES  4               /* flow control multiplicator */
-
-#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES) /* size of isochronous input buffer per URB */
-#define BAS_OUTBUFSIZE  4096            /* size of common isochronous output buffer */
-#define BAS_OUTBUFPAD   BAS_MAXFRAME    /* size of pad area for isochronous output buffer */
+#define BAS_FRAMETIME   1       /* number of milliseconds between frames */
+#define BAS_NUMFRAMES   8       /* number of frames per URB */
+#define BAS_MAXFRAME    16      /* allocated bytes per frame */
+#define BAS_NORMFRAME   8       /* send size without flow control */
+#define BAS_HIGHFRAME   10      /* "    "    with positive flow control */
+#define BAS_LOWFRAME    5       /* "    "    with negative flow control */
+#define BAS_CORRFRAMES  4       /* flow control multiplicator */
+
+#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES)
+                                        /* size of isoc in buf per URB */
+#define BAS_OUTBUFSIZE  4096            /* size of common isoc out buffer */
+#define BAS_OUTBUFPAD   BAS_MAXFRAME    /* size of pad area for isoc out buf */
 
 #define BAS_INURBS      3
 #define BAS_OUTURBS     3
@@ -207,40 +254,40 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define AT_NUM          7
 
 /* variables in struct at_state_t */
-#define VAR_ZSAU   0
-#define VAR_ZDLE   1
-#define VAR_ZVLS   2
-#define VAR_ZCTP   3
-#define VAR_NUM    4
-
-#define STR_NMBR   0
-#define STR_ZCPN   1
-#define STR_ZCON   2
-#define STR_ZBC    3
-#define STR_ZHLC   4
-#define STR_NUM    5
-
-#define EV_TIMEOUT      -105
-#define EV_IF_VER       -106
-#define EV_PROC_CIDMODE -107
-#define EV_SHUTDOWN     -108
-#define EV_START        -110
-#define EV_STOP         -111
-#define EV_IF_LOCK      -112
-#define EV_PROTO_L2     -113
-#define EV_ACCEPT       -114
-#define EV_DIAL         -115
-#define EV_HUP          -116
-#define EV_BC_OPEN      -117
-#define EV_BC_CLOSED    -118
+#define VAR_ZSAU        0
+#define VAR_ZDLE        1
+#define VAR_ZVLS        2
+#define VAR_ZCTP        3
+#define VAR_NUM         4
+
+#define STR_NMBR        0
+#define STR_ZCPN        1
+#define STR_ZCON        2
+#define STR_ZBC         3
+#define STR_ZHLC        4
+#define STR_NUM         5
+
+#define EV_TIMEOUT      -105
+#define EV_IF_VER       -106
+#define EV_PROC_CIDMODE -107
+#define EV_SHUTDOWN     -108
+#define EV_START        -110
+#define EV_STOP         -111
+#define EV_IF_LOCK      -112
+#define EV_PROTO_L2     -113
+#define EV_ACCEPT       -114
+#define EV_DIAL         -115
+#define EV_HUP          -116
+#define EV_BC_OPEN      -117
+#define EV_BC_CLOSED    -118
 
 /* input state */
-#define INS_command     0x0001
-#define INS_DLE_char    0x0002
-#define INS_byte_stuff  0x0004
-#define INS_have_data   0x0008
-#define INS_skip_frame  0x0010
-#define INS_DLE_command 0x0020
+#define INS_command     0x0001
+#define INS_DLE_char    0x0002
+#define INS_byte_stuff  0x0004
+#define INS_have_data   0x0008
+#define INS_skip_frame  0x0010
+#define INS_DLE_command 0x0020
 #define INS_flag_hunt   0x0040
 
 /* channel state */
@@ -248,27 +295,27 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define CHS_B_UP        0x02
 #define CHS_NOTIFY_LL   0x04
 
-#define ICALL_REJECT  0
-#define ICALL_ACCEPT  1
-#define ICALL_IGNORE  2
+#define ICALL_REJECT    0
+#define ICALL_ACCEPT    1
+#define ICALL_IGNORE    2
 
 /* device state */
-#define MS_UNINITIALIZED        0
-#define MS_INIT                 1
-#define MS_LOCKED               2
-#define MS_SHUTDOWN             3
-#define MS_RECOVER              4
-#define MS_READY                5
+#define MS_UNINITIALIZED        0
+#define MS_INIT                 1
+#define MS_LOCKED               2
+#define MS_SHUTDOWN             3
+#define MS_RECOVER              4
+#define MS_READY                5
 
 /* mode */
-#define M_UNKNOWN       0
-#define M_CONFIG        1
-#define M_UNIMODEM      2
-#define M_CID           3
+#define M_UNKNOWN       0
+#define M_CONFIG        1
+#define M_UNIMODEM      2
+#define M_CID           3
 
 /* start mode */
-#define SM_LOCKED       0
-#define SM_ISDN         1 /* default */
+#define SM_LOCKED       0
+#define SM_ISDN         1 /* default */
 
 struct gigaset_ops;
 struct gigaset_driver;
@@ -283,27 +330,26 @@ struct ser_bc_state;
 struct bas_bc_state;
 
 struct reply_t {
-        int     resp_code;      /* RSP_XXXX */
-        int     min_ConState;   /* <0 => ignore */
-        int     max_ConState;   /* <0 => ignore */
-        int     parameter;      /* e.g. ZSAU_XXXX <0: ignore*/
-        int     new_ConState;   /* <0 => ignore */
-        int     timeout;        /* >0 => *HZ; <=0 => TOUT_XXXX*/
-        int     action[MAXACT]; /* ACT_XXXX */
-        char *command;        /* NULL==none */
+        int     resp_code;      /* RSP_XXXX */
+        int     min_ConState;   /* <0 => ignore */
+        int     max_ConState;   /* <0 => ignore */
+        int     parameter;      /* e.g. ZSAU_XXXX <0: ignore*/
+        int     new_ConState;   /* <0 => ignore */
+        int     timeout;        /* >0 => *HZ; <=0 => TOUT_XXXX*/
+        int     action[MAXACT]; /* ACT_XXXX */
+        char    *command;       /* NULL==none */
 };
 
 extern struct reply_t gigaset_tab_cid_m10x[];
 extern struct reply_t gigaset_tab_nocid_m10x[];
 
 struct inbuf_t {
-        unsigned char           *rcvbuf;                /* usb-gigaset receive buffer */
+        unsigned char           *rcvbuf;        /* usb-gigaset receive buffer */
         struct bc_state         *bcs;
-        struct cardstate *cs;
-        int inputstate;
-
-        atomic_t head, tail;
-        unsigned char data[RBUFSIZE];
+        struct cardstate        *cs;
+        int                     inputstate;
+        atomic_t                head, tail;
+        unsigned char           data[RBUFSIZE];
 };
 
 /* isochronous write buffer structure
@@ -319,16 +365,19 @@ struct inbuf_t {
  *   if writesem <= 0, data[write..read-1] is currently being written to
  * - idle contains the byte value to repeat when the end of valid data is
  *   reached; if nextread==write (buffer contains no data to send), either the
- *   BAS_OUTBUFPAD bytes immediately before data[write] (if write>=BAS_OUTBUFPAD)
- *   or those of the pad area (if write<BAS_OUTBUFPAD) are also filled with that
- *   value
- * - optionally, the following statistics on the buffer's usage can be collected:
- *   maxfill: maximum number of bytes occupied
- *   idlefills: number of times a frame of idle bytes is prepared
- *   emptygets: number of times the buffer was empty when a data frame was requested
+ *   BAS_OUTBUFPAD bytes immediately before data[write] (if
+ *   write>=BAS_OUTBUFPAD) or those of the pad area (if write<BAS_OUTBUFPAD)
+ *   are also filled with that value
+ * - optionally, the following statistics on the buffer's usage can be
+ *   collected:
+ *   maxfill:    maximum number of bytes occupied
+ *   idlefills:  number of times a frame of idle bytes is prepared
+ *   emptygets:  number of times the buffer was empty when a data frame was
+ *               requested
  *   backtoback: number of times two data packets were entered into the buffer
- *    without intervening idle flags
- *   nakedback: set if no idle flags have been inserted since the last data packet
+ *               without intervening idle flags
+ *   nakedback:  set if no idle flags have been inserted since the last data
+ *               packet
  */
 struct isowbuf_t {
         atomic_t        read;
@@ -358,34 +407,28 @@ struct isow_urbctx_t {
  * it is currently assigned a B channel
  */
 struct at_state_t {
-        struct list_head        list;
-        int                     waiting;
-        int                     getstring;
+        struct list_head        list;
+        int                     waiting;
+        int                     getstring;
         atomic_t                timer_index;
         unsigned long           timer_expires;
         int                     timer_active;
-        unsigned int            ConState;                           /* State of connection */
-        struct reply_t          *replystruct;
-        int                     cid;
-        int                     int_var[VAR_NUM];   /* see VAR_XXXX */
-        char                    *str_var[STR_NUM];  /* see STR_XXXX */
-        unsigned                pending_commands;   /* see PC_XXXX */
-        atomic_t                seq_index;
-
-        struct cardstate    *cs;
-        struct bc_state         *bcs;
+        unsigned int            ConState;       /* State of connection */
+        struct reply_t          *replystruct;
+        int                     cid;
+        int                     int_var[VAR_NUM];       /* see VAR_XXXX */
+        char                    *str_var[STR_NUM];      /* see STR_XXXX */
+        unsigned                pending_commands;       /* see PC_XXXX */
+        atomic_t                seq_index;
+
+        struct cardstate        *cs;
+        struct bc_state         *bcs;
 };
 
 struct resp_type_t {
         unsigned char   *response;
-        int             resp_code;           /* RSP_XXXX */
-        int             type;                /* RT_XXXX */
-};
-
-struct prot_skb {
-        atomic_t                empty;
-        struct semaphore        *sem;
-        struct sk_buff          *skb;
+        int             resp_code;      /* RSP_XXXX */
+        int             type;           /* RT_XXXX */
 };
 
 struct event_t {
@@ -398,29 +441,29 @@ struct event_t {
 
 /* This buffer holds all information about the used B-Channel */
 struct bc_state {
-        struct sk_buff *tx_skb;                        /* Current transfer buffer to modem */
-        struct sk_buff_head squeue;                    /* B-Channel send Queue */
+        struct sk_buff *tx_skb;         /* Current transfer buffer to modem */
+        struct sk_buff_head squeue;     /* B-Channel send Queue */
 
         /* Variables for debugging .. */
-        int corrupted;                                   /* Counter for corrupted packages */
-        int trans_down;                                  /* Counter of packages (downstream) */
-        int trans_up;                                    /* Counter of packages (upstream) */
+        int corrupted;                  /* Counter for corrupted packages */
+        int trans_down;                 /* Counter of packages (downstream) */
+        int trans_up;                   /* Counter of packages (upstream) */
 
         struct at_state_t at_state;
         unsigned long rcvbytes;
 
         __u16 fcs;
         struct sk_buff *skb;
-        int inputstate; /* see INS_XXXX */
+        int inputstate;                 /* see INS_XXXX */
 
         int channel;
 
         struct cardstate *cs;
 
-        unsigned chstate;                       /* bitmap (CHS_*) */
+        unsigned chstate;               /* bitmap (CHS_*) */
         int ignore;
-        unsigned        proto2;                 /* Layer 2 protocol (ISDN_PROTO_L2_*) */
-        char            *commands[AT_NUM]; /* see AT_XXXX */
+        unsigned proto2;                /* Layer 2 protocol (ISDN_PROTO_L2_*) */
+        char *commands[AT_NUM];         /* see AT_XXXX */
 
 #ifdef CONFIG_GIGASET_DEBUG
         int emptycount;
@@ -430,9 +473,9 @@ struct bc_state {
 
         /* hardware drivers */
         union {
-                struct ser_bc_state *ser;                /* private data of serial hardware driver */
-                struct usb_bc_state *usb;                /* private data of usb hardware driver */
-                struct bas_bc_state *bas;
+                struct ser_bc_state *ser;       /* serial hardware driver */
+                struct usb_bc_state *usb;       /* usb hardware driver (m105) */
+                struct bas_bc_state *bas;       /* usb hardware driver (base) */
         } hw;
 };
 
@@ -443,22 +486,23 @@ struct cardstate {
         const struct gigaset_ops *ops;
 
         /* Stuff to handle communication */
-        //wait_queue_head_t initwait;
         wait_queue_head_t waitqueue;
         int waiting;
-        atomic_t mode;                       /* see M_XXXX */
-        atomic_t mstate;                     /* Modem state: see MS_XXXX */
-                                             /* only changed by the event layer */
+        atomic_t mode;                  /* see M_XXXX */
+        atomic_t mstate;                /* Modem state: see MS_XXXX */
+                                        /* only changed by the event layer */
         int cmd_result;
 
         int channels;
-        struct bc_state *bcs;                /* Array of struct bc_state */
+        struct bc_state *bcs;           /* Array of struct bc_state */
 
-        int onechannel;                      /* data and commands transmitted in one stream (M10x) */
+        int onechannel;                 /* data and commands transmitted in one
+                                           stream (M10x) */
 
         spinlock_t lock;
-        struct at_state_t at_state;          /* at_state_t for cid == 0 */
-        struct list_head temp_at_states;     /* list of temporary "struct at_state_t"s without B channel */
+        struct at_state_t at_state;     /* at_state_t for cid == 0 */
+        struct list_head temp_at_states;/* list of temporary "struct
+                                           at_state_t"s without B channel */
 
         struct inbuf_t *inbuf;
 
@@ -474,36 +518,47 @@ struct cardstate {
         unsigned fwver[4];
         int gotfwver;
 
-        atomic_t running;                    /* !=0 if events are handled */
-        atomic_t connected;                  /* !=0 if hardware is connected */
+        atomic_t running;               /* !=0 if events are handled */
+        atomic_t connected;             /* !=0 if hardware is connected */
 
         atomic_t cidmode;
 
-        int myid;                            /* id for communication with LL */
+        int myid;                       /* id for communication with LL */
         isdn_if iif;
 
         struct reply_t *tabnocid;
         struct reply_t *tabcid;
         int cs_init;
-        int ignoreframes;                    /* frames to ignore after setting up the B channel */
-        struct semaphore sem;                /* locks this structure: */
-                                             /*   connected is not changed, */
-                                             /*   hardware_up is not changed, */
-                                             /*   MState is not changed to or from MS_LOCKED */
+        int ignoreframes;               /* frames to ignore after setting up the
+                                           B channel */
+        struct semaphore sem;           /* locks this structure: */
+                                        /*   connected is not changed, */
+                                        /*   hardware_up is not changed, */
+                                        /*   MState is not changed to or from
+                                             MS_LOCKED */
 
         struct timer_list timer;
         int retry_count;
-        int dle;                             /* !=0 if modem commands/responses are dle encoded */
-        int cur_at_seq;                      /* sequence of AT commands being processed */
-        int curchannel;                      /* channel, those commands are meant for */
-        atomic_t commands_pending;           /* flag(s) in xxx.commands_pending have been set */
-        struct tasklet_struct event_tasklet; /* tasklet for serializing AT commands. Scheduled
-                                              *   -> for modem reponses (and incomming data for M10x)
-                                              *   -> on timeout
-                                              *   -> after setting bits in xxx.at_state.pending_command
-                                              *      (e.g. command from LL) */
-        struct tasklet_struct write_tasklet; /* tasklet for serial output
-                                              * (not used in base driver) */
+        int dle;                        /* !=0 if modem commands/responses are
+                                           dle encoded */
+        int cur_at_seq;                 /* sequence of AT commands being
+                                           processed */
+        int curchannel;                 /* channel, those commands are meant
+                                           for */
+        atomic_t commands_pending;      /* flag(s) in xxx.commands_pending have
+                                           been set */
+        struct tasklet_struct event_tasklet;
+                                        /* tasklet for serializing AT commands.
+                                         * Scheduled
+                                         *   -> for modem reponses (and
+                                         *      incomming data for M10x)
+                                         *   -> on timeout
+                                         *   -> after setting bits in
+                                         *      xxx.at_state.pending_command
+                                         *      (e.g. command from LL) */
+        struct tasklet_struct write_tasklet;
+                                        /* tasklet for serial output
+                                         * (not used in base driver) */
 
         /* event queue */
         struct event_t events[MAX_EVENTS];
@@ -516,16 +571,15 @@ struct cardstate {
 
         /* hardware drivers */
         union {
-                struct usb_cardstate *usb; /* private data of USB hardware driver */
-                struct ser_cardstate *ser; /* private data of serial hardware driver */
-                struct bas_cardstate *bas; /* private data of base hardware driver */
+                struct usb_cardstate *usb; /* USB hardware driver (m105) */
+                struct ser_cardstate *ser; /* serial hardware driver */
+                struct bas_cardstate *bas; /* USB hardware driver (base) */
         } hw;
 };
 
 struct gigaset_driver {
         struct list_head list;
-        spinlock_t lock;                       /* locks minor tables and blocked */
-        //struct semaphore sem;                /* locks this structure */
+        spinlock_t lock;                /* locks minor tables and blocked */
         struct tty_driver *tty;
         unsigned have_tty;
         unsigned minor;
@@ -553,7 +607,8 @@ struct bas_bc_state {
         struct isow_urbctx_t    isoouturbs[BAS_OUTURBS];
         struct isow_urbctx_t    *isooutdone, *isooutfree, *isooutovfl;
         struct isowbuf_t        *isooutbuf;
-        unsigned numsub;                        /* submitted URB counter (for diagnostic messages only) */
+        unsigned numsub;                        /* submitted URB counter (for
+                                                   diagnostic messages only) */
         struct tasklet_struct   sent_tasklet;
 
         /* isochronous input state */
@@ -563,24 +618,31 @@ struct bas_bc_state {
         struct urb *isoindone;                  /* completed isoc read URB */
         int loststatus;                         /* status of dropped URB */
         unsigned isoinlost;                     /* number of bytes lost */
-        /* state of bit unstuffing algorithm (in addition to BC_state.inputstate) */
-        unsigned seqlen;                        /* number of '1' bits not yet unstuffed */
-        unsigned inbyte, inbits;                /* collected bits for next byte */
+        /* state of bit unstuffing algorithm (in addition to
+           BC_state.inputstate) */
+        unsigned seqlen;                        /* number of '1' bits not yet
+                                                   unstuffed */
+        unsigned inbyte, inbits;                /* collected bits for next byte
+                                                */
         /* statistics */
         unsigned goodbytes;                     /* bytes correctly received */
-        unsigned alignerrs;                     /* frames with incomplete byte at end */
+        unsigned alignerrs;                     /* frames with incomplete byte
+                                                   at end */
         unsigned fcserrs;                       /* FCS errors */
         unsigned frameerrs;                     /* framing errors */
         unsigned giants;                        /* long frames */
         unsigned runts;                         /* short frames */
         unsigned aborts;                        /* HDLC aborts */
-        unsigned shared0s;                      /* '0' bits shared between flags */
-        unsigned stolen0s;                      /* '0' stuff bits also serving as leading flag bits */
+        unsigned shared0s;                      /* '0' bits shared between flags
+                                                */
+        unsigned stolen0s;                      /* '0' stuff bits also serving
+                                                   as leading flag bits */
         struct tasklet_struct rcvd_tasklet;
 };
 
 struct gigaset_ops {
-        /* Called from ev-layer.c/interface.c for sending AT commands to the device */
+        /* Called from ev-layer.c/interface.c for sending AT commands to the
+           device */
         int (*write_cmd)(struct cardstate *cs,
                          const unsigned char *buf, int len,
                          struct tasklet_struct *wake_tasklet);
@@ -604,7 +666,8 @@ struct gigaset_ops {
         /* Called by gigaset_freecs() for freeing bcs->hw.xxx */
         int (*freebcshw)(struct bc_state *bcs);
 
-        /* Called by gigaset_stop() or gigaset_bchannel_down() for resetting bcs->hw.xxx */
+        /* Called by gigaset_stop() or gigaset_bchannel_down() for resetting
+           bcs->hw.xxx */
         void (*reinitbcshw)(struct bc_state *bcs);
 
         /* Called by gigaset_initcs() for setting up cs->hw.xxx */
@@ -613,13 +676,10 @@ struct gigaset_ops {
         /* Called by gigaset_freecs() for freeing cs->hw.xxx */
         void (*freecshw)(struct cardstate *cs);
 
-        ///* Called by gigaset_stop() for killing URBs, shutting down the device, ...
-        //   hardwareup: ==0: don't try to shut down the device, hardware is really not accessible
-        //             !=0: hardware still up */
-        //void (*stophw)(struct cardstate *cs, int hardwareup);
-
-        /* Called from common.c/interface.c for additional serial port control */
-        int (*set_modem_ctrl)(struct cardstate *cs, unsigned old_state, unsigned new_state);
+        /* Called from common.c/interface.c for additional serial port
+           control */
+        int (*set_modem_ctrl)(struct cardstate *cs, unsigned old_state,
+                              unsigned new_state);
         int (*baud_rate)(struct cardstate *cs, unsigned cflag);
         int (*set_line_ctrl)(struct cardstate *cs, unsigned cflag);
 
@@ -667,7 +727,8 @@ void gigaset_isoc_input(struct inbuf_t *inbuf);
 
 /* Called from bas-gigaset.c to process a block of data
  * received through the isochronous channel */
-void gigaset_isoc_receive(unsigned char *src, unsigned count, struct bc_state *bcs);
+void gigaset_isoc_receive(unsigned char *src, unsigned count,
+                          struct bc_state *bcs);
 
 /* Called from bas-gigaset.c to put a block of data
  * into the isochronous output buffer */
@@ -763,7 +824,8 @@ struct cardstate *gigaset_getunassignedcs(struct gigaset_driver *drv);
 void gigaset_unassign(struct cardstate *cs);
 void gigaset_blockdriver(struct gigaset_driver *drv);
 
-/* Allocate and initialize card state. Calls hardware dependent gigaset_init[b]cs(). */
+/* Allocate and initialize card state. Calls hardware dependent
+   gigaset_init[b]cs(). */
 struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
                                  int onechannel, int ignoreframes,
                                  int cidmode, const char *modulename);