Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils
[cascardo/linux.git] / drivers / isdn / i4l / isdn_ttyfax.c
index 4c41f19..47aae49 100644 (file)
@@ -45,7 +45,7 @@ isdn_getrev(const char *revision)
  */
 
 static void
-isdn_tty_fax_modem_result(int code, modem_info * info)
+isdn_tty_fax_modem_result(int code, modem_info *info)
 {
        atemu *m = &info->emu;
        T30_s *f = info->fax;
@@ -54,9 +54,9 @@ isdn_tty_fax_modem_result(int code, modem_info * info)
        char *rp;
        int i;
        static char *msg[] =
-       {"OK", "ERROR", "+FCON", "+FCSI:", "+FDIS:",
-        "+FHNG:", "+FDCS:", "CONNECT", "+FTSI:",
-        "+FCFR", "+FPTS:", "+FET:"};
+               {"OK", "ERROR", "+FCON", "+FCSI:", "+FDIS:",
+                "+FHNG:", "+FDCS:", "CONNECT", "+FTSI:",
+                "+FCFR", "+FPTS:", "+FET:"};
 
 
        isdn_tty_at_cout("\r\n", info);
@@ -64,95 +64,95 @@ isdn_tty_fax_modem_result(int code, modem_info * info)
 
 #ifdef ISDN_TTY_FAX_CMD_DEBUG
        printk(KERN_DEBUG "isdn_tty: Fax send %s on ttyI%d\n",
-               msg[code], info->line);
+              msg[code], info->line);
 #endif
        switch (code) {
-               case 0: /* OK */
-                       break;
-               case 1: /* ERROR */
-                       break;
-               case 2: /* +FCON */
-                       /* Append CPN, if enabled */
-                       if ((m->mdmreg[REG_CPNFCON] & BIT_CPNFCON) &&
-                               (!(dev->usage[info->isdn_channel] & ISDN_USAGE_OUTGOING))) {
-                               sprintf(rs, "/%s", m->cpn);
-                               isdn_tty_at_cout(rs, info);
-                       }
-                       info->online = 1;
-                       f->fet = 0;
-                       if (f->phase == ISDN_FAX_PHASE_A)
-                               f->phase = ISDN_FAX_PHASE_B;
-                       break;
-               case 3: /* +FCSI */
-               case 8: /* +FTSI */
-                       sprintf(rs, "\"%s\"", f->r_id);
-                       isdn_tty_at_cout(rs, info);
-                       break;
-               case 4: /* +FDIS */
-                       rs[0] = 0;
-                       rp = &f->r_resolution;
-                       for (i = 0; i < 8; i++) {
-                               sprintf(rss, "%c%s", rp[i] + 48,
-                                       (i < 7) ? "," : "");
-                               strcat(rs, rss);
-                       }
+       case 0: /* OK */
+               break;
+       case 1: /* ERROR */
+               break;
+       case 2: /* +FCON */
+               /* Append CPN, if enabled */
+               if ((m->mdmreg[REG_CPNFCON] & BIT_CPNFCON) &&
+                   (!(dev->usage[info->isdn_channel] & ISDN_USAGE_OUTGOING))) {
+                       sprintf(rs, "/%s", m->cpn);
                        isdn_tty_at_cout(rs, info);
+               }
+               info->online = 1;
+               f->fet = 0;
+               if (f->phase == ISDN_FAX_PHASE_A)
+                       f->phase = ISDN_FAX_PHASE_B;
+               break;
+       case 3: /* +FCSI */
+       case 8: /* +FTSI */
+               sprintf(rs, "\"%s\"", f->r_id);
+               isdn_tty_at_cout(rs, info);
+               break;
+       case 4: /* +FDIS */
+               rs[0] = 0;
+               rp = &f->r_resolution;
+               for (i = 0; i < 8; i++) {
+                       sprintf(rss, "%c%s", rp[i] + 48,
+                               (i < 7) ? "," : "");
+                       strcat(rs, rss);
+               }
+               isdn_tty_at_cout(rs, info);
 #ifdef ISDN_TTY_FAX_CMD_DEBUG
-                       printk(KERN_DEBUG "isdn_tty: Fax DIS=%s on ttyI%d\n",
-                              rs, info->line);
+               printk(KERN_DEBUG "isdn_tty: Fax DIS=%s on ttyI%d\n",
+                      rs, info->line);
 #endif
-                       break;
-               case 5: /* +FHNG */
-                       sprintf(rs, "%d", f->code);
-                       isdn_tty_at_cout(rs, info);
-                       info->faxonline = 0;
-                       break;
-               case 6: /* +FDCS */
-                       rs[0] = 0;
-                       rp = &f->r_resolution;
-                       for (i = 0; i < 8; i++) {
-                               sprintf(rss, "%c%s", rp[i] + 48,
-                                       (i < 7) ? "," : "");
-                               strcat(rs, rss);
-                       }
-                       isdn_tty_at_cout(rs, info);
+               break;
+       case 5: /* +FHNG */
+               sprintf(rs, "%d", f->code);
+               isdn_tty_at_cout(rs, info);
+               info->faxonline = 0;
+               break;
+       case 6: /* +FDCS */
+               rs[0] = 0;
+               rp = &f->r_resolution;
+               for (i = 0; i < 8; i++) {
+                       sprintf(rss, "%c%s", rp[i] + 48,
+                               (i < 7) ? "," : "");
+                       strcat(rs, rss);
+               }
+               isdn_tty_at_cout(rs, info);
 #ifdef ISDN_TTY_FAX_CMD_DEBUG
-                       printk(KERN_DEBUG "isdn_tty: Fax DCS=%s on ttyI%d\n",
-                              rs, info->line);
+               printk(KERN_DEBUG "isdn_tty: Fax DCS=%s on ttyI%d\n",
+                      rs, info->line);
 #endif
-                       break;
-               case 7: /* CONNECT */
-                       info->faxonline |= 2;
-                       break;
-               case 9: /* FCFR */
-                       break;
-               case 10:        /* FPTS */
-                       isdn_tty_at_cout("1", info);
-                       break;
-               case 11:        /* FET */
-                       sprintf(rs, "%d", f->fet);
-                       isdn_tty_at_cout(rs, info);
-                       break;
+               break;
+       case 7: /* CONNECT */
+               info->faxonline |= 2;
+               break;
+       case 9: /* FCFR */
+               break;
+       case 10:        /* FPTS */
+               isdn_tty_at_cout("1", info);
+               break;
+       case 11:        /* FET */
+               sprintf(rs, "%d", f->fet);
+               isdn_tty_at_cout(rs, info);
+               break;
        }
 
        isdn_tty_at_cout("\r\n", info);
 
        switch (code) {
-               case 7: /* CONNECT */
-                       info->online = 2;
-                       if (info->faxonline & 1) {
-                               sprintf(rs, "%c", XON);
-                               isdn_tty_at_cout(rs, info);
-                       }
-                       break;
+       case 7: /* CONNECT */
+               info->online = 2;
+               if (info->faxonline & 1) {
+                       sprintf(rs, "%c", XON);
+                       isdn_tty_at_cout(rs, info);
+               }
+               break;
        }
 }
 
 static int
-isdn_tty_fax_command1(modem_info * info, isdn_ctrl * c)
+isdn_tty_fax_command1(modem_info *info, isdn_ctrl *c)
 {
        static char *msg[] =
-       {"OK", "CONNECT", "NO CARRIER", "ERROR", "FCERROR"};
+               {"OK", "CONNECT", "NO CARRIER", "ERROR", "FCERROR"};
 
 #ifdef ISDN_TTY_FAX_CMD_DEBUG
        printk(KERN_DEBUG "isdn_tty: FCLASS1 cmd(%d)\n", c->parm.aux.cmd);
@@ -165,30 +165,30 @@ isdn_tty_fax_command1(modem_info * info, isdn_ctrl * c)
                isdn_tty_at_cout("\r\n", info);
        }
        switch (c->parm.aux.cmd) {
-               case ISDN_FAX_CLASS1_CONNECT:
-                       info->online = 2;
-                       break;
-               case ISDN_FAX_CLASS1_OK:
-               case ISDN_FAX_CLASS1_FCERROR:
-               case ISDN_FAX_CLASS1_ERROR:
-               case ISDN_FAX_CLASS1_NOCARR:
-                       break;
-               case ISDN_FAX_CLASS1_QUERY:
+       case ISDN_FAX_CLASS1_CONNECT:
+               info->online = 2;
+               break;
+       case ISDN_FAX_CLASS1_OK:
+       case ISDN_FAX_CLASS1_FCERROR:
+       case ISDN_FAX_CLASS1_ERROR:
+       case ISDN_FAX_CLASS1_NOCARR:
+               break;
+       case ISDN_FAX_CLASS1_QUERY:
+               isdn_tty_at_cout("\r\n", info);
+               if (!c->parm.aux.para[0]) {
+                       isdn_tty_at_cout(msg[ISDN_FAX_CLASS1_ERROR], info);
                        isdn_tty_at_cout("\r\n", info);
-                       if (!c->parm.aux.para[0]) {
-                               isdn_tty_at_cout(msg[ISDN_FAX_CLASS1_ERROR], info);
-                               isdn_tty_at_cout("\r\n", info);
-                       } else {
-                               isdn_tty_at_cout(c->parm.aux.para, info);
-                               isdn_tty_at_cout("\r\nOK\r\n", info);
-                       }
-                       break;
+               } else {
+                       isdn_tty_at_cout(c->parm.aux.para, info);
+                       isdn_tty_at_cout("\r\nOK\r\n", info);
+               }
+               break;
        }
        return (0);
 }
 
 int
-isdn_tty_fax_command(modem_info * info, isdn_ctrl * c)
+isdn_tty_fax_command(modem_info *info, isdn_ctrl *c)
 {
        T30_s *f = info->fax;
        char rs[10];
@@ -201,78 +201,78 @@ isdn_tty_fax_command(modem_info * info, isdn_ctrl * c)
               f->r_code, info->line);
 #endif
        switch (f->r_code) {
-               case ISDN_TTY_FAX_FCON:
-                       info->faxonline = 1;
-                       isdn_tty_fax_modem_result(2, info);     /* +FCON */
-                       return (0);
-               case ISDN_TTY_FAX_FCON_I:
-                       info->faxonline = 16;
-                       isdn_tty_fax_modem_result(2, info);     /* +FCON */
-                       return (0);
-               case ISDN_TTY_FAX_RID:
-                       if (info->faxonline & 1)
-                               isdn_tty_fax_modem_result(3, info);     /* +FCSI */
-                       if (info->faxonline & 16)
-                               isdn_tty_fax_modem_result(8, info);     /* +FTSI */
-                       return (0);
-               case ISDN_TTY_FAX_DIS:
-                       isdn_tty_fax_modem_result(4, info);     /* +FDIS */
-                       return (0);
-               case ISDN_TTY_FAX_HNG:
-                       if (f->phase == ISDN_FAX_PHASE_C) {
-                               if (f->direction == ISDN_TTY_FAX_CONN_IN) {
-                                       sprintf(rs, "%c%c", DLE, ETX);
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       sprintf(rs, "%c", 0x18);
-                                       isdn_tty_at_cout(rs, info);
-                               }
-                               info->faxonline &= ~2;  /* leave data mode */
-                               info->online = 1;
-                       }
-                       f->phase = ISDN_FAX_PHASE_E;
-                       isdn_tty_fax_modem_result(5, info);     /* +FHNG */
-                       isdn_tty_fax_modem_result(0, info);     /* OK */
-                       return (0);
-               case ISDN_TTY_FAX_DCS:
-                       isdn_tty_fax_modem_result(6, info);     /* +FDCS */
-                       isdn_tty_fax_modem_result(7, info);     /* CONNECT */
-                       f->phase = ISDN_FAX_PHASE_C;
-                       return (0);
-               case ISDN_TTY_FAX_TRAIN_OK:
-                       isdn_tty_fax_modem_result(6, info);     /* +FDCS */
-                       isdn_tty_fax_modem_result(0, info);     /* OK */
-                       return (0);
-               case ISDN_TTY_FAX_SENT:
-                       isdn_tty_fax_modem_result(0, info);     /* OK */
-                       return (0);
-               case ISDN_TTY_FAX_CFR:
-                       isdn_tty_fax_modem_result(9, info);     /* +FCFR */
-                       return (0);
-               case ISDN_TTY_FAX_ET:
-                       sprintf(rs, "%c%c", DLE, ETX);
-                       isdn_tty_at_cout(rs, info);
-                       isdn_tty_fax_modem_result(10, info);    /* +FPTS */
-                       isdn_tty_fax_modem_result(11, info);    /* +FET */
-                       isdn_tty_fax_modem_result(0, info);     /* OK */
-                       info->faxonline &= ~2;  /* leave data mode */
-                       info->online = 1;
-                       f->phase = ISDN_FAX_PHASE_D;
-                       return (0);
-               case ISDN_TTY_FAX_PTS:
-                       isdn_tty_fax_modem_result(10, info);    /* +FPTS */
-                       if (f->direction == ISDN_TTY_FAX_CONN_OUT) {
-                               if (f->fet == 1)
-                                       f->phase = ISDN_FAX_PHASE_B;
-                               if (f->fet == 0)
-                                       isdn_tty_fax_modem_result(0, info);     /* OK */
+       case ISDN_TTY_FAX_FCON:
+               info->faxonline = 1;
+               isdn_tty_fax_modem_result(2, info);     /* +FCON */
+               return (0);
+       case ISDN_TTY_FAX_FCON_I:
+               info->faxonline = 16;
+               isdn_tty_fax_modem_result(2, info);     /* +FCON */
+               return (0);
+       case ISDN_TTY_FAX_RID:
+               if (info->faxonline & 1)
+                       isdn_tty_fax_modem_result(3, info);     /* +FCSI */
+               if (info->faxonline & 16)
+                       isdn_tty_fax_modem_result(8, info);     /* +FTSI */
+               return (0);
+       case ISDN_TTY_FAX_DIS:
+               isdn_tty_fax_modem_result(4, info);     /* +FDIS */
+               return (0);
+       case ISDN_TTY_FAX_HNG:
+               if (f->phase == ISDN_FAX_PHASE_C) {
+                       if (f->direction == ISDN_TTY_FAX_CONN_IN) {
+                               sprintf(rs, "%c%c", DLE, ETX);
+                               isdn_tty_at_cout(rs, info);
+                       } else {
+                               sprintf(rs, "%c", 0x18);
+                               isdn_tty_at_cout(rs, info);
                        }
-                       return (0);
-               case ISDN_TTY_FAX_EOP:
                        info->faxonline &= ~2;  /* leave data mode */
                        info->online = 1;
-                       f->phase = ISDN_FAX_PHASE_D;
-                       return (0);
+               }
+               f->phase = ISDN_FAX_PHASE_E;
+               isdn_tty_fax_modem_result(5, info);     /* +FHNG */
+               isdn_tty_fax_modem_result(0, info);     /* OK */
+               return (0);
+       case ISDN_TTY_FAX_DCS:
+               isdn_tty_fax_modem_result(6, info);     /* +FDCS */
+               isdn_tty_fax_modem_result(7, info);     /* CONNECT */
+               f->phase = ISDN_FAX_PHASE_C;
+               return (0);
+       case ISDN_TTY_FAX_TRAIN_OK:
+               isdn_tty_fax_modem_result(6, info);     /* +FDCS */
+               isdn_tty_fax_modem_result(0, info);     /* OK */
+               return (0);
+       case ISDN_TTY_FAX_SENT:
+               isdn_tty_fax_modem_result(0, info);     /* OK */
+               return (0);
+       case ISDN_TTY_FAX_CFR:
+               isdn_tty_fax_modem_result(9, info);     /* +FCFR */
+               return (0);
+       case ISDN_TTY_FAX_ET:
+               sprintf(rs, "%c%c", DLE, ETX);
+               isdn_tty_at_cout(rs, info);
+               isdn_tty_fax_modem_result(10, info);    /* +FPTS */
+               isdn_tty_fax_modem_result(11, info);    /* +FET */
+               isdn_tty_fax_modem_result(0, info);     /* OK */
+               info->faxonline &= ~2;  /* leave data mode */
+               info->online = 1;
+               f->phase = ISDN_FAX_PHASE_D;
+               return (0);
+       case ISDN_TTY_FAX_PTS:
+               isdn_tty_fax_modem_result(10, info);    /* +FPTS */
+               if (f->direction == ISDN_TTY_FAX_CONN_OUT) {
+                       if (f->fet == 1)
+                               f->phase = ISDN_FAX_PHASE_B;
+                       if (f->fet == 0)
+                               isdn_tty_fax_modem_result(0, info);     /* OK */
+               }
+               return (0);
+       case ISDN_TTY_FAX_EOP:
+               info->faxonline &= ~2;  /* leave data mode */
+               info->online = 1;
+               f->phase = ISDN_FAX_PHASE_D;
+               return (0);
 
        }
        return (-1);
@@ -280,7 +280,7 @@ isdn_tty_fax_command(modem_info * info, isdn_ctrl * c)
 
 
 void
-isdn_tty_fax_bitorder(modem_info * info, struct sk_buff *skb)
+isdn_tty_fax_bitorder(modem_info *info, struct sk_buff *skb)
 {
        __u8 LeftMask;
        __u8 RightMask;
@@ -292,10 +292,10 @@ isdn_tty_fax_bitorder(modem_info * info, struct sk_buff *skb)
                for (i = 0; i < skb->len; i++) {
                        Data = skb->data[i];
                        for (
-                                   LeftMask = 0x80, RightMask = 0x01;
-                                   LeftMask > RightMask;
-                                   LeftMask >>= 1, RightMask <<= 1
-                           ) {
+                               LeftMask = 0x80, RightMask = 0x01;
+                               LeftMask > RightMask;
+                               LeftMask >>= 1, RightMask <<= 1
+                               ) {
                                fBit = (Data & LeftMask);
                                if (Data & RightMask)
                                        Data |= LeftMask;
@@ -317,10 +317,10 @@ isdn_tty_fax_bitorder(modem_info * info, struct sk_buff *skb)
  */
 
 static int
-isdn_tty_cmd_FCLASS1(char **p, modem_info * info)
+isdn_tty_cmd_FCLASS1(char **p, modem_info *info)
 {
        static char *cmd[] =
-       {"AE", "TS", "RS", "TM", "RM", "TH", "RH"};
+               {"AE", "TS", "RS", "TM", "RM", "TH", "RH"};
        isdn_ctrl c;
        int par, i;
        u_long flags;
@@ -337,28 +337,28 @@ isdn_tty_cmd_FCLASS1(char **p, modem_info * info)
 
        p[0] += 2;
        switch (*p[0]) {
-               case '?':
-                       p[0]++;
-                       c.parm.aux.subcmd = AT_QUERY;
-                       break;
-               case '=':
+       case '?':
+               p[0]++;
+               c.parm.aux.subcmd = AT_QUERY;
+               break;
+       case '=':
+               p[0]++;
+               if (*p[0] == '?') {
                        p[0]++;
-                       if (*p[0] == '?') {
-                               p[0]++;
-                               c.parm.aux.subcmd = AT_EQ_QUERY;
-                       } else {
-                               par = isdn_getnum(p);
-                               if ((par < 0) || (par > 255))
-                                       PARSE_ERROR1;
-                               c.parm.aux.subcmd = AT_EQ_VALUE;
-                               c.parm.aux.para[0] = par;
-                       }
-                       break;
-               case 0:
-                       c.parm.aux.subcmd = AT_COMMAND;
-                       break;
-               default:
-                       PARSE_ERROR1;
+                       c.parm.aux.subcmd = AT_EQ_QUERY;
+               } else {
+                       par = isdn_getnum(p);
+                       if ((par < 0) || (par > 255))
+                               PARSE_ERROR1;
+                       c.parm.aux.subcmd = AT_EQ_VALUE;
+                       c.parm.aux.para[0] = par;
+               }
+               break;
+       case 0:
+               c.parm.aux.subcmd = AT_COMMAND;
+               break;
+       default:
+               PARSE_ERROR1;
        }
        c.command = ISDN_CMD_FAXCMD;
 #ifdef ISDN_TTY_FAX_CMD_DEBUG
@@ -409,7 +409,7 @@ isdn_tty_cmd_FCLASS1(char **p, modem_info * info)
  */
 
 static int
-isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
+isdn_tty_cmd_FCLASS2(char **p, modem_info *info)
 {
        atemu *m = &info->emu;
        T30_s *f = info->fax;
@@ -418,25 +418,25 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        char rs[50];
        char rss[50];
        int maxdccval[] =
-       {1, 5, 2, 2, 3, 2, 0, 7};
+               {1, 5, 2, 2, 3, 2, 0, 7};
 
        /* FAA still unchanged */
        if (!strncmp(p[0], "AA", 2)) {  /* TODO */
                p[0] += 2;
                switch (*p[0]) {
-                       case '?':
-                               p[0]++;
-                               sprintf(rs, "\r\n%d", 0);
-                               isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               par = isdn_getnum(p);
-                               if ((par < 0) || (par > 255))
-                                       PARSE_ERROR1;
-                               break;
-                       default:
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", 0);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       par = isdn_getnum(p);
+                       if ((par < 0) || (par > 255))
                                PARSE_ERROR1;
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -444,29 +444,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "BADLIN", 6)) {
                p[0] += 6;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->badlin);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->badlin);
+                               sprintf(rs, "\r\n0-255");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0-255");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 255))
-                                               PARSE_ERROR1;
-                                       f->badlin = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 255))
+                                       PARSE_ERROR1;
+                               f->badlin = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FBADLIN=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FBADLIN=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -474,29 +474,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "BADMUL", 6)) {
                p[0] += 6;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->badmul);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->badmul);
+                               sprintf(rs, "\r\n0-255");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0-255");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 255))
-                                               PARSE_ERROR1;
-                                       f->badmul = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 255))
+                                       PARSE_ERROR1;
+                               f->badmul = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FBADMUL=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FBADMUL=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -504,29 +504,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "BOR", 3)) {
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->bor);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->bor);
+                               sprintf(rs, "\r\n0,1");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0,1");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 1))
-                                               PARSE_ERROR1;
-                                       f->bor = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 1))
+                                       PARSE_ERROR1;
+                               f->bor = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FBOR=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FBOR=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -534,29 +534,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "NBC", 3)) {
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->nbc);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->nbc);
+                               sprintf(rs, "\r\n0,1");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0,1");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 1))
-                                               PARSE_ERROR1;
-                                       f->nbc = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 1))
+                                       PARSE_ERROR1;
+                               f->nbc = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FNBC=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FNBC=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -576,36 +576,36 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
                int i, r;
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n\"%s\"", f->pollid);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n\"%s\"", f->pollid);
+                               sprintf(rs, "\r\n\"STRING\"");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
+                       } else {
+                               if (*p[0] == '"')
                                        p[0]++;
-                                       sprintf(rs, "\r\n\"STRING\"");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       if (*p[0] == '"')
-                                               p[0]++;
-                                       for (i = 0; (*p[0]) && i < (FAXIDLEN - 1) && (*p[0] != '"'); i++) {
-                                               f->pollid[i] = *p[0]++;
-                                       }
-                                       if (*p[0] == '"')
-                                               p[0]++;
-                                       for (r = i; r < FAXIDLEN; r++) {
-                                               f->pollid[r] = 32;
-                                       }
-                                       f->pollid[FAXIDLEN - 1] = 0;
+                               for (i = 0; (*p[0]) && i < (FAXIDLEN - 1) && (*p[0] != '"'); i++) {
+                                       f->pollid[i] = *p[0]++;
+                               }
+                               if (*p[0] == '"')
+                                       p[0]++;
+                               for (r = i; r < FAXIDLEN; r++) {
+                                       f->pollid[r] = 32;
+                               }
+                               f->pollid[FAXIDLEN - 1] = 0;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax local poll ID rx \"%s\"\n", f->pollid);
+                               printk(KERN_DEBUG "isdn_tty: Fax local poll ID rx \"%s\"\n", f->pollid);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -613,29 +613,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "CQ", 2)) {
                p[0] += 2;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->cq);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->cq);
+                               sprintf(rs, "\r\n0,1,2");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0,1,2");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 2))
-                                               PARSE_ERROR1;
-                                       f->cq = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 2))
+                                       PARSE_ERROR1;
+                               f->cq = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FCQ=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FCQ=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -643,29 +643,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "CR", 2)) {
                p[0] += 2;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->cr);   /* read actual value from struct and print */
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->cr);   /* read actual value from struct and print */
+                               sprintf(rs, "\r\n0,1");         /* display online help */
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0,1");         /* display online help */
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 1))
-                                               PARSE_ERROR1;
-                                       f->cr = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 1))
+                                       PARSE_ERROR1;
+                               f->cr = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FCR=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FCR=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -673,29 +673,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "CTCRTY", 6)) {
                p[0] += 6;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->ctcrty);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->ctcrty);
+                               sprintf(rs, "\r\n0-255");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0-255");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 255))
-                                               PARSE_ERROR1;
-                                       f->ctcrty = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 255))
+                                       PARSE_ERROR1;
+                               f->ctcrty = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FCTCRTY=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FCTCRTY=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -706,42 +706,42 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
 
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
-                               p[0]++;
-                               strcpy(rs, "\r\n");
-                               for (i = 0; i < 8; i++) {
-                                       sprintf(rss, "%c%s", rp[i] + 48,
-                                               (i < 7) ? "," : "");
-                                       strcat(rs, rss);
-                               }
-                               isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
+               case '?':
+                       p[0]++;
+                       strcpy(rs, "\r\n");
+                       for (i = 0; i < 8; i++) {
+                               sprintf(rss, "%c%s", rp[i] + 48,
+                                       (i < 7) ? "," : "");
+                               strcat(rs, rss);
+                       }
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
+                               isdn_tty_at_cout("\r\n(0,1),(0-5),(0-2),(0-2),(0-3),(0-2),(0),(0-7)", info);
                                p[0]++;
-                               if (*p[0] == '?') {
-                                       isdn_tty_at_cout("\r\n(0,1),(0-5),(0-2),(0-2),(0-3),(0-2),(0),(0-7)", info);
-                                       p[0]++;
-                               } else {
-                                       for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 8); i++) {
-                                               if (*p[0] != ',') {
-                                                       if ((*p[0] - 48) > maxdccval[i]) {
-                                                               PARSE_ERROR1;
-                                                       }
-                                                       rp[i] = *p[0] - 48;
-                                                       p[0]++;
-                                                       if (*p[0] == ',')
-                                                               p[0]++;
-                                               } else
+                       } else {
+                               for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 8); i++) {
+                                       if (*p[0] != ',') {
+                                               if ((*p[0] - 48) > maxdccval[i]) {
+                                                       PARSE_ERROR1;
+                                               }
+                                               rp[i] = *p[0] - 48;
+                                               p[0]++;
+                                               if (*p[0] == ',')
                                                        p[0]++;
-                                       }
+                                       } else
+                                               p[0]++;
+                               }
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FDCC capabilities DCE=%d,%d,%d,%d,%d,%d,%d,%d\n",
-                                              rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7]);
+                               printk(KERN_DEBUG "isdn_tty: Fax FDCC capabilities DCE=%d,%d,%d,%d,%d,%d,%d,%d\n",
+                                      rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7]);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -752,42 +752,42 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
 
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
-                               p[0]++;
-                               strcpy(rs, "\r\n");
-                               for (i = 0; i < 8; i++) {
-                                       sprintf(rss, "%c%s", rp[i] + 48,
-                                               (i < 7) ? "," : "");
-                                       strcat(rs, rss);
-                               }
-                               isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
+               case '?':
+                       p[0]++;
+                       strcpy(rs, "\r\n");
+                       for (i = 0; i < 8; i++) {
+                               sprintf(rss, "%c%s", rp[i] + 48,
+                                       (i < 7) ? "," : "");
+                               strcat(rs, rss);
+                       }
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
+                               isdn_tty_at_cout("\r\n(0,1),(0-5),(0-2),(0-2),(0-3),(0-2),(0),(0-7)", info);
                                p[0]++;
-                               if (*p[0] == '?') {
-                                       isdn_tty_at_cout("\r\n(0,1),(0-5),(0-2),(0-2),(0-3),(0-2),(0),(0-7)", info);
-                                       p[0]++;
-                               } else {
-                                       for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 8); i++) {
-                                               if (*p[0] != ',') {
-                                                       if ((*p[0] - 48) > maxdccval[i]) {
-                                                               PARSE_ERROR1;
-                                                       }
-                                                       rp[i] = *p[0] - 48;
-                                                       p[0]++;
-                                                       if (*p[0] == ',')
-                                                               p[0]++;
-                                               } else
+                       } else {
+                               for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 8); i++) {
+                                       if (*p[0] != ',') {
+                                               if ((*p[0] - 48) > maxdccval[i]) {
+                                                       PARSE_ERROR1;
+                                               }
+                                               rp[i] = *p[0] - 48;
+                                               p[0]++;
+                                               if (*p[0] == ',')
                                                        p[0]++;
-                                       }
+                                       } else
+                                               p[0]++;
+                               }
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FDIS session parms=%d,%d,%d,%d,%d,%d,%d,%d\n",
-                                              rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7]);
+                               printk(KERN_DEBUG "isdn_tty: Fax FDIS session parms=%d,%d,%d,%d,%d,%d,%d,%d\n",
+                                      rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7]);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -808,18 +808,18 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
                                f->phase = ISDN_FAX_PHASE_C;
                        } else if (f->phase == ISDN_FAX_PHASE_D) {
                                switch (f->fet) {
-                                       case 0: /* next page will be received */
-                                               f->phase = ISDN_FAX_PHASE_C;
-                                               isdn_tty_fax_modem_result(7, info);     /* CONNECT */
-                                               break;
-                                       case 1: /* next doc will be received */
-                                               f->phase = ISDN_FAX_PHASE_B;
-                                               break;
-                                       case 2: /* fax session is terminating */
-                                               f->phase = ISDN_FAX_PHASE_E;
-                                               break;
-                                       default:
-                                               PARSE_ERROR1;
+                               case 0: /* next page will be received */
+                                       f->phase = ISDN_FAX_PHASE_C;
+                                       isdn_tty_fax_modem_result(7, info);     /* CONNECT */
+                                       break;
+                               case 1: /* next doc will be received */
+                                       f->phase = ISDN_FAX_PHASE_B;
+                                       break;
+                               case 2: /* fax session is terminating */
+                                       f->phase = ISDN_FAX_PHASE_E;
+                                       break;
+                               default:
+                                       PARSE_ERROR1;
                                }
                        }
                } else {
@@ -830,7 +830,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        /* DT=df,vr,wd,ln - TX phase C data command (release DCE to proceed with negotiation) */
        if (!strncmp(p[0], "DT", 2)) {
                int i, val[] =
-               {4, 0, 2, 3};
+                       {4, 0, 2, 3};
                char *rp = &f->resolution;
 
                p[0] += 2;
@@ -872,29 +872,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "ECM", 3)) {
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->ecm);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->ecm);
+                               sprintf(rs, "\r\n0,2");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0,2");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par != 0) && (par != 2))
-                                               PARSE_ERROR1;
-                                       f->ecm = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par != 0) && (par != 2))
+                                       PARSE_ERROR1;
+                               f->ecm = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FECM=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FECM=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -938,36 +938,36 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
                int i, r;
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n\"%s\"", f->id);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n\"%s\"", f->id);
+                               sprintf(rs, "\r\n\"STRING\"");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
+                       } else {
+                               if (*p[0] == '"')
                                        p[0]++;
-                                       sprintf(rs, "\r\n\"STRING\"");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       if (*p[0] == '"')
-                                               p[0]++;
-                                       for (i = 0; (*p[0]) && i < (FAXIDLEN - 1) && (*p[0] != '"'); i++) {
-                                               f->id[i] = *p[0]++;
-                                       }
-                                       if (*p[0] == '"')
-                                               p[0]++;
-                                       for (r = i; r < FAXIDLEN; r++) {
-                                               f->id[r] = 32;
-                                       }
-                                       f->id[FAXIDLEN - 1] = 0;
+                               for (i = 0; (*p[0]) && i < (FAXIDLEN - 1) && (*p[0] != '"'); i++) {
+                                       f->id[i] = *p[0]++;
+                               }
+                               if (*p[0] == '"')
+                                       p[0]++;
+                               for (r = i; r < FAXIDLEN; r++) {
+                                       f->id[r] = 32;
+                               }
+                               f->id[FAXIDLEN - 1] = 0;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax local ID \"%s\"\n", f->id);
+                               printk(KERN_DEBUG "isdn_tty: Fax local ID \"%s\"\n", f->id);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -994,29 +994,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "MINSP", 5)) {
                p[0] += 5;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->minsp);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->minsp);
+                               sprintf(rs, "\r\n0-5");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0-5");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 5))
-                                               PARSE_ERROR1;
-                                       f->minsp = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 5))
+                                       PARSE_ERROR1;
+                               f->minsp = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FMINSP=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FMINSP=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -1024,29 +1024,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "PHCTO", 5)) {
                p[0] += 5;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->phcto);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->phcto);
+                               sprintf(rs, "\r\n0-255");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0-255");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 255))
-                                               PARSE_ERROR1;
-                                       f->phcto = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 255))
+                                       PARSE_ERROR1;
+                               f->phcto = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FPHCTO=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FPHCTO=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -1055,29 +1055,29 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
        if (!strncmp(p[0], "REL", 3)) {
                p[0] += 3;
                switch (*p[0]) {
-                       case '?':
+               case '?':
+                       p[0]++;
+                       sprintf(rs, "\r\n%d", f->rel);
+                       isdn_tty_at_cout(rs, info);
+                       break;
+               case '=':
+                       p[0]++;
+                       if (*p[0] == '?') {
                                p[0]++;
-                               sprintf(rs, "\r\n%d", f->rel);
+                               sprintf(rs, "\r\n0,1");
                                isdn_tty_at_cout(rs, info);
-                               break;
-                       case '=':
-                               p[0]++;
-                               if (*p[0] == '?') {
-                                       p[0]++;
-                                       sprintf(rs, "\r\n0,1");
-                                       isdn_tty_at_cout(rs, info);
-                               } else {
-                                       par = isdn_getnum(p);
-                                       if ((par < 0) || (par > 1))
-                                               PARSE_ERROR1;
-                                       f->rel = par;
+                       } else {
+                               par = isdn_getnum(p);
+                               if ((par < 0) || (par > 1))
+                                       PARSE_ERROR1;
+                               f->rel = par;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-                                       printk(KERN_DEBUG "isdn_tty: Fax FREL=%d\n", par);
+                               printk(KERN_DEBUG "isdn_tty: Fax FREL=%d\n", par);
 #endif
-                               }
-                               break;
-                       default:
-                               PARSE_ERROR1;
+                       }
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -1100,11 +1100,11 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
                printk(KERN_DEBUG "isdn_tty: Fax FTBC=%c\n", *p[0]);
 #endif
                switch (*p[0]) {
-                       case '0':
-                               p[0]++;
-                               break;
-                       default:
-                               PARSE_ERROR1;
+               case '0':
+                       p[0]++;
+                       break;
+               default:
+                       PARSE_ERROR1;
                }
                return 0;
        }
@@ -1113,7 +1113,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
 }
 
 int
-isdn_tty_cmd_PLUSF_FAX(char **p, modem_info * info)
+isdn_tty_cmd_PLUSF_FAX(char **p, modem_info *info)
 {
        if (TTY_IS_FCLASS2(info))
                return (isdn_tty_cmd_FCLASS2(p, info));