Compare commits

...

5 Commits

Author SHA1 Message Date
Shaun Ruffell
cecd931399 Importing release summary for 2.4.1.2 release.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/tags/2.4.1.2@9898 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-04-11 18:51:37 +00:00
Shaun Ruffell
9f61a1cce9 Importing files for 2.4.1.2 release.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/tags/2.4.1.2@9897 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-04-11 18:51:29 +00:00
Shaun Ruffell
b716790363 Creating tag for the release of dahdi-linux-2.4.1.2
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/tags/2.4.1.2@9896 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-04-11 18:50:44 +00:00
Tzafrir Cohen
75b7b53f10 dahdi: Do not define dev_name if already backported.
RHEL 5.6 has backported dev_name in include/dahdi/devices.h.  We now need to
check for a back ported definition before defining our own version on pre
2.6.26 kernels.

(closes issue #18992)
Reported by: ndupeux, AlexCeli
Tested by: elguero

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9894

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9895 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-04-11 18:45:05 +00:00
Shaun Ruffell
6105ec0b16 wctdm24xxp: Fix regression with LEDS on TDM410.
r9720 disabled the LEDs on the front panel of the TDM410. This commit
restores the behavior and clarify which part of the TDM410 eframes
control the LED operation.

(closes issue #18939)

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9827

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9828 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-03-15 19:15:40 +00:00
7 changed files with 4082 additions and 8 deletions

1
.version Normal file
View File

@@ -0,0 +1 @@
2.4.1.2

3895
ChangeLog Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,61 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - dahdi-linux-2.4.1.2</title></head>
<body>
<h1 align="center"><a name="top">Release Summary</a></h1>
<h3 align="center">dahdi-linux-2.4.1.2</h3>
<h3 align="center">Date: 2011-04-11</h3>
<h3 align="center">&lt;asteriskteam@digium.com&gt;</h3>
<hr/>
<h2 align="center">Table of Contents</h2>
<ol>
<li><a href="#summary">Summary</a></li>
<li><a href="#contributors">Contributors</a></li>
<li><a href="#issues">Closed Issues</a></li>
<li><a href="#diffstat">Diffstat</a></li>
</ol>
<hr/>
<a name="summary"><h2 align="center">Summary</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p>
<p>The data in this summary reflects changes that have been made since the previous release, dahdi-linux-2.4.1.1.</p>
<hr/>
<a name="contributors"><h2 align="center">Contributors</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
<table width="100%" border="0">
<tr>
<td width="33%"><h3>Coders</h3></td>
<td width="33%"><h3>Testers</h3></td>
<td width="33%"><h3>Reporters</h3></td>
</tr>
<tr valign="top">
<td>
1 sruffell<br/>
</td>
<td>
1 elguero<br/>
</td>
<td>
1 ndupeux<br/>
</td>
</tr>
</table>
<hr/>
<a name="issues"><h2 align="center">Closed Issues</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p>
<h3>Category: dahdi (the module)</h3><br/>
<a href="https://issues.asterisk.org/view.php?id=18992">#18992</a>: [patch] Unable to compile dahdi-linux-mod of RHEL 5.6 (and derivates)<br/>
Revision: <a href="http://svn.digium.com/view/dahdi/linux/branches/2.4?view=revision&revision=9895">9895</a><br/>
Reporter: ndupeux<br/>
Testers: elguero<br/>
Coders: sruffell<br/>
<br/>
<hr/>
<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
<pre>
kernel.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
</pre><br/>
<hr/>
</body>
</html>

View File

@@ -0,0 +1,97 @@
Release Summary
dahdi-linux-2.4.1.2
Date: 2011-04-11
<asteriskteam@digium.com>
--------------------------------------------------------------------------
Table of Contents
 1. [1]Summary
 2. [2]Contributors
 3. [3]Closed Issues
 4. [4]Diffstat
--------------------------------------------------------------------------
Summary
[5][Back to Top]
This release includes only bug fixes. The changes included were made only
to address problems that have been identified in this release series.
Users should be able to safely upgrade to this version if this release
series is already in use. Users considering upgrading from a previous
release series are strongly encouraged to review the UPGRADE.txt document
as well as the CHANGES document for information about upgrading to this
release series.
The data in this summary reflects changes that have been made since the
previous release, dahdi-linux-2.4.1.1.
--------------------------------------------------------------------------
Contributors
[6][Back to Top]
This table lists the people who have submitted code, those that have
tested patches, as well as those that reported issues on the issue tracker
that were resolved in this release. For coders, the number is how many of
their patches (of any size) were committed into this release. For testers,
the number is the number of times their name was listed as assisting with
testing a patch. Finally, for reporters, the number is the number of
issues that they reported that were closed by commits that went into this
release.
Coders Testers Reporters
1 sruffell 1 elguero 1 ndupeux
--------------------------------------------------------------------------
Closed Issues
[7][Back to Top]
This is a list of all issues from the issue tracker that were closed by
changes that went into this release.
Category: dahdi (the module)
[8]#18992: [patch] Unable to compile dahdi-linux-mod of RHEL 5.6 (and
derivates)
Revision: [9]9895
Reporter: ndupeux
Testers: elguero
Coders: sruffell
--------------------------------------------------------------------------
Diffstat Results
[10][Back to Top]
This is a summary of the changes to the source code that went into this
release that was generated using the diffstat utility.
kernel.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--------------------------------------------------------------------------
References
Visible links
1. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#summary
2. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#contributors
3. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#issues
4. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#diffstat
5. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#top
6. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#top
7. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#top
8. https://issues.asterisk.org/view.php?id=18992
9. http://svn.digium.com/view/dahdi/linux/branches/2.4?view=revision&revision=9895
10. file:///home/sruffell/repotools/dahdi-linux-2.4.1.2-summary.html#top

View File

@@ -921,12 +921,8 @@ static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *writechun
if (x < DAHDI_CHUNKSIZE - 1) {
writechunk[EFRAME_SIZE] = wc->ctlreg;
writechunk[EFRAME_SIZE + 1] = wc->txident++;
if ((wc->desc->ports == 4) && ((wc->ctlreg & 0x10))) {
writechunk[EFRAME_SIZE + 2] = 0;
for (y = 0; y < 4; y++)
writechunk[EFRAME_SIZE + 2] |= (1 << y);
}
if (4 == wc->desc->ports)
writechunk[EFRAME_SIZE + 2] = wc->tdm410leds;
}
writechunk += (EFRAME_SIZE + EFRAME_GAP);
}
@@ -4592,6 +4588,21 @@ static inline void remove_sysfs_files(struct wctdm *wc) { return; }
#endif /* CONFIG_VOICEBUS_SYSFS */
static void wctdm_set_tdm410_leds(struct wctdm *wc)
{
int i;
if (4 != wc->desc->ports)
return;
wc->tdm410leds = 0; /* all on by default */
for (i = 0; i < wc->desc->ports; ++i) {
/* Turn off the LED for any module that isn't installed. */
if (MOD_TYPE_NONE == wc->modtype[i])
wc->tdm410leds |= (1 << i);
}
}
#ifdef USE_ASYNC_INIT
struct async_data {
struct pci_dev *pdev;
@@ -4734,6 +4745,8 @@ __wctdm_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Now track down what modules are installed */
wctdm_identify_modules(wc);
wctdm_set_tdm410_leds(wc);
if (fatal_signal_pending(current)) {
wctdm_back_out_gracefully(wc);
return -EINTR;

View File

@@ -165,7 +165,8 @@ struct wctdm {
unsigned char rxident;
int flags[NUM_MODULES]; /* bitmap of board-specific + module-specific flags */
unsigned char ctlreg; /* FIXME: something to do with VPM? */
u8 ctlreg;
u8 tdm410leds;
int mods_per_board; /* maximum number of modules for this board */
int digi_mods; /* number of digital modules present */

View File

@@ -87,7 +87,13 @@
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
#define dev_name(dev) (dev)->bus_id
# ifdef RHEL_RELEASE_VERSION
# if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6)
#define dev_name(dev) ((dev)->bus_id)
# endif
# else
#define dev_name(dev) ((dev)->bus_id)
# endif
#define dev_set_name(dev, format, ...) \
snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__);
#endif