Added support for new insmod parameter handling.

This commit is contained in:
Fritz Elfert 1997-02-14 12:23:31 +00:00
parent c78477a4df
commit 6485a9f153
6 changed files with 72 additions and 4 deletions

View File

@ -7,6 +7,9 @@
* Fritz Elfert
*
* $Log$
* Revision 1.18 1997/02/11 01:36:58 keil
* Changed setup-interface (incoming and outgoing), cause reporting
*
* Revision 1.17 1997/02/09 00:23:10 keil
* new interface handling, one interface per card
* some changes in debug and leased line mode
@ -64,7 +67,12 @@
#include "hisax.h"
#ifdef MODULE
#if (LINUX_VERSION_CODE < 0x020111)
extern long mod_use_count_;
#define MOD_USE_COUNT mod_use_count_
#else
#define MOD_USE_COUNT ((&__this_module)->usecount)
#endif
#endif /* MODULE */
const char *l4_revision = "$Revision$";
@ -1762,7 +1770,7 @@ HiSax_command(isdn_ctrl * ic)
if (csta->channel[0].debug & 1024) {
jiftime(tmp, jiffies);
i = strlen(tmp);
sprintf(tmp + i, " LOCK modcnt %lx\n", mod_use_count_);
sprintf(tmp + i, " LOCK modcnt %lx\n", MOD_USE_COUNT);
HiSax_putstatus(csta, tmp);
}
#endif /* MODULE */
@ -1773,7 +1781,7 @@ HiSax_command(isdn_ctrl * ic)
if (csta->channel[0].debug & 1024) {
jiftime(tmp, jiffies);
i = strlen(tmp);
sprintf(tmp + i, " UNLOCK modcnt %lx\n", mod_use_count_);
sprintf(tmp + i, " UNLOCK modcnt %lx\n", MOD_USE_COUNT);
HiSax_putstatus(csta, tmp);
}
#endif /* MODULE */
@ -1822,7 +1830,11 @@ HiSax_command(isdn_ctrl * ic)
break;
#ifdef MODULE
case (55):
mod_use_count_ = MOD_VISITED;
#if (LINUX_VERSION_CODE < 0x020111)
MOD_USE_COUNT = MOD_VISITED;
#else
MOD_USE_COUNT = 0;
#endif
HiSax_mod_inc_use_count();
break;
#endif /* MODULE */

View File

@ -5,6 +5,9 @@
*
*
* $Log$
* Revision 1.10 1997/02/14 09:22:09 keil
* Final 2.0 version
*
* Revision 1.9 1997/02/10 11:45:09 fritz
* More changes for Kernel 2.1.X compatibility.
*
@ -167,6 +170,21 @@ int irq[] =
int mem[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
char *id = HiSaxID;
#if (LINUX_VERSION_CODE > 0x020111)
MODULE_AUTHOR("Karsten Keil");
MODULE_PARM(type, "1-16i");
MODULE_PARM(protocol, "1-16i");
MODULE_PARM(io, "1-16i");
MODULE_PARM(irq, "1-16i");
MODULE_PARM(mem, "1-16i");
MODULE_PARM(id, "s");
#ifdef CONFIG_HISAX_16_3 /* For Creatix/Teles PnP */
MODULE_PARM(io0, "1-16i");
MODULE_PARM(io1, "1-16i");
#endif
#endif
#endif
extern char *l1_revision;

View File

@ -19,6 +19,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.25 1997/02/10 10:10:31 fritz
* Changes for Kernel 2.1.X compatibility.
* Enhanced initialization, can recover from
* misconfiguration by other autoprobing drivers.
*
* Revision 1.24 1997/01/29 22:34:46 fritz
* Cleanup, Corrected D64S setup of 2nd channel.
*
@ -294,6 +299,20 @@ static int membase = ICN_MEMADDR;
static char *icn_id = "\0";
static char *icn_id2 = "\0";
#ifdef MODULE
#if (LINUX_VERSION_CODE > 0x020111)
MODULE_AUTHOR("Fritz Elfert");
MODULE_PARM(portbase, "i");
MODULE_PARM_DESC(portbase, "Port adress of first card");
MODULE_PARM(membase, "i");
MODULE_PARM_DESC(membase, "Shared memory adress of all cards");
MODULE_PARM(icn_id, "s");
MODULE_PARM_DESC(icn_id, "ID-String of first card");
MODULE_PARM(icn_id2, "s");
MODULE_PARM_DESC(icn_id2, "ID-String of first card, second S0 (4B only)");
#endif
#endif
#endif /* __KERNEL__ */
/* Utility-Macros */

View File

@ -35,6 +35,10 @@ extern void pcbit_terminate(int board);
extern int pcbit_init_dev(int board, int mem_base, int irq);
#ifdef MODULE
#if (LINUX_VERSION_CODE > 0x020111)
MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_PCBIT_CARDS) "i");
MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_PCBIT_CARDS) "i");
#endif
#define pcbit_init init_module
#endif

View File

@ -1,4 +1,3 @@
#define __NO_VERSION__
#include "includes.h"
#include "hardware.h"
#include "card.h"
@ -39,6 +38,12 @@ int irq_supported(int irq_x)
}
#ifdef MODULE
#if (LINUX_VERSION_CODE > 0x020111)
MODULE_PARM(io, "1-4i");
MODULE_PARM(irq, "1-4i");
MODULE_PARM(ram, "1-4i");
MODULE_PARM(do_reset, "i");
#endif
#define init_sc init_module
#else
/*

View File

@ -1,6 +1,9 @@
/* $Id$
*
* $Log$
* Revision 1.2 1997/02/10 11:45:14 fritz
* More changes for Kernel 2.1.X compatibility.
*
* Revision 1.1 1996/04/13 10:27:02 fritz
* Initial revision
*
@ -40,6 +43,13 @@ io_type io[] =
{0, 0, 0, 0},
};
#ifdef MODULE
#if (LINUX_VERSION_CODE > 0x020111)
MODULE_PARM(io, "1-64i");
MODULE_PARM(teles_id, "s");
#endif
#endif
void
teles_mod_dec_use_count(void)
{