From: Andy P. <at...@us...> - 2002-04-10 18:31:22
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc In directory usw-pr-cvs1:/tmp/cvs-serv1502/isdn/sc Modified Files: card.h command.c debug.c debug.h event.c hardware.h includes.h init.c interrupt.c ioctl.c message.c message.h packet.c scioc.h shmem.c timer.c Log Message: synch 2.4.15 commit 49 Index: card.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/card.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- card.h 14 Jan 2001 18:42:42 -0000 1.1.1.1 +++ card.h 10 Apr 2002 15:32:27 -0000 1.2 @@ -1,24 +1,13 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * card.h - Driver parameters for SpellCaster ISA ISDN adapters + * Driver parameters for SpellCaster ISA ISDN adapters * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 Index: command.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/command.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- command.c 14 Jan 2001 18:42:46 -0000 1.1.1.1 +++ command.c 10 Apr 2002 15:32:28 -0000 1.2 @@ -1,22 +1,11 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 @@ -27,6 +16,7 @@ */ #define __NO_VERSION__ +#include <linux/module.h> #include "includes.h" /* This must be first */ #include "hardware.h" #include "message.h" Index: debug.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/debug.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- debug.c 14 Jan 2001 18:42:46 -0000 1.1.1.1 +++ debug.c 10 Apr 2002 15:32:28 -0000 1.2 @@ -1,22 +1,11 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 @@ -25,9 +14,9 @@ * +1 (416) 297-8565 * +1 (416) 297-6433 Facsimile */ -#include <linux/kernel.h> -inline char *strcpy(char *, const char *); +#include <linux/kernel.h> +#include <linux/string.h> int dbg_level = 0; static char dbg_funcname[255]; @@ -45,19 +34,6 @@ strcpy(dbg_funcname, func); if(dbg_level) printk("--> Entering function %s\n", dbg_funcname); -} - -inline char *strcpy(char *dest, const char *src) -{ - char *i = dest; - char *j = (char *) src; - - while(*j) { - *i = *j; - i++; j++; - } - *(++i) = 0; - return dest; } inline void pullphone(char *dn, char *str) Index: debug.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/debug.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- debug.h 14 Jan 2001 18:42:46 -0000 1.1.1.1 +++ debug.h 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,22 +1,11 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 Index: event.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/event.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- event.c 14 Jan 2001 18:42:46 -0000 1.1.1.1 +++ event.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,22 +1,11 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 Index: hardware.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/hardware.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- hardware.h 14 Jan 2001 18:42:49 -0000 1.1.1.1 +++ hardware.h 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,5 +1,9 @@ /* * Hardware specific macros, defines and structures + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * */ #ifndef HARDWARE_H @@ -12,15 +16,7 @@ */ #define MAX_CARDS 4 /* The maximum number of cards to - control or probe for. If you change - this, you must also change the number - of elements in io, irq, and ram to - match. Initialized in init.c */ -/* -extern unsigned int io[]; -extern unsigned char irq[]; -extern unsigned long ram[]; -*/ + control or probe for. */ #define SIGNATURE 0x87654321 /* Board reset signature */ #define SIG_OFFSET 0x1004 /* Where to find signature in shared RAM */ Index: includes.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/includes.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- includes.h 25 Feb 2001 23:15:10 -0000 1.1.1.2 +++ includes.h 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,4 +1,9 @@ -#include <linux/module.h> +/* + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * + */ + #include <linux/version.h> #include <linux/errno.h> #include <asm/segment.h> Index: init.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/init.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- init.c 14 Jan 2001 18:42:44 -0000 1.1.1.1 +++ init.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,7 +1,23 @@ +/* + * 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/init.h> #include "includes.h" #include "hardware.h" #include "card.h" +MODULE_DESCRIPTION("ISDN4Linux: Driver for Spellcaster card"); +MODULE_AUTHOR("Spellcaster Telecommunications Inc."); +MODULE_LICENSE("GPL"); +MODULE_PARM( io, "1-" __MODULE_STRING(MAX_CARDS) "i"); +MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_CARDS) "i"); +MODULE_PARM(ram, "1-" __MODULE_STRING(MAX_CARDS) "i"); +MODULE_PARM(do_reset, "i"); + board *adapter[MAX_CARDS]; int cinst; @@ -37,23 +53,7 @@ return 0; } -#ifdef MODULE -MODULE_PARM(io, "1-4i"); -MODULE_PARM(irq, "1-4i"); -MODULE_PARM(ram, "1-4i"); -MODULE_PARM(do_reset, "i"); -#define init_sc init_module -#else -/* -Initialization code for non-module version to be included - -void sc_setup(char *str, int *ints) -{ -} -*/ -#endif - -int init_sc(void) +static int __init sc_init(void) { int b = -1; int i, j; @@ -410,8 +410,7 @@ return status; } -#ifdef MODULE -void cleanup_module(void) +static void __exit sc_exit(void) { int i, j; @@ -463,7 +462,6 @@ } pr_info("SpellCaster ISA ISDN Adapter Driver Unloaded.\n"); } -#endif int identify_board(unsigned long rambase, unsigned int iobase) { @@ -579,3 +577,6 @@ return -1; } + +module_init(sc_init); +module_exit(sc_exit); Index: interrupt.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/interrupt.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- interrupt.c 14 Jan 2001 18:42:50 -0000 1.1.1.1 +++ interrupt.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,22 +1,11 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. - * - * 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. +/* $Id$ * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 @@ -34,7 +23,6 @@ extern int indicate_status(int, int, ulong, char *); extern void check_phystat(unsigned long); -extern void dump_messages(int); extern int receivemessage(int, RspMessage *); extern int sendmessage(int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int *); @@ -141,7 +129,7 @@ } else if(callid>=0x0000 && callid<=0x7FFF) { - pr_debug("%s: Got Incomming Call\n", adapter[card]->devicename); + pr_debug("%s: Got Incoming Call\n", adapter[card]->devicename); strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4])); strcpy(setup.eazmsn,adapter[card]->channel[rcvmsg.phy_link_no-1].dn); setup.si1 = 7; Index: ioctl.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/ioctl.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ioctl.c 14 Jan 2001 18:42:49 -0000 1.1.1.1 +++ ioctl.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,3 +1,11 @@ +/* + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * + * 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 "includes.h" #include "hardware.h" Index: message.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/message.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- message.c 14 Jan 2001 18:42:51 -0000 1.1.1.1 +++ message.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,24 +1,13 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. - * - * message.c - functions for sending and receiving control messages +/* $Id$ * - * 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. + * functions for sending and receiving control messages * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 @@ -38,55 +27,12 @@ extern unsigned int cinst; /* - * Obligitory function prototypes + * Obligatory function prototypes */ extern int indicate_status(int,ulong,char*); extern int scm_command(isdn_ctrl *); extern void *memcpy_fromshmem(int, void *, const void *, size_t); -/* - * Dump message queue in shared memory to screen - */ -void dump_messages(int card) -{ - DualPortMemory dpm; - unsigned long flags; - - int i =0; - - if (!IS_VALID_CARD(card)) { - pr_debug("Invalid param: %d is not a valid card id\n", card); - } - - save_flags(flags); - cli(); - outb(adapter[card]->ioport[adapter[card]->shmem_pgport], - (adapter[card]->shmem_magic >> 14) | 0x80); - memcpy_fromshmem(card, &dpm, 0, sizeof(dpm)); - restore_flags(flags); - - pr_debug("%s: Dumping Request Queue\n", adapter[card]->devicename); - for (i = 0; i < dpm.req_head; i++) { - pr_debug("%s: Message #%d: (%d,%d,%d), link: %d\n", - adapter[card]->devicename, i, - dpm.req_queue[i].type, - dpm.req_queue[i].class, - dpm.req_queue[i].code, - dpm.req_queue[i].phy_link_no); - } - - pr_debug("%s: Dumping Response Queue\n", adapter[card]->devicename); - for (i = 0; i < dpm.rsp_head; i++) { - pr_debug("%s: Message #%d: (%d,%d,%d), link: %d, status: %d\n", - adapter[card]->devicename, i, - dpm.rsp_queue[i].type, - dpm.rsp_queue[i].class, - dpm.rsp_queue[i].code, - dpm.rsp_queue[i].phy_link_no, - dpm.rsp_queue[i].rsp_status); - } - -} /* * receive a message from the board Index: message.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/message.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- message.h 14 Jan 2001 18:42:52 -0000 1.1.1.1 +++ message.h 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,25 +1,14 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * message.h - structures, macros and defines useful for sending - * messages to the adapter + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * structures, macros and defines useful for sending + * messages to the adapter * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 Index: packet.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/packet.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- packet.c 14 Jan 2001 18:42:53 -0000 1.1.1.1 +++ packet.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,22 +1,11 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 Index: scioc.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/scioc.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- scioc.h 14 Jan 2001 18:42:54 -0000 1.1.1.1 +++ scioc.h 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,3 +1,7 @@ +/* + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + */ /* * IOCTL Command Codes Index: shmem.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/shmem.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- shmem.c 14 Jan 2001 18:42:54 -0000 1.1.1.1 +++ shmem.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,24 +1,13 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * card.c - Card functions implementing ISDN4Linux functionality + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * Card functions implementing ISDN4Linux functionality * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 Index: timer.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/sc/timer.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- timer.c 14 Jan 2001 18:42:55 -0000 1.1.1.1 +++ timer.c 10 Apr 2002 15:32:29 -0000 1.2 @@ -1,22 +1,11 @@ -/* - * $Id$ - * Copyright (C) 1996 SpellCaster Telecommunications Inc. +/* $Id$ * - * 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. + * Copyright (C) 1996 SpellCaster Telecommunications Inc. * - * 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. + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. * - * 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. - * - * For more information, please contact gpl...@sp... or write: + * For more information, please contact gpl...@sp... or write: * * SpellCaster Telecommunications Inc. * 5621 Finch Avenue East, Unit #3 |