[svn-commits] tzafrir: branch tzafrir/kernelmove_conf r2704 - in /team/tzafrir/kernelmove_c...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jul 6 21:00:12 CDT 2007
Author: tzafrir
Date: Fri Jul 6 21:00:11 2007
New Revision: 2704
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2704
Log:
* Add configuration information to the utilities.
* Fix update_config to extract it too.
* Some kernel modules require userspace tools.
Modified:
team/tzafrir/kernelmove_conf/build_tools/update_config
team/tzafrir/kernelmove_conf/fxotune.c
team/tzafrir/kernelmove_conf/fxstest.c
team/tzafrir/kernelmove_conf/hdlcgen.c
team/tzafrir/kernelmove_conf/hdlcstress.c
team/tzafrir/kernelmove_conf/hdlctest.c
team/tzafrir/kernelmove_conf/hdlcverify.c
team/tzafrir/kernelmove_conf/kernel/pciradio.c
team/tzafrir/kernelmove_conf/kernel/tor2.c
team/tzafrir/kernelmove_conf/kernel/torisa.c
team/tzafrir/kernelmove_conf/kernel/zaptel-base.c
team/tzafrir/kernelmove_conf/patgen.c
team/tzafrir/kernelmove_conf/patlooptest.c
team/tzafrir/kernelmove_conf/pattest.c
team/tzafrir/kernelmove_conf/sethdlc.c
team/tzafrir/kernelmove_conf/timertest.c
team/tzafrir/kernelmove_conf/tor2ee.c
team/tzafrir/kernelmove_conf/torisatool.c
team/tzafrir/kernelmove_conf/usbfxstest.c
team/tzafrir/kernelmove_conf/ztcfg-dude.c
team/tzafrir/kernelmove_conf/ztcfg.c
team/tzafrir/kernelmove_conf/ztdiag.c
team/tzafrir/kernelmove_conf/ztmonitor.c
team/tzafrir/kernelmove_conf/ztspeed.c
team/tzafrir/kernelmove_conf/zttest.c
team/tzafrir/kernelmove_conf/zttool.c
Modified: team/tzafrir/kernelmove_conf/build_tools/update_config
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/build_tools/update_config?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/build_tools/update_config (original)
+++ team/tzafrir/kernelmove_conf/build_tools/update_config Fri Jul 6 21:00:11 2007
@@ -4,13 +4,18 @@
# extract configuration from kernel modules:
-sub extract_kernel() {
- my $subdir = 'kernel';
-
- foreach my $src (<$subdir/*.c> , <$subdir/*/*.c>) {
+sub get_category {
+ my $category = shift;
+ my @files = @_;
+
+ open OUTPUT,">build_conf/$category" or
+ die "cannot open category file build_conf/$category for writing: $!\n";
+
+ foreach my $src (@files) {
+ # For this simplistic parsing we must have a subdirectory.
+ # Oh well, let's use ./*.c for the utils for now
open SRC,$src or die "Can't read from source file $src: $!\n";
-
- $src =~ m|.*/(.*)\.c|;
+ $src =~ m|.*/([^/]*)\.c|;
my $mod_name = $1;
my %data = ('Item' => $mod_name);
@@ -28,13 +33,26 @@
my ($var,$val) = split(/: +/, $_, 2);
$data{$var} = $val;
}
+ close SRC;
+
next unless ($found);
foreach my $var (sort keys %data) {
- print $var.": $data{$var}\n";
+ print OUTPUT $var.": $data{$var}\n";
}
- print "\n";
+ print OUTPUT "\n";
}
+
+ close OUTPUT;
+}
+
+sub extract_kernel() {
+ get_category('kernel', <kernel/*.c> , <kernel/*/*.c>)
+}
+
+sub extract_utils() {
+ get_category('utils', <./*.c>)
}
extract_kernel;
+extract_utils;
Modified: team/tzafrir/kernelmove_conf/fxotune.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/fxotune.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/fxotune.c (original)
+++ team/tzafrir/kernelmove_conf/fxotune.c Fri Jul 6 21:00:11 2007
@@ -10,6 +10,10 @@
*
* (C) 2004-2005 Digium, Inc.
*/
+
+/*** MODULEINFO
+DisplayName: Tunes FXO modules to reduce echo
+ ***/
#include <stdio.h>
#include <stdlib.h>
Modified: team/tzafrir/kernelmove_conf/fxstest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/fxstest.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/fxstest.c (original)
+++ team/tzafrir/kernelmove_conf/fxstest.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,9 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+DisplayName: FXS port diagnostics
+ ***/
+
#include <stdio.h>
#include <string.h>
#include <errno.h>
Modified: team/tzafrir/kernelmove_conf/hdlcgen.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/hdlcgen.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/hdlcgen.c (original)
+++ team/tzafrir/kernelmove_conf/hdlcgen.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: Tests HDLC encoding
+ ***/
+
#define FAST_HDLC_NEED_TABLES
#include "kernel/fasthdlc.h"
#include <stdio.h>
Modified: team/tzafrir/kernelmove_conf/hdlcstress.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/hdlcstress.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/hdlcstress.c (original)
+++ team/tzafrir/kernelmove_conf/hdlcstress.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: HDLC-related stress-test of something.
+ ***/
+
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
Modified: team/tzafrir/kernelmove_conf/hdlctest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/hdlctest.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/hdlctest.c (original)
+++ team/tzafrir/kernelmove_conf/hdlctest.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: HDLC-related test of something.
+ ***/
+
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
Modified: team/tzafrir/kernelmove_conf/hdlcverify.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/hdlcverify.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/hdlcverify.c (original)
+++ team/tzafrir/kernelmove_conf/hdlcverify.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: Tests HDLC Decoding
+ ***/
+
#define FAST_HDLC_NEED_TABLES
#include "kernel/fasthdlc.h"
#include <stdio.h>
Modified: team/tzafrir/kernelmove_conf/kernel/pciradio.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/kernel/pciradio.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/kernel/pciradio.c (original)
+++ team/tzafrir/kernelmove_conf/kernel/pciradio.c Fri Jul 6 21:00:11 2007
@@ -27,7 +27,7 @@
*/
/*** MODULEINFO
-Depends: zaptel
+Depends: zaptel, ztcfg-dude
DisplayName: PCI Radio
***/
Modified: team/tzafrir/kernelmove_conf/kernel/tor2.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/kernel/tor2.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/kernel/tor2.c (original)
+++ team/tzafrir/kernelmove_conf/kernel/tor2.c Fri Jul 6 21:00:11 2007
@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
-Depends: zaptel
+Depends: zaptel, tor2ee
DisplayName: Tormenta 2
***/
Modified: team/tzafrir/kernelmove_conf/kernel/torisa.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/kernel/torisa.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/kernel/torisa.c (original)
+++ team/tzafrir/kernelmove_conf/kernel/torisa.c Fri Jul 6 21:00:11 2007
@@ -20,7 +20,7 @@
*/
/*** MODULEINFO
-Depends: zaptel
+Depends: zaptel, torisatool
DisplayName: Tormenta ISA
***/
Modified: team/tzafrir/kernelmove_conf/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/kernel/zaptel-base.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/kernel/zaptel-base.c (original)
+++ team/tzafrir/kernelmove_conf/kernel/zaptel-base.c Fri Jul 6 21:00:11 2007
@@ -37,6 +37,7 @@
/*** MODULEINFO
Item: zaptel
PullOnly: yes
+Depends: ztcfg
DisplayName: Base Zaptel module
***/
Modified: team/tzafrir/kernelmove_conf/patgen.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/patgen.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/patgen.c (original)
+++ team/tzafrir/kernelmove_conf/patgen.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: Tests HDLC Transmitting or something
+ ***/
+
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
Modified: team/tzafrir/kernelmove_conf/patlooptest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/patlooptest.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/patlooptest.c (original)
+++ team/tzafrir/kernelmove_conf/patlooptest.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: Some loopback test.
+ ***/
+
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
Modified: team/tzafrir/kernelmove_conf/pattest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/pattest.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/pattest.c (original)
+++ team/tzafrir/kernelmove_conf/pattest.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: Pattern recieving test
+ ***/
+
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
Modified: team/tzafrir/kernelmove_conf/sethdlc.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/sethdlc.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/sethdlc.c (original)
+++ team/tzafrir/kernelmove_conf/sethdlc.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: OBSOLETE T1/E1 card control utility
+ ***/
+
#include <errno.h>
#include <stdio.h>
#include <stdarg.h>
Modified: team/tzafrir/kernelmove_conf/timertest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/timertest.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/timertest.c (original)
+++ team/tzafrir/kernelmove_conf/timertest.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: Tests /dev/zap/timer timers
+ ***/
+
#include <string.h>
#include <stdio.h>
#include <fcntl.h>
Modified: team/tzafrir/kernelmove_conf/tor2ee.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/tor2ee.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/tor2ee.c (original)
+++ team/tzafrir/kernelmove_conf/tor2ee.c Fri Jul 6 21:00:11 2007
@@ -23,6 +23,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
+
+/*** MODULEINFO
+Default: no
+DisplayName: Tormenta 2 Quad-T1 PCI EEprom programmer
+ ***/
#include <sys/types.h>
#include <pci/pci.h>
Modified: team/tzafrir/kernelmove_conf/torisatool.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/torisatool.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/torisatool.c (original)
+++ team/tzafrir/kernelmove_conf/torisatool.c Fri Jul 6 21:00:11 2007
@@ -20,6 +20,11 @@
* Modified from original tor.c by Mark Spencer <markster at digium.com>
* original by Jim Dixon <jim at lambdatel.com>
*/
+
+/*** MODULEINFO
+Default: no
+DisplayName: Tormenta ISA card control utility
+ ***/
#include <stdio.h>
#include <fcntl.h>
Modified: team/tzafrir/kernelmove_conf/usbfxstest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/usbfxstest.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/usbfxstest.c (original)
+++ team/tzafrir/kernelmove_conf/usbfxstest.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,11 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+Depends: libzap
+DisplayName: FXS port test using the obsolete libzap
+ ***/
+
#include <stdio.h>
#include <string.h>
#include <errno.h>
Modified: team/tzafrir/kernelmove_conf/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/ztcfg-dude.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/ztcfg-dude.c (original)
+++ team/tzafrir/kernelmove_conf/ztcfg-dude.c Fri Jul 6 21:00:11 2007
@@ -27,6 +27,11 @@
* Primary Author: Mark Spencer <markster at digium.com>
*
*/
+
+/*** MODULEINFO
+Default: no
+DisplayName: Zaptel control utility w/support for pciradio
+ ***/
#include <stdio.h>
#include <getopt.h>
Modified: team/tzafrir/kernelmove_conf/ztcfg.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/ztcfg.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/ztcfg.c (original)
+++ team/tzafrir/kernelmove_conf/ztcfg.c Fri Jul 6 21:00:11 2007
@@ -27,6 +27,10 @@
* Primary Author: Mark Spencer <markster at digium.com>
* Radio Support by Jim Dixon <jim at lambdatel.com>
*/
+
+/*** MODULEINFO
+DisplayName: Zaptel Configuration Utility
+ ***/
#include <stdio.h>
#include <getopt.h>
Modified: team/tzafrir/kernelmove_conf/ztdiag.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/ztdiag.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/ztdiag.c (original)
+++ team/tzafrir/kernelmove_conf/ztdiag.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,9 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+DisplayName: Ask channel to print diagnotics to kernel logs
+ ***/
+
#include <fcntl.h>
#include <sys/ioctl.h>
#include <stdio.h>
Modified: team/tzafrir/kernelmove_conf/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/ztmonitor.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/ztmonitor.c (original)
+++ team/tzafrir/kernelmove_conf/ztmonitor.c Fri Jul 6 21:00:11 2007
@@ -27,6 +27,10 @@
* Primary Author: Mark Spencer <markster at digium.com>
*
*/
+
+/*** MODULEINFO
+DisplayName: View, hear and/or record the audio in a zaptel channel
+ ***/
#include <stdio.h>
#include <getopt.h>
Modified: team/tzafrir/kernelmove_conf/ztspeed.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/ztspeed.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/ztspeed.c (original)
+++ team/tzafrir/kernelmove_conf/ztspeed.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,10 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+Default: no
+DisplayName: Simple CPU speed test
+ ***/
+
/*
*
* Generic speed test -- Run an infinite loop and
Modified: team/tzafrir/kernelmove_conf/zttest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/zttest.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/zttest.c (original)
+++ team/tzafrir/kernelmove_conf/zttest.c Fri Jul 6 21:00:11 2007
@@ -1,3 +1,9 @@
+/* Copyright stanza needed */
+
+/*** MODULEINFO
+DisplayName: Zaptel timing test
+ ***/
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: team/tzafrir/kernelmove_conf/zttool.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/zttool.c?view=diff&rev=2704&r1=2703&r2=2704
==============================================================================
--- team/tzafrir/kernelmove_conf/zttool.c (original)
+++ team/tzafrir/kernelmove_conf/zttool.c Fri Jul 6 21:00:11 2007
@@ -27,6 +27,10 @@
* Primary Author: Mark Spencer <markster at digium.com>
*
*/
+
+/*** MODULEINFO
+DisplayName: Monitor zaptel spans
+ ***/
#include <stdio.h>
#include <getopt.h>
More information about the svn-commits
mailing list