sync with kernel. std2kern hopefully takes care of the Makefile

difference for the time being
This commit is contained in:
Kai Germaschewski 2000-12-17 21:15:02 +00:00
parent 6b5088dacc
commit 18d43861d0
24 changed files with 408 additions and 401 deletions

View File

@ -1,12 +1,15 @@
#
# ISDN device configuration
#
# only included if CONFIG_ISDN != n
if [ "$CONFIG_INET" != "n" ]; then
bool ' Support synchronous PPP' CONFIG_ISDN_PPP
if [ "$CONFIG_ISDN_PPP" != "n" ]; then
bool ' Use VJ-compression with synchronous PPP' CONFIG_ISDN_PPP_VJ
bool ' Support generic MP (RFC 1717)' CONFIG_ISDN_MPP
tristate ' Support BSD compression with sync PPP' CONFIG_ISDN_PPP_BSDCOMP
bool ' Use VJ-compression with synchronous PPP' CONFIG_ISDN_PPP_VJ
bool ' Support generic MP (RFC 1717)' CONFIG_ISDN_MPP
dep_tristate ' Support BSD compression (module only)' CONFIG_ISDN_PPP_BSDCOMP m
fi
fi
bool ' Support audio via ISDN' CONFIG_ISDN_AUDIO
@ -116,51 +119,53 @@ endmenu
mainmenu_option next_comment
comment 'Active ISDN cards'
dep_tristate 'ICN 2B and 4B support' CONFIG_ISDN_DRV_ICN $CONFIG_ISDN
dep_tristate 'PCBIT-D support' CONFIG_ISDN_DRV_PCBIT $CONFIG_ISDN
if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then
dep_tristate 'Spellcaster support (EXPERIMENTAL)' CONFIG_ISDN_DRV_SC $CONFIG_ISDN
dep_tristate 'IBM Active 2000 support (EXPERIMENTAL)' CONFIG_ISDN_DRV_ACT2000 $CONFIG_ISDN
fi
dep_tristate 'Eicon active card support' CONFIG_ISDN_DRV_EICON $CONFIG_ISDN
dep_tristate 'ICN 2B and 4B support' CONFIG_ISDN_DRV_ICN $CONFIG_ISDN
dep_tristate 'PCBIT-D support' CONFIG_ISDN_DRV_PCBIT $CONFIG_ISDN
dep_tristate 'Spellcaster support (EXPERIMENTAL)' CONFIG_ISDN_DRV_SC $CONFIG_ISDN
dep_tristate 'IBM Active 2000 support (EXPERIMENTAL)' CONFIG_ISDN_DRV_ACT2000 $CONFIG_ISDN
bool 'Eicon active card support' CONFIG_ISDN_DRV_EICON
if [ "$CONFIG_ISDN_DRV_EICON" != "n" ]; then
if [ "$CONFIG_ISDN_DRV_EICON_STANDALONE" != "y" ]; then
if [ "$CONFIG_PCI" = "y" ]; then
bool ' Eicon PCI DIVA Server BRI/PRI/4BRI support' CONFIG_ISDN_DRV_EICON_PCI
fi
bool ' Eicon S,SX,SCOM,Quadro,S2M support' CONFIG_ISDN_DRV_EICON_ISA
if [ "$CONFIG_ISDN_DRV_EICON_OLD" != "y" ]; then
dep_tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS $CONFIG_ISDN
fi
if [ "$CONFIG_PCI" = "y" ]; then
bool ' build eicon driver type standalone' CONFIG_ISDN_DRV_EICON_STANDALONE
if [ "$CONFIG_ISDN_DRV_EICON_DIVAS" != "y" ]; then
dep_tristate ' Legacy Eicon driver' CONFIG_ISDN_DRV_EICON_OLD $CONFIG_ISDN
if [ "$CONFIG_ISDN_DRV_EICON_OLD" != "n" ]; then
dep_bool ' Eicon PCI DIVA Server BRI/PRI/4BRI support' CONFIG_ISDN_DRV_EICON_PCI $CONFIG_PCI
bool ' Eicon S,SX,SCOM,Quadro,S2M support' CONFIG_ISDN_DRV_EICON_ISA
fi
fi
fi
# CAPI subsystem
tristate 'CAPI2.0 support' CONFIG_ISDN_CAPI
tristate 'CAPI2.0 support' CONFIG_ISDN_CAPI
if [ "$CONFIG_ISDN_CAPI" != "n" ]; then
dep_bool ' CAPI2.0 Middleware support (EXPERIMENTAL)' CONFIG_ISDN_CAPI_MIDDLEWARE $CONFIG_EXPERIMENTAL
dep_tristate ' CAPI2.0 filesystem support' CONFIG_ISDN_CAPI_CAPIFS $CONFIG_ISDN_CAPI_MIDDLEWARE
dep_tristate ' CAPI2.0 /dev/capi support' CONFIG_ISDN_CAPI_CAPI20 $CONFIG_ISDN_CAPIFS
dep_tristate ' CAPI2.0 capidrv interface support' CONFIG_ISDN_CAPI_CAPIDRV $CONFIG_ISDN
bool ' Verbose reason code reporting (kernel size +=7K)' CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
bool ' Verbose reason code reporting (kernel size +=7K)' CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
dep_bool ' CAPI2.0 Middleware support (EXPERIMENTAL)' CONFIG_ISDN_CAPI_MIDDLEWARE $CONFIG_EXPERIMENTAL
if [ "$CONFIG_ISDN_CAPI_MIDDLEWARE" = "y" ]; then
dep_tristate ' CAPI2.0 filesystem support' CONFIG_ISDN_CAPI_CAPIFS $CONFIG_ISDN_CAPI
fi
dep_tristate ' CAPI2.0 /dev/capi support' CONFIG_ISDN_CAPI_CAPI20 $CONFIG_ISDN_CAPI_CAPIFS
dep_tristate ' CAPI2.0 capidrv interface support' CONFIG_ISDN_CAPI_CAPIDRV $CONFIG_ISDN_CAPI $CONFIG_ISDN
fi
# CAPI drivers
if [ "$CONFIG_ISDN_CAPI" != "n" ]; then
tristate ' AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA
dep_tristate ' AVM B1 PCI support' CONFIG_ISDN_DRV_AVMB1_B1PCI $CONFIG_PCI
dep_tristate ' AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA $CONFIG_ISDN_CAPI
dep_tristate ' AVM B1 PCI support' CONFIG_ISDN_DRV_AVMB1_B1PCI $CONFIG_ISDN_CAPI $CONFIG_PCI
dep_mbool ' AVM B1 PCI V4 support' CONFIG_ISDN_DRV_AVMB1_B1PCIV4 $CONFIG_ISDN_DRV_AVMB1_B1PCI
tristate ' AVM T1/T1-B ISA support' CONFIG_ISDN_DRV_AVMB1_T1ISA
dep_tristate ' AVM B1/M1/M2 PCMCIA support' CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_PCMCIA
dep_tristate ' AVM T1/T1-B ISA support' CONFIG_ISDN_DRV_AVMB1_T1ISA $CONFIG_ISDN_CAPI
dep_tristate ' AVM B1/M1/M2 PCMCIA support' CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_ISDN_CAPI $CONFIG_PCMCIA
dep_tristate ' AVM B1/M1/M2 PCMCIA cs module' CONFIG_ISDN_DRV_AVMB1_AVM_CS $CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
dep_tristate ' AVM T1/T1-B PCI support' CONFIG_ISDN_DRV_AVMB1_T1PCI $CONFIG_PCI
dep_tristate ' AVM C4 support' CONFIG_ISDN_DRV_AVMB1_C4 $CONFIG_PCI
dep_tristate ' AVM T1/T1-B PCI support' CONFIG_ISDN_DRV_AVMB1_T1PCI $CONFIG_ISDN_CAPI $CONFIG_PCI
dep_tristate ' AVM C4 support' CONFIG_ISDN_DRV_AVMB1_C4 $CONFIG_ISDN_CAPI $CONFIG_PCI
fi
# HYSDN
dep_tristate ' Hypercope HYSDN cards (Champ, Ergo, Metro) support (module)' CONFIG_HYSDN m $CONFIG_PROC_FS
dep_tristate ' Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)' CONFIG_HYSDN m $CONFIG_PROC_FS
dep_mbool ' HYSDN CAPI 2.0 support' CONFIG_HYSDN_CAPI $CONFIG_HYSDN $CONFIG_ISDN_CAPI
endmenu

View File

@ -1,18 +1,8 @@
#
# Makefile for the kernel ISDN subsystem and device drivers.
#
# Subdirs.
SUB_DIRS :=
MOD_SUB_DIRS :=
ALL_SUB_DIRS := icn pcbit hisax avmb1 act2000 eicon divert hysdn
# The target object and module list name.
O_TARGET := isdn.a
M_OBJS :=
O_OBJS :=
# Objects that export symbols.
@ -40,69 +30,44 @@ obj-m :=
obj-n :=
obj- :=
# Ordering constraints: isdn.o first, rest doesn't matter
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN) += isdn.o
obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
# Object files in subdirectories
subdir-$(CONFIG_ISDN_DIVERSION) += divert
subdir-$(CONFIG_ISDN_DRV_HISAX) += hisax
subobj-$(CONFIG_ISDN_DRV_HISAX) += hisax/hisax_drv.o
subdir-$(CONFIG_ISDN_DRV_ICN) += icn
subobj-$(CONFIG_ISDN_DRV_ICN) += icn/icn_obj.o
subobj-$(CONFIG_ISDN_DRV_ICN) += icn/icn_drv.o
subdir-$(CONFIG_ISDN_DRV_PCBIT) += pcbit
subobj-$(CONFIG_ISDN_DRV_PCBIT) += pcbit/pcbit.o
subobj-$(CONFIG_ISDN_DRV_PCBIT) += pcbit/pcbit_drv.o
subdir-$(CONFIG_ISDN_DRV_SC) += sc
subobj-$(CONFIG_ISDN_DRV_SC) += sc/sc.o
subobj-$(CONFIG_ISDN_DRV_SC) += sc/sc_drv.o
subdir-$(CONFIG_ISDN_CAPI) += avmb1
subobj-$(CONFIG_ISDN_CAPI) += avmb1/avmb1.o
subdir-$(CONFIG_ISDN_DRV_LOOP) += isdnloop
subobj-$(CONFIG_ISDN_DRV_LOOP) += isdnloop/isdnloop.o
subobj-$(CONFIG_ISDN_DRV_LOOP) += isdnloop/isdnloop_drv.o
subdir-$(CONFIG_ISDN_DRV_ACT2000) += act2000
subobj-$(CONFIG_ISDN_DRV_ACT2000) += act2000/act2000.o
subdir-$(CONFIG_ISDN_DRV_EICON) += eicon
subobj-$(CONFIG_ISDN_DRV_EICON) += eicon/eicon.o
subobj-$(CONFIG_ISDN_DRV_ACT2000) += act2000/act2000_drv.o
subdir-$(CONFIG_ISDN_DRV_EICON_OLD) += eicon
subobj-$(CONFIG_ISDN_DRV_EICON_OLD) += eicon/eicon_drv.o
subdir-$(CONFIG_ISDN_DRV_EICON_DIVAS) += eicon
subobj-$(CONFIG_ISDN_DRV_EICON_DIVAS) += eicon/eicon_drv.o
subdir-$(CONFIG_HYSDN) += hysdn
subobj-$(CONFIG_HYSDN) += hysdn/hysdn.o
subobj-$(CONFIG_HYSDN) += hysdn/hysdn_drv.o
SUB_DIRS += $(subdir-y)
MOD_SUB_DIRS += $(subdir-m)
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN) += isdn.o
obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
obj-y += $(subobj-y)
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# Translate to Rules.make lists.
O_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
OX_OBJS := $(sort $(filter $(export-objs), $(obj-y)))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
# The global Rules.make.
include $(TOPDIR)/Rules.make
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.
isdn.o: $(isdn-objs)
$(LD) -r -o $@ $(isdn-objs)

32
drivers/isdn/Rules.make Normal file
View File

@ -0,0 +1,32 @@
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# Translate to Rules.make lists.
O_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
OX_OBJS := $(sort $(filter $(export-objs), $(obj-y)))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
both-m := $(filter $(mod-subdirs), $(subdir-y))
SUB_DIRS := $(subdir-y)
MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m))
ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
include $(TOPDIR)/Rules.make

View File

@ -1,15 +1,32 @@
L_OBJS :=
M_OBJS :=
O_OBJS := module.o capi.o act2000_isa.o
# Makefile for the act2000 ISDN device driver
O_TARGET :=
ifeq ($(CONFIG_ISDN_DRV_ACT2000),y)
O_TARGET += act2000.o
else
ifeq ($(CONFIG_ISDN_DRV_ACT2000),m)
O_TARGET += act2000.o
M_OBJS = act2000.o
endif
endif
# The target object and module list name.
include $(TOPDIR)/Rules.make
O_TARGET := act2000_drv.o
# Objects that export symbols.
export-objs :=
# Multipart objects.
list-multi := act2000.o
act2000-objs := module.o capi.o act2000_isa.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN_DRV_ACT2000) += act2000.o
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.
act2000.o: $(act2000-objs)
$(LD) -r -o $@ $(act2000-objs)

View File

@ -1,19 +1,8 @@
#
# Makefile for the kernel ISDN subsystem and device drivers.
#
# Subdirs.
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
MOD_IN_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
# Makefile for the AVM ISDN device drivers and CAPI subsystem.
# The target object and module list name.
O_TARGET := avmb1.o
M_OBJS :=
O_OBJS :=
# Objects that export symbols.
@ -33,6 +22,8 @@ obj- :=
# Each configuration option enables a list of files.
# Ordering constraints: kernelcapi.o first
obj-$(CONFIG_ISDN_CAPI) += kernelcapi.o capiutil.o
obj-$(CONFIG_ISDN_CAPI_CAPI20) += capi.o
obj-$(CONFIG_ISDN_CAPI_CAPIDRV) += capidrv.o
@ -45,35 +36,9 @@ obj-$(CONFIG_ISDN_DRV_AVMB1_T1ISA) += t1isa.o b1.o
obj-$(CONFIG_ISDN_DRV_AVMB1_T1PCI) += t1pci.o b1.o b1dma.o
obj-$(CONFIG_ISDN_DRV_AVMB1_C4) += c4.o b1.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# Translate to Rules.make lists.
O_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
OX_OBJS := $(sort $(filter $(export-objs), $(obj-y)))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
# The global Rules.make.
include $(TOPDIR)/Rules.make
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.

View File

@ -6,6 +6,11 @@
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
*
* $Log$
* Revision 1.35 2000/12/10 22:51:05 kai
* add pci_set_master
* ioremap is handling unaligned regions since
* at least 2.2.0
*
* Revision 1.34 2000/12/07 00:09:53 kai
* setup dependency on CONFIG_PCI for the PCI drivers
* in Config.in
@ -582,7 +587,6 @@ static int __init b1pci_init(void)
#endif
struct pci_dev *dev = NULL;
char *p;
int retval;
MOD_INC_USE_COUNT;

View File

@ -1,18 +1,37 @@
L_OBJS :=
LX_OBJS :=
M_OBJS :=
MX_OBJS :=
O_OBJS :=
OX_OBJS :=
L_TARGET :=
O_TARGET :=
#
# Makefile for the dss1_divert ISDN module
#
O_OBJS += isdn_divert.o divert_procfs.o
O_TARGET := dss1_divert.o
M_OBJS += dss1_divert.o
OX_OBJS += divert_init.o
# The target object and module list name.
include $(TOPDIR)/Rules.make
O_TARGET :=
# Objects that export symbols.
export-objs :=
# Multipart objects.
list-multi := dss1_divert.o
dss1_divert-objs := isdn_divert.o divert_procfs.o divert_init.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-m += dss1_divert.o
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.
dss1_divert.o: $(dss1_divert-objs)
$(LD) -r -o $@ $(dss1_divert-objs)

View File

@ -46,7 +46,7 @@ isdn_divert_if divert_if =
/* Module interface code */
/* no cmd line parms */
/*************************/
int init_module(void)
static int __init divert_init(void)
{ int i;
if (divert_dev_init())
@ -63,12 +63,12 @@ int init_module(void)
#endif
printk(KERN_INFO "dss1_divert module successfully installed\n");
return(0);
} /* init_module */
}
/**********************/
/* Module deinit code */
/**********************/
void cleanup_module(void)
static void __exit divert_exit(void)
{ int flags;
int i;
@ -89,6 +89,8 @@ void cleanup_module(void)
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);

View File

@ -26,6 +26,7 @@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/fs.h>
#undef N_DATA
@ -51,7 +52,8 @@ EXPORT_SYMBOL_NOVERS(DivasPrintf);
int DivasCardsDiscover(void);
static int __init Divas_init(void)
static int __init
divas_init(void)
{
printk(KERN_DEBUG "DIVA Server Driver - initialising\n");
@ -80,7 +82,8 @@ static int __init Divas_init(void)
return 0;
}
static void __exit Divas_exit(void)
static void __exit
divas_exit(void)
{
card_t *pCard;
word wCardIndex;
@ -149,6 +152,6 @@ static void __exit Divas_exit(void)
unregister_chrdev(Divas_major, "Divas");
}
module_init(Divas_init);
module_exit(Divas_exit);
module_init(divas_init);
module_exit(divas_exit);

View File

@ -1,43 +1,50 @@
L_OBJS :=
M_OBJS :=
LX_OBJS :=
MX_OBJS :=
O_OBJS :=
OX_OBJS :=
L_TARGET :=
O_TARGET :=
# Makefile for the eicon ISDN device driver
ifeq ($(CONFIG_ISDN_DRV_EICON_STANDALONE),y)
# The target object and module list name.
ifeq ($(CONFIG_PCI),y)
O_OBJS += common.o idi.o bri.o pri.o log.o xlog.o kprintf.o fpga.o fourbri.o
O_OBJS += lincfg.o linchr.o linsys.o linio.o
OX_OBJS += Divas_mod.o
endif
O_TARGET := eicon_drv.o
else
# Objects that export symbols.
OX_OBJS += eicon_mod.o
O_OBJS := eicon_isa.o eicon_pci.o eicon_idi.o eicon_io.o
ifeq ($(CONFIG_PCI),y)
ifeq ($(CONFIG_ISDN_DRV_EICON_PCI),y)
O_OBJS += common.o idi.o bri.o pri.o log.o xlog.o kprintf.o fpga.o fourbri.o
O_OBJS += lincfg.o linchr.o linsys.o linio.o
endif
endif
export-objs := Divas_mod.o eicon_mod.o
endif
# Multipart objects.
O_TARGET :=
list-multi := eicon.o divas.o
eicon-objs := eicon_mod.o eicon_isa.o eicon_pci.o eicon_idi.o \
eicon_io.o
divas-objs := common.o idi.o bri.o pri.o log.o xlog.o kprintf.o fpga.o \
fourbri.o lincfg.o linchr.o linsys.o linio.o \
Divas_mod.o
ifeq ($(CONFIG_ISDN_DRV_EICON),y)
O_TARGET += eicon.o
else
O_TARGET += eicon.o
M_OBJS = eicon.o
endif
include $(TOPDIR)/Rules.make
# Optional parts of multipart objects.
eicon-objs-$(CONFIG_ISDN_DRV_EICON_PCI) += common.o idi.o bri.o pri.o log.o \
xlog.o kprintf.o fpga.o fourbri.o lincfg.o linchr.o \
linsys.o linio.o
eicon-objs += $(eicon-objs-y)
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN_DRV_EICON_OLD) += eicon.o
obj-$(CONFIG_ISDN_DRV_EICON_DIVAS) += divas.o
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.
eicon.o: $(eicon-objs)
$(LD) -r -o $@ $(eicon-objs)
divas.o: $(divas-objs)
$(LD) -r -o $@ $(divas-objs)

View File

@ -101,7 +101,6 @@ void DIVA_DIDD_Read( DESCRIPTOR *table, int tablelength )
return;
}
static
void DIVA_DIDD_Write(DESCRIPTOR *table, int tablelength)
{
if (tablelength > sizeof(DIDD_Table))

View File

@ -1,19 +1,8 @@
#
# Makefile for the hisax ISDN device driver
#
# Subdirs.
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
MOD_IN_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
# The target object and module list name.
O_TARGET := hisax_drv.o
M_OBJS :=
O_OBJS :=
# Objects that export symbols.
@ -74,35 +63,7 @@ obj- :=
obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# Translate to Rules.make lists.
O_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
OX_OBJS := $(sort $(filter $(export-objs), $(obj-y)))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
# The global Rules.make.
include $(TOPDIR)/Rules.make
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.

View File

@ -7,7 +7,7 @@
# cards in the moment.
# Read ../../../Documentation/isdn/HiSax.cert for more informations.
#
f4573d10ffe38b49f6c94e4c966b7bab isac.c
4131693d878d465faf0a4a4b4c6b811e isac.c
a29f5270c0c89626d8d6fa5dd09e7005 isdnl1.c
fbe41751c8130a8c3c607bfe1b41cb4e isdnl2.c
7915b7e802b98f6f4f05b931c4736ad4 isdnl3.c
@ -15,19 +15,19 @@ fbe41751c8130a8c3c607bfe1b41cb4e isdnl2.c
f1fbd532016f005e01decf36e5197d8f callc.c
a1834e9b2ec068440cff2e899eff4710 cert.c
a1f908f8b4f225c5c2f2a13842549b72 l3dss1.c
5bcab52f9937beb352aa02093182e039 l3_1tr6.c
030d4600ee59a2b246410d6a73977412 elsa.c
9e800b8e05c24542d731721eb192f305 diva.c
f32fae58dd9b2b3a73b2e5028f68dc4c sedlbauer.c
3d0a3f88fe48f3151813fafb22ea6119 l3_1tr6.c
6f3420dca0f50084f82471a238545a95 elsa.c
65da7b33bbfa454df2f99636b83f0610 diva.c
4bdb7e35627b7e25f17fccb669fda835 sedlbauer.c
# end of md5sums
-----BEGIN PGP SIGNATURE-----
Version: 2.6.3i
Charset: noconv
iQCVAwUBOaARmDpxHvX/mS9tAQFT7wP/TEEhtP96uKKgzr2o3GpJ5rRik0Q1HbKY
dzeA3U79QCEYqyptU09Uz96Av3dt1lNxpQyaahX419NjHH53HCaZgFCxgRxFWBYS
M9s4aSXLPTCSNM/kWiZkzWQ2lZ7ISNk2/+fF73w4l3G+4zF5y+VotjZCPx7OJj6i
R/L1m4vZXys=
=6DzE
iQCVAwUBOVctcDpxHvX/mS9tAQFOhAP+OpOSxDz46cEHjy4jLsYz44/yKZzFAXz4
s0tYmixrFbbS5XoT1GZqzEF0n/EycO9jsp6d0eanDCg25UX7ehu9dtOJw0o6qRr2
4M/EbloHK2G1aW4gI8W2eWRNRqTZQJ2cjPJD/V/27jDbxBBP31NvOSYvVxrbBzJG
qZHWUDiQxRo=
=mYrg
-----END PGP SIGNATURE-----

View File

@ -1,27 +1,40 @@
SUB_DIRS :=
MOD_SUB_DIRS :=
ALL_SUB_DIRS :=
# Makefile for the hysdn ISDN device driver
L_OBJS :=
LX_OBJS :=
M_OBJS :=
MX_OBJS :=
O_OBJS :=
OX_OBJS :=
L_TARGET :=
O_TARGET :=
# The target object and module list name.
ifeq ($(CONFIG_PROC_FS),y)
ifeq ($(CONFIG_HYSDN),y)
M_OBJS += hysdn.o
O_TARGET += hysdn.o
O_OBJS += hysdn_procconf.o hysdn_proclog.o boardergo.o hysdn_boot.o hysdn_sched.o hysdn_net.o
ifeq ($(CONFIG_HYSDN_CAPI),y)
O_OBJS += hycapi.o
endif
OX_OBJS += hysdn_init.o
endif
endif
O_TARGET := hysdn_drv.o
include $(TOPDIR)/Rules.make
# Objects that export symbols.
export-objs :=
# Multipart objects.
list-multi := hysdn.o
hysdn-objs := hysdn_procconf.o hysdn_proclog.o boardergo.o hysdn_boot.o \
hysdn_sched.o hysdn_net.o hysdn_init.o
# Optional parts of multipart objects.
hysdn-objs-$(CONFIG_HYSDN_CAPI) += hycapi.o
hysdn-objs += $(hysdn-objs-y)
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_HYSDN) += hysdn.o
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.
hysdn.o: $(hysdn-objs)
$(LD) -r -o $@ $(hysdn-objs)

View File

@ -176,7 +176,6 @@ stop_cards(void)
/* image becomes smaller and the driver code is only loaded when needed. */
/* Additionally newer versions may be activated without rebooting. */
/****************************************************************************/
#ifdef CONFIG_MODULES
/******************************************************/
/* extract revision number from string for log output */
@ -204,8 +203,8 @@ hysdn_getrev(const char *revision)
/* and the module is added to the list in /proc/modules, otherwise an error */
/* is assumed and the module will not be kept in memory. */
/****************************************************************************/
int
init_module(void)
static int __init
hysdn_init(void)
{
char tmp[50];
@ -244,8 +243,8 @@ init_module(void)
/* cated as after the return from this function the module code will */
/* be removed from memory. */
/***********************************************************************/
void
cleanup_module(void)
static void __exit
hysdn_exit(void)
{
#ifdef CONFIG_HYSDN_CAPI
hysdn_card *card;
@ -264,4 +263,5 @@ cleanup_module(void)
printk(KERN_NOTICE "HYSDN: module unloaded\n");
} /* cleanup_module */
#endif /* CONFIG_MODULES */
module_init(hysdn_init);
module_exit(hysdn_exit);

View File

@ -1,8 +1,22 @@
ifeq ($(CONFIG_ISDN_DRV_ICN),y)
O_TARGET := icn_obj.o
O_OBJS := icn.o
else
M_OBJS := icn.o
endif
# Makefile for the act2000 ISDN device driver
include $(TOPDIR)/Rules.make
# The target object and module list name.
O_TARGET := icn_drv.o
# Objects that export symbols.
export-objs :=
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN_DRV_ICN) += icn.o
include $(TOPDIR)/drivers/isdn/Rules.make

View File

@ -2509,7 +2509,6 @@ static int __init init_isdn(void)
printk(" loaded\n");
#else
printk("\n");
isdn_cards_init();
#endif
isdn_info_update();
#ifdef CONFIG_ISDN_WITH_ABC

View File

@ -1,11 +1,25 @@
L_OBJS :=
M_OBJS :=
#
# Makefile for the isdnloop ISDN device driver
#
ifeq ($(CONFIG_ISDN_DRV_LOOP),y)
L_OBJS += isdnloop.o
else
M_OBJS += isdnloop.o
endif
# The target object and module list name.
include $(TOPDIR)/Rules.make
O_TARGET := isdnloop_drv.o
# Objects that export symbols.
export-objs :=
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN_DRV_LOOP) += isdnloop.o
include $(TOPDIR)/drivers/isdn/Rules.make

View File

@ -21,6 +21,7 @@
*/
#include <linux/config.h>
#include <linux/init.h>
#include "isdnloop.h"
static char
@ -1534,22 +1535,7 @@ isdnloop_addcard(char *id1)
return 0;
}
#ifdef MODULE
#define isdnloop_init init_module
#else
void
isdnloop_setup(char *str, int *ints)
{
static char sid[20];
if (strlen(str)) {
strcpy(sid, str);
isdnloop_id = sid;
}
}
#endif
int
static int __init
isdnloop_init(void)
{
char *p;
@ -1568,9 +1554,8 @@ isdnloop_init(void)
return (isdnloop_addcard(isdnloop_id));
}
#ifdef MODULE
void
cleanup_module(void)
static void __exit
isdnloop_exit(void)
{
isdn_ctrl cmd;
isdnloop_card *card = cards;
@ -1598,4 +1583,6 @@ cleanup_module(void)
}
printk(KERN_NOTICE "isdnloop-ISDN-driver unloaded\n");
}
#endif
module_init(isdnloop_init);
module_exit(isdnloop_exit);

View File

@ -1,15 +1,32 @@
L_OBJS :=
M_OBJS :=
O_OBJS := module.o edss1.o drv.o layer2.o capi.o callbacks.o
# Makefile for the pcbit ISDN device driver
O_TARGET :=
ifeq ($(CONFIG_ISDN_DRV_PCBIT),y)
O_TARGET += pcbit.o
else
ifeq ($(CONFIG_ISDN_DRV_PCBIT),m)
O_TARGET += pcbit.o
M_OBJS += pcbit.o
endif
endif
# The target object and module list name.
include $(TOPDIR)/Rules.make
O_TARGET := pcbit_drv.o
# Objects that export symbols.
export-objs :=
# Multipart objects.
list-multi := pcbit.o
pcbit-objs := module.o edss1.o drv.o layer2.o capi.o callbacks.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN_DRV_PCBIT) += pcbit.o
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.
pcbit.o: $(pcbit-objs)
$(LD) -r -o $@ $(pcbit-objs)

View File

@ -1,44 +1,33 @@
#
# $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.
#
# 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.
#
# For more information, please contact gpl-info@spellcast.com or write:
#
# SpellCaster Telecommunications Inc.
# 5621 Finch Avenue East, Unit #3
# Scarborough, Ontario Canada
# M1B 2T9
# +1 (416) 297-8565
# +1 (416) 297-6433 Facsimile
#
# Makefile for the sc ISDN device driver
L_OBJS :=
M_OBJS :=
O_OBJS := shmem.o init.o debug.o packet.o command.o event.o \
ioctl.o interrupt.o message.o timer.o
# The target object and module list name.
O_TARGET :=
ifeq ($(CONFIG_ISDN_DRV_SC),y)
O_TARGET += sc.o
else
ifeq ($(CONFIG_ISDN_DRV_SC),m)
O_TARGET += sc.o
M_OBJS += sc.o
endif
endif
O_TARGET := sc_drv.o
include $(TOPDIR)/Rules.make
# Objects that export symbols.
export-objs :=
# Multipart objects.
list-multi := sc.o
sc-objs := shmem.o init.o debug.o packet.o command.o event.o \
ioctl.o interrupt.o message.o timer.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN_DRV_SC) += sc.o
include $(TOPDIR)/drivers/isdn/Rules.make
# Link rules for multi-part drivers.
sc.o: $(sc-objs)
$(LD) -r -o $@ $(sc-objs)

View File

@ -1,3 +1,5 @@
#include <linux/module.h>
#include <linux/init.h>
#include "includes.h"
#include "hardware.h"
#include "card.h"
@ -37,23 +39,12 @@ int irq_supported(int irq_x)
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 +401,7 @@ int init_sc(void)
return status;
}
#ifdef MODULE
void cleanup_module(void)
static void __exit sc_exit(void)
{
int i, j;
@ -463,7 +453,6 @@ void cleanup_module(void)
}
pr_info("SpellCaster ISA ISDN Adapter Driver Unloaded.\n");
}
#endif
int identify_board(unsigned long rambase, unsigned int iobase)
{
@ -591,3 +580,6 @@ int identify_board(unsigned long rambase, unsigned int iobase)
return -1;
}
module_init(sc_init);
module_exit(sc_exit);

View File

@ -8,18 +8,25 @@ VERBOSE=false
NOTEST=true
docpd() {
if ! cmp -s $1 $2 ; then
if $NOTEST ; then
echo Copying $1 ...
mkdir -p `dirname $2`
rm -rf $2 # unlink first
cp $1 $2
else
echo $1 was changed
BASENAME=`basename $2`;
if [ "$BASENAME" = "Makefile" ] ; then
if [ $VERSION -gt 3 -o $PATCHLEVEL -gt 3 ]; then
cat $1 | sed -e "s/drivers\/isdn\/Rules\.make/Rules\.make/" > $2;
fi
else
if $VERBOSE ; then
echo $2 is up to date, NOT converted
if ! cmp -s $1 $2 ; then
if $NOTEST ; then
echo Copying $1 ...
mkdir -p `dirname $2`
rm -rf $2 # unlink first
cp $1 $2
else
echo $1 was changed
fi
else
if $VERBOSE ; then
echo $2 is up to date, NOT converted
fi
fi
fi
}
@ -252,19 +259,13 @@ else
for i in drivers/isdn/isdnloop/*.[ch] ; do
$DOCP $i $KERNELDIR/$i
done
for i in drivers/isdn/hysdn/*.[ch] drivers/isdn/hysdn/Makefile ; do
for i in drivers/isdn/hysdn/*.[ch] ; do
$DOCP $i $KERNELDIR/$i
done
if [ ! -d $KERNELDIR/drivers/isdn/divert ] ; then
mkdir $KERNELDIR/drivers/isdn/divert
fi
for i in drivers/isdn/divert/*.[ch] drivers/isdn/divert/Makefile ; do
$DOCP $i $KERNELDIR/$i
done
if [ ! -d $KERNELDIR/drivers/isdn/hysdn ] ; then
mkdir $KERNELDIR/drivers/isdn/hysdn
fi
for i in drivers/isdn/hysdn/*.[ch] drivers/isdn/hysdn/Makefile ; do
for i in drivers/isdn/divert/*.[ch] ; do
$DOCP $i $KERNELDIR/$i
done
if [ -f $KERNELDIR/Documentation/Configure.help ] ; then
@ -290,7 +291,7 @@ else
fi
fi
for i in drivers/isdn/eicon/*.[ch] ; do
$DOCP $i $KERNELDIR/$i
$DOCP $i $KERNELDIR/$i
done
COPY_COMPAT=false
if [ -n "$CTRLNAME" ] ; then
@ -322,14 +323,17 @@ else
$DOCP $i $KERNELDIR/$i
fi
done
for i in drivers/isdn/Makefile drivers/isdn/icn/Makefile \
for i in drivers/isdn/Makefile \
drivers/isdn/icn/Makefile \
drivers/isdn/hisax/Makefile \
drivers/isdn/pcbit/Makefile drivers/isdn/sc/Makefile \
drivers/isdn/pcbit/Makefile \
drivers/isdn/sc/Makefile \
drivers/isdn/act2000/Makefile \
drivers/isdn/isdnloop/Makefile \
drivers/isdn/eicon/Makefile \
drivers/isdn/divert/Makefile \
drivers/isdn/avmb1/Makefile; do
drivers/isdn/avmb1/Makefile \
drivers/isdn/hysdn/Makefile; do
if [ -f $i.kernel ] ; then
if $UNIQUE ; then
docpd $i.kernel $KERNELDIR/$i

View File

@ -48,6 +48,5 @@
#undef COMPAT_USE_MODCOUNT_LOCK
#define COMPAT_HAVE_NEW_FILLDIR
#define COMPAT_HAS_SCHEDULE_TASK
#define PCI_VENDOR_ID_ABOCOM 0x13D1
#define PCI_DEVICE_ID_ABOCOM_2BD1 0x2BD1
#define PCI_VENDOR_ID_ABOCOM 0x13D1
#define PCI_DEVICE_ID_ABOCOM_2BD1 0x2BD1