patch-2.2.13 linux/drivers/isdn/divert/isdn_divert.c
Next file: linux/drivers/isdn/divert/isdn_divert.h
Previous file: linux/drivers/isdn/divert/divert_procfs.c
Back to the patch index
Back to the overall index
- Lines: 77
- Date:
Tue Oct 19 17:14:00 1999
- Orig file:
v2.2.12/linux/drivers/isdn/divert/isdn_divert.c
- Orig date:
Mon Aug 9 16:05:55 1999
diff -u --recursive --new-file v2.2.12/linux/drivers/isdn/divert/isdn_divert.c linux/drivers/isdn/divert/isdn_divert.c
@@ -1,5 +1,5 @@
/*
- * $Id: isdn_divert.c,v 1.2 1999/07/04 21:37:32 werner Exp $
+ * $Id: isdn_divert.c,v 1.5 1999/08/31 11:20:04 paul Exp $
*
* DSS1 main diversion supplementary handling for i4l.
*
@@ -20,6 +20,19 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: isdn_divert.c,v $
+ * Revision 1.5 1999/08/31 11:20:04 paul
+ * various spelling corrections (new checksums may be needed, Karsten!)
+ *
+ * Revision 1.4 1999/08/25 20:02:21 werner
+ * Changed return values for stat_icall(w) from 3->4 and 4->5 because of conflicts
+ * with existing software definitions. (PtP incomplete called party number)
+ *
+ * Revision 1.3 1999/08/22 20:26:35 calle
+ * backported changes from kernel 2.3.14:
+ * - several #include "config.h" gone, others come.
+ * - "struct device" changed to "struct net_device" in 2.3.14, added a
+ * define in isdn_compat.h for older kernel versions.
+ *
* Revision 1.2 1999/07/04 21:37:32 werner
* Ported from kernel version 2.0
*
@@ -29,7 +42,6 @@
-#include <linux/config.h>
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/version.h>
@@ -504,19 +516,19 @@
if (cs->akt_state == DEFLECT_ALERT)
{ strcpy(cs->deflect_dest,dv->rule.to_nr);
if (!cs->timer.expires)
- { strcpy(ic->parm.setup.eazmsn,"Testtext direkt");
+ { strcpy(ic->parm.setup.eazmsn,"Testtext direct");
ic->parm.setup.screen = dv->rule.screen;
strcpy(ic->parm.setup.phone,dv->rule.to_nr);
cs->akt_state = DEFLECT_AUTODEL; /* delete after timeout */
cs->timer.expires = jiffies + (HZ * AUTODEL_TIME);
- retval = 4;
+ retval = 5;
}
else
retval = 1; /* alerting */
}
else
{ cs->deflect_dest[0] = '\0';
- retval = 3; /* only proceed */
+ retval = 4; /* only proceed */
}
sprintf(cs->info,"%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n",
cs->akt_state,
@@ -760,18 +772,6 @@
}
-#if 0
- sprintf(st, "0x%lx 0x%lx",ic->arg, ic->parm.dss1_io.ll_id);
- p = st + strlen(st);
- p1 = ic->parm.dss1_io.data;
- i = ic->parm.dss1_io.datalen;
- while ((i > 0) && (p - st < 530))
- { p += sprintf(p," %02x",(*p1++) & 0xFF);
- i--;
- }
- sprintf(p, "\n");
- put_info_buffer(st);
-#endif
break;
default:
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)