SOURCES: zaptel-sangoma.patch (NEW), zaptel-make.patch - 1.2.7

[areq]

Author: areq                         Date: Sun Aug 20 00:47:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 1.2.7

---- Files affected:
SOURCES:
   zaptel-sangoma.patch (NONE -> 1.1)  (NEW), zaptel-make.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/zaptel-sangoma.patch
diff -u /dev/null SOURCES/zaptel-sangoma.patch:1.1
--- /dev/null	Sun Aug 20 02:47:46 2006
+++ SOURCES/zaptel-sangoma.patch	Sun Aug 20 02:47:41 2006
@@ -0,0 +1,29 @@
+diff -Nur zaptel-1.2.7.org/zaptel.c zaptel-1.2.7_/zaptel.c
+--- zaptel-1.2.7.org/zaptel.c   2005-12-17 03:04:05.000000000 +0100
++++ zaptel-1.2.7_/zaptel.c      2006-08-07 15:36:18.487081500 +0200
+ 		} else {
+ 			if (copy_from_user(chan->writebuf[chan->inwritebuf], usrbuf, amnt))
+ 				return -EFAULT;
++                        if ((chan->flags & ZT_FLAG_HDLC) && chan->span->ioctl != NULL){
++                                if (chan->span->ioctl(chan, ZT_DCHAN_TX_V2, amnt)==0){
++                                        return amnt;
++                                }
++                        }
+ 			chan->writen[chan->inwritebuf] = amnt;
+ 		}
+ 		chan->writeidx[chan->inwritebuf] = 0;
+diff -Nur zaptel-1.2.7.org/zaptel.h zaptel-1.2.7_/zaptel.h
+--- zaptel-1.2.7.org/zaptel.h   2005-12-17 03:04:05.000000000 +0100
++++ zaptel-1.2.7_/zaptel.h      2006-08-07 15:36:18.479081000 +0200
+@@ -632,6 +632,11 @@
+  *  60-80 are reserved for private drivers
+  *  80-85 are reserved for dynamic span stuff
+  */
++#define ZT_DCHAN_TX    _IOR (ZT_CODE, 60, int)
++#define ZT_DCHAN_TX_V1  ZT_DCHAN_TX
++#define ZT_DCHAN_TX_V2  ZT_DCHAN_TX
++/*
++ */
+ 
+ /*
+  * Create a dynamic span

================================================================
Index: SOURCES/zaptel-make.patch
diff -u SOURCES/zaptel-make.patch:1.5 SOURCES/zaptel-make.patch:1.6
--- SOURCES/zaptel-make.patch:1.5	Tue Jun  6 00:10:47 2006
+++ SOURCES/zaptel-make.patch	Sun Aug 20 02:47:41 2006
@@ -1,22 +1,51 @@
 diff -ur zaptel-1.2.1.org/Makefile zaptel-1.2.1/Makefile
 --- zaptel-1.2.1.org/Makefile	2005-12-04 20:29:27.000000000 +0100
 +++ zaptel-1.2.1/Makefile	2006-01-12 21:50:07.253302750 +0100
-@@ -22,12 +22,12 @@
+@@ -7,9 +7,8 @@
+ 
+ 
+ HOSTCC=gcc
+-ifeq ($(PWD),)
+ PWD:=$(shell pwd)
+-endif
++
+ # If you want to build for a kernel other than the current kernel, set KVERS
+ ifndef KVERS
+ KVERS:=$(shell uname -r)
+@@ -24,12 +24,12 @@
  endif
  KINCLUDES:=$(KSRC)/include
  
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. $(OPTFLAGS) -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+-CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
++CFLAGS+=-I. -Iinclude $(OPTFLAGS) -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
  CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
  CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
  CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
  LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
 -KFLAGS:=-I$(KINCLUDES) -O6
-+KFLAGS=-I$(KINCLUDES) $(OPTFLAGS)
++KFLAGS:=-I$(KINCLUDES) $(OPTFLAGS)
  KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
  	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net
  ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
-@@ -308,20 +308,6 @@
+@@ -111,7 +111,7 @@
+ 
+ MOD_DESTDIR:=zaptel
+ 
+-EXTRA_CFLAGS:=-I$(PWD)/include  -I$(PWD)/include/oct6100api
++EXTRA_CFLAGS:=-I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api
+ obj-m:=$(MODULESO)
+ wct4xxp-objs:=wct4xxp_base.o vpm450m.o
+ 
+@@ -177,7 +177,7 @@
+ 	$(CC) $(KFLAGS) -o $@ -c $<
+ 
+ vpm450m.o: vpm450m.c zaptel.h
+-	$(CC) $(KFLAGS) -I$(PWD)/include  -I$(PWD)/include/oct6100api -o $@ -c $<
++	$(CC) $(KFLAGS) -I$(PWD)/include -I$(PWD)/include/oct6100api -I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
+ 
+ wct4xxp.o: wct4xxp_base.o vpm450m.o
+ 	$(LD) -r -o $@ wct4xxp_base.o vpm450m.o
+@@ -322,20 +322,6 @@
  		install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
  	fi
  	if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi
@@ -37,7 +66,7 @@
  	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
  	[ `id -u` = 0 ] && /sbin/ldconfig || :
  	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
-@@ -335,12 +321,7 @@
+@@ -349,12 +335,7 @@
  	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
  	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
  	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/zaptel-make.patch?r1=1.5&r2=1.6&f=u