From 60be2d76f8037171fddfec49d411c85525bf88d6 Mon Sep 17 00:00:00 2001 From: Chrisian Richter Date: Mon, 9 Oct 2006 12:51:33 +0000 Subject: [PATCH] removed a lot of verbosity. Better commented the pcm_slave and ignore_pcm_frameclock options --- drivers/isdn/hardware/mISDN/hfc_multi.c | 26 ++++++++++--------------- drivers/isdn/hardware/mISDN/l3_udss1.c | 17 +++++++++++++--- drivers/isdn/hardware/mISDN/layer1.c | 4 +++- drivers/isdn/hardware/mISDN/layer2.c | 6 ++++-- drivers/isdn/hardware/mISDN/stack.c | 6 +++--- include/linux/mISDNif.h | 2 +- misdn-init | 15 +++++++++++--- 7 files changed, 47 insertions(+), 29 deletions(-) diff --git a/drivers/isdn/hardware/mISDN/hfc_multi.c b/drivers/isdn/hardware/mISDN/hfc_multi.c index c10ab24..4dba771 100644 --- a/drivers/isdn/hardware/mISDN/hfc_multi.c +++ b/drivers/isdn/hardware/mISDN/hfc_multi.c @@ -2786,8 +2786,9 @@ handle_bmsg(channel_t *ch, struct sk_buff *skb) break; default: - printk(KERN_DEBUG "%s: unknown PH_CONTROL info %x\n", - __FUNCTION__, hh->dinfo); + if (debug) + printk(KERN_DEBUG "%s: unknown PH_CONTROL info %x\n", + __FUNCTION__, hh->dinfo); ret = -EINVAL; } spin_unlock_irqrestore(ch->inst.hwlock, flags); @@ -3436,8 +3437,6 @@ static void release_ports_hw(hfc_multi_t *hc) { u_long flags; - printk(KERN_INFO "release_ports_hw called type=%d\n",hc->type); - spin_lock_irqsave(&hc->lock, flags); /*first we disable all the hw stuff*/ @@ -3525,9 +3524,6 @@ static void release_ports_hw(hfc_multi_t *hc) if (debug & DEBUG_HFCMULTI_INIT) printk(KERN_WARNING "%s: card successfully removed\n", __FUNCTION__); - - printk(KERN_INFO "release_ports_hw finished \n"); - } /*************************** @@ -4279,11 +4275,10 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev) int i,ch; hfc_multi_t *card = pci_get_drvdata(pdev); - printk( KERN_INFO "removing hfc_multi card vendor:%x device:%x subvendor:%x subdevice:%x\n", + if (debug) + printk( KERN_INFO "removing hfc_multi card vendor:%x device:%x subvendor:%x subdevice:%x\n", pdev->vendor,pdev->device,pdev->subsystem_vendor,pdev->subsystem_device); if (card) { - - printk( KERN_INFO "releasing card\n"); #if 1 for(i=0;itype;i++) { // type is also number of d-channel if(card->created[i]) { @@ -4302,8 +4297,10 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev) // relase all ports allocated[card->idx] = 0; } - else printk(KERN_WARNING "%s: drvdata allready removed\n", __FUNCTION__); - printk(KERN_INFO "hfcmulti card removed\n"); + else { + if (debug) + printk(KERN_WARNING "%s: drvdata allready removed\n", __FUNCTION__); + } } static struct pci_device_id hfmultipci_ids[] __devinitdata = { @@ -4379,7 +4376,7 @@ HFCmulti_cleanup(void) list_for_each_entry_safe(hc, next, &HFCM_obj.ilist, list) { int i; - printk(KERN_ERR "HFC PCI card struct not empty refs %d\n", HFCM_obj.refcnt); + if (debug) printk(KERN_ERR "HFC PCI card struct not empty refs %d\n", HFCM_obj.refcnt); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) for (i=0;itype;i++) { @@ -4390,11 +4387,8 @@ HFCmulti_cleanup(void) udelay(1000); } - printk(KERN_NOTICE "HFC Before unregistering from PCI\n"); /* get rid of all devices of this driver */ pci_unregister_driver(&hfcmultipci_driver); - - printk(KERN_NOTICE "HFC PCI card Unregistered from PCI\n"); } static int __init diff --git a/drivers/isdn/hardware/mISDN/l3_udss1.c b/drivers/isdn/hardware/mISDN/l3_udss1.c index e12f4eb..bb334e1 100644 --- a/drivers/isdn/hardware/mISDN/l3_udss1.c +++ b/drivers/isdn/hardware/mISDN/l3_udss1.c @@ -2791,9 +2791,19 @@ dss1_fromup(layer3_t *l3, struct sk_buff *skb, mISDN_head_t *hh) } return(ret); } + + if (!proc && (hh->prim == (CC_RELEASE_COMPLETE | REQUEST)) ) { + /* crich: */ + l3_debug(l3, "mISDN dss1 sending RELEASE_COMPLETE without proc pr=%04x dinof(%x)\n", hh->prim, hh->dinfo); + SendMsg(l3->dummy, skb, -1); + + return 0; + } + if (!proc) { - printk(KERN_ERR "mISDN dss1 fromup without proc pr=%04x dinfo(%x)\n", - hh->prim, hh->dinfo); + if(debug) + printk(KERN_ERR "mISDN dss1 fromup without proc pr=%04x dinfo(%x)\n", + hh->prim, hh->dinfo); return(-EINVAL); } for (i = 0; i < DOWNSLLEN; i++) @@ -2892,7 +2902,8 @@ release_udss1(layer3_t *l3) mISDNinstance_t *inst = &l3->inst; u_long flags; - printk(KERN_DEBUG "release_udss1 refcnt %d l3(%p) inst(%p)\n", + if (debug) + printk(KERN_DEBUG "release_udss1 refcnt %d l3(%p) inst(%p)\n", u_dss1.refcnt, l3, inst); release_l3(l3); #ifdef FIXME diff --git a/drivers/isdn/hardware/mISDN/layer1.c b/drivers/isdn/hardware/mISDN/layer1.c index 2e92996..690609b 100644 --- a/drivers/isdn/hardware/mISDN/layer1.c +++ b/drivers/isdn/hardware/mISDN/layer1.c @@ -769,7 +769,8 @@ l1_manager(void *data, u_int prim, void *arg) { } spin_unlock_irqrestore(&isdnl1.lock, flags); if (err && (prim != (MGR_NEWLAYER | REQUEST))) { - printk(KERN_WARNING "l1_manager connect no instance\n"); + if (debug) + printk(KERN_WARNING "l1_manager connect no instance\n"); return(err); } @@ -800,6 +801,7 @@ l1_manager(void *data, u_int prim, void *arg) { break; PRIM_NOT_HANDLED(MGR_CTRLREADY|INDICATION); PRIM_NOT_HANDLED(MGR_ADDSTPARA|INDICATION); + PRIM_NOT_HANDLED(MGR_SETSTACK|INDICATION); default: printk(KERN_WARNING "l1_manager prim %x not handled\n", prim); err = -EINVAL; diff --git a/drivers/isdn/hardware/mISDN/layer2.c b/drivers/isdn/hardware/mISDN/layer2.c index f1e3e6c..9fad6c5 100644 --- a/drivers/isdn/hardware/mISDN/layer2.c +++ b/drivers/isdn/hardware/mISDN/layer2.c @@ -2245,10 +2245,12 @@ new_l2(mISDNstack_t *st, mISDN_pid_t *pid) { nl2->maxlen = MAX_DFRAME_LEN; if (pid->protocol[3] & ISDN_PID_L3_DF_CRLEN2) { - printk("layer2: Windowsize 7\n"); + if (debug) + printk("layer2: Windowsize 7\n"); nl2->window = 7; } else { - printk("layer2: Windowsize 1\n"); + if (debug) + printk("layer2: Windowsize 1\n"); nl2->window = 1; } diff --git a/drivers/isdn/hardware/mISDN/stack.c b/drivers/isdn/hardware/mISDN/stack.c index f6c4ed1..8413dc5 100644 --- a/drivers/isdn/hardware/mISDN/stack.c +++ b/drivers/isdn/hardware/mISDN/stack.c @@ -478,8 +478,8 @@ mISDNStackd(void *data) #ifdef CONFIG_SMP unlock_kernel(); #endif -// if ( core_debug & DEBUG_THREADS) - printk(KERN_DEBUG "mISDNStackd started for id(%08x)\n", st->id); + if ( core_debug & DEBUG_THREADS) + printk(KERN_DEBUG "mISDNStackd started for id(%08x)\n", st->id); for (;;) { struct sk_buff *skb, *c_skb; @@ -622,8 +622,8 @@ mISDNStackd(void *data) st->id, st->msg_cnt, st->clone_cnt, st->sleep_cnt, st->stopped_cnt); printk(KERN_DEBUG "mISDNStackd daemon for id(%08x) utime(%ld) stime(%ld)\n", st->id, st->thread->utime, st->thread->stime); printk(KERN_DEBUG "mISDNStackd daemon for id(%08x) nvcsw(%ld) nivcsw(%ld)\n", st->id, st->thread->nvcsw, st->thread->nivcsw); -#endif printk(KERN_DEBUG "mISDNStackd daemon for id(%08x) killed now\n", st->id); +#endif test_and_set_bit(mISDN_STACK_KILLED, &st->status); test_and_clear_bit(mISDN_STACK_RUNNING, &st->status); test_and_clear_bit(mISDN_STACK_ACTIVE, &st->status); diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 534de92..effeb23 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -27,7 +27,7 @@ #define MISDN_DATE "$Date$" /* collect some statistics about the message queues */ -#define MISDN_MSG_STATS +//#define MISDN_MSG_STATS /* primitives for information exchange * generell format diff --git a/misdn-init b/misdn-init index 166f197..39cac4c 100755 --- a/misdn-init +++ b/misdn-init @@ -469,9 +469,19 @@ function create_misdn_init_conf { # or the name of your card driver module. #