retronetworking
/
mISDN
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added new BN8S+ which has 8 LEDS for each ISDN Port, also added VERSION printing to mISDN_core

This commit is contained in:
Chrisian Richter 2007-02-13 10:27:01 +00:00
parent 2083ca73f1
commit 26104aec84
5 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -38,13 +38,13 @@ CONFIGS+=CONFIG_MISDN_NETJET=m
#CONFIGS+=CONFIG_MISDN_NETDEV=y
MISDNVERSION=$(shell cat VERSION)
MINCLUDES+=-I$(MISDNDIR)/include
all: test_old_misdn
cp $(MISDNDIR)/drivers/isdn/hardware/mISDN/Makefile.v2.6 $(MISDNDIR)/drivers/isdn/hardware/mISDN/Makefile
export MINCLUDES=$(MISDNDIR)/include ; make -C $(LINUX) SUBDIRS=$(MISDN_SRC) modules $(CONFIGS)
export MINCLUDES=$(MISDNDIR)/include ; export MISDNVERSION=$(MISDNVERSION); make -C $(LINUX) SUBDIRS=$(MISDN_SRC) modules $(CONFIGS)
install: all modules-install misdn-init
$(DEPMOD)
@ -97,9 +97,16 @@ clean:
find . -iname "*.mod.c" -exec rm -rf {} \;
find . -iname "*.mod" -exec rm -rf {} \;
VERSION:
if cvs status Makefile | grep "Sticky Tag" | grep none > /dev/null ; then \
echo $(MAJOR)_$(MINOR)_$(SUBMINOR)-$$(date +"20%y_%m_%d" | sed -e "s/\//_/g") > VERSION ; \
else \
echo $(MAJOR)_$(MINOR)_$(SUBMINOR) > VERSION ; \
fi
snapshot: clean
DIR=mISDN-$$(date +"20%y_%m_%d") ; \
echo $$(date +"20%y_%m_%d" | sed -e "s/\//_/g") > VERSION ; \
echo $(MAJOR)_$(MINOR)_$(SUBMINOR)-$$(date +"20%y_%m_%d" | sed -e "s/\//_/g") > VERSION ; \
mkdir -p /tmp/$$DIR ; \
cp -a * /tmp/$$DIR ; \
cd /tmp/; \

2
drivers/isdn/hardware/mISDN/Makefile
View File

@ -14,7 +14,7 @@ ifdef CONFIG_MISDN_NETDEV
EXTRA_CFLAGS += -DCONFIG_MISDN_NETDEV
endif
CFLAGS += -DMISDNVERSION=\"$(MISDNVERSION)\"
obj-$(CONFIG_MISDN_DRV) += mISDN_core.o
obj-$(CONFIG_MISDN_DRV) += mISDN_isac.o

2
drivers/isdn/hardware/mISDN/Makefile.v2.6
View File

@ -14,7 +14,7 @@ ifdef CONFIG_MISDN_NETDEV
EXTRA_CFLAGS += -DCONFIG_MISDN_NETDEV
endif
CFLAGS += -DMISDNVERSION=\"$(MISDNVERSION)\"
obj-$(CONFIG_MISDN_DRV) += mISDN_core.o
obj-$(CONFIG_MISDN_DRV) += mISDN_isac.o

3
drivers/isdn/hardware/mISDN/core.c
View File

@ -20,6 +20,7 @@
#endif
static char *mISDN_core_revision = "$Revision$";
static char *mISDN_core_version = MISDNVERSION ;
LIST_HEAD(mISDN_objectlist);
static rwlock_t mISDN_objects_lock = RW_LOCK_UNLOCKED;
@ -723,7 +724,7 @@ mISDNInit(void)
DECLARE_MUTEX_LOCKED(sem);
int err;
printk(KERN_INFO "Modular ISDN Stack core %s\n", mISDN_core_revision);
printk(KERN_INFO "Modular ISDN Stack core version (%s) revision (%s)\n", mISDN_core_version, mISDN_core_revision);
core_debug = debug;
#ifdef MISDN_MEMDEBUG
err = __mid_init();

36
drivers/isdn/hardware/mISDN/hfc_multi.c
View File

@ -210,6 +210,8 @@ static const PCI_ENTRY id_list[] =
"HFC-8S", 0, 8, 1, 0},
{CCAG_VID, CCAG_VID, HFC8S_ID, 0xB562, VENDOR_CCD,
"HFC-8S Beronet Card", 0, 8, 1, 0},
{CCAG_VID, CCAG_VID, HFC8S_ID, 0xB56B, VENDOR_CCD,
"HFC-8S Beronet Card (+)", 0, 8, 1, 8},
{CCAG_VID, CCAG_VID, HFCE1_ID, 0xB523, VENDOR_CCD,
"HFC-E1 IOB1E1", 1, 1, 0, 1}, /* E1 only supports single clock */
{CCAG_VID, CCAG_VID, HFCE1_ID, 0xC523, VENDOR_CCD,
@ -1133,6 +1135,36 @@ hfcmulti_leds(hfc_multi_t *hc)
HFC_outb(hc, R_GPIO_OUT1,
((led[0]&1)<<2) | ((led[1]&1)<<3) );
break;
case 8:
{
unsigned long led=0;
int off=0;
if (hc->ledcount>2048)
off=1;
for (i=0;i<8;i++) {
state = 0;
active = -1;
dch = hc->chan[(i<<2)|2].ch;
if (dch && test_bit(FLG_DCHANNEL, &dch->Flags)) {
state = dch->state;
active = test_bit(HFC_CFG_NTMODE, &hc->chan[dch->channel].cfg)?3:7;
}
if (state) {
if (state!=active && off)
led |= 1<<i;
} else
led |= 1<<i;
}
unsigned long leddw=led << 24 | led << 16 | led << 8 | led;
HFC_outb(hc, R_BRG_PCM_CFG, 1);
outw(0x4000, hc->pci_iobase + 4);
outl(leddw, hc->pci_iobase);
HFC_outb(hc, R_BRG_PCM_CFG, 0);
}
break;
}
}
@ -1855,6 +1887,7 @@ handle_timer_irq(hfc_multi_t *hc)
if (hc->leds)
hfcmulti_leds(hc);
}
static irqreturn_t
@ -3244,6 +3277,8 @@ init_card(hfc_multi_t *hc)
if (hc->irqcnt) {
if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_DEBUG "%s: done\n", __FUNCTION__);
return(0);
}
printk(KERN_WARNING "HFC PCI: IRQ(%d) getting no interrupts during init (try %d)\n", hc->irq, cnt);
@ -4331,6 +4366,7 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = {
/** Cards with HFC-8S Chip**/
{ CCAG_VID, 0x16B8 , CCAG_VID, 0xB562, 0, 0, 0 }, //BN8S
{ CCAG_VID, 0x16B8 , CCAG_VID, 0xB56B, 0, 0, 0 }, //BN8S+
{ CCAG_VID, 0x16B8 , CCAG_VID, 0x16B8, 0, 0, 0 }, //old Eval
{ CCAG_VID, 0x16B8 , CCAG_VID, 0xB521, 0, 0, 0 }, //IOB8ST Recording
{ CCAG_VID, 0x16B8 , CCAG_VID, 0xB522, 0, 0, 0 }, //IOB8ST