diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-04 21:45:55 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-04 21:45:55 +0000 |
commit | 303b8aadf67449b6633bac29135e2e8134fb8a97 (patch) | |
tree | b4817a27c4f917e93958f67b65c3dfb3fc17d48c /drivers/dahdi/xpp/card_bri.c | |
parent | 8326c1faa72044e72fd4095cd9f8eec960633a7b (diff) |
T1 CAS support in the xpp "pri" module
Merged revisions 7244-7245,7266,7276,7457 via svnmerge from
http://svn.digium.com/svn/dahdi/linux/trunk
........
r7244 | tzafrir | 2009-09-29 18:23:13 +0200 (Tue, 29 Sep 2009) | 5 lines
xpp: make card_hooksig an optional card method.
Done in preperation for T1 CAS support, as the PRI module will use RBS
instead.
........
r7245 | tzafrir | 2009-09-29 18:45:15 +0200 (Tue, 29 Sep 2009) | 2 lines
xpp: refactor pcm mask handling.
........
r7266 | tzafrir | 2009-09-30 00:43:05 +0200 (Wed, 30 Sep 2009) | 2 lines
xpp: T1 CAS support
........
r7276 | tzafrir | 2009-09-30 15:49:48 +0200 (Wed, 30 Sep 2009) | 2 lines
xpp: PRI PIC firmware: T1-CAS fixes
........
r7457 | tzafrir | 2009-11-03 22:24:13 +0200 (Tue, 03 Nov 2009) | 4 lines
xpp: More E1/T1 CAS fixes. Mostly connect/disconnect
xpp revs: mostly 7458, 7466
........
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7485 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/card_bri.c')
-rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index a749f9d..280be6c 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -1279,6 +1279,7 @@ void BRI_card_pcm_recompute(xbus_t *xbus, xpd_t *xpd, xpp_line_t dont_care) int i; int line_count; xpp_line_t pcm_mask; + uint pcm_len; xpd_t *main_xpd; unsigned long flags; @@ -1308,8 +1309,7 @@ void BRI_card_pcm_recompute(xbus_t *xbus, xpd_t *xpd, xpp_line_t dont_care) } /* subunits have fake pcm_len and wanted_pcm_mask */ if(i > 0) { - sub_xpd->pcm_len = 0; - sub_xpd->wanted_pcm_mask = lines; + update_wanted_pcm_mask(sub_xpd, lines, 0); } } } @@ -1324,13 +1324,10 @@ void BRI_card_pcm_recompute(xbus_t *xbus, xpd_t *xpd, xpp_line_t dont_care) /* * The main unit account for all subunits (pcm_len and wanted_pcm_mask). */ - main_xpd->pcm_len = (line_count) + pcm_len = (line_count) ? RPACKET_HEADERSIZE + sizeof(xpp_line_t) + line_count * DAHDI_CHUNKSIZE : 0L; - main_xpd->wanted_pcm_mask = pcm_mask; - XPD_DBG(SIGNAL, main_xpd, "pcm_len=%d wanted_pcm_mask=0x%X (%s)\n", - main_xpd->pcm_len, main_xpd->wanted_pcm_mask, - xpd->xpdname); + update_wanted_pcm_mask(main_xpd, pcm_mask, pcm_len); spin_unlock_irqrestore(&main_xpd->lock_recompute_pcm, flags); } |