cleanup old names

This commit is contained in:
Karsten Keil 2003-07-21 12:44:46 +00:00
parent 3163b25b1f
commit c6a01eb57a
29 changed files with 83 additions and 90 deletions

View File

@ -1,3 +1,3 @@
# new mISDN driver as module
CONFIG_ISDN_DRV_NEWmISDN=m
CONFIG_ISDN_DRV_mISDN=m

View File

@ -11,29 +11,25 @@ O_TARGET := vmlinux-obj.o
# multi objects
SEDLFAXOBJ := sedl_fax.o debug.o helper.o fsm.o isar.o mISDN_dch.o mISDN_bch.o
FRITZOBJ := fritz_pci.o debug.o helper.o fsm.o mISDN_dch.o mISDN_bch.o
HFC_PCIOBJ := hfc_pci.o debug.o helper.o mISDN_dch.o mISDN_bch.o
mISDNisac-objs := isac.o arcofi.o debug.o
OBJ_core := mISDN_core.o mISDN_stack.o mISDN_dev.o helper.o
OBJ_l1 := mISDN_l1.o helper.o debug.o fsm.o
OBJ_l2 := mISDN_l2.o tei.o helper.o debug.o fsm.o
OBJ_l3udss1 := mISDN_l3.o helper.o l3helper.o debug.o fsm.o l3_udss1.o
OBJ_capi := capi.o contr.o listen.o appl.o plci.o cplci.o ncci.o asn1.o \
asn1_aoc.o asn1_comp.o asn1_generic.o asn1_diversion.o \
asn1_basic_service.o asn1_address.o asn1_enc.o capi_enc.o \
supp_serv.o helper.o l3helper.o debug.o fsm.o
OBJ_dtmf := mISDN_dtmf.o helper.o debug.o
sedlfax-objs := sedl_fax.o debug.o helper.o fsm.o isar.o dchannel.o bchannel.o
avmfritz-objs := avm_fritz.o debug.o helper.o fsm.o dchannel.o bchannel.o
hfcpci-objs := hfc_pci.o debug.o helper.o dchannel.o bchannel.o
mISDN_isac-objs := isac.o arcofi.o debug.o
mISDN_core-objs := core.o stack.o udevice.o helper.o
mISDN_l1-objs := layer1.o helper.o debug.o fsm.o
mISDN_l2-objs := layer2.o tei.o helper.o debug.o fsm.o
l3udss1-objs := layer3.o helper.o l3helper.o debug.o fsm.o l3_udss1.o
mISDN_capi-objs := capi.o contr.o listen.o appl.o plci.o cplci.o ncci.o asn1.o \
asn1_aoc.o asn1_comp.o asn1_generic.o asn1_diversion.o \
asn1_basic_service.o asn1_address.o asn1_enc.o capi_enc.o \
supp_serv.o helper.o l3helper.o debug.o fsm.o
mISDN_dtmf-objs := dtmf.o helper.o debug.o
ifdef CONFIG_I4L_CAPI_LAYER
i4lcapi-objs := i4l_capi.o helper.o l3helper.o debug.o fsm.o
I4LmISDN-objs := i4l_mISDN.o helper.o l3helper.o debug.o fsm.o
endif
LX_OBJS += mISDN_core.o
LX_OBJS += core.o
ifdef MEMDBG
EXTRA_CFLAGS += -DMEMDBG
@ -49,71 +45,68 @@ endif
# endif
#endif
export-objs := mISDN_core.o isac.o
export-objs := core.o isac.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) :=
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += mISDNcore.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += mISDNisac.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += fritzpci.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += sedlfax.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += hfcpci.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += mISDNl1.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += mISDNl2.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += l3udss1.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += mISDNcapi.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += mISDNdtmf.o
obj-$(CONFIG_ISDN_DRV_NEWmISDN) += i4lcapi.o
obj-$(CONFIG_ISDN_DRV_mISDN) :=
obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_core.o
obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_isac.o
obj-$(CONFIG_ISDN_DRV_mISDN) += avmfritz.o
obj-$(CONFIG_ISDN_DRV_mISDN) += sedlfax.o
obj-$(CONFIG_ISDN_DRV_mISDN) += hfcpci.o
obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_l1.o
obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_l2.o
obj-$(CONFIG_ISDN_DRV_mISDN) += l3udss1.o
obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_capi.o
obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_dtmf.o
obj-$(CONFIG_ISDN_DRV_mISDN) += I4LmISDN.o
M_OBJS := $(obj-m)
include $(TOPDIR)/Rules.make
mISDNcore.o: $(OBJ_core)
mISDN_core.o: $(mISDN_core-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
mISDNisac.o: $(mISDNisac-objs)
mISDN_isac.o: $(mISDN_isac-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
fritzpci.o: $(FRITZOBJ)
avmfritz.o: $(avmfritz-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
sedlfax.o: $(SEDLFAXOBJ)
sedlfax.o: $(sedlfax-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
hfcpci.o: $(HFC_PCIOBJ)
hfcpci.o: $(hfcpci-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
mISDNl1.o: $(OBJ_l1)
mISDN_l1.o: $(mISDN_l1-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
mISDNl2.o: $(OBJ_l2)
mISDN_l2.o: $(mISDN_l2-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
l3udss1.o: $(OBJ_l3udss1)
l3udss1.o: $(l3udss1-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
mISDNcapi.o: $(OBJ_capi)
mISDN_capi.o: $(mISDN_capi-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
mISDNdtmf.o: $(OBJ_dtmf)
mISDN_dtmf.o: $(mISDN_dtmf-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
ifdef CONFIG_I4L_CAPI_LAYER
i4lcapi.o: $(i4lcapi-objs)
I4LmISDN.o: $(I4LmISDN-objs)
$(RM) $@
$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "helper.h"
#include "debug.h"

View File

@ -9,8 +9,8 @@
*/
#define __NO_VERSION__
#include "mISDN_dch.h"
#include "mISDNl1.h"
#include "dchannel.h"
#include "layer1.h"
#include "isac.h"
#include "arcofi.h"
#include "debug.h"

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "helper.h"
#include "asn1_enc.h"

View File

@ -14,10 +14,10 @@
#include <linux/isapnp.h>
#include <linux/kernel_stat.h>
#include <linux/delay.h>
#include "mISDN_dch.h"
#include "mISDN_bch.h"
#include "dchannel.h"
#include "bchannel.h"
#include "isac.h"
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "debug.h"
@ -25,7 +25,7 @@
#define LOCK_STATISTIC
#include "hw_lock.h"
static const char *avm_pci_rev = "$Revision$";
static const char *avm_fritz_rev = "$Revision$";
enum {
AVM_FRITZ_PCI,
@ -646,7 +646,7 @@ HDLC_irq_main(fritzpnppci *fc)
}
static void
avm_pcipnp_interrupt(int intno, void *dev_id, struct pt_regs *regs)
avm_fritz_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{
fritzpnppci *fc = dev_id;
u_long flags;
@ -681,7 +681,7 @@ avm_pcipnp_interrupt(int intno, void *dev_id, struct pt_regs *regs)
fc->lock.irq_ok++;
#endif
#ifdef SPIN_DEBUG
fc->lock.busy_adr = avm_pcipnp_interrupt;
fc->lock.busy_adr = avm_fritz_interrupt;
#endif
}
@ -838,7 +838,7 @@ static int init_card(fritzpnppci *fc)
irq_cnt = kstat_irqs(fc->irq);
printk(KERN_INFO "AVM Fritz!PCI: IRQ %d count %d\n", fc->irq, irq_cnt);
lock_dev(fc, 0);
if (request_irq(fc->irq, avm_pcipnp_interrupt, SA_SHIRQ,
if (request_irq(fc->irq, avm_fritz_interrupt, SA_SHIRQ,
"AVM Fritz!PCI", fc)) {
printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n",
fc->irq);
@ -1335,7 +1335,7 @@ static int __init Fritz_init(void)
int err, pci_nr_found;
char tmp[64];
strcpy(tmp, avm_pci_rev);
strcpy(tmp, avm_fritz_rev);
printk(KERN_INFO "AVM Fritz PCI/PnP driver Rev. %s\n", mISDN_getrev(tmp));
SET_MODULE_OWNER(&fritz);

View File

@ -8,8 +8,8 @@
#define __NO_VERSION__
#include <linux/mISDNif.h>
#include "mISDNl1.h"
#include "mISDN_bch.h"
#include "layer1.h"
#include "bchannel.h"
#include "helper.h"
static void

View File

@ -5,7 +5,7 @@
#include <linux/module.h>
#include <linux/vmalloc.h>
#include <asm/uaccess.h>
#include "mISDN_capi.h"
#include "capi.h"
#include "helper.h"
#include "debug.h"

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "asn1.h"
int capiEncodeWord(__u8 *p, __u16 i)

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "helper.h"
#include "debug.h"

View File

@ -10,7 +10,7 @@
#include <linux/stddef.h>
#include <linux/config.h>
#include <linux/module.h>
#include "mISDN_core.h"
#include "core.h"
#ifdef CONFIG_KMOD
#include <linux/kmod.h>
#endif

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "helper.h"
#include "debug.h"
#include "dss1.h"

View File

@ -8,9 +8,9 @@
#define __NO_VERSION__
#include <linux/mISDNif.h>
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "mISDN_dch.h"
#include "dchannel.h"
static void
dchannel_bh(dchannel_t *dch)

View File

@ -17,7 +17,7 @@
#include <linux/config.h>
#include <linux/module.h>
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "debug.h"

View File

@ -31,10 +31,10 @@
#include <linux/kernel_stat.h>
#include <linux/delay.h>
#include "mISDN_dch.h"
#include "mISDN_bch.h"
#include "dchannel.h"
#include "bchannel.h"
#include "hfc_pci.h"
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "debug.h"
#include <linux/isdn_compat.h>

View File

@ -9,10 +9,10 @@
#define __NO_VERSION__
#include <linux/module.h>
#include "mISDN_dch.h"
#include "dchannel.h"
#include "isac.h"
#include "arcofi.h"
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "debug.h"
#ifdef CONFIG_KMOD

View File

@ -10,9 +10,9 @@
#define __NO_VERSION__
#include <linux/delay.h>
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "mISDN_bch.h"
#include "bchannel.h"
#include "isar.h"
#include "debug.h"

View File

@ -15,7 +15,7 @@
#include <linux/module.h>
#include "mISDNl3.h"
#include "layer3.h"
#include "helper.h"
#include "debug.h"
#include "dss1.h"

View File

@ -14,7 +14,7 @@ static char *l1_revision = "$Revision$";
#include <linux/config.h>
#include <linux/module.h>
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "debug.h"

View File

@ -8,7 +8,7 @@
*
*/
#include <linux/module.h>
#include "mISDNl2.h"
#include "layer2.h"
#include "helper.h"
#include "debug.h"

View File

@ -11,7 +11,7 @@
*
*/
#define __NO_VERSION__
#include "mISDNl3.h"
#include "layer3.h"
#include "helper.h"
const char *l3_revision = "$Revision$";

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "helper.h"
#include "debug.h"

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "helper.h"
#include "debug.h"
#include "dss1.h"

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "dss1.h"
#include "helper.h"
#include "debug.h"

View File

@ -32,11 +32,11 @@
#include <linux/kernel_stat.h>
#include <linux/delay.h>
#include <asm/semaphore.h>
#include "mISDN_dch.h"
#include "mISDN_bch.h"
#include "dchannel.h"
#include "bchannel.h"
#include "isac.h"
#include "isar.h"
#include "mISDNl1.h"
#include "layer1.h"
#include "helper.h"
#include "debug.h"

View File

@ -6,7 +6,7 @@
*
*/
#include "mISDN_core.h"
#include "core.h"
mISDNstack_t *mISDN_stacklist = NULL;
mISDNinstance_t *mISDN_instlist = NULL;

View File

@ -2,7 +2,7 @@
*
*/
#include "mISDN_capi.h"
#include "capi.h"
#include "asn1_comp.h"
#include "asn1_enc.h"
#include "dss1.h"

View File

@ -8,7 +8,7 @@
*
*/
#define __NO_VERSION__
#include "mISDNl2.h"
#include "layer2.h"
#include "helper.h"
#include "debug.h"
#include <linux/random.h>

View File

@ -10,7 +10,7 @@
#include <linux/vmalloc.h>
#include <linux/config.h>
#include <linux/timer.h>
#include "mISDN_core.h"
#include "core.h"
#define MAX_HEADER_LEN 4