[Home]

Summary:ASTERISK-08181: [PATCH] if (debug); printk ... in wcte11xp.c
Reporter:Guillaume Knispel (gknispel_proformatique)Labels:
Date Opened:2006-11-24 07:31:41.000-0600Date Closed:2008-06-07 12:10:08
Priority:MinorRegression?No
Status:Closed/CompleteComponents:Core/General
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) zaptel-svn1640-if_debug_printk_controller_version.diff
( 1) zaptel-svn1640-printk_controller_version-no_if_debug.diff
Description:The following line in wcte11xp.c is weird :

if (debug); printk("Controller version: %02x\n", control_get_reg(wc, WC_VERSION));

I guess you want to apply one of the two attached patchs...
Comments:By: Russell Bryant (russell) 2006-11-26 02:11:48.000-0600

This has been fixed in the 1.2 branch, 1.4 branch, and the trunk in revisions 1641, 1642, and 1643.  Thanks!
By: Digium Subversion (svnbot) 2008-06-07 12:07:54

Repository: dahdi
Revision: 1641

U   branches/1.2/wcte11xp.c

------------------------------------------------------------------------
r1641 | russell | 2008-06-07 12:07:53 -0500 (Sat, 07 Jun 2008) | 3 lines

Remove a misplaced semicolon which caused some debug output to be printed
regardless of the debug setting.  (issue ASTERISK-8181, gknispel_proformatique)

------------------------------------------------------------------------

http://svn.digium.com/view/dahdi?view=rev&revision=1641
By: Digium Subversion (svnbot) 2008-06-07 12:07:57

Repository: dahdi
Revision: 1642

_U  branches/1.4/
U   branches/1.4/wcte11xp.c

------------------------------------------------------------------------
r1642 | russell | 2008-06-07 12:07:56 -0500 (Sat, 07 Jun 2008) | 11 lines

Merged revisions 1641 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1641 | russell | 2006-11-26 03:10:22 -0500 (Sun, 26 Nov 2006) | 3 lines

Remove a misplaced semicolon which caused some debug output to be printed
regardless of the debug setting.  (issue ASTERISK-8181, gknispel_proformatique)

........

------------------------------------------------------------------------

http://svn.digium.com/view/dahdi?view=rev&revision=1642
By: Digium Subversion (svnbot) 2008-06-07 12:07:59

Repository: dahdi
Revision: 1643

_U  trunk/
U   trunk/wcte11xp.c

------------------------------------------------------------------------
r1643 | russell | 2008-06-07 12:07:58 -0500 (Sat, 07 Jun 2008) | 19 lines

Merged revisions 1642 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1642 | russell | 2006-11-26 03:12:57 -0500 (Sun, 26 Nov 2006) | 11 lines

Merged revisions 1641 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1641 | russell | 2006-11-26 03:10:22 -0500 (Sun, 26 Nov 2006) | 3 lines

Remove a misplaced semicolon which caused some debug output to be printed
regardless of the debug setting.  (issue ASTERISK-8181, gknispel_proformatique)

........

................

------------------------------------------------------------------------

http://svn.digium.com/view/dahdi?view=rev&revision=1643
By: Digium Subversion (svnbot) 2008-06-07 12:10:08

Repository: dahdi
Revision: 1696

_U  team/jsloan/private/tc400b/
U   team/jsloan/private/tc400b/Makefile
U   team/jsloan/private/tc400b/build_tools/genmodconf
U   team/jsloan/private/tc400b/wct4xxp/base.c
U   team/jsloan/private/tc400b/wcte11xp.c
_U  team/jsloan/private/tc400b/xpp/
U   team/jsloan/private/tc400b/xpp/Makefile
U   team/jsloan/private/tc400b/xpp/README.Astribank
U   team/jsloan/private/tc400b/xpp/calibrate_slics
U   team/jsloan/private/tc400b/xpp/card_fxo.c
U   team/jsloan/private/tc400b/xpp/card_fxs.c
U   team/jsloan/private/tc400b/xpp/card_global.c
U   team/jsloan/private/tc400b/xpp/init_card_3_23
U   team/jsloan/private/tc400b/xpp/init_card_4_23
U   team/jsloan/private/tc400b/xpp/utils/Makefile
U   team/jsloan/private/tc400b/xpp/utils/genzaptelconf
U   team/jsloan/private/tc400b/xpp/xbus-core.c
U   team/jsloan/private/tc400b/xpp/xpd.h
U   team/jsloan/private/tc400b/xpp/xpp_zap.c
U   team/jsloan/private/tc400b/zaptel.c
U   team/jsloan/private/tc400b/zconfig.h
U   team/jsloan/private/tc400b/ztcfg-dude.c
U   team/jsloan/private/tc400b/ztcfg.c
U   team/jsloan/private/tc400b/zttool.c

------------------------------------------------------------------------
r1696 | mogorman | 2008-06-07 12:10:05 -0500 (Sat, 07 Jun 2008) | 263 lines

Merged revisions 1584,1591,1602-1603,1607,1612,1616,1624,1636,1640,1643,1655,1659,1662,1665,1679-1685,1688 via svnmerge from
https://svn.digium.com/svn/zaptel/trunk

................
r1584 | mattf | 2006-11-09 15:08:26 -0600 (Thu, 09 Nov 2006) | 2 lines

Minor makefile typo

................
r1591 | tzafrir | 2006-11-11 08:38:49 -0600 (Sat, 11 Nov 2006) | 9 lines

r9497@boole (orig r1590):  tzafrir | 2006-11-11 16:34:45 +0200
init_card[34]_23: merge from 2654,2655.
 * Redirect stderr to /dev/null.
   Without any redirection, it may fail with exitval=4 .
   Probably, fd 2 is closed and the shell (or sed which is
   used in the scripts) tries to write to it (or do some other
   I/O related syscall) which fails.
 * make XPP_BASE handling identical in the two scripts.

................
r1602 | kpfleming | 2006-11-14 17:54:40 -0600 (Tue, 14 Nov 2006) | 10 lines

Merged revisions 1601 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r1601 | kpfleming | 2006-11-14 17:53:56 -0600 (Tue, 14 Nov 2006) | 2 lines

might as well do it for Zaptel too...

........

................
r1603 | mattf | 2006-11-16 17:09:21 -0600 (Thu, 16 Nov 2006) | 2 lines

Fix for 7769.  Make sure we lock before modifying flags.

................
r1607 | mattf | 2006-11-16 18:51:10 -0600 (Thu, 16 Nov 2006) | 2 lines

Make the master span change more atomic, in face of not doing actual locking like we need to do.

................
r1612 | bweschke | 2006-11-16 22:17:05 -0600 (Thu, 16 Nov 2006) | 20 lines

Merged revisions 1611 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1611 | bweschke | 2006-11-16 23:12:38 -0500 (Thu, 16 Nov 2006) | 12 lines

Merged revisions 1610 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1610 | bweschke | 2006-11-16 23:06:05 -0500 (Thu, 16 Nov 2006) | 4 lines

mattf - I'm not sure if this is where you wanted the definitions placed.
If not, please fix, but this gets the compiles working again for now.


........

................

................
r1616 | qwell | 2006-11-17 11:48:24 -0600 (Fri, 17 Nov 2006) | 15 lines

Merged revisions 1615 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r1615 | qwell | 2006-11-17 11:47:36 -0600 (Fri, 17 Nov 2006) | 7 lines

Fix an issue (8071) where wct4xxp wasn't being put into /etc/modprobe.d/zaptel (or similar).

There should be no reason that adding wct4xxp to the MODULES variable at this point in the
Makefile, would cause any harm.  Somebody please correct me if I'm wrong...

(Fix is slightly different from 1.2)

........

................
r1624 | tzafrir | 2006-11-21 09:20:10 -0600 (Tue, 21 Nov 2006) | 2 lines

Typo: SBINDIR -> BINDIR

................
r1636 | mattf | 2006-11-22 17:23:55 -0600 (Wed, 22 Nov 2006) | 2 lines

Fix for ASTERISK-8172.  No extra characters in /proc/zaptel/* when reading

................
r1640 | tzafrir | 2006-11-23 04:02:50 -0600 (Thu, 23 Nov 2006) | 5 lines

* Work around http://bugs.digium.com/view.php?id=7877: reset every value
 we set (except signalling). Isn't zapata.conf fun to work with?
* Allow different signalling type for ZapBRI through ZAPBRI_SIGNALLING.
- Note that even "pri" ZAPBRI_SIGNALLING requires bristuffed zaptel.
* All in all a good reason to increase version number.
................
r1643 | russell | 2006-11-26 02:14:43 -0600 (Sun, 26 Nov 2006) | 19 lines

Merged revisions 1642 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1642 | russell | 2006-11-26 03:12:57 -0500 (Sun, 26 Nov 2006) | 11 lines

Merged revisions 1641 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1641 | russell | 2006-11-26 03:10:22 -0500 (Sun, 26 Nov 2006) | 3 lines

Remove a misplaced semicolon which caused some debug output to be printed
regardless of the debug setting.  (issue ASTERISK-8181, gknispel_proformatique)

........

................

................
r1655 | mattf | 2006-11-28 16:43:08 -0600 (Tue, 28 Nov 2006) | 2 lines

Fix for ZAP-142

................
r1659 | mattf | 2006-11-29 11:34:43 -0600 (Wed, 29 Nov 2006) | 2 lines

Fix for ZAP-126.  Don't allow channel 16 to be clear in E1/CAS mode.

................
r1662 | kpfleming | 2006-11-29 16:29:08 -0600 (Wed, 29 Nov 2006) | 18 lines

Merged revisions 1661 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1661 | kpfleming | 2006-11-29 16:27:20 -0600 (Wed, 29 Nov 2006) | 10 lines

Merged revisions 1660 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1660 | kpfleming | 2006-11-29 16:24:07 -0600 (Wed, 29 Nov 2006) | 2 lines

clarify the BOOST_RINGER compile-time option

........

................

................
r1665 | qwell | 2006-11-29 18:26:56 -0600 (Wed, 29 Nov 2006) | 18 lines

Merged revisions 1664 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1664 | qwell | 2006-11-29 18:24:30 -0600 (Wed, 29 Nov 2006) | 10 lines

Merged revisions 1663 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1663 | qwell | 2006-11-29 18:23:33 -0600 (Wed, 29 Nov 2006) | 2 lines

Fix issue that was discovered by using dash as /bin/sh instead of bash.

........

................

................
r1679 | mattf | 2006-11-30 21:34:47 -0600 (Thu, 30 Nov 2006) | 2 lines

Take out useless line of code.  Thanks Nick!

................
r1680 | tzafrir | 2006-11-30 23:22:55 -0600 (Thu, 30 Nov 2006) | 6 lines

Merging from 1.2:
* Removing -DSOFT_RING: unused, useless code.
* Register init scripts are not as noisy by default.
* Register init scripts read configuration from a standard location.
* Fixed a FXO spinlock race.
(Log was lost on previos merge)
................
r1681 | tzafrir | 2006-11-30 23:29:42 -0600 (Thu, 30 Nov 2006) | 4 lines

r1667@boole:  tzafrir | 2006-11-30 23:46:46 +0200
  r2831@boole:  tzafrir | 2006-11-29 11:05:08 +0200
    genzaptelconf: A list of countries for which to use busydetect.
    (and get genzaptelconf here back in sync)
................
r1682 | tzafrir | 2006-11-30 23:31:16 -0600 (Thu, 30 Nov 2006) | 11 lines

r1676@boole:  tzafrir | 2006-12-01 02:09:53 +0200
 r1668@boole:  tzafrir | 2006-11-30 23:48:25 +0200
  r2832@boole:  tzafrir | 2006-11-29 11:06:06 +0200
  Add parameter xpp_ec to the module xpp (xpp_zap.c). Defaults to 1.
  If 0, module will use Zaptel echo canceller even with XPP_EC_CHUNK.
  Parameter is read-only for now: cannot be set through /sys/modules.
  (Merge of changeset:2830)
 
 


................
r1683 | tzafrir | 2006-11-30 23:31:36 -0600 (Thu, 30 Nov 2006) | 9 lines

r1677@boole:  tzafrir | 2006-12-01 02:13:00 +0200
 r1670@boole:  tzafrir | 2006-12-01 01:29:57 +0200
  r2794@boole:  oron | 2006-11-26 14:24:15 +0200
  Remove all SOFT_RING code (unused for a long time).
 
 
 


................
r1684 | tzafrir | 2006-11-30 23:32:00 -0600 (Thu, 30 Nov 2006) | 9 lines

r1678@boole:  tzafrir | 2006-12-01 02:13:47 +0200
 r1671@boole:  tzafrir | 2006-12-01 01:30:24 +0200
  r2806@boole:  oron | 2006-11-27 16:54:06 +0200
  Fixed panic in ticket:147 merged code from changeset:2802 changeset:2804
 
 
 


................
r1685 | mattf | 2006-12-01 12:45:15 -0600 (Fri, 01 Dec 2006) | 2 lines

Fix workqueues for newer kernels

................
r1688 | file | 2006-12-06 17:28:26 -0600 (Wed, 06 Dec 2006) | 18 lines

Merged revisions 1687 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1687 | file | 2006-12-06 18:25:42 -0500 (Wed, 06 Dec 2006) | 10 lines

Merged revisions 1686 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1686 | file | 2006-12-06 18:22:11 -0500 (Wed, 06 Dec 2006) | 2 lines

Link ztcfg-dude against stdc++ so we get needed functions. (issue ZAP-151 reported by Romik)

........

................

................

------------------------------------------------------------------------

http://svn.digium.com/view/dahdi?view=rev&revision=1696