[dahdi-commits] fjoe: freebsd/trunk r9173 - in /freebsd/trunk: ./ build_tools/ drivers/dahdi/...
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Sun Aug 22 06:54:55 CDT 2010
Author: fjoe
Date: Sun Aug 22 06:48:38 2010
New Revision: 9173
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9173
Log:
Merge from linux trunk up to rev. 9172
Added:
freebsd/trunk/drivers/dahdi/oct612x/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/
freebsd/trunk/drivers/dahdi/oct612x/Makefile
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/Makefile
freebsd/trunk/drivers/dahdi/oct612x/apilib/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/
freebsd/trunk/drivers/dahdi/oct612x/apilib/bt/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/bt/
freebsd/trunk/drivers/dahdi/oct612x/apilib/bt/octapi_bt0.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/bt/octapi_bt0.c
freebsd/trunk/drivers/dahdi/oct612x/apilib/bt/octapi_bt0_private.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/bt/octapi_bt0_private.h
freebsd/trunk/drivers/dahdi/oct612x/apilib/largmath/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/largmath/
freebsd/trunk/drivers/dahdi/oct612x/apilib/largmath/octapi_largmath.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/largmath/octapi_largmath.c
freebsd/trunk/drivers/dahdi/oct612x/apilib/llman/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/llman/
freebsd/trunk/drivers/dahdi/oct612x/apilib/llman/octapi_llman.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/llman/octapi_llman.c
freebsd/trunk/drivers/dahdi/oct612x/apilib/llman/octapi_llman_private.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/apilib/llman/octapi_llman_private.h
freebsd/trunk/drivers/dahdi/oct612x/get_discards
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/get_discards
freebsd/trunk/drivers/dahdi/oct612x/include/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/include/
freebsd/trunk/drivers/dahdi/oct612x/include/apilib/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/include/apilib/
freebsd/trunk/drivers/dahdi/oct612x/include/apilib/octapi_bt0.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/apilib/octapi_bt0.h
freebsd/trunk/drivers/dahdi/oct612x/include/apilib/octapi_largmath.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/apilib/octapi_largmath.h
freebsd/trunk/drivers/dahdi/oct612x/include/apilib/octapi_llman.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/apilib/octapi_llman.h
freebsd/trunk/drivers/dahdi/oct612x/include/digium_unused.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/digium_unused.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_adpcm_chan_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_adpcm_chan_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_adpcm_chan_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_adpcm_chan_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_api.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_api.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_api_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_api_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_apimi.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_apimi.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_apiud.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_apiud.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_open_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_open_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_open_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_open_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_stats_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_stats_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_stats_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_chip_stats_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_conf_bridge_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_conf_bridge_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_conf_bridge_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_conf_bridge_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_debug_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_debug_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_debug_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_debug_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_errors.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_errors.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_events_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_events_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_events_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_events_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_interrupts_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_interrupts_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_interrupts_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_interrupts_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_mixer_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_mixer_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_mixer_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_mixer_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_phasing_tsst_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_phasing_tsst_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_phasing_tsst_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_phasing_tsst_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_playout_buf_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_playout_buf_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_playout_buf_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_playout_buf_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_remote_debug_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_remote_debug_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_remote_debug_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_remote_debug_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tlv_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tlv_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tone_detection_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tone_detection_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tone_detection_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tone_detection_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tsi_cnct_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tsi_cnct_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tsi_cnct_pub.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tsi_cnct_pub.h
freebsd/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tsst_inst.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/oct6100api/oct6100_tsst_inst.h
freebsd/trunk/drivers/dahdi/oct612x/include/octdef.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octdef.h
freebsd/trunk/drivers/dahdi/oct612x/include/octmac.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octmac.h
freebsd/trunk/drivers/dahdi/oct612x/include/octosdependant.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octosdependant.h
freebsd/trunk/drivers/dahdi/oct612x/include/octrpc/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/include/octrpc/
freebsd/trunk/drivers/dahdi/oct612x/include/octrpc/oct6100_rpc_protocol.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octrpc/oct6100_rpc_protocol.h
freebsd/trunk/drivers/dahdi/oct612x/include/octrpc/rpc_protocol.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octrpc/rpc_protocol.h
freebsd/trunk/drivers/dahdi/oct612x/include/octtype.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octtype.h
freebsd/trunk/drivers/dahdi/oct612x/include/octtypevx.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octtypevx.h
freebsd/trunk/drivers/dahdi/oct612x/include/octtypewin.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/include/octtypewin.h
freebsd/trunk/drivers/dahdi/oct612x/octasic-helper
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octasic-helper
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_apimi/
- copied from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_apimi/
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_channel_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_channel_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_debug_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_debug_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_events_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_events_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_memory_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_memory_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_mixer_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_mixer_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tlv_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tlv_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tsst_priv.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_tsst_priv.h
freebsd/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_version.h
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_version.h
freebsd/trunk/drivers/dahdi/oct612x/test.c
- copied unchanged from r9172, linux/trunk/drivers/dahdi/oct612x/test.c
freebsd/trunk/include/stdbool.h (with props)
Modified:
freebsd/trunk/ (props changed)
freebsd/trunk/Makefile
freebsd/trunk/README
freebsd/trunk/build_tools/kernel-cp
freebsd/trunk/build_tools/live_dahdi
freebsd/trunk/drivers/dahdi/ (props changed)
freebsd/trunk/drivers/dahdi/Kbuild
freebsd/trunk/drivers/dahdi/dahdi-base.c
freebsd/trunk/drivers/dahdi/dahdi_dummy.c
freebsd/trunk/drivers/dahdi/dahdi_dynamic.c
freebsd/trunk/drivers/dahdi/dahdi_echocan_jpah.c
freebsd/trunk/drivers/dahdi/dahdi_echocan_oslec.c
freebsd/trunk/drivers/dahdi/dahdi_transcode.c
freebsd/trunk/drivers/dahdi/hpec/dahdi_echocan_hpec.c
freebsd/trunk/drivers/dahdi/pciradio.c
freebsd/trunk/drivers/dahdi/tor2.c
freebsd/trunk/drivers/dahdi/voicebus/GpakApi.c
freebsd/trunk/drivers/dahdi/voicebus/GpakApi.h
freebsd/trunk/drivers/dahdi/voicebus/GpakCust.c
freebsd/trunk/drivers/dahdi/voicebus/GpakCust.h
freebsd/trunk/drivers/dahdi/voicebus/gpakErrs.h
freebsd/trunk/drivers/dahdi/voicebus/gpakenum.h
freebsd/trunk/drivers/dahdi/voicebus/voicebus.c
freebsd/trunk/drivers/dahdi/voicebus/voicebus.h
freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
freebsd/trunk/drivers/dahdi/wcb4xxp/wcb4xxp.h
freebsd/trunk/drivers/dahdi/wcfxo.c
freebsd/trunk/drivers/dahdi/wct1xxp.c
freebsd/trunk/drivers/dahdi/wct4xxp/base.c
freebsd/trunk/drivers/dahdi/wct4xxp/wct4xxp.h
freebsd/trunk/drivers/dahdi/wctc4xxp/base.c
freebsd/trunk/drivers/dahdi/wctdm.c
freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c
freebsd/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
freebsd/trunk/drivers/dahdi/wctdm24xxp/xhfc.c
freebsd/trunk/drivers/dahdi/wctdm24xxp/xhfc.h
freebsd/trunk/drivers/dahdi/wcte11xp.c
freebsd/trunk/drivers/dahdi/wcte12xp/base.c
freebsd/trunk/drivers/dahdi/wcte12xp/wcte12xp.h
freebsd/trunk/drivers/dahdi/xpp/card_bri.c
freebsd/trunk/drivers/dahdi/xpp/card_fxo.c
freebsd/trunk/drivers/dahdi/xpp/card_fxs.c
freebsd/trunk/drivers/dahdi/xpp/card_global.c
freebsd/trunk/drivers/dahdi/xpp/card_pri.c
freebsd/trunk/drivers/dahdi/xpp/firmwares/PIC_TYPE_4.hex
freebsd/trunk/drivers/dahdi/xpp/firmwares/USB_FW.hex
freebsd/trunk/drivers/dahdi/xpp/init_card_4_30
freebsd/trunk/drivers/dahdi/xpp/xbus-core.c
freebsd/trunk/drivers/dahdi/xpp/xbus-core.h
freebsd/trunk/drivers/dahdi/xpp/xbus-pcm.c
freebsd/trunk/drivers/dahdi/xpp/xbus-pcm.h
freebsd/trunk/drivers/dahdi/xpp/xbus-sysfs.c
freebsd/trunk/drivers/dahdi/xpp/xpd.h
freebsd/trunk/drivers/dahdi/xpp/xpp_dahdi.c
freebsd/trunk/drivers/dahdi/xpp/xpp_dahdi.h
freebsd/trunk/drivers/dahdi/xpp/xpp_debug
freebsd/trunk/drivers/dahdi/xpp/xpp_usb.c
freebsd/trunk/drivers/dahdi/xpp/xproto.h
freebsd/trunk/firmware.mk
freebsd/trunk/include/dahdi/compat/bsd.h
freebsd/trunk/include/dahdi/dahdi_config.h
freebsd/trunk/include/dahdi/kernel.h
freebsd/trunk/include/dahdi/user.h
Propchange: freebsd/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 06:48:38 2010
@@ -1,1 +1,1 @@
-/linux/trunk:7418-8272
+/linux/trunk:7418-9172
Modified: freebsd/trunk/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/Makefile?view=diff&rev=9173&r1=9172&r2=9173
==============================================================================
--- freebsd/trunk/Makefile (original)
+++ freebsd/trunk/Makefile Sun Aug 22 06:48:38 2010
@@ -62,7 +62,7 @@
ASCIIDOC:=asciidoc
ASCIIDOC_CMD:=$(ASCIIDOC) -n -a toc -a toclevels=4
-GENERATED_DOCS:=README.html dahdi-api.html
+GENERATED_DOCS:=README.html
ifneq ($(wildcard .version),)
DAHDIVERSION:=$(shell cat .version)
Modified: freebsd/trunk/README
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/README?view=diff&rev=9173&r1=9172&r2=9173
==============================================================================
--- freebsd/trunk/README (original)
+++ freebsd/trunk/README Sun Aug 22 06:48:38 2010
@@ -121,7 +121,37 @@
There may be cases where you will need a specific version of gcc to build
kernel modules.
-TODO: copy build requirement from Zaptel README.
+Kernel Source / "Headers"
+^^^^^^^^^^^^^^^^^^^^^^^^^
+- Building DAHDI-linux requires a kernel build tree.
+- This should basically be at least a partial kernel source tree and
+ most importantly, the exact kernel .config file used for the build as
+ well as several files generated at kernel build time.
+- KERNEL_VERSION is the output of the command `uname -r`
+- If you build your own kernel, you need to point to the exact kernel
+ build tree. Luckily for you, this will typically be pointed by the
+ symbolic link /lib/modules/KERNEL_VERSION/build which is the location
+ zaptel checks by default.
+- If you use a kernel from your distribution you will typically have a
+ package with all the files required to build a kernel modules for your
+ kernel image.
+ * On Debian Etch and Ubuntu this is
+ +++ linux-headers-`uname -r` +++
+ * On Fedora, RHEL and compatibles (e.g. CentOS) and in SUSE this is
+ the kernel-devel package. Or if you run kernel-smp or kernel-xen,
+ you need kernel-smp-devel or kernel-xen-devel, respectively.
+ * In some distributions (e.g.: in RHEL/CentOS, Fedora, Ubuntu) the
+ installation of the kernel-devel / kernel-headers package will
+ be of a version that is newer than the one you currently run. In
+ such a case you may need to upgrade the kernel package itself as
+ well and reboot.
+- To point explicitly to a different build tree: set KSRC to the kernel
+ source tree or KVERS to the exact kernel version (if "headers" are
+ available for a different version). This parameter must be run on
+ every calls to 'make' (e.g.: 'make clean', 'make install').
+
+ make KVERS=2.6.18.Custom
+ make KSRC=/home/tzafrir/kernels/linus
Installing to a Subtree
@@ -591,14 +621,15 @@
PROCFS Interface: /proc/dahdi
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A simple way to get the current list of spans and channels each span contains
is the files under /proc/dahdi . /proc/dahdi is generated by DAHDI as it
loads. As each span registers to DAHDI, a file under /proc/dahdi is created
for it. The name of that file is the number of that span.
-Each file has a 1-line title for the span followed by an empty line and
-then a line for each channel of the span.
+Each file has a 1-line title for the span followed by a few optional
+general counter lines, an empty line and then a line for each channel of
+the span.
The title line shows the number of the span, its name and title, and
(potentially) the alarms in which it is.
@@ -608,6 +639,19 @@
alarms):
Span 1: XBUS-00/XPD-00 "Xorcom XPD #0/0: FXS"
+
+There are several extra optional keywords that may be added there:
+
+(Master)::
+ This span is the master span. See <<_dahdi_timing,DAHDI Timing>>.
+ClockSource::
+ The clock source among several spans that belong to a single E1/J1/T1
+ card.
+RED/YELLOW/RED/NOTOPEN/LOOP/RECOVERING::
+ The span is in alarm
+
+Following that line there may be some optional lines about IRQ misses,
+timing slips and such, if there are any.
The channel line for each channel shows its channel number, name and the
actual signalling assigned to it through dahdi_cfg. Before being configured by
@@ -860,34 +904,33 @@
So suppose we had the following ioctl:
----------------------------------
-struct zt_example {
+struct dahdi_example {
int sample;
}
-#define DAHDI_EXAMPLE _IOWR (DAHDI_CODE, 62, struct zt_example)
+#define DAHDI_EXAMPLE _IOWR (DAHDI_CODE, 62, struct dahdi_example)
----------------------------------
And we want to add the field 'int onemore', we won't just add it to the
struct. We will do something that is more complex:
------------------------------------
/* The original, unchanged: */
-struct zt_example_v1 {
+struct dahdi_example_v1 {
int sample;
}
/* The new struct: */
-struct zt_example {
+struct dahdi_example {
int sample;
int onemore;
}
-#define DAHDI_EXAMPLE_V1 _IOWR (DAHDI_CODE, 62, struct zt_example_v1)
-#define DAHDI_EXAMPLE _IOWR (DAHDI_CODE, 62, struct zt_example)
+#define DAHDI_EXAMPLE_V1 _IOWR(DAHDI_CODE, 62, struct dahdi_example_v1)
+#define DAHDI_EXAMPLE _IOWR(DAHDI_CODE, 62, struct dahdi_example)
------------------------------------
We actually have here two different ioctls: the old DAHDI_EXAMPLE would be
-0xC0044A3E . DAHDI_EXAMPLE_V1 would have the same value. But the new value
-of DAHDI_EXAMPLE would be 0xC0084A3E .
-(TODO: fix ioctl values)
+0xC004DA3E . DAHDI_EXAMPLE_V1 would have the same value. But the new value
+of DAHDI_EXAMPLE would be 0xC008DA3E .
Programs built with the original dahdi/user.h (before the change) use the
original ioctl, whether or not the kernel code is actually of the newer
@@ -895,7 +938,7 @@
When can we have compatibility issues? If we have code built with the new
dahdi/user.h, but the loaded kernel code (modules) are of the older version.
-Thus the userspace program will try to use the newer DAHDI_EXAMPLE (0xC0084A3E).
+Thus the userspace program will try to use the newer DAHDI_EXAMPLE (0xC008DA3E).
But the kernel code has no handler for that ioctl. The result: the error 25,
ENOTTY, which means "Inappropriate ioctl for device".
@@ -903,6 +946,18 @@
added. That definition is for the old version and thus it might appear
slightly confusing in the code, but it is useful for writing code that works
with all versions of DAHDI.
+
+Past Incompatibilities
+^^^^^^^^^^^^^^^^^^^^^^
+.DAHDI 2.3:
+DAHDI_SPANINFO_V1 (extra members added). This will typically only be
+used on ISDN (PRI/BRI) spans in Asterisk.
+
+.DAHDI 2.2:
+* DAHDI_GET_PARAMS_V1, DAHDI_GETCONF_V1, DAHDI_SETCONF_V1,
+ DAHDI_GETGAINS_V1 ('direction' changed from 'R' to 'RW' to fix
+ FreeBSD support).
+* DAHDI_CONFDIAG_V1, DAHDI_CHANDIAG_V1 (fixed direction).
Alarm Types
@@ -997,7 +1052,7 @@
Reporting Bugs
--------------
Please report bug and patches to the Asterisk bug tracker at
-http://issues.asterisk.org in the "DAHDI" category.
+http://issues.asterisk.org in the "DAHDI-linux" category.
Links
-----
Modified: freebsd/trunk/build_tools/kernel-cp
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/build_tools/kernel-cp?view=diff&rev=9173&r1=9172&r2=9173
==============================================================================
--- freebsd/trunk/build_tools/kernel-cp (original)
+++ freebsd/trunk/build_tools/kernel-cp Sun Aug 22 06:48:38 2010
@@ -26,7 +26,7 @@
fi
wget -O "$check_patch" "$URL"
- if [ `wc -c "$check_patch"` -lt 1000 ]; then
+ if [ `wc -c <"$check_patch"` -lt 1000 ]; then
# already downloaded
# FIXME: redirection fails on downloading and you get a
# short HTML file as your "script".
Modified: freebsd/trunk/build_tools/live_dahdi
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/build_tools/live_dahdi?view=diff&rev=9173&r1=9172&r2=9173
==============================================================================
--- freebsd/trunk/build_tools/live_dahdi (original)
+++ freebsd/trunk/build_tools/live_dahdi Sun Aug 22 06:48:38 2010
@@ -2,13 +2,14 @@
LINUX_DIR=${LINUX_DIR:=.}
TOOLS_DIR=${TOOLS_DIR:=../dahdi-tools}
+DYNAMIC_LOC="${DYNAMIC_LOC:-no}"
DESTDIR=$PWD/live
KVERS=${KVERS:-`uname -r`}
-MODULES_DIR="$DESTDIR/lib/modules/$KVERS/dahdi"
XPP_SYNC=${XPP_SYNC:-auto}
AST_SCRIPT=${AST_SCRIPT:-/etc/init.d/asterisk}
# Use this file to pass options to modules:
PERLLIBDIR=`perl -V:sitelib | cut -d "'" -f 2`
+EXTRA_MODS="crc_ccitt"
# Manual list of modules. They will be loaded by insmod.
# If reside in a subdir, add it explicitly.
@@ -22,6 +23,7 @@
if [ -r $DESTDIR/live.conf ]; then . $DESTDIR/live.conf; fi
+MODULES_DIR="$DESTDIR/lib/modules/$KVERS/dahdi"
if [ ! -d "$LINUX_DIR" ]; then
echo >&2 "$0:dahdi-linux dir '$LINUX_DIR' does not exits. Aborting".
exit 1
@@ -55,6 +57,11 @@
# make sure Astribank initialization scripts are from our tree.
xpp_ARGS="$xpp_ARGS initdir=$FIRMWARE_DIR"
+#dahdi_ARGS="$dahdi_ARGS initdir=$FIRMWARE_DIR"
+
+if [ "$DYNAMIC_LOC" = 'yes' ]; then
+ MODULES_LOAD="$MODULES_LOAD dahdi_dynamic dahdi_dynamic_loc"
+fi
# the same as xpp/utils/dahdi_drivers .
# With the remote mode, I can't rely on files in the source directory.
@@ -84,6 +91,7 @@
# FIXME: better automation of the voicebus
# dependency:
MODULES_LOAD="$MODULES_LOAD voicebus/dahdi_voicebus $mod/$mod"
+ EXTRA_MODS="$EXTRA_MODS firmware_class"
;;
wct4xxp | wcte12xp | wctc4xp | wcb4xxp)
MODULES_LOAD="$MODULES_LOAD $mod/$mod"
@@ -106,7 +114,7 @@
if ! grep -q connected /proc/xpp/xbuses 2>/dev/null; then return 0; fi
echo "Waiting for Astribank devices to initialize:"
- $TOOLS_DIR_FULL/xpp/waitfor_xpds # Asusmes a recent dahdi-tools
+ "$FIRMWARE_DIR/waitfor_xpds" # Asusmes a recent dahdi-tools
# overriding locales for the above two, as perl can be noisy
# when locales are missing.
@@ -129,16 +137,69 @@
set -- $line
# $1: the original module, $2: size, $3: refcount, $4: deps list
mods=`echo $4 | tr , ' '`
+ ec_modules=""
# xpp_usb keeps the xpds below busy if an xpp hardware is
# connected. Hence must be removed before them:
case "$module" in xpd_*) mods="xpp_usb $mods";; esac
+
for mod in $mods; do
- # run in a subshell, so it won't step over our vars:
- (unload_module $mod)
- # TODO: the following is probably the error handling we want:
- # if [ $? != 0 ]; then return 1; fi
+ case "$mod" in
+ dahdi_echocan_*)
+ ec_modules="$mod $ec_modules"
+ ;;
+ *)
+ # run in a subshell, so it won't step over our vars:
+ (unload_module $mod)
+ ;;
+ esac
+ done
+ # Now that all the other dependencies are unloaded, we can unload the
+ # dahdi_echocan modules. The drivers that register spans may keep
+ # references on the echocan modules before they are unloaded.
+ for mod in $ec_modules; do
+ (unload_module $mod)
done
rmmod $module
+}
+
+load_dynamic() {
+ if [ "$DYNAMIC_LOC" != yes ]; then return; fi
+
+ local conf_file="$DESTDIR/etc/dahdi/dynamic.conf"
+ if [ ! -r "$conf_file" ]; then
+ cat <<EOF >"$conf_file"
+dynamic=loc,1:0,5,0
+dynamic=loc,1:1,5,0
+EOF
+ fi
+
+ dahdi_cfg -c "$conf_file"
+}
+
+unload_dynamic() {
+ if [ "$DYNAMIC_LOC" != yes ]; then return; fi
+
+ local conf_file="$DESTDIR/etc/dahdi/dynamic.conf"
+ if [ ! -r "$conf_file" ]; then return; fi
+
+ dahdi_cfg -c "$conf_file" -s || :
+}
+
+genconf() {
+ GENCONF_PARAMETERS=$DESTDIR/etc/dahdi/genconf_parameters \
+ DAHDI_CONF_FILE=$DESTDIR/etc/dahdi/system.conf \
+ DAHDI_MODS_FILE=$DESTDIR/etc/dahdi/modules \
+ CHAN_DAHDI_CHANNELS_FILE=$DESTDIR/etc/asterisk/dahdi-channels.conf \
+ dahdi_genconf
+ if [ "$DYNAMIC_LOC" = yes ]; then
+ cat "$DESTDIR/etc/dahdi/dynamic.conf" >>"$DESTDIR/etc/dahdi/system.conf"
+ fi
+ dahdi_cfg -c $DESTDIR/etc/dahdi/system.conf
+ # TODO: fxotune, hpec
+}
+
+run_asterisk() {
+ $AST_SCRIPT start
}
usage() {
@@ -154,6 +215,8 @@
echo "$me load /etc/init.d/dahdi start"
echo "$me reload /etc/init.d/dahdi restart"
echo "$me xpp-firm (Reset and load xpp firmware)"
+ echo "$me genconf dahdi_genconf; dahdi_cfg"
+ echo "$me asterisk /etc/init.d/asterisk start"
echo "$me rsync TARGET (copy filea to /tmp/live in host TARGET)"
echo "$me exec COMMAND (Run COMMAND in 'live' environment)"
echo ""
@@ -175,6 +238,12 @@
shift
cd "$TOOLS_DIR"; make config DESTDIR=$DESTDIR "$@"
mkdir -p $DESTDIR/etc/asterisk
+ cat >"$FIRMWARE_DIR/live-init.conf" <<EOF
+PATH="$PATH" # FIXME: add to existing \$PATH?
+export PATH
+dahdiconfdir="${DESTDIR}/etc/dahdi"
+export dahdiconfdir
+EOF
;;
rsync)
if [ $# -ne 2 ]; then
@@ -188,6 +257,7 @@
unload)
# OK for Asterisk not to be running. TODO: a better test?
$AST_SCRIPT stop || :
+ unload_dynamic
for mod in $REMOVE_MODULES; do
unload_module $mod
done
@@ -196,24 +266,27 @@
# TODO: Find a way to use modprobe.
# Or implement a way to pass arguments to modules here (yuck)
set_modules_to_load
- modprobe crc_ccitt || : # FIXME: Make this optional?
+ for mod in $EXTRA_MODS; do
+ modprobe $mod || : # FIXME: Make this optional?
+ done
for module in $MODULES_LOAD; do
eval module_args="\$`basename ${module}`_ARGS"
insmod $MODULES_DIR/$module.ko $module_args
done
xpp_startup
- GENCONF_PARAMETERS=$DESTDIR/etc/dahdi/genconf_parameters \
- DAHDI_CONF_FILE=$DESTDIR/etc/dahdi/system.conf \
- DAHDI_MODS_FILE=$DESTDIR/etc/dahdi/modules \
- CHAN_DAHDI_CHANNELS_FILE=$DESTDIR/etc/asterisk/dahdi-channels.conf \
- dahdi_genconf
- dahdi_cfg -c $DESTDIR/etc/dahdi/system.conf
- # TODO: fxotune, hpec
+ load_dynamic
+ genconf
# or find a way to reuse init.d start sequence.
# TODO: A local copy of Asterisk, configured with dahdi_gnconf.
# doable, but trickier.
- $AST_SCRIPT start
+ run_asterisk
+ ;;
+genconf)
+ genconf
+ ;;
+asterisk)
+ run_asterisk
;;
reload)
$0 unload
@@ -235,10 +308,10 @@
# Still broken. Needs to be run several times.
# set XPP_HOTPLUG_DISABLED=yes in /etc/dahdi/init.conf
XPP_FIRMWARE_DIR=$FIRMWARE_DIR \
- sh "$TOOLS_DIR"/xpp/xpp_fxloader reset
+ "$FIRMWARE_DIR/xpp_fxloader" reset
sleep 5
XPP_FIRMWARE_DIR=$FIRMWARE_DIR \
- sh "$TOOLS_DIR"/xpp/xpp_fxloader load
+ "$FIRMWARE_DIR/xpp_fxloader" load
;;
help|'')
usage
Propchange: freebsd/trunk/drivers/dahdi/
('svn:externals' removed)
Modified: freebsd/trunk/drivers/dahdi/Kbuild
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/Kbuild?view=diff&rev=9173&r1=9172&r2=9173
==============================================================================
--- freebsd/trunk/drivers/dahdi/Kbuild (original)
+++ freebsd/trunk/drivers/dahdi/Kbuild Sun Aug 22 06:48:38 2010
@@ -62,6 +62,10 @@
# as part of an ALSA backport. TODO: Any better way to detect that?
ifeq (1,$(shell fgrep -q ' hrtimer_set_expires' include/linux/hrtimer.h 2>/dev/null && echo 1))
EXTRA_CFLAGS+=-DHAVE_HRTIMER_ACCESSORS=1
+endif
+
+ifeq (1,$(shell fgrep -q 'wait_for_completion_timeout' include/linux/completion.h 2>/dev/null && echo 1))
+CFLAGS_MODULE+=-DHAVE_WAIT_FOR_COMPLETION_TIMEOUT=1
endif
# In 2.6.18 skb_linearize changed; however, some distros backported the change
Modified: freebsd/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9173&r1=9172&r2=9173
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi-base.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi-base.c Sun Aug 22 06:48:38 2010
@@ -106,6 +106,8 @@
#endif
#include "hpec/hpec_user.h"
+
+#include <stdbool.h>
#if defined(EMPULSE) && defined(EMFLASH)
#error "You cannot define both EMPULSE and EMFLASH"
@@ -895,6 +897,58 @@
memset(conf_sums_next, 0, maxconfs * sizeof(sumtype));
}
+
+/**
+ * can_dacs_chans() - Returns true if it may be possible to dacs two channels.
+ *
+ */
+static bool can_dacs_chans(struct dahdi_chan *dst, struct dahdi_chan *src)
+{
+ if (src && dst && src->span && dst->span && src->span->ops &&
[... 14819 lines stripped ...]
More information about the dahdi-commits
mailing list