[zaptel-commits] mattf: branch 1.4 r2971 - in /branches/1.4: Makefile patlooptest.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Tue Aug 28 13:16:51 2007
New Revision: 2971

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2971
Log:
Make sure the target name is not the same as the directory name.  Thanks Josh :-)

Modified:
    branches/1.4/Makefile
    branches/1.4/patlooptest.c

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2971&r1=2970&r2=2971
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Tue Aug 28 13:16:51 2007
@@ -437,7 +437,7 @@
 $(UTILSO): %.o: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
-install: all devices install-modules install-programs firmware
+install: all devices install-modules install-programs install-firmware
 	@echo "###################################################"
 	@echo "###"
 	@echo "### Zaptel installed successfully."
@@ -465,7 +465,7 @@
 		/sbin/update-modules ; \
 	fi
 
-firmware:
+install-firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	$(MAKE) -C firmware hotplug-install
 endif

Modified: branches/1.4/patlooptest.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/patlooptest.c?view=diff&rev=2971&r1=2970&r2=2971
==============================================================================
--- branches/1.4/patlooptest.c (original)
+++ branches/1.4/patlooptest.c Tue Aug 28 13:16:51 2007
@@ -62,6 +62,7 @@
 	}
 	ioctl(fd, ZT_GETEVENT);
 
+restart:
 	i = ZT_FLUSH_ALL;
 	if (ioctl(fd,ZT_FLUSH,&i) == -1)
 	   {
@@ -85,7 +86,7 @@
 			printf("Res is %d: %s\n", res, strerror(errno));
 			ioctl(fd, ZT_GETEVENT, &x);
 			printf("Event: %d\n", x);
-			exit(1);
+			continue;
 		}
 
 		if (skipcount)
@@ -99,7 +100,9 @@
 		res = read(fd, inbuf, bs);
 		if (res < bs) {
 			printf("Res is %d\n", res);
-			exit(1);
+			ioctl(fd, ZT_GETEVENT, &x);
+			printf("Event: %d\n", x);
+			continue;
 		}
 		if (!setup) {
 			c = inbuf[0];