Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/drivers/isdn/divert divert_init.c,1.1.1.1,1.2 divert_procfs.c,1.1.1.1,1.2 isdn_divert.c,1.1.1.2,1.2 isdn_divert.h,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-10 18:33:00
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/isdn/divert
In directory usw-pr-cvs1:/tmp/cvs-serv1502/isdn/divert
Modified Files:
divert_init.c divert_procfs.c isdn_divert.c isdn_divert.h
Log Message:
synch 2.4.15 commit 49
Index: divert_init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/divert/divert_init.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- divert_init.c 14 Jan 2001 18:44:11 -0000 1.1.1.1
+++ divert_init.c 10 Apr 2002 15:32:23 -0000 1.2
@@ -1,30 +1,23 @@
-/*
- * $Id$
+/* $Id divert_init.c,v 1.5.6.2 2001/01/24 22:18:17 kai Exp $
*
* Module init for DSS1 diversion services for i4l.
*
* Copyright 1999 by Werner Cornelius (we...@is...)
*
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
*
*/
#include <linux/module.h>
#include <linux/version.h>
+#include <linux/init.h>
#include "isdn_divert.h"
+MODULE_DESCRIPTION("ISDN4Linux: Call diversion support");
+MODULE_AUTHOR("Werner Cornelius");
+MODULE_LICENSE("GPL");
+
/********************/
/* needed externals */
/********************/
@@ -46,7 +39,7 @@
/* Module interface code */
/* no cmd line parms */
/*************************/
-int init_module(void)
+static int __init divert_init(void)
{ int i;
if (divert_dev_init())
@@ -63,13 +56,13 @@
#endif
printk(KERN_INFO "dss1_divert module successfully installed\n");
return(0);
-} /* init_module */
+}
/**********************/
/* Module deinit code */
/**********************/
-void cleanup_module(void)
-{ int flags;
+static void __exit divert_exit(void)
+{ unsigned long flags;
int i;
save_flags(flags);
@@ -89,6 +82,8 @@
deleterule(-1); /* delete all rules and free mem */
deleteprocs();
printk(KERN_INFO "dss1_divert module successfully removed \n");
-} /* cleanup_module */
+}
+module_init(divert_init);
+module_exit(divert_exit);
Index: divert_procfs.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/divert/divert_procfs.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- divert_procfs.c 14 Jan 2001 18:44:12 -0000 1.1.1.1
+++ divert_procfs.c 10 Apr 2002 15:32:23 -0000 1.2
@@ -1,23 +1,11 @@
-/*
- * $Id$
+/* $Id$
*
* Filesystem handling for the diversion supplementary services.
*
* Copyright 1998 by Werner Cornelius (we...@is...)
*
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
*
*/
@@ -50,7 +38,7 @@
put_info_buffer(char *cp)
{
struct divert_info *ib;
- int flags;
+ unsigned long flags;
if (if_used <= 0)
return;
@@ -145,7 +133,7 @@
static int
isdn_divert_open(struct inode *ino, struct file *filep)
{
- int flags;
+ unsigned long flags;
lock_kernel();
save_flags(flags);
@@ -168,7 +156,7 @@
isdn_divert_close(struct inode *ino, struct file *filep)
{
struct divert_info *inf;
- int flags;
+ unsigned long flags;
lock_kernel();
save_flags(flags);
@@ -198,7 +186,8 @@
uint cmd, ulong arg)
{
divert_ioctl dioctl;
- int i, flags;
+ int i;
+ unsigned long flags;
divert_rule *rulep;
char *cp;
@@ -276,15 +265,9 @@
#ifdef CONFIG_PROC_FS
-static loff_t
-isdn_divert_lseek(struct file *file, loff_t offset, int orig)
-{
- return -ESPIPE;
-}
-
static struct file_operations isdn_fops =
{
- llseek: isdn_divert_lseek,
+ llseek: no_llseek,
read: isdn_divert_read,
write: isdn_divert_write,
poll: isdn_divert_poll,
Index: isdn_divert.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/divert/isdn_divert.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- isdn_divert.c 25 Feb 2001 23:15:10 -0000 1.1.1.2
+++ isdn_divert.c 10 Apr 2002 15:32:23 -0000 1.2
@@ -1,30 +1,14 @@
-/*
- * $Id$
+/* $Id$
*
* DSS1 main diversion supplementary handling for i4l.
*
* Copyright 1999 by Werner Cornelius (we...@is...)
*
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
*
*/
-
-
-#define __NO_VERSION__
-#include <linux/module.h>
#include <linux/version.h>
#include <linux/proc_fs.h>
#include "isdn_divert.h"
@@ -67,7 +51,7 @@
/* timer callback function */
/***************************/
static void deflect_timer_expire(ulong arg)
-{ int flags;
+{ unsigned long flags;
struct call_struc *cs = (struct call_struc *) arg;
save_flags(flags);
@@ -125,7 +109,8 @@
int cf_command(int drvid, int mode,
u_char proc, char *msn,
u_char service, char *fwd_nr, ulong *procid)
-{ int retval,msnlen,flags;
+{ unsigned long flags;
+ int retval,msnlen;
int fwd_len;
char *p,*ielenp,tmp[60];
struct call_struc *cs;
@@ -220,7 +205,7 @@
int deflect_extern_action(u_char cmd, ulong callid, char *to_nr)
{ struct call_struc *cs;
isdn_ctrl ic;
- int flags;
+ unsigned long flags;
int i;
if ((cmd & 0x7F) > 2) return(-EINVAL); /* invalid command */
@@ -290,8 +275,8 @@
/* insert a new rule before idx */
/********************************/
int insertrule(int idx, divert_rule *newrule)
-{ struct deflect_struc *ds,*ds1;
- int flags;
+{ struct deflect_struc *ds,*ds1=NULL;
+ unsigned long flags;
if (!(ds = (struct deflect_struc *) kmalloc(sizeof(struct deflect_struc),
GFP_KERNEL)))
@@ -337,7 +322,7 @@
/***********************************/
int deleterule(int idx)
{ struct deflect_struc *ds,*ds1;
- int flags;
+ unsigned long flags;
if (idx < 0)
{ save_flags(flags);
@@ -405,7 +390,7 @@
/*************************************************/
int isdn_divert_icall(isdn_ctrl *ic)
{ int retval = 0;
- int flags;
+ unsigned long flags;
struct call_struc *cs = NULL;
struct deflect_struc *dv;
char *p,*p1;
@@ -557,7 +542,7 @@
void deleteprocs(void)
{ struct call_struc *cs, *cs1;
- int flags;
+ unsigned long flags;
save_flags(flags);
cli();
@@ -714,7 +699,8 @@
/*********************************************/
int prot_stat_callback(isdn_ctrl *ic)
{ struct call_struc *cs, *cs1;
- int i,flags;
+ int i;
+ unsigned long flags;
cs = divert_head; /* start of list */
cs1 = NULL;
@@ -805,7 +791,8 @@
/***************************/
int isdn_divert_stat_callback(isdn_ctrl *ic)
{ struct call_struc *cs, *cs1;
- int flags, retval;
+ unsigned long flags;
+ int retval;
retval = -1;
cs = divert_head; /* start of list */
Index: isdn_divert.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/divert/isdn_divert.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- isdn_divert.h 14 Jan 2001 18:44:16 -0000 1.1.1.1
+++ isdn_divert.h 10 Apr 2002 15:32:23 -0000 1.2
@@ -1,26 +1,13 @@
-/*
- * $Id$
+/* $Id$
*
* Header for the diversion supplementary ioctl interface.
*
* Copyright 1998 by Werner Cornelius (we...@ik...)
*
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
*
*/
-
#include <linux/ioctl.h>
#include <linux/types.h>
|
