Compare commits
36 Commits
debian/1%2
...
master
Author | SHA1 | Date |
---|---|---|
Harald Welte | 7160050851 | |
Harald Welte | 8b1300c64f | |
Harald Welte | 25db1de549 | |
Tzafrir Cohen | 99e1eb3931 | |
Tzafrir Cohen | b4d232a16b | |
Tzafrir Cohen | 55cd742b33 | |
Tzafrir Cohen | 980780d920 | |
Tzafrir Cohen | 5cf4228733 | |
Tzafrir Cohen | 2522272bb0 | |
Tzafrir Cohen | b32b05b65c | |
Tzafrir Cohen | e97af70c68 | |
Tzafrir Cohen | b5f85ef682 | |
Tzafrir Cohen | e89188c691 | |
Tzafrir Cohen | c47c863de8 | |
Tzafrir Cohen | 3b4ebbb6f2 | |
Tzafrir Cohen | 950ac20608 | |
Tzafrir Cohen | b87cbc284f | |
Tzafrir Cohen | 845b5cad9d | |
Tzafrir Cohen | 7d85dfbec2 | |
Tzafrir Cohen | 78754c91e2 | |
Tzafrir Cohen | a018543a58 | |
Tzafrir Cohen | 01c96f1dbe | |
Tzafrir Cohen | 12a607fe15 | |
Tzafrir Cohen | cd6136cec1 | |
Tzafrir Cohen | 49fd3ad883 | |
Tzafrir Cohen | b262662bf4 | |
Tzafrir Cohen | 3a3f5811fd | |
Tzafrir Cohen | 5f8a26faed | |
Tzafrir Cohen | 7d1b43d757 | |
Bernhard Schmidt | e91aa93bfb | |
Tzafrir Cohen | 9882223b59 | |
Tzafrir Cohen | e8300f5f29 | |
Tzafrir Cohen | 30a76fb778 | |
Tzafrir Cohen | 0a75720af7 | |
Tzafrir Cohen | 040980e53f | |
Oron Peled | 99e3c572d1 |
|
@ -12,6 +12,7 @@
|
|||
.libs
|
||||
.dirstamp
|
||||
.version
|
||||
/.pc
|
||||
Makefile
|
||||
Makefile.in
|
||||
auxdir/
|
||||
|
|
|
@ -5,7 +5,7 @@ LEGACY_MAKE = \
|
|||
top_srcdir=$(top_srcdir) \
|
||||
srcdir=$(srcdir)
|
||||
|
||||
CFLAGS = -g -Wall -O2 $(DAHDI_INCLUDE)
|
||||
CFLAGS += -g -Wall -O2 $(DAHDI_INCLUDE)
|
||||
if DAHDI_DEVMODE
|
||||
CFLAGS += \
|
||||
-Werror \
|
||||
|
|
|
@ -86,7 +86,7 @@ install: all install-programs
|
|||
@echo "### DAHDI tools installed successfully."
|
||||
@echo "### If you have not done so before, install init scripts with:"
|
||||
@echo "###"
|
||||
@echo "### make config"
|
||||
@echo "### make install-config"
|
||||
@echo "###"
|
||||
@echo "###################################################"
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ __dahdi_span_types() {
|
|||
has_cmd=0
|
||||
for (( i=0; i < COMP_CWORD; i++)); do
|
||||
case "${COMP_WORDS[$i]}" in
|
||||
dumpconfig | list | set)
|
||||
dumpconfig | list | set | compare)
|
||||
has_cmd=1
|
||||
break
|
||||
;;
|
||||
|
@ -69,7 +69,7 @@ __dahdi_span_types() {
|
|||
grep -l '[EJT]1' /sys/devices/pci0000:00/0000:00:10.4/usb1/1-1/xbus-00/*/spantype 2>/dev/null | sed -e 's|/spantype||') )
|
||||
else
|
||||
COMPREPLY=( ${COMPREPLY[@]} $(compgen -W \
|
||||
'dumpconfig list set' -- $cur) )
|
||||
'dumpconfig list set compare' -- $cur) )
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -66,6 +66,8 @@ usage() {
|
|||
echo >&2 " add - assign spans, according to /etc/dahdi/assigned-spans.conf"
|
||||
echo >&2 " remove - unassign spans"
|
||||
echo >&2 " list - human-readable list of all spans"
|
||||
echo >&2 " matched - found spans matched in configuration"
|
||||
echo >&2 " unmatched - found spans not matched in configuration"
|
||||
echo >&2 " dumpconfig - dump current state as new configuration"
|
||||
echo >&2 ""
|
||||
echo >&2 " options:"
|
||||
|
@ -109,7 +111,7 @@ while true ; do
|
|||
break
|
||||
;;
|
||||
*)
|
||||
echo "Internal error!"
|
||||
echo >&2 "Internal error!"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
@ -215,10 +217,10 @@ unassign_all_spans() {
|
|||
sort | while read spandir; do
|
||||
local_spanno=`cat "$spandir/local_spanno"`
|
||||
if [ "$dry_run" = true ]; then
|
||||
echo "(dry-run) unassign $device $local_spanno"
|
||||
echo >&2 "(dry-run) unassign $device $local_spanno"
|
||||
continue
|
||||
fi
|
||||
echo "unassign $device $local_spanno"
|
||||
echo >&2 "unassign $device $local_spanno"
|
||||
if ! echo "$local_spanno" > "$device/unassign_span"; then
|
||||
echo >&2 "$0: failed unassigning '$local_spanno' in '$device'"
|
||||
fi
|
||||
|
@ -245,12 +247,12 @@ assign_device_spans() {
|
|||
if [ -d "$span" ]; then
|
||||
span_local_spanno=`cat "$span/local_spanno"`
|
||||
if [ "$span_local_spanno" != "$local_spanno" ]; then
|
||||
echo "WARNING: $span_local_spanno != $local_spanno"
|
||||
echo >&2 "WARNING: $span_local_spanno != $local_spanno"
|
||||
fi
|
||||
echo "$device [$local_spanno] already assigned to span $spanno. Skipping..."
|
||||
echo >&2 "$device [$local_spanno] already assigned to span $spanno. Skipping..."
|
||||
continue
|
||||
fi
|
||||
echo "assign $device: $s"
|
||||
echo >&2 "assign $device: $s"
|
||||
if ! echo "$s" > "$device/assign_span"; then
|
||||
echo >&2 "$0: failed assigning '$s' to '$device'"
|
||||
fi
|
||||
|
@ -267,21 +269,21 @@ match_device() {
|
|||
# We use case to enable shell-style globbing in configuration
|
||||
case "$hardware_id" in
|
||||
$id)
|
||||
[ "$verbose" = true ] && echo "match by hwid ($id ~ $hardware_id): $spanspecs"
|
||||
[ "$verbose" = true ] && echo >&2 "match by hwid ($id ~ $hardware_id): $spanspecs"
|
||||
assign_device_spans "$device"
|
||||
;;
|
||||
esac
|
||||
# We use case to enable shell-style globbing in configuration
|
||||
case "$location" in
|
||||
$id)
|
||||
[ "$verbose" = true ] && echo "match by location ($id ~ $location): $spanspecs"
|
||||
[ "$verbose" = true ] && echo >&2 "match by location ($id ~ $location): $spanspecs"
|
||||
assign_device_spans "$device"
|
||||
;;
|
||||
esac
|
||||
# We use case to enable shell-style globbing in configuration
|
||||
case "$devpath" in
|
||||
$id)
|
||||
[ "$verbose" = true ] && echo "match by devpath ($id ~ $devpath): $spanspecs"
|
||||
[ "$verbose" = true ] && echo >&2 "match by devpath ($id ~ $devpath): $spanspecs"
|
||||
assign_device_spans "$device"
|
||||
;;
|
||||
esac
|
||||
|
@ -293,7 +295,7 @@ assign_devices() {
|
|||
echo >&2 "$0: Missing '$DAHDISASSIGNEDSPANSCONF'"
|
||||
exit 1
|
||||
fi
|
||||
echo "using '$DAHDISASSIGNEDSPANSCONF'"
|
||||
echo >&2 "using '$DAHDISASSIGNEDSPANSCONF'"
|
||||
for device in $DEVICES
|
||||
do
|
||||
match_device "$device"
|
||||
|
@ -303,13 +305,71 @@ assign_devices() {
|
|||
auto_assign_devices() {
|
||||
for device in $DEVICES
|
||||
do
|
||||
echo "auto-assign $device"
|
||||
echo >&2 "auto-assign $device"
|
||||
if [ "$dry_run" != true ]; then
|
||||
echo 1 > "$device/auto_assign"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
dev_match_conf() {
|
||||
local devpath="$1"
|
||||
local location="$2"
|
||||
local hardware_id="$3"
|
||||
local local_spanno="$4"
|
||||
filter_conf | while read id spanspecs
|
||||
do
|
||||
spanno=`echo "$spanspecs" | cut -d: -f1`
|
||||
match_dev=no
|
||||
# We use case to enable shell-style globbing in configuration
|
||||
case "$hardware_id" in
|
||||
$id)
|
||||
match_dev=yes
|
||||
;;
|
||||
esac
|
||||
# We use case to enable shell-style globbing in configuration
|
||||
case "$location" in
|
||||
$id)
|
||||
match_dev=yes
|
||||
;;
|
||||
esac
|
||||
# We use case to enable shell-style globbing in configuration
|
||||
case "$devpath" in
|
||||
$id)
|
||||
match_dev=yes
|
||||
;;
|
||||
esac
|
||||
if [ "$match_dev" = 'yes' -a "$local_spanno" = "$spanno" ]; then
|
||||
#printf "%-8s (%s) %-14s %s %s\n" "$local_spanno" "$spanno" "[$hardware_id]" "$location" "$devpath"
|
||||
echo "[$hardware_id]:$local_spanno"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
list_devices() {
|
||||
wanted="$1"
|
||||
if [ ! -f "$DAHDISASSIGNEDSPANSCONF" ]; then
|
||||
echo >&2 "$0: Missing '$DAHDISASSIGNEDSPANSCONF'"
|
||||
exit 1
|
||||
fi
|
||||
echo >&2 "using '$DAHDISASSIGNEDSPANSCONF'"
|
||||
for device in $DEVICES
|
||||
do
|
||||
devpath=`cd "$device" && pwd -P`
|
||||
location='@'`attr_clean "$device/location"`
|
||||
hardware_id=`attr_clean "$device/hardware_id"`
|
||||
for local_spanno in `cut -d: -f1 "$device/spantype"`
|
||||
do
|
||||
found=`dev_match_conf "$devpath" "$location" "$hardware_id" "$local_spanno"`
|
||||
if [ "$wanted" = "unmatched" ]; then
|
||||
[ -z "$found" ] && echo "[$hardware_id]:$local_spanno"
|
||||
else
|
||||
[ -z "$found" ] || echo "[$hardware_id]:$local_spanno"
|
||||
fi
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
case "$action" in
|
||||
auto)
|
||||
auto_assign_devices
|
||||
|
@ -326,6 +386,12 @@ list)
|
|||
dumpconfig)
|
||||
dump_config
|
||||
;;
|
||||
matched)
|
||||
list_devices "matched"
|
||||
;;
|
||||
unmatched)
|
||||
list_devices "unmatched"
|
||||
;;
|
||||
*)
|
||||
echo >&2 "Bad action='$action'"
|
||||
usage
|
||||
|
|
|
@ -69,6 +69,7 @@ usage() {
|
|||
echo >&2 "Usage: $0 [options] action [devpath ...]"
|
||||
echo >&2 " action:"
|
||||
echo >&2 " set - set spans to E1/T1 according to /etc/dahdi/span-types.conf"
|
||||
echo >&2 " compare - show config values that differ from system"
|
||||
echo >&2 " list - human-readable list of all spans"
|
||||
echo >&2 " dumpconfig - dump current state in /etc/dahdi/span-types.conf format"
|
||||
echo >&2 ""
|
||||
|
@ -88,6 +89,8 @@ if [ $? != 0 ]; then
|
|||
usage
|
||||
fi
|
||||
|
||||
compare=false
|
||||
|
||||
# Note the quotes around `$TEMP': they are essential!
|
||||
eval set -- "$TEMP"
|
||||
|
||||
|
@ -321,13 +324,26 @@ handle_span() {
|
|||
echo >&2 "Set $devname span $spanno = $val"
|
||||
fi
|
||||
if [ "$dry_run" != 'true' ]; then
|
||||
echo "$spanno:$val" > "$attr_file"
|
||||
if [ "$compare" = 'true' ]; then
|
||||
config="$spanno:$val"
|
||||
system=`grep "$spanno:" "$attr_file"`
|
||||
if [ "$config" != "$system" ]; then
|
||||
|
||||
active_val=`echo $system | cut -d: -f2`
|
||||
echo "$devname $spanno $val $active_val" >>"$compare_results_file"
|
||||
fi
|
||||
else
|
||||
echo "$spanno:$val" > "$attr_file"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
set_all_devices() {
|
||||
span_differs='false'
|
||||
SPANS_DIFFER='false'
|
||||
|
||||
if [ ! -f "$DAHDISPANTYPESCONF" ]; then
|
||||
echo >&2 "$0: Missing configuration '$DAHDISPANTYPESCONF'"
|
||||
exit 1
|
||||
|
@ -348,6 +364,16 @@ set_all_devices() {
|
|||
esac
|
||||
done
|
||||
done
|
||||
if [ "$compare" = 'true' ]; then
|
||||
if [ -s "$compare_results_file" ]; then
|
||||
echo "# Device Unit Config Active"
|
||||
cat "$compare_results_file"
|
||||
rm -f "$compare_results_file"
|
||||
exit 5
|
||||
fi
|
||||
rm -f "$compare_results_file"
|
||||
exit 0
|
||||
fi
|
||||
}
|
||||
|
||||
case "$action" in
|
||||
|
@ -360,6 +386,11 @@ dumpconfig)
|
|||
set)
|
||||
set_all_devices
|
||||
;;
|
||||
compare)
|
||||
compare=true
|
||||
compare_results_file=`mktemp`
|
||||
set_all_devices
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
|
|
|
@ -64,7 +64,7 @@ void hup_handler(int sig)
|
|||
printf("\n--- Results after %d passes ---\n", pass);
|
||||
printf("Best: %.3f%% -- Worst: %.3f%% -- Average: %f%%\n",
|
||||
best, worst, pass ? total/pass : 100.00);
|
||||
printf("Cummulative Accuracy (not per pass): %0.3f\n",
|
||||
printf("Cumulative Accuracy (not per pass): %0.3f\n",
|
||||
pass ? accuracy : 0.0);
|
||||
exit(0);
|
||||
}
|
||||
|
|
|
@ -1,3 +1,44 @@
|
|||
dahdi-tools (1:3.1.0-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
* dahdi-tools-3.1.0-fno-common.patch (Closes: #957117)
|
||||
* Don't include non-installed files (fix_install_paths.patch)
|
||||
* compat level 13
|
||||
* debian/watch: use a secure URI
|
||||
* rename TODO.Debian => TODO (lintian)
|
||||
|
||||
-- Tzafrir Cohen <tzafrir@debian.org> Tue, 25 Aug 2020 23:01:45 +0300
|
||||
|
||||
dahdi-tools (1:3.0.0-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
- Patches no_xtalk_send, udevadm_path and dracut removed: merged upstream.
|
||||
* dahdi_spantypes.patch (Closes: #916577)
|
||||
* Patch init_unload_oslec: dropped. dahdi.init removed
|
||||
* Update upstream signing keys
|
||||
* Standard version 4.3.0
|
||||
* Zaptel is long gone. No need to obsolete it
|
||||
* debian/rules: remove get-orig-source
|
||||
* typos.patch: a typo in astribank_is_starting (lintian)
|
||||
* Remove unused patches
|
||||
* build fix: external CFLAGS are ignored
|
||||
* watch: use uupdate instead of svn-upgrade
|
||||
|
||||
-- Tzafrir Cohen <tzafrir@debian.org> Mon, 04 Mar 2019 01:51:06 +0200
|
||||
|
||||
dahdi-tools (1:2.11.1-3) unstable; urgency=medium
|
||||
|
||||
* Team upload.
|
||||
|
||||
[ Tzafrir Cohen ]
|
||||
* Allow building with just asciidoc-base
|
||||
* add udevadm_path.patch (Closes: #852561)
|
||||
* Add dracut.patch: exclude xpp from dracut initramfs
|
||||
* Compat level 10
|
||||
* watch file: copy gpg sig check from dahdi-linux
|
||||
|
||||
-- Bernhard Schmidt <berni@debian.org> Wed, 11 Oct 2017 08:13:56 +0200
|
||||
|
||||
dahdi-tools (1:2.11.1-2) unstable; urgency=medium
|
||||
|
||||
* VCS: we use git
|
||||
|
@ -44,7 +85,7 @@ dahdi-tools (1:2.10.0.1-1) unstable; urgency=low
|
|||
* New upstream release (Closes: #765377).
|
||||
- xpp_revert_clear_halt.patch merged upstream.
|
||||
* Compat level 9.
|
||||
* debian-cflags.patch: some cases where build flags were not passed
|
||||
* debian-cflags.patch: some cases where build flags were not passed
|
||||
* Multi-arch headers.
|
||||
|
||||
-- Tzafrir Cohen <tzafrir@debian.org> Sun, 26 Oct 2014 20:46:32 +0200
|
||||
|
@ -94,7 +135,7 @@ dahdi-tools (1:2.7.0-1) unstable; urgency=low
|
|||
dahdi-tools 2.6.3. A further build fix for gcc 4.8 (Closes: #707391).
|
||||
* Enable pinned spans support.
|
||||
|
||||
[ Mark Purcell ]
|
||||
[ Mark Purcell ]
|
||||
* Fix "FTBFS: astribank_hexload.c:36:27: fatal error: ../autoconfig.h:
|
||||
No such file or directory" new upstream release (Closes: #707391)
|
||||
|
||||
|
@ -147,16 +188,16 @@ dahdi-tools (1:2.2.1-1) unstable; urgency=low
|
|||
|
||||
[ Tzafrir Cohen ]
|
||||
* New upstream release (Closes: #536257, #564381).
|
||||
* Patch 'bashism' dropped: merged upstream.
|
||||
* Patch xpp_no_extra_at dropped: merged upstream.
|
||||
* Patch 'bashism' dropped: merged upstream.
|
||||
* Patch xpp_no_extra_at dropped: merged upstream.
|
||||
* Add an example genconf_parameters.
|
||||
* Compat level 7.
|
||||
* Bump standars version to 3.8.3.0 (no change needed)
|
||||
* Udev rules are now in dahdi-linux.
|
||||
* Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some
|
||||
minor perl issues.
|
||||
* Add the missing ${misc:Depends}, as per lintian.
|
||||
* Patch astribank_allow_ignoreend: an extra missing patch from upstream.
|
||||
* Add the missing ${misc:Depends}, as per lintian.
|
||||
* Patch astribank_allow_ignoreend: an extra missing patch from upstream.
|
||||
* Patches init_unload_modules and init_unload_oslec: also unload OSLEC
|
||||
when unloading all modules.
|
||||
|
||||
|
@ -168,7 +209,7 @@ dahdi-tools (1:2.2.0-1) unstable; urgency=low
|
|||
* New upstream release.
|
||||
* Patch bashism: fixes bashism in waitfor_xpds (Closes: #535865).
|
||||
* Patch hardware_rescan: backport Dahdi::Hardware->rescan()
|
||||
* Patch no_extra_at: backport of a per/xpp fix.
|
||||
* Patch no_extra_at: backport of a per/xpp fix.
|
||||
|
||||
[ Mark Purcell ]
|
||||
* Reorder debian/watch to correctly handle upstream -rc
|
||||
|
@ -204,15 +245,15 @@ dahdi-tools (1:2.2.0~rc2-1) unstable; urgency=low
|
|||
dahdi-tools (1:2.1.0.2-1) experimental; urgency=low
|
||||
|
||||
[ Tzafrir Cohen ]
|
||||
* Zaptel renamed DAHDI and split to dahdi-linux and dahdi-tools.
|
||||
* Zaptel renamed DAHDI and split to dahdi-linux and dahdi-tools.
|
||||
* This package no longer includes drivers and m-a magic.
|
||||
* DAHDI is incompatible (ABI and API) with Zaptel.
|
||||
* NEW libtonezone2.0 due to its usage of DAHDI.
|
||||
* Programs renamed. E.g. dahdi_cfg instead of ztcfg.
|
||||
* Configurations files are now under /etc/dahdi .
|
||||
* Using the upstream init.d script. This script is responsible for
|
||||
* Using the upstream init.d script. This script is responsible for
|
||||
loading modules unlike the Zaptel one.
|
||||
* Depend on groff and man-db for man -Thtml used in the upstream
|
||||
* Depend on groff and man-db for man -Thtml used in the upstream
|
||||
'docs' target.
|
||||
* Delete false(?) libtonezone.so.1 symlinks.
|
||||
* Add missing dh_perl check (for perl modules).
|
||||
|
@ -226,7 +267,7 @@ dahdi-tools (1:2.1.0.2-1) experimental; urgency=low
|
|||
zaptel (1:1.4.11~dfsg-3) unstable; urgency=low
|
||||
|
||||
* zaptel.init: exit on a different condition: Nicer handling of ztdummy.
|
||||
* zaptel.init: Give a sane default to XPP_SYNC.
|
||||
* zaptel.init: Give a sane default to XPP_SYNC.
|
||||
|
||||
-- Tzafrir Cohen <tzafrir.cohen@xorcom.com> Mon, 03 Nov 2008 09:35:23 +0200
|
||||
|
||||
|
@ -248,7 +289,7 @@ zaptel (1:1.4.11~dfsg-2) unstable; urgency=low
|
|||
* Patch device_class_2626: Fix building 2.6.26 (Closes: #493397).
|
||||
* Using dh_lintian for lintian overrides, hence requiring debhelper 6.0.7.
|
||||
* Lintian: we know we have direct changes. Too bad we're half-upstream :-(
|
||||
* Fix doc-base section names.
|
||||
* Fix doc-base section names.
|
||||
|
||||
-- Tzafrir Cohen <tzafrir.cohen@xorcom.com> Thu, 28 Aug 2008 22:58:23 +0300
|
||||
|
||||
|
@ -328,7 +369,7 @@ zaptel (1:1.4.9.2~dfsg-1) unstable; urgency=low
|
|||
(Closes: #447245).
|
||||
* Adjusted lintian overrides: mknod is now called from a function.
|
||||
* Adjust vzaphfc to netdevice API changes in kernel 2.6.24.
|
||||
* Once again ignoring 'make distclean' errors: it will fail if we don't
|
||||
* Once again ignoring 'make distclean' errors: it will fail if we don't
|
||||
have kernel sources / headers for current kernel :-( .
|
||||
* Remove some unnecessary changes from the florz zaphfc patch - fixes zaphfc
|
||||
warning.
|
||||
|
@ -440,7 +481,7 @@ zaptel (1:1.4.5.1~dfsg-1) unstable; urgency=low
|
|||
zaptel (1:1.4.5~dfsg-1) unstable; urgency=low
|
||||
|
||||
* New Upstream Maintenance Release
|
||||
- support for Digium's new 32 channel hardware echo canceler
|
||||
- support for Digium's new 32 channel hardware echo canceler
|
||||
(VPMADT032) for the TDM800P and TDM2400P
|
||||
|
||||
[ Tzafrir Cohen ]
|
||||
|
@ -493,8 +534,8 @@ zaptel (1:1.4.4~dfsg-1) unstable; urgency=low
|
|||
zaptel (1:1.4.3~dfsg-2) unstable; urgency=low
|
||||
|
||||
[ Tzafrir Cohen ]
|
||||
* Fixed and re-added zaptel_perl.
|
||||
* And added zaptel_hardware (zaptel hardware lister), just for fun.
|
||||
* Fixed and re-added zaptel_perl.
|
||||
* And added zaptel_hardware (zaptel hardware lister), just for fun.
|
||||
|
||||
-- Tzafrir Cohen <tzafrir.cohen@xorcom.com> Sat, 09 Jun 2007 03:36:17 +0300
|
||||
|
||||
|
@ -810,7 +851,7 @@ zaptel (1:1.2.4-1) unstable; urgency=low
|
|||
* Makefile_kbuild.dpatch: modified, as it was not properly merged in
|
||||
upstream
|
||||
* Makefile_bristuff.dpatch: really build zaptel modules again
|
||||
* Makefile_xpp: fixed.
|
||||
* Makefile_xpp: fixed.
|
||||
* debian/modulestest: a script for postbuild of zaptel modules from a svn
|
||||
build
|
||||
* zaptel-source: removing unnecessary dependency on dpatch
|
||||
|
@ -820,7 +861,7 @@ zaptel (1:1.2.4-1) unstable; urgency=low
|
|||
zaptel (1:1.2.3-2) unstable; urgency=low
|
||||
|
||||
* bristuff 0.3.0-PRE1k. Also, renamed the dpatch to simply "bristuff"
|
||||
* updated version in dot_version.dpatch.
|
||||
* updated version in dot_version.dpatch.
|
||||
* Include build_tools and .version in copied files
|
||||
* newer versions of genzaptelconf and xpp.dpatch
|
||||
|
||||
|
@ -847,7 +888,7 @@ zaptel (1:1.2.1-3) unstable; urgency=low
|
|||
|
||||
zaptel (1:1.2.1-2) unstable; urgency=low
|
||||
|
||||
* Added bristuff 0.3.0-PRE1d patch. bristuff re-enabled.
|
||||
* Added bristuff 0.3.0-PRE1d patch. bristuff re-enabled.
|
||||
(Closes: #340627, #344432)
|
||||
* Documentation fixes (Closes: #316801)
|
||||
* Makefile_targets.dpatch is ba its small self
|
||||
|
@ -971,9 +1012,9 @@ zaptel (1:1.0.9.1-3) unstable; urgency=low
|
|||
zaptel (1:1.0.9.1-2) unstable; urgency=low
|
||||
|
||||
* Closes: #302836: zaptel-source: zaphfc module missing after
|
||||
compiling modules.
|
||||
compiling modules.
|
||||
* Closes: #323753: zaptel-source: cannot compile zaphfc in unstable
|
||||
with gcc-4.0.1.
|
||||
with gcc-4.0.1.
|
||||
|
||||
-- Santiago Ruano Rincon <santiago@unicauca.edu.co> Fri, 19 Aug 2005 00:40:56 -0500
|
||||
|
||||
|
@ -1019,7 +1060,7 @@ zaptel (1:1.0.9-3) unstable; urgency=low
|
|||
zaptel (1:1.0.9-2) unstable; urgency=low
|
||||
|
||||
* Import bristuff-0.2.0-RC8h.dpatch
|
||||
* Enable rtia.dpatch
|
||||
* Enable rtia.dpatch
|
||||
|
||||
-- Mark Purcell <msp@debian.org> Mon, 4 Jul 2005 02:35:37 +0100
|
||||
|
||||
|
@ -1027,7 +1068,7 @@ zaptel (1:1.0.9-1) unstable; urgency=low
|
|||
|
||||
* New upstream release
|
||||
* Disable bristuff to allow 1.0.9 upload
|
||||
* Disable rtia to allow 1.0.9 upload
|
||||
* Disable rtia to allow 1.0.9 upload
|
||||
|
||||
-- Mark Purcell <msp@debian.org> Sun, 3 Jul 2005 15:51:32 +0100
|
||||
|
||||
|
@ -1104,7 +1145,7 @@ zaptel (1:1.0.7-2) unstable; urgency=medium
|
|||
|
||||
* Kilian Krause:
|
||||
+ Increased urgency for fixing RC-bug and this is the last deb to
|
||||
allow the whole Debian VoIP suit proceed to testing.
|
||||
allow the whole Debian VoIP suit proceed to testing.
|
||||
|
||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Sat, 2 Apr 2005 01:14:23 +0200
|
||||
|
||||
|
@ -1136,7 +1177,7 @@ zaptel (1:1.0.4-3) unstable; urgency=low
|
|||
-- Kilian Krause <kk@verfaction.de> Thu, 24 Feb 2005 01:42:36 +0100
|
||||
|
||||
zaptel (1:1.0.4-2) experimental; urgency=low
|
||||
|
||||
|
||||
* Better "use" of uname -r in Makefile for zaptel-source
|
||||
|
||||
-- Santiago Ruano Rincon <santiago@unicauca.edu.co> Mon, 21 Feb 2005 00:27:14 -0500
|
||||
|
@ -1152,8 +1193,8 @@ zaptel (1:1.0.4-1) experimental; urgency=low
|
|||
-- Santiago Ruano Rincon <santiago@unicauca.edu.co> Wed, 26 Jan 2005 23:05:20 -0500
|
||||
|
||||
zaptel (1:1.0.2-2) unstable; urgency=low
|
||||
|
||||
* libtonezone out of zaptel-source
|
||||
|
||||
* libtonezone out of zaptel-source
|
||||
* /dev/zap/ are now created by zaptel.postinst and deleted by
|
||||
zaptel.postrm. Now, the zap devices match with the upstream version
|
||||
(Closes: #274384).
|
||||
|
@ -1163,13 +1204,13 @@ zaptel (1:1.0.2-2) unstable; urgency=low
|
|||
-- Santiago Ruano Rincon <santiago@unicauca.edu.co> Wed, 24 Nov 2004 22:05:52 -0500
|
||||
|
||||
zaptel (1:1.0.2-1) unstable; urgency=low
|
||||
|
||||
|
||||
* New upstream release (zaptel-1.0.2)
|
||||
|
||||
|
||||
-- Santiago Ruano Rincon <santiago@unicauca.edu.co> Sat, 30 Oct 2004 00:51:54 -0500
|
||||
|
||||
zaptel (1:1.0.0-2) unstable; urgency=low
|
||||
|
||||
|
||||
* New maintainer (Closes: #251938).
|
||||
* Man pages created for ztcfg, ztmonitor and zttool
|
||||
(Closes: #274632, #274633, #274634).
|
||||
|
@ -1178,7 +1219,7 @@ zaptel (1:1.0.0-2) unstable; urgency=low
|
|||
* zaptel-modules can be build from zaptel-source with
|
||||
make-kpkg (Closes: #274085).
|
||||
* Now it compiles for 2.6 Kernels (Closes: #251930).
|
||||
|
||||
|
||||
-- Santiago Ruano Rincon <santiago@unicauca.edu.co> Sun, 26 Sep 2004 02:05:44 -0500
|
||||
|
||||
zaptel (1:1.0.0-1) unstable; urgency=low
|
||||
|
@ -1197,7 +1238,7 @@ zaptel (1:0.8.1+1.0-RC2-1) unstable; urgency=low
|
|||
zaptel (1:0.8.1+1.0-RC1-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* Add a debian/watch file
|
||||
* Add a debian/watch file
|
||||
|
||||
-- Mark Purcell <msp@debian.org> Wed, 21 Jul 2004 17:51:22 +1000
|
||||
|
||||
|
@ -1278,4 +1319,3 @@ zaptel (0.cvs.20020624-1) unstable; urgency=low
|
|||
* Initial Release (Closes: #150874)
|
||||
|
||||
-- Matt Zimmerman <mdz@debian.org> Mon, 17 Jun 2002 10:31:21 -0400
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
9
|
||||
10
|
||||
|
|
|
@ -4,36 +4,34 @@ Priority: optional
|
|||
Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org>
|
||||
Uploaders: Tzafrir Cohen <tzafrir@debian.org>, Mark Purcell <msp@debian.org>
|
||||
# groff, man-db and asciidoc are required for generating documentation
|
||||
Build-Depends: debhelper (>= 9),
|
||||
Build-Depends: debhelper (>= 10),
|
||||
autoconf,
|
||||
automake,
|
||||
cpio,
|
||||
dh-autoreconf,
|
||||
pkg-config,
|
||||
dahdi-source (>= 1:2.7),
|
||||
linux-libc-dev,
|
||||
libnewt-dev,
|
||||
bzip2,
|
||||
libusb-1.0-0-dev,
|
||||
asciidoc,
|
||||
asciidoc-base | asciidoc,
|
||||
groff,
|
||||
man-db,
|
||||
Standards-Version: 3.9.8
|
||||
Standards-Version: 4.3.0
|
||||
Homepage: http://www.asterisk.org/
|
||||
Vcs-Git: https://anonscm.debian.org/git/pkg-voip/dahdi-tools.git
|
||||
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/dahdi-tools.git
|
||||
Vcs-Git: https://salsa.debian.org/pkg-voip-team/dahdi-tools.git
|
||||
Vcs-Browser: https://salsa.debian.org/pkg-voip-team/dahdi-tools
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: dahdi
|
||||
Architecture: linux-any
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, procps, fxload, dahdi-linux, usbutils
|
||||
Conflicts: zaptel
|
||||
Replaces: zaptel
|
||||
Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, procps, fxload, usbutils
|
||||
Description: utilities for using the DAHDI kernel modules
|
||||
DAHDI (formly Zaptel) is an interface for telephony devices used by e.g.
|
||||
the Asterisk PBX software. The dahdi-* packages provide the kernel
|
||||
DAHDI (formly Zaptel) is an interface for telephony devices used by e.g.
|
||||
the Asterisk PBX software. The dahdi-* packages provide the kernel
|
||||
DAHDI kernel modules and their required setup environment.
|
||||
.
|
||||
This package includes userspace utilities required to configure DAHDI
|
||||
This package includes userspace utilities required to configure DAHDI
|
||||
modules.
|
||||
|
||||
Package: libtonezone2.0
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
hotplug/span_config.d/50-asterisk
|
||||
xpp/genconf_parameters
|
||||
*.conf.sample
|
||||
*.conf
|
||||
|
|
|
@ -2,3 +2,5 @@ usr/sbin/*
|
|||
usr/share/perl5/Dahdi*
|
||||
usr/share/dahdi/*
|
||||
usr/share/man/man8/*
|
||||
usr/lib/dracut/dracut.conf.d/50-dahdi.conf
|
||||
usr/share/bash-completion/completions/dahdi
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
libtonezone.so.2.0 libtonezone2.0 #MINVER#
|
||||
* Build-Depends-Package: libtonezone-dev
|
||||
builtin_zones@Base 1:2.2.1.1
|
||||
dahdi_tools_version@Base 1:2.2.1.1
|
||||
tone_zone_find@Base 1:2.2.1.1
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
From: Jaco Kroon <jaco@uls.co.za>
|
||||
Subject: Remove unused union names that break build
|
||||
Bug: https://issues.asterisk.org/jira/browse/DAHTOOL-85
|
||||
|
||||
diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c
|
||||
index fdb34f1..8fb3687 100644
|
||||
--- a/xpp/mpptalk.c
|
||||
+++ b/xpp/mpptalk.c
|
||||
@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) {
|
||||
MEMBER(MPP, TWS_PORT_GET_REPLY);
|
||||
MEMBER(MPP, TWS_PWR_GET);
|
||||
MEMBER(MPP, TWS_PWR_GET_REPLY);
|
||||
-} PACKED members;
|
||||
+} PACKED;
|
||||
|
||||
/*
|
||||
* Statuses
|
||||
diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c
|
||||
index 49e47d5..251a502 100644
|
||||
--- a/xpp/xtalk/xtalk_raw.c
|
||||
+++ b/xpp/xtalk/xtalk_raw.c
|
||||
@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK,
|
||||
|
||||
union XTALK_PDATA(XTALK) {
|
||||
MEMBER(XTALK, ACK);
|
||||
-} PACKED members;
|
||||
+} PACKED;
|
||||
|
||||
const struct xtalk_protocol xtalk_raw_proto = {
|
||||
.name = "XTALK-RAW",
|
||||
diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c
|
||||
index 18a5cad..ffa79d2 100644
|
||||
--- a/xpp/xtalk/xtalk_sync.c
|
||||
+++ b/xpp/xtalk/xtalk_sync.c
|
||||
@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) {
|
||||
MEMBER(XTALK, ACK);
|
||||
MEMBER(XTALK, PROTO_GET);
|
||||
MEMBER(XTALK, PROTO_GET_REPLY);
|
||||
-} PACKED members;
|
||||
+} PACKED;
|
||||
|
||||
const struct xtalk_protocol xtalk_sync_proto = {
|
||||
.name = "XTALK-SYNC",
|
|
@ -0,0 +1,134 @@
|
|||
From: Tzafrir Cohen <tzafrir@debian.org>
|
||||
Date: Sat, 2 Mar 2019 01:37:51 +0200
|
||||
Bug: https://issues.asterisk.org/jira/browse/DAHTOOL-82
|
||||
Subject: [PATCH] handle both spantypes and dahdi_spantypes in sysfs
|
||||
|
||||
dahdi_span_types and dahdi_span_assignments use information from sysfs.
|
||||
As of kernel 4.13, the name of the attribute chnaged. Handle both old
|
||||
and new name.
|
||||
|
||||
Signed-off-by: Tzafrir Cohen <tzafrir@debian.org>
|
||||
---
|
||||
dahdi_span_assignments | 15 ++++++++++++---
|
||||
dahdi_span_types | 23 ++++++++++++++++++-----
|
||||
2 files changed, 30 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/dahdi_span_assignments b/dahdi_span_assignments
|
||||
index 9b4f305..235d61e 100755
|
||||
--- a/dahdi_span_assignments
|
||||
+++ b/dahdi_span_assignments
|
||||
@@ -151,6 +151,15 @@ attr_clean() {
|
||||
cat "$1" 2>/dev/null | tr -d '\n' | tr '!' '/' | tr -c 'a-zA-Z0-9/:.-' '_'
|
||||
}
|
||||
|
||||
+get_device_spannos() {
|
||||
+ device=$1
|
||||
+ sp_file="dahdi_spantype"
|
||||
+ if [ ! -f "$device/$sp_file" ]; then
|
||||
+ sp_file="spantype"
|
||||
+ fi
|
||||
+ cut -d: -f1 "$device/$sp_file"
|
||||
+}
|
||||
+
|
||||
show_devices() {
|
||||
|
||||
for device in $DEVICES
|
||||
@@ -158,7 +167,7 @@ show_devices() {
|
||||
devpath=`cd "$device" && pwd -P`
|
||||
location='@'`attr_clean "$device/location"`
|
||||
hardware_id=`attr_clean "$device/hardware_id"`
|
||||
- for local_spanno in `cut -d: -f1 "$device/spantype"`
|
||||
+ for local_spanno in `get_device_spannos "$device"`
|
||||
do
|
||||
span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \
|
||||
sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'`
|
||||
@@ -193,7 +202,7 @@ dump_config() {
|
||||
id="$devpath"
|
||||
fi
|
||||
echo "# Device: [$hardware_id] @$location $devpath"
|
||||
- for local_spanno in `cut -d: -f1 "$device/spantype"`
|
||||
+ for local_spanno in `get_device_spannos "$device"`
|
||||
do
|
||||
span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \
|
||||
sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'`
|
||||
@@ -358,7 +367,7 @@ list_devices() {
|
||||
devpath=`cd "$device" && pwd -P`
|
||||
location='@'`attr_clean "$device/location"`
|
||||
hardware_id=`attr_clean "$device/hardware_id"`
|
||||
- for local_spanno in `cut -d: -f1 "$device/spantype"`
|
||||
+ for local_spanno in `get_device_spannos "$device"`
|
||||
do
|
||||
found=`dev_match_conf "$devpath" "$location" "$hardware_id" "$local_spanno"`
|
||||
if [ "$wanted" = "unmatched" ]; then
|
||||
diff --git a/dahdi_span_types b/dahdi_span_types
|
||||
index 5fce110..f44b494 100755
|
||||
--- a/dahdi_span_types
|
||||
+++ b/dahdi_span_types
|
||||
@@ -172,6 +172,15 @@ attr_clean() {
|
||||
cat "$1" 2>/dev/null | tr -d '\n' | tr '!' '/' | tr -c 'a-zA-Z0-9/:.-' '_'
|
||||
}
|
||||
|
||||
+get_device_spantype_file() {
|
||||
+ device=$1
|
||||
+ sp_file="dahdi_spantype"
|
||||
+ if [ ! -f "$device/$sp_file" ]; then
|
||||
+ sp_file="spantype"
|
||||
+ fi
|
||||
+ echo "$device/$sp_file"
|
||||
+}
|
||||
+
|
||||
show_spantypes() {
|
||||
echo "# PRI span types (E1/T1/J1)"
|
||||
for device in $DEVICES
|
||||
@@ -179,7 +188,8 @@ show_spantypes() {
|
||||
devpath=`cd "$device" && pwd -P`
|
||||
location='@'`attr_clean "$device/location"`
|
||||
hardware_id=`attr_clean "$device/hardware_id"`
|
||||
- cat "$device/spantype" | while read st; do
|
||||
+ sp_file=`get_device_spantype_file "$device"`
|
||||
+ cat "$sp_file" | while read st; do
|
||||
case "$st" in
|
||||
*:[ETJ]1)
|
||||
printf "%-10s %-20s %-30s %s\n" \
|
||||
@@ -192,7 +202,7 @@ show_spantypes() {
|
||||
}
|
||||
|
||||
list_pri_spantypes() {
|
||||
- find $DEVICES -follow -maxdepth 1 -name spantype | \
|
||||
+ find $DEVICES -follow -maxdepth 1 -name spantype -or -name dahdi_spantype | \
|
||||
xargs cat | \
|
||||
sed -n '/:[ETJ]1$/s/^.*://p' | \
|
||||
sort -u | \
|
||||
@@ -255,7 +265,8 @@ dump_config() {
|
||||
id="$devpath"
|
||||
fi
|
||||
echo "# Device: [$hardware_id] @$location $devpath"
|
||||
- cat "$device/spantype" | while read st; do
|
||||
+ sp_file=`get_device_spantype_file "$device"`
|
||||
+ cat "$sp_file" | while read st; do
|
||||
case "$st" in
|
||||
*:[ETJ]1)
|
||||
if [ "$num_spantypes" -eq 1 ]; then
|
||||
@@ -281,7 +292,8 @@ filter_conf() {
|
||||
handle_span() {
|
||||
device="$1"
|
||||
spantype="$2"
|
||||
- attr_file="$device/spantype"
|
||||
+ sp_file=`get_device_spantype_file "$device"`
|
||||
+ attr_file="$sp_file"
|
||||
devpath=`cd "$device" && pwd -P`
|
||||
devname=`echo "$device" | sed "s,$devbase/,,"`
|
||||
location='@'`attr_clean "$device/location"`
|
||||
@@ -351,7 +363,8 @@ set_all_devices() {
|
||||
for device in $DEVICES
|
||||
do
|
||||
devname=`echo "$device" | sed "s,$devbase/,,"`
|
||||
- cat "$device/spantype" | while read spantype; do
|
||||
+ sp_file=`get_device_spantype_file "$device"`
|
||||
+ cat "$sp_file" | while read spantype; do
|
||||
case "$spantype" in
|
||||
*:[ETJ]1)
|
||||
handle_span "$device" "$spantype"
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
From: Tzafrir Cohen <tzafrir@debian.org>
|
||||
Subject: Change defaults for some install paths
|
||||
|
||||
Index: dahdi-tools/Makefile.am
|
||||
===================================================================
|
||||
--- dahdi-tools.orig/Makefile.am 2020-08-19 23:41:45.003051626 +0300
|
||||
+++ dahdi-tools/Makefile.am 2020-08-19 23:41:44.999051671 +0300
|
||||
@@ -111,7 +111,7 @@
|
||||
@echo "Compatibility symlinks (should be removed in the future)"
|
||||
ln -sf libtonezone.so.2.0.0 $(DESTDIR)$(libdir)/libtonezone.so.2.0
|
||||
|
||||
-bashcompdir = $(sysconfdir)/bash_completion.d
|
||||
+bashcompdir = $(datadir)/bash-completion/completions
|
||||
|
||||
install-data-hook:
|
||||
mkdir -p $(DESTDIR)$(bashcompdir)
|
|
@ -1,26 +0,0 @@
|
|||
Subject: also unload OSLEC (echo) on module unload
|
||||
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
|
||||
Forwarded: no
|
||||
|
||||
This patch sets the DAHDI init.d script to also unload 'echo' (OSLEC)
|
||||
in the 'stop' target. This adds to the default of unloading dahdi and
|
||||
all of its dependent modules.
|
||||
|
||||
The package dahdi-linux includes 'echo' and with the default settings,
|
||||
will attempts load 'echo', that does not depend on dahdi, and hence
|
||||
will not be unloaded by default. Thus upgrading to a newer version (of
|
||||
a newer build) may break.
|
||||
|
||||
This change will not be commited upstream, as OSLEC is not used there.
|
||||
|
||||
--- a/dahdi.init
|
||||
+++ b/dahdi.init
|
||||
@@ -40,7 +40,7 @@ DAHDI_DEV_TIMEOUT=20
|
||||
|
||||
# A list of modules to unload when stopping.
|
||||
# All of their dependencies will be unloaded as well.
|
||||
-DAHDI_UNLOAD_MODULES="dahdi"
|
||||
+DAHDI_UNLOAD_MODULES="dahdi echo"
|
||||
|
||||
#
|
||||
# Determine which kind of configuration we're using
|
|
@ -1,27 +0,0 @@
|
|||
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
|
||||
Subject: Don't install xtalk_send
|
||||
|
||||
xtalk_send is a helper tool for xtalk, a low-level libary used by some
|
||||
Xorcom DAHDI userspace tools. It is hardly needed by most people.
|
||||
|
||||
--- a/xpp/xtalk/Makefile.am
|
||||
+++ b/xpp/xtalk/Makefile.am
|
||||
@@ -21,8 +21,7 @@ USB_NAME = libusb
|
||||
endif
|
||||
endif
|
||||
|
||||
-noinst_PROGRAMS = xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test
|
||||
-sbin_PROGRAMS = xtalk_send
|
||||
+noinst_PROGRAMS = xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test xtalk_send
|
||||
noinst_LTLIBRARIES = libxtalk.la
|
||||
dist_noinst_HEADERS = \
|
||||
xtalk_base.h \
|
||||
@@ -39,8 +38,6 @@ dist_noinst_HEADERS = \
|
||||
include/xtalk/xtalk_iface.h \
|
||||
#
|
||||
|
||||
-man_MANS = xtalk_send.8
|
||||
-
|
||||
libxtalk_la_CFLAGS = \
|
||||
$(COMMON_CFLAGS) \
|
||||
-I$(srcdir)/include \
|
|
@ -1,97 +0,0 @@
|
|||
Remove the dependency on the module File::Basename.
|
||||
|
||||
This provides the ability to run the scripts using a local modules
|
||||
directory. While that ability is very handy with the source distribution
|
||||
and in testing environments, it is useless on a Debian package.
|
||||
|
||||
It is removed in a (currently still failed) attempt to remove the
|
||||
dependency on perl and depend on perl-base alone.
|
||||
|
||||
--- a/xpp/dahdi.cgi
|
||||
+++ b/xpp/dahdi.cgi
|
||||
@@ -6,8 +6,6 @@
|
||||
# modify it under the same terms as Perl itself.
|
||||
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use CGI::Pretty qw/:standard start_ul start_li start_div start_pre/;
|
||||
use Dahdi;
|
||||
--- a/xpp/dahdi_drivers
|
||||
+++ b/xpp/dahdi_drivers
|
||||
@@ -1,7 +1,5 @@
|
||||
#! /usr/bin/perl -w
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use Dahdi::Hardware;
|
||||
|
||||
--- a/xpp/dahdi_genconf
|
||||
+++ b/xpp/dahdi_genconf
|
||||
@@ -8,8 +8,6 @@
|
||||
# $Id: dahdi_genconf 5440 2008-12-05 00:24:09Z tzafrir $
|
||||
#
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use Dahdi;
|
||||
use Dahdi::Hardware;
|
||||
--- a/xpp/dahdi_hardware
|
||||
+++ b/xpp/dahdi_hardware
|
||||
@@ -8,9 +8,7 @@
|
||||
# $Id: dahdi_hardware 4484 2008-06-29 16:57:48Z tzafrir $
|
||||
#
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
use Getopt::Std;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use Dahdi;
|
||||
use Dahdi::Span;
|
||||
--- a/xpp/dahdi_registration
|
||||
+++ b/xpp/dahdi_registration
|
||||
@@ -8,8 +8,6 @@
|
||||
# $Id: dahdi_registration 4533 2008-07-03 08:22:02Z tzafrir $
|
||||
#
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use Dahdi;
|
||||
use Dahdi::Span;
|
||||
--- a/xpp/lsdahdi
|
||||
+++ b/xpp/lsdahdi
|
||||
@@ -8,8 +8,6 @@
|
||||
# $Id: lsdahdi 4764 2008-08-12 10:21:53Z tzafrir $
|
||||
#
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use Dahdi;
|
||||
use Dahdi::Span;
|
||||
--- a/xpp/xpp_blink
|
||||
+++ b/xpp/xpp_blink
|
||||
@@ -8,8 +8,6 @@
|
||||
# $Id: xpp_blink 4416 2008-06-19 17:34:36Z tzafrir $
|
||||
#
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use Dahdi;
|
||||
use Dahdi::Span;
|
||||
--- a/xpp/xpp_sync
|
||||
+++ b/xpp/xpp_sync
|
||||
@@ -8,8 +8,6 @@
|
||||
# $Id: xpp_sync 4484 2008-06-29 16:57:48Z tzafrir $
|
||||
#
|
||||
use strict;
|
||||
-use File::Basename;
|
||||
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
|
||||
|
||||
use Dahdi::Xpp;
|
||||
use Dahdi::Xpp::Xbus;
|
|
@ -1,6 +1,8 @@
|
|||
zaptel_perl
|
||||
echocan_oslec
|
||||
init_unload_oslec
|
||||
remove_dahdi_speed
|
||||
soname.patch
|
||||
no_xtalk_send
|
||||
dahdi_spantypes.patch
|
||||
typos.patch
|
||||
dahdi-tools-3.1.0-fno-common.patch
|
||||
fix_install_paths.patch
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
From: Tzafrir Cohen <tzafrir@debian.org>
|
||||
Subject: add extra digit to library SO name: 2.0
|
||||
|
||||
Asterisk and various other programs were already looking for that SO
|
||||
name.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 826a7ec..2afe476 100644
|
||||
--- a/configure.ac
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
Index: dahdi-tools/xpp/astribank_is_starting.8
|
||||
===================================================================
|
||||
--- dahdi-tools.orig/xpp/astribank_is_starting.8 2019-03-03 23:44:05.883016682 +0200
|
||||
+++ dahdi-tools/xpp/astribank_is_starting.8 2019-03-04 01:34:40.398114773 +0200
|
||||
@@ -85,7 +85,7 @@
|
||||
.SH BUGS
|
||||
Option ordering matter. The \fB\-v\fR and \fB\-d\fR options should precede
|
||||
the actions (\fB\-a\fR, \fB\-r\fR and \fB\-w\fR).
|
||||
-The \fB\-t\fItimeout\fR option should preceed the \fB\-w\fR option.
|
||||
+The \fB\-t\fItimeout\fR option should precede the \fB\-w\fR option.
|
||||
|
||||
.SH SEE ALSO
|
||||
semctl(3)
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
Description: proper dahdi permissions as in Debian
|
||||
Author: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
In Debian DAHDI devices are owned by root:comm rather than
|
||||
asterisk:asterisk.
|
||||
|
||||
Note that those rules are duplication of the rules in dahdi-linux. But
|
||||
this file is probably a better place for them.
|
||||
|
||||
--- a/dahdi.rules
|
||||
+++ b/dahdi.rules
|
||||
@@ -1,4 +1,4 @@
|
||||
# DAHDI devices with ownership/permissions for running as non-root
|
||||
-SUBSYSTEM=="dahdi", OWNER="asterisk", GROUP="asterisk", MODE="0660"
|
||||
+SUBSYSTEM=="dahdi", GROUP="comm", MODE="0660"
|
||||
SUBSYSTEM=="dahdi_devices", RUN="/usr/share/dahdi/handle_device"
|
||||
SUBSYSTEM=="dahdi_spans", RUN="/usr/share/dahdi/span_config"
|
|
@ -5,22 +5,12 @@
|
|||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
|
||||
CFLAGS += -g
|
||||
endif
|
||||
|
||||
PREFIX:=dahdi
|
||||
PACKAGE_SRC:=$(PREFIX)-tools
|
||||
|
||||
DEBVERSION:=$(shell head -n 1 debian/changelog \
|
||||
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
|
||||
DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
|
||||
UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/~dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/')
|
||||
|
||||
UPFILENAME := $(PACKAGE_SRC)_$(UPVERSION).orig.tar.gz
|
||||
FILENAME := $(PACKAGE_SRC)_$(DEB_BASE_VERSION).orig.tar.gz
|
||||
URL := http://downloads.asterisk.org/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz
|
||||
|
||||
CHANGED_FILES_LIST = debian/savedfiles.lst
|
||||
CHANGED_FILES_ARCHIVE = debian/savedfiles.cpio
|
||||
|
||||
|
@ -47,7 +37,6 @@ override_dh_clean:
|
|||
|
||||
override_dh_auto_build:
|
||||
$(MAKE) all docs
|
||||
# FIXME: xpp/README.Astribank.html
|
||||
cat dahdi.rules xpp/xpp.rules >debian/dahdi.udev
|
||||
|
||||
override_dh_auto_clean:
|
||||
|
@ -64,15 +53,6 @@ override_dh_auto_install:
|
|||
# also run the 'config' target, in addition to the 'install' target:
|
||||
dh_auto_install -- config
|
||||
rm $(CURDIR)/debian/tmp/usr/share/dahdi/span_config.d/50-asterisk
|
||||
|
||||
print-version:
|
||||
@@echo "Debian version: $(DEBVERSION)"
|
||||
@@echo "Upstream version: $(UPVERSION)"
|
||||
|
||||
TARBALL_DIR=../tarballs/zaptel-$(UPVERSION).tmp
|
||||
get-orig-source:
|
||||
@@dh_testdir
|
||||
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
|
||||
@@echo Downloading $(UPFILENAME) from $(URL) ...
|
||||
@@wget -nv -T10 -t3 --verbose -O ../tarballs/$(FILENAME) $(URL)
|
||||
|
||||
rm $(CURDIR)/debian/tmp/usr/lib/*/libtonezone.la
|
||||
rm -rf $(CURDIR)/debian/tmp/etc/dahdi
|
||||
rm -rf $(CURDIR)/debian/tmp/etc/udev/rules.d
|
||||
|
|
|
@ -0,0 +1,184 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
g3LstQ==
|
||||
=vz6h
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
@ -1,4 +1,4 @@
|
|||
version=3
|
||||
opts=uversionmangle=s/-rc/\~rc/; \
|
||||
http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-(.*)\.tar\.gz\
|
||||
debian svn-upgrade
|
||||
opts=uversionmangle=s/\-rc/~rc/,pgpsigurlmangle=s/$/.asc/ \
|
||||
https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-(.*)\.tar\.gz\
|
||||
debian uupdate
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
dahdi_span_types \- set line modes of DAHDI spans before assignment
|
||||
.SH SYNOPSIS
|
||||
|
||||
.B dahdi_span_types [\fIoptions\fB] <list|dumpconfig|set> \fB[\fIdevpath \fB...]
|
||||
.B dahdi_span_types [\fIoptions\fB] <list|dumpconfig|compare|set> \fB[\fIdevpath \fB...]
|
||||
|
||||
.SH DESCRIPTION
|
||||
The span type (the line mode: E1/T1/J1) must be set to a span before
|
||||
|
@ -58,6 +58,16 @@ device(s) specified in the command line (or all devices, if none
|
|||
specified).
|
||||
.RE
|
||||
|
||||
.B compare
|
||||
.RS
|
||||
Compare the settings on the system to those in the configuration file.
|
||||
For each line that applies to a device on the system, print it if the
|
||||
value to be set and the active value on the system differ.
|
||||
|
||||
The exit status is 0 if there is no difference and non-zero if a
|
||||
difference was detected.
|
||||
.RE
|
||||
|
||||
.B list
|
||||
.RS
|
||||
List line modes for all spans in the system which may be set with
|
||||
|
|
|
@ -7,7 +7,7 @@ dahdi_tool \- Shows status of DAHDI interfaces
|
|||
.B dahdi_tool
|
||||
|
||||
.SH DESCRIPTION
|
||||
dahdi_tool shows the current status the DAHDI inteface cards plugged
|
||||
dahdi_tool shows the current status the DAHDI interface cards plugged
|
||||
to the computer.
|
||||
|
||||
It displays values like Current Alarms, SyncSource, Tx/Rx
|
||||
|
|
|
@ -33,7 +33,7 @@ is generated in the current directory.
|
|||
fxotune just reads the settings from fxotune.conf into the FXO modules.
|
||||
|
||||
You are advised to run fxotune on all FXO ports you have that support
|
||||
it and that are connected. Note that the tunning is affected by e.g.
|
||||
it and that are connected. Note that the tuning is affected by e.g.
|
||||
the physical parameters of the connection, and thus if it has been
|
||||
radically changed, you may need to re-run fxotune.
|
||||
|
||||
|
@ -44,7 +44,7 @@ cards and clones) do not have the hardware to support such tuning.
|
|||
The tuning process needs a clear line to do the tuning. In order to do
|
||||
that, it runs in cycles of the following: sets the line off-hook, dials
|
||||
a dial string (which should set the PSTN provider waiting for the next
|
||||
digit), and then starts tuning. It has a limited ammount of time for
|
||||
digit), and then starts tuning. It has a limited amount of time for
|
||||
tuning before the PSTN gives up and gives a busy tone. So after a while
|
||||
it hangs up and starts a new cycle.
|
||||
|
||||
|
@ -180,7 +180,7 @@ so if you stop it half-way, you may get a half-configured system. If you
|
|||
have already tuned your FXO channels and wish to test-run fxotune again,
|
||||
you are advised to backup /etc/fxotune.conf .
|
||||
|
||||
The default for \-m is 18 seconds. This asusmes that you get a clear line
|
||||
The default for \-m is 18 seconds. This assumes that you get a clear line
|
||||
for at least 18 seconds. It is advised that you test that timeout earlier
|
||||
by connecting a phone to the FXO line, dialing 4 (or whatever dial string
|
||||
you put with \-n) and see how much time of silence you have.
|
||||
|
|
|
@ -22,4 +22,9 @@ devices_by_registration_time | \
|
|||
done
|
||||
|
||||
# Now handle Astribanks
|
||||
LC_ALL=C dahdi_registration -Rv on
|
||||
unmatched="`dahdi_span_assignments unmatched`"
|
||||
if [ -n "$unmatched" ]; then
|
||||
# Only if astribanks are not matched in span-assignments.conf
|
||||
# TODO: have dahdi_registration run only on "$unmatched"
|
||||
LC_ALL=C dahdi_registration -Rv on
|
||||
fi
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Run xpp_sync whenever an Astribank is connected.
|
||||
|
||||
# May be set in /etc/dahdi/init.conf
|
||||
XPP_SYNC=${XPP_SYNC:-auto}
|
||||
|
||||
case "$ACTION" in
|
||||
add) ;;
|
||||
*) exit 0 ;;
|
||||
esac
|
||||
|
||||
case "${DEVPATH##*/}" in
|
||||
astribanks:*) ;;
|
||||
*) exit 0 ;;
|
||||
esac
|
||||
|
||||
xpp_sync "$XPP_SYNC"
|
|
@ -0,0 +1,5 @@
|
|||
# A dracut.conf(5) snippet
|
||||
# Disable loading the Astribank (xpp_usb) drivers. This is because
|
||||
# it relies on files in the root filesystem:
|
||||
# See https://issues.asterisk.org/jira/browse/DAHLIN-352
|
||||
omit_drivers+=" xpp_usb "
|
|
@ -62,6 +62,9 @@ dist_sbin_SCRIPTS = $(perl_scripts)
|
|||
man_MANS += $(perl_mans)
|
||||
CLEANFILES = $(perl_checks) $(perl_mans)
|
||||
|
||||
dracutconfdir = @prefix@/lib/dracut/dracut.conf.d
|
||||
dracutconf_DATA = 50-dahdi.conf
|
||||
|
||||
if PBX_USB
|
||||
|
||||
SUBDIRS += oct612x xtalk
|
||||
|
|
|
@ -47,9 +47,9 @@ Apart from the standard DAHDI build requirements, you also need:
|
|||
|
||||
* *libusb development headers* to build the Astribank firmware tools
|
||||
(astribank_tool, astribank_hexload, astribank_allow).
|
||||
This is typically the package libusb-dev on Debian (and derivatives
|
||||
like Ubuntu) or libusb-devel on RedHat (and derivatives like
|
||||
CentOS/Trixbox).
|
||||
This is typically the package libusb-1.0-0-dev on Debian (and
|
||||
derivatives such as Ubuntu) or libusbx-devel on RedHat (and derivatives
|
||||
such as CentOS).
|
||||
* *Echo Canceller Module firmware*: If you have an Astribank with an
|
||||
echo canceller module, see the following section.
|
||||
|
||||
|
@ -1257,8 +1257,8 @@ Astribanks Synchronization Source
|
|||
If there is more than one Astribank on the system, all the Astribanks
|
||||
keep their clock in sync. Optionally the Astribanks can synchronize
|
||||
their clock to the master DAHDI device (in case it is a different DAHDI
|
||||
device). Normally you just use the default init.d script or run
|
||||
explicitly:
|
||||
device). Normally it would be run automatically from the udev hooks
|
||||
run on device plug (handle_device), but you can also run it explicitly:
|
||||
|
||||
xpp_sync auto
|
||||
|
||||
|
@ -1488,6 +1488,9 @@ other side.
|
|||
current. That is: which ones are connected to an active FXS on the
|
||||
other side.
|
||||
|
||||
===== /sys/bus/astribanks/devices/xbus-NN/NN:M:P/hwid
|
||||
Prints <module type>.<module subtype>. Both are small numbers.
|
||||
|
||||
===== /sys/bus/astribanks/devices/xbus-NN/NN:M:P/offhook
|
||||
Shows ports that are (1) or are not (0) off-hook. When a channel is
|
||||
not off-hook. For BRI and E1/T1 the value is 1 if the span is in use.
|
||||
|
|
|
@ -117,7 +117,7 @@ Examples:
|
|||
1:T1,2:T1,*:E1 \- First and second ports are T1, the rest are E1.
|
||||
.RE
|
||||
|
||||
If the \fB\-S\fR is not given, the PRI default is determined by the existance of the \fB\-A-fR option.
|
||||
If the \fB\-S\fR is not given, the PRI default is determined by the existence of the \fB\-A-fR option.
|
||||
.RE
|
||||
|
||||
.SH SEE ALSO
|
||||
|
|
|
@ -94,22 +94,27 @@ wait_for_udev() {
|
|||
UDEV_SETTLE_MAX_TIME=10
|
||||
|
||||
echo "Waiting for udev to settle down..."
|
||||
if [ -x /sbin/udevsettle ]; then
|
||||
# Old system, stand-alone udevsettle command
|
||||
/sbin/udevsettle --timeout="$UDEV_SETTLE_MAX_TIME"
|
||||
udevsettle_cmd=
|
||||
if [ -x /bin/udevadm ]; then
|
||||
udevsettle_cmd="/bin/udevadm settle"
|
||||
elif [ -x /sbin/udevadm ]; then
|
||||
# Assume modern system, udevadm has settle parameter
|
||||
if ! /sbin/udevadm settle --timeout="$UDEV_SETTLE_MAX_TIME"
|
||||
then
|
||||
echo "udevadm failed ($?)."
|
||||
echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
|
||||
sleep "$UDEV_SETTLE_MAX_TIME"
|
||||
fi
|
||||
udevsettle_cmd="/sbin/udevadm settle"
|
||||
elif [ -x /sbin/udevsettle ]; then
|
||||
udevsettle_cmd="/sbin/udevsettle"
|
||||
else
|
||||
echo "No udevsettle/udevadm."
|
||||
echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
|
||||
sleep "$UDEV_SETTLE_MAX_TIME"
|
||||
return
|
||||
fi
|
||||
|
||||
if ! $udevsettle_cmd --timeout="$UDEV_SETTLE_MAX_TIME"
|
||||
then
|
||||
echo "udevadm failed ($?)."
|
||||
echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
|
||||
sleep "$UDEV_SETTLE_MAX_TIME"
|
||||
fi
|
||||
|
||||
sleep 1 # Wait a bit more (races)
|
||||
}
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ Q: Why do you use a semaphore?
|
|||
A: because, unlike the filesystem, it is writable at any given time.
|
||||
|
||||
.SH BUGS
|
||||
Option ordering matter. The \fB\-v\fR and \fB\-d\fR options should preceed
|
||||
Option ordering matter. The \fB\-v\fR and \fB\-d\fR options should precede
|
||||
the actions (\fB\-a\fR, \fB\-r\fR and \fB\-w\fR).
|
||||
The \fB\-t\fItimeout\fR option should preceed the \fB\-w\fR option.
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ static int reset_kind(const char *arg)
|
|||
if(strcasecmp(reset_kinds[i].name, arg) == 0)
|
||||
return reset_kinds[i].type_code;
|
||||
}
|
||||
ERR("Uknown reset kind '%s'\n", arg);
|
||||
ERR("Unknown reset kind '%s'\n", arg);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -157,9 +157,9 @@ int main(int argc, char *argv[])
|
|||
ERR("Bad reset kind '%s'\n", opt_reset);
|
||||
return 1;
|
||||
}
|
||||
DBG("Reseting (%s)\n", opt_reset);
|
||||
DBG("Resetting (%s)\n", opt_reset);
|
||||
if((ret = mpp_reset(mpp, full_reset)) < 0) {
|
||||
ERR("%s Reseting astribank failed: %d\n",
|
||||
ERR("%s Resetting astribank failed: %d\n",
|
||||
(full_reset) ? "Full" : "Half", ret);
|
||||
}
|
||||
goto out;
|
||||
|
|
|
@ -109,9 +109,15 @@ foreach my $xbus (Dahdi::Xpp::xbuses($sorter)) {
|
|||
system @cmd;
|
||||
warn "Failed '@cmd' (status=$?)\n" if $?;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (defined($on) && $on) {
|
||||
if ($opts{'R'} || ! $default_auto_assign) {
|
||||
# wait for UDEV to do its stuff
|
||||
system "dahdi_waitfor_span_assignments assigned";
|
||||
}
|
||||
}
|
||||
foreach my $xbus (Dahdi::Xpp::xbuses($sorter)) {
|
||||
foreach my $xpd (Dahdi::Xpp::Xpd::telephony_devs($xbus->xpds())) {
|
||||
my $spanno = $xpd->xpd_getattr('span');
|
||||
myprintf "\t%-10s: ", $xpd->fqn;
|
||||
|
|
|
@ -349,7 +349,7 @@ load_fw_device() {
|
|||
echo "WARNING: ECHO burning was skipped (no capabilities)"
|
||||
fi
|
||||
fi
|
||||
pic_files=`echo "$FIRMWARE_DIR"/PIC_TYPE_[1-4].hex`
|
||||
pic_files=`echo "$FIRMWARE_DIR"/PIC_TYPE_[1-46].hex`
|
||||
debug "PIC burning into $dev: begin $pic_files"
|
||||
run_astribank_hexload -D "$dev" -p $pic_files
|
||||
debug "PIC burning into $dev: end $pic_files"
|
||||
|
@ -443,7 +443,7 @@ fpga_firmware_all_devices() {
|
|||
reset_fpga() {
|
||||
devices=`filter_devs 'e4e4/11[3456][124]/*'`
|
||||
totaldevs=`numdevs 'e4e4/11[3456][124]/*'`
|
||||
echo >&2 -- "Reseting devices [$totaldevs devices]"
|
||||
echo >&2 -- "Resetting devices [$totaldevs devices]"
|
||||
echo "$devices" | grep -v '^$' | while read id_str dev
|
||||
do
|
||||
(
|
||||
|
|
|
@ -64,7 +64,7 @@ sub do_select(@) {
|
|||
foreach my $xpd (@_) {
|
||||
my $xbus = $xpd->xbus;
|
||||
my $busnum = $xbus->name;
|
||||
die "Uknown bus name" unless $busnum;
|
||||
die "Unknown bus name" unless $busnum;
|
||||
$busnum =~ s/XBUS-//;
|
||||
die "bad bus name" unless $busnum =~ /^\d+$/;
|
||||
#printf "Setting sync: %-10s (%s)\n", $xpd->fqn, $xpd->type;
|
||||
|
|
|
@ -21,8 +21,7 @@ USB_NAME = libusb
|
|||
endif
|
||||
endif
|
||||
|
||||
noinst_PROGRAMS = xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test
|
||||
sbin_PROGRAMS = xtalk_send
|
||||
noinst_PROGRAMS = xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test xtalk_send
|
||||
noinst_LTLIBRARIES = libxtalk.la
|
||||
dist_noinst_HEADERS = \
|
||||
xtalk_base.h \
|
||||
|
@ -39,8 +38,6 @@ dist_noinst_HEADERS = \
|
|||
include/xtalk/xtalk_iface.h \
|
||||
#
|
||||
|
||||
man_MANS = xtalk_send.8
|
||||
|
||||
libxtalk_la_CFLAGS = \
|
||||
$(COMMON_CFLAGS) \
|
||||
-I$(srcdir)/include \
|
||||
|
|
|
@ -183,7 +183,7 @@ int process_command(
|
|||
}
|
||||
DBG("REPLY OP: 0x%X [%s]\n", reply->header.op, reply_desc->name);
|
||||
if (reply->header.op == XTALK_ACK) {
|
||||
int status = CMD_FIELD(reply, XTALK, ACK, stat);
|
||||
uint8_t status = CMD_FIELD(reply, XTALK, ACK, stat);
|
||||
|
||||
if (expected) {
|
||||
ERR("Expected OP=0x%02X: Got ACK(%d): %s\n",
|
||||
|
|
|
@ -215,7 +215,7 @@ int xusb_filter_bypath(const struct xusb_device *xusb_device, void *data)
|
|||
assert(path != NULL);
|
||||
p = path_tail(path);
|
||||
if (strcmp(xusb_device->devpath_tail, p) != 0) {
|
||||
DBG("%s: device path missmatch (!= '%s')\n",
|
||||
DBG("%s: device path mismatch (!= '%s')\n",
|
||||
xusb_device->devpath_tail, p);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue