--- linux-2.6.36-/drivers/isdn/i4l/isdn_tty.c 2010-10-20 22:30:22.000000000 +0200 +++ linux-2.6.36/drivers/isdn/i4l/isdn_tty.c 2010-10-24 19:42:39.000000000 +0200 @@ -4,6 +4,7 @@ * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) * Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg + * 08/2002 Addition of +I commands by Birger Harzenetter (wimpy@yeti.dk) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. @@ -178,7 +179,7 @@ info = &dev->mdm.info[midx]; #ifdef CONFIG_ISDN_AUDIO ifmt = 1; - + if ((info->vonline) && (!info->emu.vpar[4])) isdn_audio_calc_dtmf(info, skb->data, skb->len, ifmt); if ((info->vonline & 1) && (info->emu.vpar[1])) @@ -441,7 +442,7 @@ return; if ((info->emu.mdmreg[REG_CTS] & BIT_CTS) != 0) info->msr &= ~UART_MSR_CTS; - info->lsr &= ~UART_LSR_TEMT; + info->lsr &= ~UART_LSR_TEMT; /* info->xmit_count is modified here and in isdn_tty_write(). * So we return here if isdn_tty_write() is in the * critical section. @@ -568,15 +569,15 @@ #ifdef CONFIG_ISDN_AUDIO if (si == 1) { switch(l2) { - case ISDN_PROTO_L2_MODEM: + case ISDN_PROTO_L2_MODEM: usg = ISDN_USAGE_MODEM; break; #ifdef CONFIG_ISDN_TTY_FAX - case ISDN_PROTO_L2_FAX: + case ISDN_PROTO_L2_FAX: usg = ISDN_USAGE_FAX; break; #endif - case ISDN_PROTO_L2_TRANS: + case ISDN_PROTO_L2_TRANS: default: usg = ISDN_USAGE_VOICE; break; @@ -607,7 +608,7 @@ } usg = isdn_calc_usage(si, l2); #ifdef CONFIG_ISDN_AUDIO - if ((si == 1) && + if ((si == 1) && (l2 != ISDN_PROTO_L2_MODEM) #ifdef CONFIG_ISDN_TTY_FAX && (l2 != ISDN_PROTO_L2_FAX) @@ -745,7 +746,7 @@ } /* - * Begin of a CAPI like interface, currently used only for + * Begin of a CAPI like interface, currently used only for * supplementary service (CAPI 2.0 part III) */ #include @@ -761,7 +762,7 @@ isdn_tty_suspend(char *id, modem_info * info, atemu * m) { isdn_ctrl cmd; - + int l; if (!info) @@ -817,7 +818,7 @@ } usg = isdn_calc_usage(si, l2); #ifdef CONFIG_ISDN_AUDIO - if ((si == 1) && + if ((si == 1) && (l2 != ISDN_PROTO_L2_MODEM) #ifdef CONFIG_ISDN_TTY_FAX && (l2 != ISDN_PROTO_L2_FAX) @@ -910,7 +911,7 @@ } usg = isdn_calc_usage(si, l2); #ifdef CONFIG_ISDN_AUDIO - if ((si == 1) && + if ((si == 1) && (l2 != ISDN_PROTO_L2_MODEM) #ifdef CONFIG_ISDN_TTY_FAX && (l2 != ISDN_PROTO_L2_FAX) @@ -1178,7 +1179,7 @@ } else if (TTY_IS_FCLASS1(info)) { int cc = isdn_tty_handleDLEdown(info, m, c); - + if (info->vonline & 4) { /* ETX seen */ isdn_ctrl c; @@ -1604,7 +1605,7 @@ return -ENODEV; } #ifdef ISDN_DEBUG_MODEM_OPEN - printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name, + printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name, info->count); #endif info->count++; @@ -1773,6 +1774,10 @@ m->profile[23] = 0; m->pmsn[0] = '\0'; m->plmsn[0] = '\0'; + strcpy(m->iprefix,"00"); + strcpy(m->nprefix,"0" ); + strcpy(m->prnum ,"0" ); + strcpy(m->nanum ,"0" ); } #ifdef CONFIG_ISDN_AUDIO @@ -2100,7 +2105,7 @@ info->drv_index = idx; dev->m_idx[idx] = info->line; dev->usage[idx] &= ISDN_USAGE_EXCLUSIVE; - dev->usage[idx] |= isdn_calc_usage(si1, info->emu.mdmreg[REG_L2PROT]); + dev->usage[idx] |= isdn_calc_usage(si1, info->emu.mdmreg[REG_L2PROT]); strcpy(dev->num[idx], nr); strcpy(info->emu.cpn, eaz); info->emu.mdmreg[REG_SI1I] = si2bit[si1]; @@ -2144,8 +2149,8 @@ info->emu.charge = (unsigned) simple_strtoul(c->parm.num, &e, 10); if (e == (char *)c->parm.num) info->emu.charge = 0; - - break; + + break; case ISDN_STAT_BSENT: #ifdef ISDN_TTY_STAT_DEBUG printk(KERN_DEBUG "tty_STAT_BSENT ttyI%d\n", info->line); @@ -2172,7 +2177,7 @@ printk(KERN_DEBUG "tty_STAT_DISPLAY ttyI%d\n", info->line); #endif /* Signal display to tty-device */ - if ((info->emu.mdmreg[REG_DISPLAY] & BIT_DISPLAY) && + if ((info->emu.mdmreg[REG_DISPLAY] & BIT_DISPLAY) && !(info->emu.mdmreg[REG_RESPNUM] & BIT_RESPNUM)) { isdn_tty_at_cout("\r\n", info); isdn_tty_at_cout("DISPLAY: ", info); @@ -2196,9 +2201,9 @@ printk(KERN_DEBUG "tty_STAT_DHUP ttyI%d\n", info->line); #endif if (TTY_IS_ACTIVE(info)) { - if (info->dialing == 1) + if (info->dialing == 1) isdn_tty_modem_result(RESULT_BUSY, info); - if (info->dialing > 1) + if (info->dialing > 1) isdn_tty_modem_result(RESULT_NO_CARRIER, info); info->dialing = 0; #ifdef ISDN_DEBUG_MODEM_HUP @@ -2290,7 +2295,7 @@ #ifdef CONFIG_ISDN_TTY_FAX case ISDN_STAT_FAXIND: if (TTY_IS_ACTIVE(info)) { - isdn_tty_fax_command(info, c); + isdn_tty_fax_command(info, c); } break; #endif @@ -2475,6 +2480,24 @@ */ static void +isdn_tty_modem_result_prCGPN(char *num, unsigned char typ, unsigned char pi, modem_info * info) +{ + atemu *m = &info->emu; + + typ=(typ>>4)&7; + pi=(pi>>5)&3; + isdn_tty_at_cout("\r\nCALLER NUMBER: ", info); + if (pi==1) isdn_tty_at_cout(m->prnum, info); + else if (pi==2) isdn_tty_at_cout(m->nanum, info); + else + { + if (typ==1 && m->iprefix[0]) isdn_tty_at_cout(m->iprefix, info); + if (typ==2 && m->nprefix[0]) isdn_tty_at_cout(m->nprefix, info); + isdn_tty_at_cout(num, info); + } +} + +static void isdn_tty_modem_result(int code, modem_info * info) { atemu *m = &info->emu; @@ -2553,8 +2576,8 @@ return; /* print CID, _before_ _every_ ring */ if (!(m->mdmreg[REG_CIDONCE] & BIT_CIDONCE)) { - isdn_tty_at_cout("\r\nCALLER NUMBER: ", info); - isdn_tty_at_cout(dev->num[info->drv_index], info); + isdn_tty_modem_result_prCGPN(dev->num[info->drv_index], + dev->numtyp[info->drv_index], dev->screen[info->drv_index], info); if (m->mdmreg[REG_CDN] & BIT_CDN) { isdn_tty_at_cout("\r\nCALLED NUMBER: ", info); isdn_tty_at_cout(info->emu.cpn, info); @@ -2581,9 +2604,8 @@ /* Print CID only once, _after_ 1st RING */ if ((m->mdmreg[REG_CIDONCE] & BIT_CIDONCE) && (m->mdmreg[REG_RINGCNT] == 1)) { - isdn_tty_at_cout("\r\n", info); - isdn_tty_at_cout("CALLER NUMBER: ", info); - isdn_tty_at_cout(dev->num[info->drv_index], info); + isdn_tty_modem_result_prCGPN(dev->num[info->drv_index], + dev->numtyp[info->drv_index], dev->screen[info->drv_index], info); if (m->mdmreg[REG_CDN] & BIT_CDN) { isdn_tty_at_cout("\r\nCALLED NUMBER: ", info); isdn_tty_at_cout(info->emu.cpn, info); @@ -2636,6 +2658,12 @@ if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) { return; } +#ifdef CONFIG_ISDN_AUDIO + if ( !info->vonline ) + tty_ldisc_flush(info->tty); +#else + tty_ldisc_flush(info->tty); +#endif if ((info->flags & ISDN_ASYNC_CHECK_CD) && (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) && (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) { @@ -2679,21 +2707,52 @@ static void isdn_tty_getdial(char *p, char *q,int cnt) { - int first = 1; + int first = 0; + char *oq = q; int limit = ISDN_MSNLEN - 1; /* MUST match the size of interface var to avoid buffer overflow */ - while (strchr(" 0123456789,#.*WPTSR-", *p) && *p && --cnt>0) { - if ((*p >= '0' && *p <= '9') || ((*p == 'S') && first) || - ((*p == 'R') && first) || - (*p == '*') || (*p == '#')) { - *q++ = *p; - limit--; + max--; + while (*p && (max > 0)) { + switch (*p) { + case '0':// normal digits + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '*': + case '#': + first=0; + *q++ = *p; + break; + case '+':// as first char only + case 'S': + case 'D': + case 'R': + if (first) *q++ = *p; + else *oq=0; + break; + case '.':// subadress - only once! + sub++; + *q++ = *p; + if (sub>1) *oq=0; + break; + case ' ':// ignore dialling method prefixes and + case '-':// 'optical' formatting + case 'W': + case ',': + case '(': + case ')': + case 'T': + case 'P': } - if(!limit) - break; + max--; p++; - first = 0; } *q = 0; } @@ -2805,7 +2864,7 @@ case ISDN_PROTO_L2_V11096: case ISDN_PROTO_L2_V11019: case ISDN_PROTO_L2_V11038: - info->xmit_size /= 10; + info->xmit_size /= 10; } break; case 'C': @@ -2999,7 +3058,7 @@ case ISDN_PROTO_L2_V11096: case ISDN_PROTO_L2_V11019: case ISDN_PROTO_L2_V11038: - info->xmit_size /= 10; + info->xmit_size /= 10; } break; case REG_SI1I: @@ -3229,6 +3288,92 @@ } /* + * Parse AT+I.. commands + */ +static int +isdn_tty_cmd_PLUSI(char **p, modem_info * info) +{ + atemu *m = &info->emu; + static char *icmd[] = + {"NNP", "NIP", "NNA", "NPR", NULL}; + int i, pp=0; + char param[8], reqtyp=0; + + i = 0; + while (icmd[i]) { + if (!strncmp(icmd[i], p[0], strlen(icmd[i]))) { + p[0] += strlen(icmd[i]); + break; + } + i++; + } + switch (*p[0]) { + case '?': + reqtyp=1; + p[0]++; + break; + case '=': + reqtyp=2; + p[0]++; + if (*p[0]=='?') { + reqtyp=3; + p[0]++; + } else { + while(*p[0] && *p[0]!=';' && pp<8) { + param[pp]=*p[0]; + pp++; + p[0]++; + } + if (pp>7) PARSE_ERROR1; + param[pp]=0; + } + break; + default: + PARSE_ERROR1; + } + switch (100*reqtyp+i) { + case 100: + isdn_tty_at_cout("\r\n", info); + isdn_tty_at_cout(m->nprefix, info); + break; + case 101: + isdn_tty_at_cout("\r\n", info); + isdn_tty_at_cout(m->iprefix, info); + break; + case 102: + isdn_tty_at_cout("\r\n", info); + isdn_tty_at_cout(m->nanum, info); + break; + case 103: + isdn_tty_at_cout("\r\n", info); + isdn_tty_at_cout(m->prnum, info); + break; + case 200: + strncpy(m->nprefix,param,8); + break; + case 201: + strncpy(m->iprefix,param,8); + break; + case 202: + strncpy(m->nanum,param,8); + break; + case 203: + strncpy(m->prnum,param,8); + break; + case 300: + case 301: + case 302: + case 303: + isdn_tty_at_cout("\r\n", info); + break; + default: + PARSE_ERROR1; + } + if (*p[0]==';') p[0]++; + return 0; +} + +/* * Parse AT+V.. commands */ static int @@ -3369,7 +3514,7 @@ m->vpar[1] = par1; m->vpar[2] = par2; break; - } else + } else if (*p[0] == '?') { p[0]++; isdn_tty_at_cout("\r\n<0-31>,<0-255>", @@ -3693,6 +3838,11 @@ p++; isdn_tty_send_msg(info, m, p); break; + case 'I': /* ISDN configuration */ + p++; + if (isdn_tty_cmd_PLUSI(&p, info)) + return; + break; default: PARSE_ERROR; } --- linux-2.6.36-/include/linux/isdn.h 2010-10-20 22:30:22.000000000 +0200 +++ linux-2.6.36/include/linux/isdn.h 2010-10-24 19:45:18.000000000 +0200 @@ -443,6 +443,10 @@ int carrierwait; /* Seconds of carrier waiting */ char mdmcmd[255]; /* Modem-Commandbuffer */ unsigned int charge; /* Charge units of current connection */ + char iprefix[8]; /* international prefix */ + char nprefix[8]; /* national prefix */ + char prnum[8]; /* presentation restricted */ + char nanum[8]; /* unknown number */ } atemu; /* Private data (similar to async_struct in ) */ @@ -596,6 +600,9 @@ int drvmap[ISDN_MAX_CHANNELS]; /* Map minor->driver-index */ int usage[ISDN_MAX_CHANNELS]; /* Used by tty/ip/voice */ char num[ISDN_MAX_CHANNELS][ISDN_MSNLEN]; + unsigned char numtyp[ISDN_MAX_CHANNELS]; /* type of number (and plan) + to make above unabigous */ + unsigned char screen[ISDN_MAX_CHANNELS]; /* Just to get the PI(ATM) */ /* Remote number of active ch.*/ int m_idx[ISDN_MAX_CHANNELS]; /* Index for mdm.... */ isdn_driver_t *drv[ISDN_MAX_DRIVERS]; /* Array of drivers */