[aadk-commits] dbailey: uClinux/trunk r334 - in /uClinux/trunk/uClinux-dist/user/busybox: ./...

[aadk-commits at lists.digium.com]

Author: dbailey
Date: Fri Apr 13 14:30:00 2007
New Revision: 334

URL: http://svn.digium.com/view/aadk?view=rev&rev=334
Log:
Integrate ztmonitor into busybox build

Modified:
    uClinux/trunk/uClinux-dist/user/busybox/config-s800i
    uClinux/trunk/uClinux-dist/user/busybox/include/applets.h
    uClinux/trunk/uClinux-dist/user/busybox/include/usage.h
    uClinux/trunk/uClinux-dist/user/busybox/miscutils/Config.in
    uClinux/trunk/uClinux-dist/user/busybox/miscutils/Makefile.in

Modified: uClinux/trunk/uClinux-dist/user/busybox/config-s800i
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/busybox/config-s800i?view=diff&rev=334&r1=333&r2=334
==============================================================================
--- uClinux/trunk/uClinux-dist/user/busybox/config-s800i (original)
+++ uClinux/trunk/uClinux-dist/user/busybox/config-s800i Fri Apr 13 14:30:00 2007
@@ -283,6 +283,7 @@
 # CONFIG_WATCHDOG is not set
 CONFIG_MAKEIPLIST=y
 CONFIG_ZTCFG=y
+CONFIG_ZTMONITOR=y
 CONFIG_NVRAM_EDIT=y
 
 #

Modified: uClinux/trunk/uClinux-dist/user/busybox/include/applets.h
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/busybox/include/applets.h?view=diff&rev=334&r1=333&r2=334
==============================================================================
--- uClinux/trunk/uClinux-dist/user/busybox/include/applets.h (original)
+++ uClinux/trunk/uClinux-dist/user/busybox/include/applets.h Fri Apr 13 14:30:00 2007
@@ -682,6 +682,9 @@
 #ifdef CONFIG_ZTCFG
 	APPLET(ztcfg, ztcfg_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_ZTMONITOR
+	APPLET(ztmonitor, ztmonitor_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 
 #if !defined(PROTOTYPES) && !defined(MAKE_USAGE)
 	{ 0,NULL,0 }

Modified: uClinux/trunk/uClinux-dist/user/busybox/include/usage.h
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/busybox/include/usage.h?view=diff&rev=334&r1=333&r2=334
==============================================================================
--- uClinux/trunk/uClinux-dist/user/busybox/include/usage.h (original)
+++ uClinux/trunk/uClinux-dist/user/busybox/include/usage.h Fri Apr 13 14:30:00 2007
@@ -82,6 +82,9 @@
 #define zapscan_trivial_usage \
 	"[OPTIONS]..."
 
+#define ztmonitor_trivial_usage \
+	"<channel num> [OPTIONS]..."
+
 #define ztcfg_full_usage \
 	"[OPTIONS]...\n"
 	"   Configure zaptel interfaces.   Valid options are:\n" \
@@ -96,6 +99,12 @@
 #define zapscan_full_usage \
 	"[OPTIONS]...\n"
 
+
+#define ztmonitor_full_usage \
+	"<channel num> [OPTIONS]...\n" \
+	"   monitor zaptel channel data.  Valid options are:\n" \
+	"  -v[v]             -- verbose output \n" \
+	"  -f  FILE          -- output data to the specified file. \n" 
 
 #define makeiplist_trivial_usage \
 	"START COUNT"

Modified: uClinux/trunk/uClinux-dist/user/busybox/miscutils/Config.in
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/busybox/miscutils/Config.in?view=diff&rev=334&r1=333&r2=334
==============================================================================
--- uClinux/trunk/uClinux-dist/user/busybox/miscutils/Config.in (original)
+++ uClinux/trunk/uClinux-dist/user/busybox/miscutils/Config.in Fri Apr 13 14:30:00 2007
@@ -218,6 +218,13 @@
 	  The ztcfg utility is used with Digium zaptel hardware to configure
 	  the interfaces.  You'll want this on an S800i or similar.
 
+config CONFIG_ZTMONITOR
+	bool "ztmonitor"
+	default n
+	help
+	  The ztmonitor utility is used with Digium zaptel hardware to capture 
+	  zaptel channel activity You'll want this on an S800i or similar.
+
 config CONFIG_NVRAM
 	bool "nvram"
 	default y

Modified: uClinux/trunk/uClinux-dist/user/busybox/miscutils/Makefile.in
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/busybox/miscutils/Makefile.in?view=diff&rev=334&r1=333&r2=334
==============================================================================
--- uClinux/trunk/uClinux-dist/user/busybox/miscutils/Makefile.in (original)
+++ uClinux/trunk/uClinux-dist/user/busybox/miscutils/Makefile.in Fri Apr 13 14:30:00 2007
@@ -38,6 +38,7 @@
 MISCUTILS-$(CONFIG_TIME)		+= time.o
 MISCUTILS-$(CONFIG_WATCHDOG)		+= watchdog.o
 MISCUTILS-$(CONFIG_ZTCFG)		+= ztcfg.o
+MISCUTILS-$(CONFIG_ZTMONITOR)		+= ztmonitor.o
 MISCUTILS-$(CONFIG_ZAPSCAN)		+= zapscan.o
 MISCUTILS-$(CONFIG_NVRAM)		+= nvram.o
 MISCUTILS-$(CONFIG_MAKEIPLIST)		+= makeiplist.o
@@ -47,6 +48,7 @@
 needlibm-y:=
 needlibm-$(CONFIG_DC) := y
 needlibm-$(CONFIG_ZTCFG) := y
+needlibm-$(CONFIG_ZTMONITOR) := y
 
 ifeq ($(needlibm-y),y)
   LIBRARIES += -lm