diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-02 20:42:31 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-02 20:42:31 +0000 |
| commit | 630c5f3748a600d9d1be04abaf89c63007fd69bc (patch) | |
| tree | b4349dbb7a61b077aab849f8d5d8035a7c79470b /wctdm24xxp.c | |
| parent | 899994f3cf9d5a76fe2b1155c81e1c954f9555d4 (diff) | |
Commit some old changes to driver that were overlooked
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2083 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wctdm24xxp.c')
| -rw-r--r-- | wctdm24xxp.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/wctdm24xxp.c b/wctdm24xxp.c index ec705c3..260bbfd 100644 --- a/wctdm24xxp.c +++ b/wctdm24xxp.c @@ -417,8 +417,8 @@ struct wctdm_desc { 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 @@ static int wctdm_hardware_init(struct wctdm *wc) 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 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic 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 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic 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 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic 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(vpmdtmfsupport, "i"); MODULE_PARM(dtmfthreshold, "i"); #endif #endif -MODULE_DESCRIPTION("Wildcard TDMXX00P Zaptel Driver"); +MODULE_DESCRIPTION("Wildcard TDM2400P/TDM800P Zaptel Driver"); MODULE_AUTHOR("Mark Spencer <markster@digium.com>"); #if defined(MODULE_ALIAS) MODULE_ALIAS("wctdm8xxp"); @@ -3588,3 +3586,6 @@ MODULE_LICENSE("GPL"); module_init(wctdm_init); module_exit(wctdm_cleanup); + + + |