[zaptel-commits] mattf: branch 1.4 r1975 - /branches/1.4/wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Thu Jan 25 16:55:17 2007
New Revision: 1975

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1975
Log:
Minor bug fix as well as minor cosmetic changes.

Modified:
    branches/1.4/wctdm24xxp.c

Modified: branches/1.4/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp.c?view=diff&rev=1975&r1=1974&r2=1975
==============================================================================
--- branches/1.4/wctdm24xxp.c (original)
+++ branches/1.4/wctdm24xxp.c Thu Jan 25 16:55:17 2007
@@ -417,8 +417,8 @@
 	int ports;
 };
 
-static struct wctdm_desc wctdm2400 = { "TDM2400P", 0, 24 };
-static struct wctdm_desc wctdm800 = { "TDM800P", 0, 8 };
+static struct wctdm_desc wctdm2400 = { "Wildcard TDM2400P", 0, 24 };
+static struct wctdm_desc wctdm800 = { "Wildcard TDM800P", 0, 8 };
 static int acim2tiss[16] = { 0x0, 0x1, 0x4, 0x5, 0x7, 0x0, 0x0, 0x6, 0x0, 0x0, 0x0, 0x2, 0x0, 0x3 };
 
 static struct wctdm *ifaces[WC_MAX_IFACES];
@@ -3008,7 +3008,7 @@
 	printk("(post) Reg fc is %08x\n", reg);
 	printk("Detected REG2: %08x\n", wctdm_getsdi(wc, 0x02));
 #endif
-	printk("%s: reg is %08x\n", wc->variety, wctdm_getctl(wc, 0x0088));
+	printk("wctdm24xxp: reg is %08x\n", wctdm_getctl(wc, 0x0088));
 
 	return 0;
 }
@@ -3323,8 +3323,6 @@
 	int y;
 	static int initd_ifaces=0;
 
-	d = &wctdm800;
-	
 	if(initd_ifaces){
 		memset((void *)ifaces,0,(sizeof(struct wctdm *))*WC_MAX_IFACES);
 		initd_ifaces=1;
@@ -3356,7 +3354,7 @@
 				wc->dacssrc[y] = -1;
 			}
 			/* Keep track of whether we need to free the region */
-			if (request_region(wc->iobase, 0xff, wc->variety)) 
+			if (request_region(wc->iobase, 0xff, "wctdm24xxp")) 
 				wc->freeregion = 1;
 
 			/* Allocate enough memory for two zt chunks, receive and transmit.  Each sample uses
@@ -3401,7 +3399,7 @@
 			pci_set_drvdata(pdev, wc);
 
 			if (request_irq(pdev->irq, wctdm_interrupt, SA_SHIRQ, wc->variety, wc)) {
-				printk("%s: Unable to request IRQ %d\n", wc->variety, pdev->irq);
+				printk("wctdm24xxp: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->iobase, 0xff);
 				pci_free_consistent(pdev, PCI_WINDOW_SIZE, (void *)wc->writechunk, wc->writedma);
@@ -3577,7 +3575,7 @@
 MODULE_PARM(dtmfthreshold, "i");
 #endif
 #endif
-MODULE_DESCRIPTION("Wildcard TDMXX00P Zaptel Driver");
+MODULE_DESCRIPTION("Wildcard TDM2400P/TDM800P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");