[Home]

Summary:ASTERISK-11590: [patch] channel alarm set when a channel is opened
Reporter:Tzafrir Cohen (tzafrir)Labels:
Date Opened:2008-03-06 10:11:43.000-0600Date Closed:2008-08-20 14:27:12
Priority:MinorRegression?No
Status:Closed/CompleteComponents:Channels/chan_zap
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) alarms_chan_zap.diff
( 1) alarms_chan_zap.patch
( 2) alarms_zaptel.diff
( 3) asterisk-chanalarms_14.patch
( 4) asterisk-inalarm.patch
( 5) asterisk-inalarm2.patch
Description:If a channel alarm is already set when a channel is opened by Asterisk, whose responsibility is it to check for the alarms?

1. The channe l driver should detect that and re-send alarms on zt_open

2. Zaptel should  send an alarm event at channel open time. The applicaiton opening the channel should then be able to read those events and will have the proper information.

3. The application should read channel alarms at channel initialization time. No need for Zaptel to send extra events.

As senseless as (1) is, it has been used in practice by the xpp d FXO module driver. I figure you all agree with me it is not the way to go.


The behaviour with regards to span alarm seems in Asterisk seems to be (3).

Attached are patches implementing both (2) and (3)

****** ADDITIONAL INFORMATION ******

See discussion at http://lists.digium.com/pipermail/asterisk-dev/2008-March/032193.html
Comments:By: Digium Subversion (svnbot) 2008-03-06 16:51:03.000-0600

Repository: zaptel
Revision: 3952

U   branches/1.2/xpp/.version
U   branches/1.2/xpp/Changelog_xpp
U   branches/1.2/xpp/Kbuild
U   branches/1.2/xpp/README.Astribank
U   branches/1.2/xpp/calibrate_slics
U   branches/1.2/xpp/card_bri.c
U   branches/1.2/xpp/card_fxo.c
U   branches/1.2/xpp/card_fxs.c
U   branches/1.2/xpp/card_global.c
U   branches/1.2/xpp/card_pri.c
U   branches/1.2/xpp/firmwares/FPGA_1141.hex
U   branches/1.2/xpp/firmwares/FPGA_1151.hex
U   branches/1.2/xpp/firmwares/FPGA_FXS.hex
U   branches/1.2/xpp/init_card_3_29
U   branches/1.2/xpp/utils/Makefile
U   branches/1.2/xpp/utils/astribank_hook
U   branches/1.2/xpp/utils/xpp.rules
U   branches/1.2/xpp/utils/xpp_fxloader
A   branches/1.2/xpp/utils/xpp_timing
U   branches/1.2/xpp/utils/zapconf
U   branches/1.2/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
U   branches/1.2/xpp/utils/zconf/Zaptel/Span.pm
U   branches/1.2/xpp/xbus-core.c
U   branches/1.2/xpp/xbus-core.h
U   branches/1.2/xpp/xbus-pcm.c
U   branches/1.2/xpp/xbus-pcm.h
U   branches/1.2/xpp/xbus-sysfs.c
U   branches/1.2/xpp/xdefs.h
U   branches/1.2/xpp/xframe_queue.c
U   branches/1.2/xpp/xpp_usb.c
U   branches/1.2/xpp/xpp_zap.c
U   branches/1.2/xpp/xproto.c

------------------------------------------------------------------------
r3952 | tzafrir | 2008-03-06 16:50:43 -0600 (Thu, 06 Mar 2008) | 55 lines

xpp.r5512:
* Build:
 - Zaptel >= 1.4.9 is migrating to storing kernel stuff in zaptel/kernel/*
 -  We conditionally use old/new directory scheme:
    In xpp/Kbuild and xpp/utils/Makefile use ZAP_KERNEL variable, so it's
    not confused with ZAPTEL_DIR (which appears in zaptel/Makefile as well).
 - Fix compile warnings on 64 bit systems.
 - Compile fixes for kernel-2.6.24
* UDEV:
 - /etc/udev/rules.d/xpp.rules now uses XPP_INIT_DIR to find astribank_hook.
 - astribank_hook: Modify to do nothing. Add some documentation.
* Autoconfiguration -- zapconf:
 - Don't fail zapconf et.al. if no config file was found.
 - Skip the 'IRQ Missing:' line in /proc/zaptel/nnn for wcte1xp(?).
 - Add some newer Digium cards to our hardware inventory.
 - Partially handle cases where the /proc/zaptel strings does not contain
   info about E1/T1/J1 or NT/TE.
* Better SYNC:
 - Finer tuning of PLL (New firmware).
 - Change calculation algorithm of sync offset. It now copes better
   with the variance in USB frame reception timing.
 - Statistics:
   . The view of results was moved from /proc/xpp/XBUS-*/summary to
     a new /sys/bus/astribanks/devices/xbus-*/timing and enhanced.
   . A new xpp_timing script shows all astribanks.
   . A new write only /sys/bus/astribanks/devices/xbus-*/cls is
     used to clear statistics. Eventually, clearing of XBUS related
     statistics should be done here. One that was migrated is the
     clearing of 'PCM [TR]X:' numbers currently appearing in
     /proc/xpp/XBUS-*/summary (they should be moved too later).
 - Shorten the strings representation sync_mode ("SYNC_MODE_AB" -> "AB")
   adapted their use in printk and /proc so the text is clear.
 - Added a command line parameter xpp.disable_pll_sync to stop all
   adjustments command to AB (calculations still continue as usual).
* PRI:
 - 4 port support
 - set clocking master span via ztcfg, like other zaptel devices.
* FXO:
 - Fix false hangups in some countries (voltage fluctuations).
 - Some countries send caller-id before first ring.
   Added code to handle caller-id PCM pass through according to
   a new command line parameter (xpd_fxo.caller_id_style).
 - No longer sends an event on zt_open. See ASTERISK-11590 .
* Misc:
 - Adapt to zaptel-1.4.8 and above ztscan: added fields returend by
   new ZT_SPANSTAT_V2 ioctl()
 - Document sysfs and waitfor_xpds.
 - Miscelaneous optimizations and bugfixes.
 - Remove deprecated pcm_tasklet parameter. The rx_tasklet parameter has
   replaced it a long time ago.
 - Add RX_CMD counter to /proc/xpp/XBUS-*/summary
 - Unclutter some of the usb disconnect messages.
 - xpp_usb: minor preformance improvements in receive.
   Expose the number of pending receive URB's in /proc/xpp/XBUS-*/xpp_usb

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

http://svn.digium.com/view/zaptel?view=rev&revision=3952
By: Digium Subversion (svnbot) 2008-03-06 18:42:03.000-0600

Repository: zaptel
Revision: 3957

_U  branches/1.4/
U   branches/1.4/kernel/xpp/.version
U   branches/1.4/kernel/xpp/Changelog_xpp
U   branches/1.4/kernel/xpp/Kbuild
U   branches/1.4/kernel/xpp/README.Astribank
U   branches/1.4/kernel/xpp/calibrate_slics
U   branches/1.4/kernel/xpp/card_bri.c
U   branches/1.4/kernel/xpp/card_fxo.c
U   branches/1.4/kernel/xpp/card_fxs.c
U   branches/1.4/kernel/xpp/card_global.c
U   branches/1.4/kernel/xpp/card_pri.c
U   branches/1.4/kernel/xpp/firmwares/FPGA_1141.hex
U   branches/1.4/kernel/xpp/firmwares/FPGA_1151.hex
U   branches/1.4/kernel/xpp/firmwares/FPGA_FXS.hex
U   branches/1.4/kernel/xpp/init_card_3_29
U   branches/1.4/kernel/xpp/utils/Makefile
U   branches/1.4/kernel/xpp/utils/astribank_hook
U   branches/1.4/kernel/xpp/utils/xpp.rules
U   branches/1.4/kernel/xpp/utils/xpp_fxloader
A   branches/1.4/kernel/xpp/utils/xpp_timing
U   branches/1.4/kernel/xpp/utils/zapconf
U   branches/1.4/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
U   branches/1.4/kernel/xpp/utils/zconf/Zaptel/Span.pm
U   branches/1.4/kernel/xpp/xbus-core.c
U   branches/1.4/kernel/xpp/xbus-core.h
U   branches/1.4/kernel/xpp/xbus-pcm.c
U   branches/1.4/kernel/xpp/xbus-pcm.h
U   branches/1.4/kernel/xpp/xbus-sysfs.c
U   branches/1.4/kernel/xpp/xdefs.h
U   branches/1.4/kernel/xpp/xframe_queue.c
U   branches/1.4/kernel/xpp/xpp_usb.c
U   branches/1.4/kernel/xpp/xpp_zap.c
U   branches/1.4/kernel/xpp/xproto.c

------------------------------------------------------------------------
r3957 | tzafrir | 2008-03-06 18:42:01 -0600 (Thu, 06 Mar 2008) | 58 lines

xpp.r5512:
* Build:
 - Zaptel >= 1.4.9 is migrating to storing kernel stuff in zaptel/kernel/*
 -  We conditionally use old/new directory scheme:
    In xpp/Kbuild and xpp/utils/Makefile use ZAP_KERNEL variable, so it's
    not confused with ZAPTEL_DIR (which appears in zaptel/Makefile as well).
 - Fix compile warnings on 64 bit systems.
 - Compile fixes for kernel-2.6.24
* UDEV:
 - /etc/udev/rules.d/xpp.rules now uses XPP_INIT_DIR to find astribank_hook.
 - astribank_hook: Modify to do nothing. Add some documentation.
* Autoconfiguration -- zapconf:
 - Don't fail zapconf et.al. if no config file was found.
 - Skip the 'IRQ Missing:' line in /proc/zaptel/nnn for wcte1xp(?).
 - Add some newer Digium cards to our hardware inventory.
 - Partially handle cases where the /proc/zaptel strings does not contain
   info about E1/T1/J1 or NT/TE.
* Better SYNC:
 - Finer tuning of PLL (New firmware).
 - Change calculation algorithm of sync offset. It now copes better
   with the variance in USB frame reception timing.
 - Statistics:
   . The view of results was moved from /proc/xpp/XBUS-*/summary to
     a new /sys/bus/astribanks/devices/xbus-*/timing and enhanced.
   . A new xpp_timing script shows all astribanks.
   . A new write only /sys/bus/astribanks/devices/xbus-*/cls is
     used to clear statistics. Eventually, clearing of XBUS related
     statistics should be done here. One that was migrated is the
     clearing of 'PCM [TR]X:' numbers currently appearing in
     /proc/xpp/XBUS-*/summary (they should be moved too later).
 - Shorten the strings representation sync_mode ("SYNC_MODE_AB" -> "AB")
   adapted their use in printk and /proc so the text is clear.
 - Added a command line parameter xpp.disable_pll_sync to stop all
   adjustments command to AB (calculations still continue as usual).
* PRI:
 - 4 port support
 - set clocking master span via ztcfg, like other zaptel devices.
* FXO:
 - Fix false hangups in some countries (voltage fluctuations).
 - Some countries send caller-id before first ring.
   Added code to handle caller-id PCM pass through according to
   a new command line parameter (xpd_fxo.caller_id_style).
 - No longer sends an event on zt_open. See ASTERISK-11590 .
* Misc:
 - Adapt to zaptel-1.4.8 and above ztscan: added fields returend by
   new ZT_SPANSTAT_V2 ioctl()
 - Document sysfs and waitfor_xpds.
 - Miscelaneous optimizations and bugfixes.
 - Remove deprecated pcm_tasklet parameter. The rx_tasklet parameter has
   replaced it a long time ago.
 - Add RX_CMD counter to /proc/xpp/XBUS-*/summary
 - Unclutter some of the usb disconnect messages.
 - xpp_usb: minor preformance improvements in receive.
   Expose the number of pending receive URB's in /proc/xpp/XBUS-*/xpp_usb

Merged revisions 3952 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

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

http://svn.digium.com/view/zaptel?view=rev&revision=3957
By: Tzafrir Cohen (tzafrir) 2008-03-13 13:56:15

alarms_chan_zap.patch  - to address a minor formatting issue.
By: Digium Subversion (svnbot) 2008-03-14 11:32:56

Repository: zaptel
Revision: 3989

_U  team/mattf/zaptel-1.4-vpmadt032fwupdate/
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/README
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/wct4xxp/base.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/.version
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/Changelog_xpp
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/Kbuild
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/README.Astribank
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/calibrate_slics
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_bri.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_fxo.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_fxs.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_global.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_pri.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/firmwares/FPGA_1141.hex
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/firmwares/FPGA_1151.hex
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/firmwares/FPGA_FXS.hex
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/init_card_3_29
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/Makefile
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/astribank_hook
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/xpp.rules
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/xpp_fxloader
A   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/xpp_timing
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zapconf
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Span.pm
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-core.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-core.h
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-pcm.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-pcm.h
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-sysfs.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xdefs.h
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xframe_queue.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xpp_usb.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xpp_zap.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xproto.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/zaptel-base.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/zaptel.conf.sample

------------------------------------------------------------------------
r3989 | mattf | 2008-03-14 11:32:53 -0500 (Fri, 14 Mar 2008) | 125 lines

Merged revisions 3953,3957-3958,3964,3969,3973,3976,3979,3983-3984 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r3953 | tzafrir | 2008-03-06 17:40:49 -0600 (Thu, 06 Mar 2008) | 2 lines

Blocking the 'make clean' fix.

........
r3957 | tzafrir | 2008-03-06 18:45:53 -0600 (Thu, 06 Mar 2008) | 58 lines

xpp.r5512:
* Build:
 - Zaptel >= 1.4.9 is migrating to storing kernel stuff in zaptel/kernel/*
 -  We conditionally use old/new directory scheme:
    In xpp/Kbuild and xpp/utils/Makefile use ZAP_KERNEL variable, so it's
    not confused with ZAPTEL_DIR (which appears in zaptel/Makefile as well).
 - Fix compile warnings on 64 bit systems.
 - Compile fixes for kernel-2.6.24
* UDEV:
 - /etc/udev/rules.d/xpp.rules now uses XPP_INIT_DIR to find astribank_hook.
 - astribank_hook: Modify to do nothing. Add some documentation.
* Autoconfiguration -- zapconf:
 - Don't fail zapconf et.al. if no config file was found.
 - Skip the 'IRQ Missing:' line in /proc/zaptel/nnn for wcte1xp(?).
 - Add some newer Digium cards to our hardware inventory.
 - Partially handle cases where the /proc/zaptel strings does not contain
   info about E1/T1/J1 or NT/TE.
* Better SYNC:
 - Finer tuning of PLL (New firmware).
 - Change calculation algorithm of sync offset. It now copes better
   with the variance in USB frame reception timing.
 - Statistics:
   . The view of results was moved from /proc/xpp/XBUS-*/summary to
     a new /sys/bus/astribanks/devices/xbus-*/timing and enhanced.
   . A new xpp_timing script shows all astribanks.
   . A new write only /sys/bus/astribanks/devices/xbus-*/cls is
     used to clear statistics. Eventually, clearing of XBUS related
     statistics should be done here. One that was migrated is the
     clearing of 'PCM [TR]X:' numbers currently appearing in
     /proc/xpp/XBUS-*/summary (they should be moved too later).
 - Shorten the strings representation sync_mode ("SYNC_MODE_AB" -> "AB")
   adapted their use in printk and /proc so the text is clear.
 - Added a command line parameter xpp.disable_pll_sync to stop all
   adjustments command to AB (calculations still continue as usual).
* PRI:
 - 4 port support
 - set clocking master span via ztcfg, like other zaptel devices.
* FXO:
 - Fix false hangups in some countries (voltage fluctuations).
 - Some countries send caller-id before first ring.
   Added code to handle caller-id PCM pass through according to
   a new command line parameter (xpd_fxo.caller_id_style).
 - No longer sends an event on zt_open. See ASTERISK-11590 .
* Misc:
 - Adapt to zaptel-1.4.8 and above ztscan: added fields returend by
   new ZT_SPANSTAT_V2 ioctl()
 - Document sysfs and waitfor_xpds.
 - Miscelaneous optimizations and bugfixes.
 - Remove deprecated pcm_tasklet parameter. The rx_tasklet parameter has
   replaced it a long time ago.
 - Add RX_CMD counter to /proc/xpp/XBUS-*/summary
 - Unclutter some of the usb disconnect messages.
 - xpp_usb: minor preformance improvements in receive.
   Expose the number of pending receive URB's in /proc/xpp/XBUS-*/xpp_usb

Merged revisions 3952 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

........
r3958 | tzafrir | 2008-03-06 19:01:42 -0600 (Thu, 06 Mar 2008) | 2 lines

Also print channel alarms in /proc/zaptel files.

........
r3964 | qwell | 2008-03-07 10:18:13 -0600 (Fri, 07 Mar 2008) | 7 lines

Fix compilation when using devfs

(closes issue ZAP-297)
Reported by: zandbelt
Patches:
     zaptel-1.4.9.2-devfs-mode.patch uploaded by zandbelt (license 33)

........
r3969 | tzafrir | 2008-03-09 04:51:48 -0500 (Sun, 09 Mar 2008) | 6 lines

Integrating sample / reference configuration file into the reference
documentation.

Merged revisions 3968 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

........
r3973 | tzafrir | 2008-03-09 07:06:50 -0500 (Sun, 09 Mar 2008) | 5 lines

More asciidoc polishes and small sample file fixes.

Merged revisions 3972 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

........
r3976 | tzafrir | 2008-03-09 09:30:23 -0500 (Sun, 09 Mar 2008) | 6 lines

The main Makefile now knows if we don't have kernel source.
* Nicer handling of situations where we don't have kernel source and
 don't really need it ('make clean', mainly).
* The test for hotplug firmware is now from the same .config file. No
 more strange message about autoconf.h .

........
r3979 | tzafrir | 2008-03-09 13:18:10 -0500 (Sun, 09 Mar 2008) | 2 lines

Hush grep's output once again and allow building with firmware support.

........
r3983 | mattf | 2008-03-14 10:39:17 -0500 (Fri, 14 Mar 2008) | 1 line

Update linked mISDN version to latest (1.1.7.2)
........
r3984 | mattf | 2008-03-14 11:09:15 -0500 (Fri, 14 Mar 2008) | 1 line

When doing the ISR rewrite, forgot to include the vpmdtmfcheck when doing DTMF polling causing it to check for DTMF events even when it was told not to
........

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

http://svn.digium.com/view/zaptel?view=rev&revision=3989
By: Tzafrir Cohen (tzafrir) 2008-03-18 20:32:29

Any news on this one? Move to asterisk/chan_zap ?
By: Tzafrir Cohen (tzafrir) 2008-03-31 14:12:57

Does this go to chan_zap or to zaptel?

I need an answer to that before zaptel 1.4.10 is released.
By: Shaun Ruffell (sruffell) 2008-04-01 09:53:32

I wish I had the transcript from the IRC chat you, kpfleming, and I had on this, but I believe the result was to put it in asterisk and not zaptel.
By: Tzafrir Cohen (tzafrir) 2008-04-01 10:23:09

Your wish is granted:

http://ibot.rikers.org/%23asterisk-dev/20080313.html.gz

Look for "12160"

(Thanks, jbot)
By: Digium Subversion (svnbot) 2008-06-07 13:54:27

Repository: dahdi
Revision: 3952

U   branches/1.2/xpp/.version
U   branches/1.2/xpp/Changelog_xpp
U   branches/1.2/xpp/Kbuild
U   branches/1.2/xpp/README.Astribank
U   branches/1.2/xpp/calibrate_slics
U   branches/1.2/xpp/card_bri.c
U   branches/1.2/xpp/card_fxo.c
U   branches/1.2/xpp/card_fxs.c
U   branches/1.2/xpp/card_global.c
U   branches/1.2/xpp/card_pri.c
U   branches/1.2/xpp/firmwares/FPGA_1141.hex
U   branches/1.2/xpp/firmwares/FPGA_1151.hex
U   branches/1.2/xpp/firmwares/FPGA_FXS.hex
U   branches/1.2/xpp/init_card_3_29
U   branches/1.2/xpp/utils/Makefile
U   branches/1.2/xpp/utils/astribank_hook
U   branches/1.2/xpp/utils/xpp.rules
U   branches/1.2/xpp/utils/xpp_fxloader
A   branches/1.2/xpp/utils/xpp_timing
U   branches/1.2/xpp/utils/zapconf
U   branches/1.2/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
U   branches/1.2/xpp/utils/zconf/Zaptel/Span.pm
U   branches/1.2/xpp/xbus-core.c
U   branches/1.2/xpp/xbus-core.h
U   branches/1.2/xpp/xbus-pcm.c
U   branches/1.2/xpp/xbus-pcm.h
U   branches/1.2/xpp/xbus-sysfs.c
U   branches/1.2/xpp/xdefs.h
U   branches/1.2/xpp/xframe_queue.c
U   branches/1.2/xpp/xpp_usb.c
U   branches/1.2/xpp/xpp_zap.c
U   branches/1.2/xpp/xproto.c

------------------------------------------------------------------------
r3952 | tzafrir | 2008-06-07 13:54:26 -0500 (Sat, 07 Jun 2008) | 55 lines

xpp.r5512:
* Build:
 - Zaptel >= 1.4.9 is migrating to storing kernel stuff in zaptel/kernel/*
 -  We conditionally use old/new directory scheme:
    In xpp/Kbuild and xpp/utils/Makefile use ZAP_KERNEL variable, so it's
    not confused with ZAPTEL_DIR (which appears in zaptel/Makefile as well).
 - Fix compile warnings on 64 bit systems.
 - Compile fixes for kernel-2.6.24
* UDEV:
 - /etc/udev/rules.d/xpp.rules now uses XPP_INIT_DIR to find astribank_hook.
 - astribank_hook: Modify to do nothing. Add some documentation.
* Autoconfiguration -- zapconf:
 - Don't fail zapconf et.al. if no config file was found.
 - Skip the 'IRQ Missing:' line in /proc/zaptel/nnn for wcte1xp(?).
 - Add some newer Digium cards to our hardware inventory.
 - Partially handle cases where the /proc/zaptel strings does not contain
   info about E1/T1/J1 or NT/TE.
* Better SYNC:
 - Finer tuning of PLL (New firmware).
 - Change calculation algorithm of sync offset. It now copes better
   with the variance in USB frame reception timing.
 - Statistics:
   . The view of results was moved from /proc/xpp/XBUS-*/summary to
     a new /sys/bus/astribanks/devices/xbus-*/timing and enhanced.
   . A new xpp_timing script shows all astribanks.
   . A new write only /sys/bus/astribanks/devices/xbus-*/cls is
     used to clear statistics. Eventually, clearing of XBUS related
     statistics should be done here. One that was migrated is the
     clearing of 'PCM [TR]X:' numbers currently appearing in
     /proc/xpp/XBUS-*/summary (they should be moved too later).
 - Shorten the strings representation sync_mode ("SYNC_MODE_AB" -> "AB")
   adapted their use in printk and /proc so the text is clear.
 - Added a command line parameter xpp.disable_pll_sync to stop all
   adjustments command to AB (calculations still continue as usual).
* PRI:
 - 4 port support
 - set clocking master span via ztcfg, like other zaptel devices.
* FXO:
 - Fix false hangups in some countries (voltage fluctuations).
 - Some countries send caller-id before first ring.
   Added code to handle caller-id PCM pass through according to
   a new command line parameter (xpd_fxo.caller_id_style).
 - No longer sends an event on zt_open. See ASTERISK-11590 .
* Misc:
 - Adapt to zaptel-1.4.8 and above ztscan: added fields returend by
   new ZT_SPANSTAT_V2 ioctl()
 - Document sysfs and waitfor_xpds.
 - Miscelaneous optimizations and bugfixes.
 - Remove deprecated pcm_tasklet parameter. The rx_tasklet parameter has
   replaced it a long time ago.
 - Add RX_CMD counter to /proc/xpp/XBUS-*/summary
 - Unclutter some of the usb disconnect messages.
 - xpp_usb: minor preformance improvements in receive.
   Expose the number of pending receive URB's in /proc/xpp/XBUS-*/xpp_usb

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

http://svn.digium.com/view/dahdi?view=rev&revision=3952
By: Digium Subversion (svnbot) 2008-06-07 13:54:34

Repository: dahdi
Revision: 3957

_U  branches/1.4/
U   branches/1.4/kernel/xpp/.version
U   branches/1.4/kernel/xpp/Changelog_xpp
U   branches/1.4/kernel/xpp/Kbuild
U   branches/1.4/kernel/xpp/README.Astribank
U   branches/1.4/kernel/xpp/calibrate_slics
U   branches/1.4/kernel/xpp/card_bri.c
U   branches/1.4/kernel/xpp/card_fxo.c
U   branches/1.4/kernel/xpp/card_fxs.c
U   branches/1.4/kernel/xpp/card_global.c
U   branches/1.4/kernel/xpp/card_pri.c
U   branches/1.4/kernel/xpp/firmwares/FPGA_1141.hex
U   branches/1.4/kernel/xpp/firmwares/FPGA_1151.hex
U   branches/1.4/kernel/xpp/firmwares/FPGA_FXS.hex
U   branches/1.4/kernel/xpp/init_card_3_29
U   branches/1.4/kernel/xpp/utils/Makefile
U   branches/1.4/kernel/xpp/utils/astribank_hook
U   branches/1.4/kernel/xpp/utils/xpp.rules
U   branches/1.4/kernel/xpp/utils/xpp_fxloader
A   branches/1.4/kernel/xpp/utils/xpp_timing
U   branches/1.4/kernel/xpp/utils/zapconf
U   branches/1.4/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
U   branches/1.4/kernel/xpp/utils/zconf/Zaptel/Span.pm
U   branches/1.4/kernel/xpp/xbus-core.c
U   branches/1.4/kernel/xpp/xbus-core.h
U   branches/1.4/kernel/xpp/xbus-pcm.c
U   branches/1.4/kernel/xpp/xbus-pcm.h
U   branches/1.4/kernel/xpp/xbus-sysfs.c
U   branches/1.4/kernel/xpp/xdefs.h
U   branches/1.4/kernel/xpp/xframe_queue.c
U   branches/1.4/kernel/xpp/xpp_usb.c
U   branches/1.4/kernel/xpp/xpp_zap.c
U   branches/1.4/kernel/xpp/xproto.c

------------------------------------------------------------------------
r3957 | tzafrir | 2008-06-07 13:54:34 -0500 (Sat, 07 Jun 2008) | 58 lines

xpp.r5512:
* Build:
 - Zaptel >= 1.4.9 is migrating to storing kernel stuff in zaptel/kernel/*
 -  We conditionally use old/new directory scheme:
    In xpp/Kbuild and xpp/utils/Makefile use ZAP_KERNEL variable, so it's
    not confused with ZAPTEL_DIR (which appears in zaptel/Makefile as well).
 - Fix compile warnings on 64 bit systems.
 - Compile fixes for kernel-2.6.24
* UDEV:
 - /etc/udev/rules.d/xpp.rules now uses XPP_INIT_DIR to find astribank_hook.
 - astribank_hook: Modify to do nothing. Add some documentation.
* Autoconfiguration -- zapconf:
 - Don't fail zapconf et.al. if no config file was found.
 - Skip the 'IRQ Missing:' line in /proc/zaptel/nnn for wcte1xp(?).
 - Add some newer Digium cards to our hardware inventory.
 - Partially handle cases where the /proc/zaptel strings does not contain
   info about E1/T1/J1 or NT/TE.
* Better SYNC:
 - Finer tuning of PLL (New firmware).
 - Change calculation algorithm of sync offset. It now copes better
   with the variance in USB frame reception timing.
 - Statistics:
   . The view of results was moved from /proc/xpp/XBUS-*/summary to
     a new /sys/bus/astribanks/devices/xbus-*/timing and enhanced.
   . A new xpp_timing script shows all astribanks.
   . A new write only /sys/bus/astribanks/devices/xbus-*/cls is
     used to clear statistics. Eventually, clearing of XBUS related
     statistics should be done here. One that was migrated is the
     clearing of 'PCM [TR]X:' numbers currently appearing in
     /proc/xpp/XBUS-*/summary (they should be moved too later).
 - Shorten the strings representation sync_mode ("SYNC_MODE_AB" -> "AB")
   adapted their use in printk and /proc so the text is clear.
 - Added a command line parameter xpp.disable_pll_sync to stop all
   adjustments command to AB (calculations still continue as usual).
* PRI:
 - 4 port support
 - set clocking master span via ztcfg, like other zaptel devices.
* FXO:
 - Fix false hangups in some countries (voltage fluctuations).
 - Some countries send caller-id before first ring.
   Added code to handle caller-id PCM pass through according to
   a new command line parameter (xpd_fxo.caller_id_style).
 - No longer sends an event on zt_open. See ASTERISK-11590 .
* Misc:
 - Adapt to zaptel-1.4.8 and above ztscan: added fields returend by
   new ZT_SPANSTAT_V2 ioctl()
 - Document sysfs and waitfor_xpds.
 - Miscelaneous optimizations and bugfixes.
 - Remove deprecated pcm_tasklet parameter. The rx_tasklet parameter has
   replaced it a long time ago.
 - Add RX_CMD counter to /proc/xpp/XBUS-*/summary
 - Unclutter some of the usb disconnect messages.
 - xpp_usb: minor preformance improvements in receive.
   Expose the number of pending receive URB's in /proc/xpp/XBUS-*/xpp_usb

Merged revisions 3952 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

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

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

Repository: dahdi
Revision: 3989

_U  team/mattf/zaptel-1.4-vpmadt032fwupdate/
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/README
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/wct4xxp/base.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/.version
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/Changelog_xpp
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/Kbuild
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/README.Astribank
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/calibrate_slics
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_bri.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_fxo.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_fxs.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_global.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/card_pri.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/firmwares/FPGA_1141.hex
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/firmwares/FPGA_1151.hex
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/firmwares/FPGA_FXS.hex
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/init_card_3_29
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/Makefile
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/astribank_hook
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/xpp.rules
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/xpp_fxloader
A   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/xpp_timing
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zapconf
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Span.pm
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-core.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-core.h
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-pcm.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-pcm.h
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xbus-sysfs.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xdefs.h
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xframe_queue.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xpp_usb.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xpp_zap.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/xproto.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/zaptel-base.c
U   team/mattf/zaptel-1.4-vpmadt032fwupdate/zaptel.conf.sample

------------------------------------------------------------------------
r3989 | mattf | 2008-06-07 13:55:10 -0500 (Sat, 07 Jun 2008) | 125 lines

Merged revisions 3953,3957-3958,3964,3969,3973,3976,3979,3983-3984 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r3953 | tzafrir | 2008-03-06 17:40:49 -0600 (Thu, 06 Mar 2008) | 2 lines

Blocking the 'make clean' fix.

........
r3957 | tzafrir | 2008-03-06 18:45:53 -0600 (Thu, 06 Mar 2008) | 58 lines

xpp.r5512:
* Build:
 - Zaptel >= 1.4.9 is migrating to storing kernel stuff in zaptel/kernel/*
 -  We conditionally use old/new directory scheme:
    In xpp/Kbuild and xpp/utils/Makefile use ZAP_KERNEL variable, so it's
    not confused with ZAPTEL_DIR (which appears in zaptel/Makefile as well).
 - Fix compile warnings on 64 bit systems.
 - Compile fixes for kernel-2.6.24
* UDEV:
 - /etc/udev/rules.d/xpp.rules now uses XPP_INIT_DIR to find astribank_hook.
 - astribank_hook: Modify to do nothing. Add some documentation.
* Autoconfiguration -- zapconf:
 - Don't fail zapconf et.al. if no config file was found.
 - Skip the 'IRQ Missing:' line in /proc/zaptel/nnn for wcte1xp(?).
 - Add some newer Digium cards to our hardware inventory.
 - Partially handle cases where the /proc/zaptel strings does not contain
   info about E1/T1/J1 or NT/TE.
* Better SYNC:
 - Finer tuning of PLL (New firmware).
 - Change calculation algorithm of sync offset. It now copes better
   with the variance in USB frame reception timing.
 - Statistics:
   . The view of results was moved from /proc/xpp/XBUS-*/summary to
     a new /sys/bus/astribanks/devices/xbus-*/timing and enhanced.
   . A new xpp_timing script shows all astribanks.
   . A new write only /sys/bus/astribanks/devices/xbus-*/cls is
     used to clear statistics. Eventually, clearing of XBUS related
     statistics should be done here. One that was migrated is the
     clearing of 'PCM [TR]X:' numbers currently appearing in
     /proc/xpp/XBUS-*/summary (they should be moved too later).
 - Shorten the strings representation sync_mode ("SYNC_MODE_AB" -> "AB")
   adapted their use in printk and /proc so the text is clear.
 - Added a command line parameter xpp.disable_pll_sync to stop all
   adjustments command to AB (calculations still continue as usual).
* PRI:
 - 4 port support
 - set clocking master span via ztcfg, like other zaptel devices.
* FXO:
 - Fix false hangups in some countries (voltage fluctuations).
 - Some countries send caller-id before first ring.
   Added code to handle caller-id PCM pass through according to
   a new command line parameter (xpd_fxo.caller_id_style).
 - No longer sends an event on zt_open. See ASTERISK-11590 .
* Misc:
 - Adapt to zaptel-1.4.8 and above ztscan: added fields returend by
   new ZT_SPANSTAT_V2 ioctl()
 - Document sysfs and waitfor_xpds.
 - Miscelaneous optimizations and bugfixes.
 - Remove deprecated pcm_tasklet parameter. The rx_tasklet parameter has
   replaced it a long time ago.
 - Add RX_CMD counter to /proc/xpp/XBUS-*/summary
 - Unclutter some of the usb disconnect messages.
 - xpp_usb: minor preformance improvements in receive.
   Expose the number of pending receive URB's in /proc/xpp/XBUS-*/xpp_usb

Merged revisions 3952 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

........
r3958 | tzafrir | 2008-03-06 19:01:42 -0600 (Thu, 06 Mar 2008) | 2 lines

Also print channel alarms in /proc/zaptel files.

........
r3964 | qwell | 2008-03-07 10:18:13 -0600 (Fri, 07 Mar 2008) | 7 lines

Fix compilation when using devfs

(closes issue ZAP-297)
Reported by: zandbelt
Patches:
     zaptel-1.4.9.2-devfs-mode.patch uploaded by zandbelt (license 33)

........
r3969 | tzafrir | 2008-03-09 04:51:48 -0500 (Sun, 09 Mar 2008) | 6 lines

Integrating sample / reference configuration file into the reference
documentation.

Merged revisions 3968 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

........
r3973 | tzafrir | 2008-03-09 07:06:50 -0500 (Sun, 09 Mar 2008) | 5 lines

More asciidoc polishes and small sample file fixes.

Merged revisions 3972 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2

........
r3976 | tzafrir | 2008-03-09 09:30:23 -0500 (Sun, 09 Mar 2008) | 6 lines

The main Makefile now knows if we don't have kernel source.
* Nicer handling of situations where we don't have kernel source and
 don't really need it ('make clean', mainly).
* The test for hotplug firmware is now from the same .config file. No
 more strange message about autoconf.h .

........
r3979 | tzafrir | 2008-03-09 13:18:10 -0500 (Sun, 09 Mar 2008) | 2 lines

Hush grep's output once again and allow building with firmware support.

........
r3983 | mattf | 2008-03-14 10:39:17 -0500 (Fri, 14 Mar 2008) | 1 line

Update linked mISDN version to latest (1.1.7.2)
........
r3984 | mattf | 2008-03-14 11:09:15 -0500 (Fri, 14 Mar 2008) | 1 line

When doing the ISR rewrite, forgot to include the vpmdtmfcheck when doing DTMF polling causing it to check for DTMF events even when it was told not to
........

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

http://svn.digium.com/view/dahdi?view=rev&revision=3989
By: Tzafrir Cohen (tzafrir) 2008-06-29 12:56:38

Uploaded another variation on the theme of alarms_chan_zap.patch . This time vs. asterisk 1.4 SVN.
By: Kevin P. Fleming (kpfleming) 2008-07-22 17:24:04

resolved in r132712 of branches/1.4, and merged to trunk and 1.6.0
By: Tzafrir Cohen (tzafrir) 2008-07-23 09:35:38

Sadly this still does not work. The problem is that get_alarms() on a channel only checks for span alarms and not for channel alarms. At least in 1.4 . And anyway, the information is already available from previous ioctls so no need for a further check.

Regarding the related issue: I suspect that the current patch will work for an X100P, as in its case the alarm is a span alarm.
By: Kevin P. Fleming (kpfleming) 2008-07-23 10:42:18

The information isn't already available from previous ioctls, unless the channel is part of a PRI. The code that was there already called DAHDI_SPANSTAT, directly, I've just replaced that with a call to get_alarms() instead to reduce code duplication.

Your comment is valid though; if the channel is already in 'channel alarm' state during mkintf(), calling get_alarms() won't catch it, so tmp->unknown_alarm won't be set by handle_alarms(). I'm going to commit a patch to *always* set tmp->unknown_alarm when the channel is not in a span alarm; this will have the desired result of suppressing the 'alarm cleared' message if we don't receive a new (span) alarm before the clearing of the channel alarm occurs. We can't set tmp->inalarm here without adding full support for channel alarms, which is overkill. If the channel is created while in this state, chan_dahdi won't be able to avoid placing calls on the channel like it would if the alarm occurred later, but I don't see a way to solve that without adding channel alarm support.
By: Tzafrir Cohen (tzafrir) 2008-07-23 10:47:42

asterisk-inalarm2.patch: just set InAlarm from the channel alarm you already get from the card. For 1.4 .
By: Tzafrir Cohen (tzafrir) 2008-07-24 12:43:16

asterisk-chanalarms_14.patch - A backport to 1.4 of the 1.6 get_alarms function, along with a configure-time test for the presense of the field chan_alarms in ZT_PARAMS. The extra test is only done for ZAPTEL - no point testing DAHDI that will always have it.

Note that on 1.6 the ifdef in get_alarms is probably no longer needed.
By: Tzafrir Cohen (tzafrir) 2008-07-30 06:35:36

Updated patch for current asterisk branches/1.4 (r134345)
By: Digium Subversion (svnbot) 2008-08-14 06:31:30

Repository: dahdi
Revision: 4779

A   linux/team/tzafrir/fxo_asterisk_workaround/

------------------------------------------------------------------------
r4779 | tzafrir | 2008-08-14 06:31:29 -0500 (Thu, 14 Aug 2008) | 2 lines

A branch to fix ASTERISK-11590 at the kernel level

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

http://svn.digium.com/view/dahdi?view=rev&revision=4779
By: Digium Subversion (svnbot) 2008-08-20 14:27:09

Repository: asterisk
Revision: 139145

U   branches/1.4/channels/chan_dahdi.c
U   branches/1.4/configure
U   branches/1.4/configure.ac
U   branches/1.4/include/asterisk/autoconfig.h.in

------------------------------------------------------------------------
r139145 | kpfleming | 2008-08-20 14:27:08 -0500 (Wed, 20 Aug 2008) | 8 lines

Backport support for Zaptel/DAHDI channel-level alarms from trunk/1.6, because not doing so just makes it difficult for people with channels that are in alarm when Asterisk starts up to get them going once the alarm is cleared

(closes issue ASTERISK-11590)
Reported by: tzafrir
Patches:
     asterisk-chanalarms_14.patch uploaded by tzafrir (license 46)
Tested by: tzafrir

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

http://svn.digium.com/view/asterisk?view=rev&revision=139145