Compare commits

..

2 Commits

Author SHA1 Message Date
Shaun Ruffell
92d7118803 Importing files for 2.4.1-rc1 release.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/tags/2.4.1-rc1@9762 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-02-15 15:41:20 +00:00
Shaun Ruffell
e826ea22ee Creating tag for the release of dahdi-linux-2.4.1-rc1
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/tags/2.4.1-rc1@9761 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-02-15 15:24:56 +00:00
7 changed files with 12 additions and 385 deletions

View File

@@ -1 +1 @@
2.4.1.2
2.4.1-rc1

201
ChangeLog
View File

@@ -1,29 +1,6 @@
2011-04-11 Shaun Ruffell <sruffell@digium.com>
2011-02-15 Shaun Ruffell <sruffell@digium.com>
* dahdi-linux version 2.4.1.2 released.
2011-04-11 18:45 +0000 [r9895] Shaun Ruffell <sruffell@digium.com>
* include/dahdi/kernel.h: 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
2011-03-31 Shaun Ruffell <sruffell@digium.com>
* dahdi-linux version 2.4.1.1 released.
2011-03-15 19:15 +0000 [r9828] Shaun Ruffell <sruffell@digium.com>
* wctdm24xxp: Fix regression with LEDS on TDM410.
2011-03-03 Shaun Ruffell <sruffell@digium.com>
* dahdi-linux version 2.4.1 released.
* dahdi-linux version 2.4.1-rc1 released.
2011-02-11 17:52 +0000 [r9757-9760] Shaun Ruffell <sruffell@digium.com>
@@ -151,8 +128,6 @@
2011-01-31 18:09 +0000 [r9723-9726] Shaun Ruffell <sruffell@digium.com>
* /: syncing svnmerge-integrated.
* drivers/dahdi/dahdi-base.c: dahdi: Experimentally remove
dependency on the Big Kernel Lock. With the release of Linux
2.6.37, the Big Kernel Lock is now a compile time option. This
@@ -194,8 +169,6 @@
2011-01-21 05:35 +0000 [r9652-9696] Shaun Ruffell <sruffell@digium.com>
* /: Updating the svnmerge-integrated information.
* drivers/dahdi/wct4xxp/base.c: wct4xxp: Perform an extended reset
on PCI-Express cards by default. Extended reset is needed
primarily with the PCI express version of the dual and quad-span
@@ -605,10 +578,6 @@
reads. dahdi-526 Origin:
http://svnview.digium.com/svn/dahdi?view=rev&rev=9312
* /: Turning on merge tracking.
* / (added): Creating 2.4 branch.
2010-08-31 Shaun Ruffell <sruffell@digium.com>
* dahdi-linux version 2.4.0 released.
@@ -721,171 +690,7 @@
2010-08-13 19:38 +0000 [r9130-9138] Shaun Ruffell <sruffell@digium.com>
* drivers/dahdi/oct612x/include/oct6100api/oct6100_mixer_pub.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_tsst_inst.h
(added), drivers/dahdi/oct612x/apilib/bt (added),
drivers/dahdi/oct612x/include/apilib/octapi_largmath.h (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_playout_buf_pub.h
(added), drivers/dahdi/oct612x/include/digium_unused.h (added),
drivers/dahdi/oct612x/include/apilib/octapi_llman.h (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_events_inst.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_debug_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_tlv_inst.h
(added), drivers/dahdi/oct612x/include/octtypewin.h (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_phasing_tsst_inst.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_stats_pub.h
(added), drivers/dahdi/oct612x/include/octosdependant.h (added),
drivers/dahdi/oct612x/include/octrpc/oct6100_rpc_protocol.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_open_pub.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_adpcm_chan_inst.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_phasing_tsst_pub.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_pub.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
(added), drivers/dahdi/oct612x/get_discards (added),
drivers/dahdi/oct612x/include/apilib/octapi_bt0.h (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_apimi
(added), drivers/dahdi/oct612x/apilib/llman (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
(added), drivers/dahdi/oct612x/apilib/bt/octapi_bt0_private.h
(added), drivers/dahdi/oct612x/include/oct6100api/oct6100_apimi.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
(added), drivers/dahdi/oct612x/include/octdef.h (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_tsi_cnct_inst.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_api_inst.h
(added), drivers/dahdi/oct612x/include (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tsst_priv.h
(added), drivers/dahdi/oct612x/apilib/llman/octapi_llman.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_tsi_cnct_pub.h
(added), drivers/dahdi,
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_events_priv.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_mixer_inst.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tlv_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_adpcm_chan_pub.h
(added), drivers/dahdi/oct612x/octdeviceapi (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_memory_priv.h
(added), drivers/dahdi/oct612x (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_conf_bridge_inst.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_remote_debug_inst.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_open_inst.h
(added), drivers/dahdi/oct612x/include/octrpc (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_inst.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_tone_detection_pub.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_events_pub.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_errors.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_debug_inst.h
(added), drivers/dahdi/oct612x/apilib/largmath (added),
drivers/dahdi/oct612x/apilib (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_interrupts_pub.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_playout_buf_inst.h
(added), drivers/dahdi/oct612x/octasic-helper (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_debug_pub.h
(added), drivers/dahdi/oct612x/include/octrpc/rpc_protocol.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
(added), drivers/dahdi/oct612x/include/oct6100api (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_stats_inst.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api
(added), drivers/dahdi/oct612x/apilib/bt/octapi_bt0.c (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_tone_detection_inst.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_mixer_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_version.h
(added), drivers/dahdi/oct612x/Makefile (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_apiud.h (added),
drivers/dahdi/oct612x/include/octtypevx.h (added),
drivers/dahdi/oct612x/apilib/largmath/octapi_largmath.c (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
(added), drivers/dahdi/oct612x/include/octmac.h (added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_remote_debug_pub.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_conf_bridge_pub.h
(added), drivers/dahdi/oct612x/include/apilib (added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
(added), drivers/dahdi/oct612x/include/oct6100api/oct6100_api.h
(added), drivers/dahdi/oct612x/octdeviceapi/oct6100api (added),
drivers/dahdi/oct612x/apilib/llman/octapi_llman_private.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_interrupts_inst.h
(added),
drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
(added),
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_channel_priv.h
(added), drivers/dahdi/oct612x/include/octtype.h (added),
drivers/dahdi/oct612x/test.c (added): wct4xxp: Move 'oct612x'
* wct4xxp: Move 'oct612x'
from an svn:external directly into dahdi-linux. From
http://svn.digium.com/svn/octasic_api/oct612x/tags/PR49-03/software@44
This is only currently maintained as part of DAHDI linux so it

View File

@@ -1,61 +0,0 @@
<!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

@@ -1,97 +0,0 @@
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,8 +921,12 @@ 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 (4 == wc->desc->ports)
writechunk[EFRAME_SIZE + 2] = wc->tdm410leds;
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);
}
}
writechunk += (EFRAME_SIZE + EFRAME_GAP);
}
@@ -4588,21 +4592,6 @@ 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;
@@ -4745,8 +4734,6 @@ __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,8 +165,7 @@ struct wctdm {
unsigned char rxident;
int flags[NUM_MODULES]; /* bitmap of board-specific + module-specific flags */
u8 ctlreg;
u8 tdm410leds;
unsigned char ctlreg; /* FIXME: something to do with VPM? */
int mods_per_board; /* maximum number of modules for this board */
int digi_mods; /* number of digital modules present */

View File

@@ -87,13 +87,7 @@
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
# 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_name(dev) (dev)->bus_id
#define dev_set_name(dev, format, ...) \
snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__);
#endif