diff options
author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-06-11 22:12:04 +0000 |
---|---|---|
committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-06-11 22:12:04 +0000 |
commit | ff736bb15083df81b711d3e17ef5981e8a8c699c (patch) | |
tree | a5b2af16d12842031ede426e4b0a7fb6342b841d /wct4xxp | |
parent | dd9a1787d2e61f1815cc650cd2528411808e5d9f (diff) |
Merged revisions 2633 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2633 | mattf | 2007-06-11 17:10:59 -0500 (Mon, 11 Jun 2007) | 1 line
Make the version check optional
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2634 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
-rw-r--r-- | wct4xxp/base.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 7cdfb28..72b0846 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -171,6 +171,7 @@ static inline int t4_queue_work(struct workqueue_struct *wq, struct work_struct #endif +static int pedanticpci = 1; static int debug=0; static int timingcable = 0; static int highestorder; @@ -429,9 +430,11 @@ static inline void __t4_pci_out(struct t4 *wc, const unsigned int addr, const un { unsigned int tmp; writel(value, &wc->membase[addr]); - tmp = __t4_pci_in(wc, WC_VERSION); - if ((tmp & 0xffff0000) != 0xc01a0000) - printk("TE4XXP: Version Synchronization Error!\n"); + if (pedanticpci) { + tmp = __t4_pci_in(wc, WC_VERSION); + if ((tmp & 0xffff0000) != 0xc01a0000) + printk("TE4XXP: Version Synchronization Error!\n"); + } #if 0 tmp = __t4_pci_in(wc, addr); if ((value != tmp) && (addr != WC_LEDS) && (addr != WC_LDATA) && @@ -518,7 +521,9 @@ static inline unsigned int __t4_framer_in(struct t4 *wc, int unit, const unsigne unit &= 0x3; __t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff)); __t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff) | WC_LFRMR_CS | WC_LREAD); - __t4_pci_out(wc, WC_VERSION, 0); + if (pedanticpci) { + __t4_pci_out(wc, WC_VERSION, 0); + } ret = __t4_pci_in(wc, WC_LDATA); __t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff)); return ret & 0xff; @@ -3880,6 +3885,7 @@ MODULE_ALIAS("wct2xxp"); MODULE_LICENSE("GPL"); #endif #ifdef LINUX26 +module_param(pedanticpci, int, 0600); module_param(debug, int, 0600); module_param(loopback, int, 0600); module_param(noburst, int, 0600); @@ -3897,6 +3903,7 @@ module_param(vpmspans, int, 0600); module_param(dtmfthreshold, int, 0600); #endif #else +MODULE_PARM(pedanticpci, "i"); MODULE_PARM(debug, "i"); MODULE_PARM(loopback, "i"); MODULE_PARM(noburst, "i"); |