various minor fixes and get dahdi_tool to actually be built

git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4340 a0bf4364-ded3-4de4-8d8a-66a801d63aff

5 files changed, 8 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 36c95f4..644fea6 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ UTILS		+= patgen pattest patlooptest hdlcstress hdlctest hdlcgen \
 
 UTILSO		= $(UTILS:%=%.o)
 
-BINS:=fxotune fxstest sethdlc dahdi_cfg dahdi_diag dahdi_monitor dahdi_speed dahdi_test dahdi_scan
+BINS:=fxotune fxstest sethdlc dahdi_cfg dahdi_diag dahdi_monitor dahdi_speed dahdi_test dahdi_scan dahdi_tool
 BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
 MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
 
diff --git a/dahdi_diag.c b/dahdi_diag.c
index 1b5b105..2fd56d7 100644
--- a/dahdi_diag.c
+++ b/dahdi_diag.c
@@ -14,9 +14,9 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "Usage: ztdiag <channel>\n");
 		exit(1);
 	}
-	fd = open("/dev/zap/ctl", O_RDWR);
+	fd = open("/dev/dahdi/ctl", O_RDWR);
 	if (fd < 0) {
-		perror("open(/dev/zap/ctl");
+		perror("open(/dev/dahdi/ctl");
 		exit(1);
 	}
 	if (ioctl(fd, DAHDI_CHANDIAG, &chan)) {
diff --git a/dahdi_scan.c b/dahdi_scan.c
index 23d5226..5f7fe48 100644
--- a/dahdi_scan.c
+++ b/dahdi_scan.c
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 	char buf[100];
 	char alarms[50];
 
-	if ((ctl = open("/dev/zap/ctl", O_RDWR)) < 0) {
-		fprintf(stderr, "Unable to open /dev/zap/ctl: %s\n", strerror(errno));
+	if ((ctl = open("/dev/dahdi/ctl", O_RDWR)) < 0) {
+		fprintf(stderr, "Unable to open /dev/dahdi/ctl: %s\n", strerror(errno));
 		exit(1);
 	}
 	
diff --git a/dahdi_tool.c b/dahdi_tool.c
index de7067b..fe49a54 100644
--- a/dahdi_tool.c
+++ b/dahdi_tool.c
@@ -568,9 +568,9 @@ static void cleanup(void)
 int main(int argc, char *argv[])
 {
 
-	ctl = open("/dev/zap/ctl", O_RDWR);
+	ctl = open("/dev/dahdi/ctl", O_RDWR);
 	if (ctl < 0) {
-		fprintf(stderr, "Unable to open /dev/zap/ctl: %s\n", strerror(errno));
+		fprintf(stderr, "Unable to open /dev/dahdi/ctl: %s\n", strerror(errno));
 		exit(1);
 	}
 	newtInit();
diff --git a/tonezone.c b/tonezone.c
index ee3d9d8..588bf52 100644
--- a/tonezone.c
+++ b/tonezone.c
@@ -33,7 +33,7 @@
 #include "dahdi/user.h"
 #include "tonezone.h"
 
-#define DEFAULT_DAHDI_DEV "/dev/zap/ctl"
+#define DEFAULT_DAHDI_DEV "/dev/dahdi/ctl"
 
 #define MAX_SIZE 16384
 #define CLIP 32635