[svn-commits] tzafrir: branch tzafrir/kernelmove_14 r2773 - in /team/tzafrir/kernelmove_14:...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Mon Jul 23 11:32:05 CDT 2007 

Author: tzafrir
Date: Mon Jul 23 11:32:03 2007
New Revision: 2773

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2773
Log:
Merge from branches/1.4  r2692:2772 .
Also:
* Added flag STANDALONE_ZAPATA to kernel/wctdm24xxp/
* Minr cleanups in Makefile and svn:ignore-s .

Added:
    team/tzafrir/kernelmove_14/build_tools/install_prereq
      - copied unchanged from r2772, branches/1.4/build_tools/install_prereq
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/   (props changed)
      - copied from r2772, branches/1.4/wctdm24xxp/
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/GpakApi.c
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/GpakApi.c
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/GpakApi.h
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/GpakApi.h
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/GpakCust.c
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/GpakCust.c
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/GpakCust.h
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/GpakCust.h
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/GpakHpi.h
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/GpakHpi.h
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/Makefile
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/Makefile
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/Makefile.kernel26
      - copied, changed from r2772, branches/1.4/wctdm24xxp/Makefile.kernel26
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/VPMADT032.bin
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/VPMADT032.bin
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/base.c
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/base.c
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/gpakErrs.h
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/gpakErrs.h
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/gpakenum.h
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/gpakenum.h
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp/wctdm24xxp.h
      - copied unchanged from r2772, branches/1.4/wctdm24xxp/wctdm24xxp.h
    team/tzafrir/kernelmove_14/kernel/xpp/README.metering
      - copied unchanged from r2772, branches/1.4/xpp/README.metering
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zconf/Zaptel/Config/
      - copied from r2772, branches/1.4/xpp/utils/zconf/Zaptel/Config/
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
      - copied unchanged from r2772, branches/1.4/xpp/utils/zconf/Zaptel/Config/Defaults.pm
Removed:
    team/tzafrir/kernelmove_14/README.Linux26
    team/tzafrir/kernelmove_14/kernel/wctdm24xxp.c
Modified:
    team/tzafrir/kernelmove_14/   (props changed)
    team/tzafrir/kernelmove_14/Makefile
    team/tzafrir/kernelmove_14/README
    team/tzafrir/kernelmove_14/TODO
    team/tzafrir/kernelmove_14/build_tools/genmodconf
    team/tzafrir/kernelmove_14/firmware/Makefile
    team/tzafrir/kernelmove_14/firmware/firmware.xml
    team/tzafrir/kernelmove_14/kernel/Makefile
    team/tzafrir/kernelmove_14/kernel/pciradio.c
    team/tzafrir/kernelmove_14/kernel/tor2.c
    team/tzafrir/kernelmove_14/kernel/torisa.c
    team/tzafrir/kernelmove_14/kernel/wcfxo.c
    team/tzafrir/kernelmove_14/kernel/wct1xxp.c
    team/tzafrir/kernelmove_14/kernel/wct4xxp/base.c
    team/tzafrir/kernelmove_14/kernel/wctc4xxp/base.c
    team/tzafrir/kernelmove_14/kernel/wctdm.c
    team/tzafrir/kernelmove_14/kernel/wcte11xp.c
    team/tzafrir/kernelmove_14/kernel/wcte12xp.c
    team/tzafrir/kernelmove_14/kernel/xpp/.version
    team/tzafrir/kernelmove_14/kernel/xpp/ChangeLog
    team/tzafrir/kernelmove_14/kernel/xpp/Makefile
    team/tzafrir/kernelmove_14/kernel/xpp/README.Astribank
    team/tzafrir/kernelmove_14/kernel/xpp/card_bri.c
    team/tzafrir/kernelmove_14/kernel/xpp/card_fxo.c
    team/tzafrir/kernelmove_14/kernel/xpp/card_fxs.c
    team/tzafrir/kernelmove_14/kernel/xpp/card_global.c
    team/tzafrir/kernelmove_14/kernel/xpp/card_global.h
    team/tzafrir/kernelmove_14/kernel/xpp/firmwares/FPGA_1141.hex
    team/tzafrir/kernelmove_14/kernel/xpp/firmwares/FPGA_1151.hex
    team/tzafrir/kernelmove_14/kernel/xpp/firmwares/FPGA_FXS.hex
    team/tzafrir/kernelmove_14/kernel/xpp/firmwares/USB_1130.hex
    team/tzafrir/kernelmove_14/kernel/xpp/firmwares/USB_1140.hex
    team/tzafrir/kernelmove_14/kernel/xpp/firmwares/USB_1150.hex
    team/tzafrir/kernelmove_14/kernel/xpp/init_card_3_26
    team/tzafrir/kernelmove_14/kernel/xpp/utils/Makefile
    team/tzafrir/kernelmove_14/kernel/xpp/utils/fpga_load.c
    team/tzafrir/kernelmove_14/kernel/xpp/utils/genzaptelconf
    team/tzafrir/kernelmove_14/kernel/xpp/utils/lszaptel
    team/tzafrir/kernelmove_14/kernel/xpp/utils/xpp.rules
    team/tzafrir/kernelmove_14/kernel/xpp/utils/xpp_blink
    team/tzafrir/kernelmove_14/kernel/xpp/utils/xpp_sync
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zapconf
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zaptel_hardware
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zconf/Zaptel/Chans.pm
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zconf/Zaptel/Hardware.pm
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zconf/Zaptel/Span.pm
    team/tzafrir/kernelmove_14/kernel/xpp/utils/zt_registration
    team/tzafrir/kernelmove_14/kernel/xpp/xbus-core.c
    team/tzafrir/kernelmove_14/kernel/xpp/xbus-core.h
    team/tzafrir/kernelmove_14/kernel/xpp/xdefs.h
    team/tzafrir/kernelmove_14/kernel/xpp/xpd.h
    team/tzafrir/kernelmove_14/kernel/xpp/xpp_usb.c
    team/tzafrir/kernelmove_14/kernel/xpp/xpp_zap.c
    team/tzafrir/kernelmove_14/kernel/xpp/xpp_zap.h
    team/tzafrir/kernelmove_14/kernel/xpp/xproto.c
    team/tzafrir/kernelmove_14/kernel/xpp/xproto.h
    team/tzafrir/kernelmove_14/kernel/zaptel-base.c
    team/tzafrir/kernelmove_14/kernel/zaptel.h
    team/tzafrir/kernelmove_14/kernel/ztdummy.c
    team/tzafrir/kernelmove_14/zaptel.init

Propchange: team/tzafrir/kernelmove_14/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 23 11:32:03 2007
@@ -1,3 +1,4 @@
+fxotune
 fxstest
 hdlcgen
 hdlcstress
@@ -11,32 +12,20 @@
 timertest
 usbfxstest
 ztdiag
+zttest
 zttool
 ztspeed
 ztmonitor
 ztcfg
 ztcfg-dude
+torisatool
 zonedata.lo
-torisatool
-tor2fw.h
-radfw.h
 tonezone.lo
-tones.h
-makefw
 libtonezone.so.1.0
-gendigits
-fxstest
-zttest
-fxotune
-*.ko
-*.mod.c
-.*.cmd
-.tmp_versions
 *.so
 *.a
+.tmp_versions
 version.h
-vpm450m_fw.h
-fw2h
 autom4te.cache
 missing
 makeopts
@@ -45,5 +34,4 @@
 config.log
 config.status
 menuselect-tree
-Modules.symvers
-Module.symvers
+README.html

Modified: team/tzafrir/kernelmove_14/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/Makefile?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/Makefile (original)
+++ team/tzafrir/kernelmove_14/Makefile Mon Jul 23 11:32:03 2007
@@ -29,6 +29,9 @@
     KSRC:=$(shell for dir in $(KSRC_SEARCH_PATH); do if [ -d $$dir ]; then echo $$dir; break; fi; done)
   endif
 endif
+
+-include $(KSRC)/.config
+
 KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2)
 KINCLUDES:=$(KSRC)/include
 
@@ -40,15 +43,17 @@
 
 # Set HOTPLUG_FIRMWARE=no to override automatic building with hotplug support
 # if it is enabled in the kernel.
+ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))
+  HOTPLUG_FIRMWARE:= yes
+else
+  HOTPLUG_FIRMWARE:= no
+endif
+
 ifeq ($(BUILDVER),linux26)
   ifneq (,$(wildcard $(INSTALL_PREFIX)/etc/udev/rules.d))
     DYNFS=yes
     UDEVRULES=yes
   endif
-  HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
-else
-  # Hotplug firmware loading is not supported on any other version then 2.6
-  HOTPLUG_FIRMWARE:=no
 endif
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -76,19 +81,41 @@
  endif
 endif
 
-MODULES		:= pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp \
+# FIXME: We should not have hardwired lists of modules in the makefile
+MODULES		:= pciradio tor2 torisa wcfxo wct1xxp wctdm \
   		   wcte11xp wcte12xp wcusb zaptel ztd-eth ztd-loc ztdummy \
 		   ztdynamic zttranscode
-MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
-
-ZAP_SUBDIRS	:= xpp wctc4xxp wct4xxp
-ZAP_SUBDIRS	:= $(filter-out $(MENUSELECT_MODULES),$(ZAP_SUBDIRS))
-
-ifeq ($(findstring xpp,$(MENUSELECT_MODULES)),)
+
+# remove modules that require features we don't support.
+# FIXME: even more hard0wiring in the makefile.
+ifneq (,$(filter m y,$(CONFIG_USB)))
+  # We have no USB support: 
+  NOSUPPORTED_MODULES	+= wcusb
+  NOSUPPORTED_DIRS	+= xpp
+endif
+ifeq (,$(filter m y,$(CONFIG_PCI)))
+  NOSUPPORTED_MODULES	+= pciradio tor2 wcfxo wct1xxp wctdm \
+			   wcte11xp wcte12xp
+  NOSUPPORTED_DIRS	+= wctdm24xxp wctc4xxp wct4xxp
+endif
+# CONFIG_ISA? CONFIG_EISA?
+ifeq (,$(filter m y,$(CONFIG_ISA)))
+  NOSUPPORTED_MODULES	+= torisa
+endif
+
+MODULES:=$(filter-out $(MENUSELECT_MODULES) $(NOSUPPORTED_MODULES),$(MODULES))
+
+ZAP_SUBDIRS	:= xpp wctdm24xxp wctc4xxp wct4xxp
+ZAP_SUBDIRS	:= $(filter-out $(MENUSELECT_MODULES) $(NOSUPPORTED_DIRS),$(ZAP_SUBDIRS))
+
+
+ifneq (,$(findstring xpp,$(ZAP_SUBDIRS)))
   BUILD_XPP:=yes
 endif
 
 CFLAGS+=-g -Wall -DSTANDALONE_ZAPATA -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+# FIXME: is this magic really needed in userspace?
+# If so: move it to autoconf.
 ifneq (,$(findstring ppc,$(UNAME_M)))
 CFLAGS_PPC:=-fsigned-char
 endif
@@ -101,8 +128,6 @@
 #
 # Features are now configured in zconfig.h
 #
-
-MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
 KMAKE		:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
 		   MODULES="$(MODULES)" ZAP_SUBDIRS="$(ZAP_SUBDIRS)"
@@ -115,9 +140,31 @@
 CONFIG_FILE=$(INSTALL_PREFIX)/etc/zaptel.conf
 CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
 
-CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
-ifndef CHKCONFIG
-CHKCONFIG:=:
+# sample makefile "trace print"
+#tracedummy=$(shell echo ====== GOT HERE ===== >&2; echo >&2)
+
+CHKCONFIG	:= $(wildcard /sbin/chkconfig)
+UPDATE_RCD	:= $(wildcard /usr/sbin/update-rc.d)
+ifneq (,$(DESTDIR))
+  ifneq (,$(CHKCONFIG))
+    ADD_INITD	:= $(CHKCONFIG) --add zaptel
+  else
+    ifndef (,$(UPDATE_RCD))
+      ADD_INITD	:= $(UPDATE_RCD) zaptel defaults 15 30
+    endif
+  endif
+endif
+
+INITRD_DIR	:= $(firstword $(wildcard /etc/rc.d/init.d /etc/init.d))
+ifneq (,$(INITRD_DIR))
+  INIT_TARGET	:= $(DESTDIR)$(INITRD_DIR)/zaptel
+  COPY_INITD	:= install -D zaptel.init $(INIT_TARGET)
+endif
+
+NETSCR_DIR	:= $(firstword $(wildcard /etc/sysconfig/network-scripts ))
+ifneq (,$(NET_SCR_DIR))
+  NETSCR_TARGET	:= $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc
+  COPY_NETSCR	:= install -D ifup-hdlc $(NETSCR_TARGET)
 endif
 
 ifneq ($(wildcard .version),)
@@ -356,26 +403,34 @@
 endif
 
 config:
-	if [ -d $(INSTALL_PREFIX)/etc/rc.d/init.d ]; then \
-		$(INSTALL) -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/rc.d/init.d/zaptel; \
-		if [ -z "$(INSTALL_PREFIX)" ]; then \
-			$(CHKCONFIG) --add zaptel; \
-		fi; \
-	elif [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
-		$(INSTALL) -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/init.d/zaptel; \
-		if [ -z "$(INSTALL_PREFIX)" ]; then \
-			$(CHKCONFIG) --add zaptel; \
-		fi; \
-	fi 
-	if [ -d $(INSTALL_PREFIX)/etc/default ] && [ ! -f $(INSTALL_PREFIX)/etc/default/zaptel ]; then \
-			$(INSTALL) -D -m 644 zaptel.sysconfig $(INSTALL_PREFIX)/etc/default/zaptel; \
-	fi
-	if [ -d $(INSTALL_PREFIX)/etc/sysconfig ] && [ ! -f $(INSTALL_PREFIX)/etc/sysconfig/zaptel ]; then \
-		$(INSTALL) -D -m 644 zaptel.sysconfig $(INSTALL_PREFIX)/etc/sysconfig/zaptel; \
-	fi
-	if [ -d $(INSTALL_PREFIX)/etc/sysconfig/network-scripts ]; then \
-		$(INSTALL) -D -m 755 ifup-hdlc $(INSTALL_PREFIX)/etc/sysconfig/network-scripts/ifup-hdlc; \
-	fi
+ifneq (,$(COPY_INITD))
+	$(COPY_INITD)
+endif
+ifneq (,$(wildcard /etc/default))
+  ifeq (,$(wildcard $(DESTDIR)/etc/default/zaptel))
+	install -D -m 644 zaptel.sysconfig $(DESTDIR)/etc/default/zaptel
+  endif
+endif
+ifneq (,$(wildcard /etc/sysconfig))
+  ifeq (,$(wildcard $(DESTDIR)/etc/sysconfig/zaptel))
+	install -D -m 644 zaptel.sysconfig $(DESTDIR)/etc/sysconfig/zaptel
+  endif
+endif
+ifneq (,$(COPY_NETSCR))
+	$(COPY_NETSCR)
+endif
+ifneq (,$(ADD_INITD))
+	$(ADD_INITD)
+endif
+	@echo "Zaptel has been configured."
+	@echo ""
+	@echo "If you have any zaptel hardware it is now recommended to "
+	@echo "edit /etc/default/zaptel or /etc/sysconfig/zaptel and set there an "
+	@echo "optimal value for the variable MODULES ."
+	@echo ""
+	@echo "I think that the zaptel hardware you have on your system is:"
+	@xpp/utils/zaptel_hardware || true
+
 
 update:
 	@if [ -d .svn ]; then \

Modified: team/tzafrir/kernelmove_14/README
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/README?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/README (original)
+++ team/tzafrir/kernelmove_14/README Mon Jul 23 11:32:03 2007
@@ -3,7 +3,7 @@
 Asterisk Development Team <asteriskteam at digium.com>
 $Revision$, $Date$
 
-Zaptel is a short for ZAPata Telephony.
+Zaptel is a short for ZAPata TELephony.
 
 Supported Hardware
 ------------------
@@ -46,6 +46,16 @@
 ------------------
 You will need a matching kernel source tree and a working Linux build 
 system. Some of the programs require some additional libraries.
+
+The script build_tools/install_prereq should help you install the
+required packages. To see what it suggests, run:
+
+  build_tools/install_prereq test
+
+You can either copy/paste that code to a terminal to run it, or just
+run:
+
+  build_tools/install_prereq test
 
 
 Kernel Source / "Headers"
@@ -68,6 +78,11 @@
     kernel-devel package. Or if you run kernel-smp or kernel-xen, you
     need kernel-smp-devel or kernel-xen-devel, respectively.
   * On SUSE you seem to need the package kernel-source .
+  * In some distributions (e.g.: in RHEL/CentOS, Fedora, Ubuntu) the 
+    installation of the kernel-devel / kernel-headers package will 
+    be of a version that is newer than the one you currently run. In 
+    such a case you may need to upgrade the kernel package itself as 
+    well and reboot.
 - To point explicitly to a different build tree: set KSRC to the kernel 
   source tree and KVERS to the exact kernel version:
 
@@ -77,15 +92,17 @@
 Kernel Configuration
 ~~~~~~~~~~~~~~~~~~~~
 If you build a custom kernel, note the following configuration items:
+
 - CONFIG_CRC_CCITT must be enabled ('y' or 'm'). On 2.6 kernels this can 
   be selected These can be selected from the "Library Routines" submenu 
   during kernel configuration via "make menuconfig".
-- ztdummy on i386/amd64 and later kernels (>= 2.6.15) can (and should)
-  use the system's RTC (Real Time Clock).
-- Alternatives to that for ztdummy are a UHCI USB controller (USB
-  controllers made by Intel or VIA) or a kernel that has HZ=1000
-  (default on kernels 2.6.0-2.6.12, optional on newer kernels. Not
-  possible on 2.4).
+- If you don't have any zaptel hardware, you need ztdummy.
+  * ztdummy on i386/amd64 and later kernels (>= 2.6.15) can (and should)
+    use the system's RTC (Real Time Clock).
+  * Alternatives to that for ztdummy are a UHCI USB controller (USB
+    controllers made by Intel or VIA) or a kernel that has HZ=1000
+    (default on kernels 2.6.0-2.6.12, optional on newer kernels. Not
+    possible on 2.4).
 
 
 A Build System
@@ -94,46 +111,75 @@
 There may be cases where you will need a specific version of gcc to build
 kernel modules.
 
-On Debian and similar distributions run:
-
-   apt-get install build-essential
-
-On Centos and Fedora:
-
-  apt-get install gcc
-
 
 Extra Libraries
 ~~~~~~~~~~~~~~~
 Some libraries are needed for extra utilities that are provided with
 Zaptel
 
-- libusb is needed for building fpgaload, needed for firmware loading of
+- libusb is needed for building fpga_load, needed for firmware loading of
   the Xorcom Astribank.
 - libnewt is needed to build the optional but useful utility zttool.
-- For building usbfxstest you will need the zapata library. TODO:
-  Needed?
-
-Installing the first two on Debian:
-
-  apt-get install libusb-dev libnewt-dev
-
-Installing the first two on Centos/Fedora:
-
-  yum install libusb-devel libnewt-devel
+
+
+Distribution-Specific Instructions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Debian 4.0 (Etch)
+  apt-get install linux-headers-`uname -r` build-essential libnewt-dev libusb-dev
+
+==== Debian 3.1 (Sarge)
+  apt-get install kernel-headers-`uname -r` build-essential libnewt-dev libusb-dev
+
+==== RHEL4 / CentOS 4
+You need the following non-kernel-related packages:
+
+  yum install gcc newt-devel libusb-devel
+
+If the following command produces an error, you need to install
+ithe kernel devel package:
+
+  ls /lib/modules/`uname -r`/build/.config
+
+The right one depends on your kernel version. If the following command
+produces output you have an SMP kernel:
+
+  uname -r | grep smp
+
+and thus need to run:
+
+  yum install kernel-smp kernel-smp-devel
+
+If that command produced no output, you have a non-SMP kernel:
+
+  yum install kernel kernel-devel
+
+At this point you should probably reboot to get the new kernel in effect.
 
 
 Installation
 ------------
-
-  ./configure
-  # optional step: select custom configuration:
-  #make menuconfig
-  # optional step: enable zaptel-perl
-  make
-  make install
-  # To install init scripts and config files:
-  #make config
+Note: If using `sudo` to build/install, you may need to add /sbin to your PATH.
+----------------------------------
+./configure
+# optional step: select custom configuration:
+#make menuconfig
+make
+make install
+# To install init scripts and config files:
+#make config
+----------------------------------
+
+
+zaptel.conf
+~~~~~~~~~~~
+The main method to configure Zaptel devices is using the utility
+*ztcfg*. ztcfg reads data from the configuration file /etc/zaptel.conf ,
+figures out what configuration to send to channels, and send it. 
+
+A sample annotated zaptel.conf is included in this directory and
+installed by default to /etc/zaptel.conf . Edit it to suit your
+configuration. Alternatively use the script genzaptelconf to generate
+one that should work with your system.
 
 
 Zaptel PERL modules
@@ -145,24 +191,117 @@
 - xpp-specific: zt_registration, xpp_sync, xpp_blink .
 - General: lszaptel, zapconf, zaptel_hardware
 
+The zaptel perl modules will currently only be automatically installed
+if you happen to isntall the xpp module. This should be the defualt, but
+you can also initiate it manually by running:
+
+  make -C xpp/utils install
+
 Those utilities require the perl modules to be installed, however they
 will also look for them in the directory zconf, and thus can be run
 directly from the zaptel source tree. For example:
 
   ./xpp/utils/zaptel_hardware
 
-The modules and utilities are not installed by default in this version
-of zaptel . In order to get them installed, you need do the following
-before running 'make install': remove the '#' in the line that sets 
-PERLLIBDIR in xpp/utils/Makefile . This can be done by e.g.:
-
-  sed -i -e 's/^#\(PERLLIBDIR\)/\1/' xpp/utils/Makefile
-
 To get usage information on a program, you can also use perldoc
 (sometimes provided in a package separate from perl itself). For
-instalnce:
+instance:
 
   perldoc ./xpp/utils/xpp_blink
+
+zapconf is currently experimental and intended to eventually replace
+genzaptelconf by a more maintainable code.
+
+
+Zaptel Device Files
+-------------------
+Userspace programs will usually interact with Zaptel through device
+files under the /dev/zap directory (pedantically: characted device files 
+with major number 196) . Those device files can be generated statically
+or dynamically through the udev system.
+
+* /dev/zap/ctl (196:0) - a general device file for various information and
+  control operations on the zaptel channels.
+* /dev/zap/NNN (196:NNN) - for NNN in the range 1-249. A device file for
+  zaptel channel NNN. It can be used to read data from the channel
+  and write data to the channel.
+* /dev/zap/transcode (196:250) - Used to connect to a zaptel transcoding
+  device.
+* /dev/zap/timer (196:253) - Allows setting timers. Used anywhere?
+* /dev/zap/channel (196:254) - Can be used to open an arbitrary zaptel
+  channel. This is an alternative to /dev/zap/NNN that is not limited to
+  249 channels.
+* /dev/zap/pseudo (196:255) - A timing-only device. Every time you open
+  it, a new Zaptel channel is created. That Zaptel channel is "pseudo" -
+  Zaptel recieves no data in it, and only sends garbage data with the
+  same timing as the Zaptel timing master device.
+
+
+Zaptel Timing
+-------------
+A PBX system should generally have a single clock. If you are connected
+to a telephony provider via a digital interface (e.g: E1, T1) you should
+also typically use the provider's clock (as you get through the
+interface). Hence one important job of Asterisk is to provide timing to
+the PBX. 
+
+Zaptel "ticks" once per millisecond (1000 times per second). On each
+tick every active zaptel channel reads and 8 bytes of data. Asterisk
+also uses this for timing, through a zaptel pseudo channel it opens.
+
+However, not all PBX systems are connected to a telephony provider via
+a T1 or similar connection. With an analog connection you are not synced
+to the other party. And some systems don't have Zaptel hardware at all.
+Even a digital card may be used for other uses or is simply not
+connected to a provider. Zaptel cards are also capable of providing timing 
+from a clock on card. Cheap x100P clone cards are sometimes used for
+that pupose.
+
+If all the above fail, you can use the module ztdummy to provide timing
+alone without needing any zaptel hardware. It will work with most
+systems and kernels.
+
+You can check the zaptel timing source with zttest, which is a small 
+utility that is included with zaptel. It runs in cycles. In each such
+cycle it tries to read 8192 bytes, and sees how long it takes. If zaptel
+is not loaded or you don't have the device files, it will fail
+immedietly. If you lack a timing device it will hang forever in the
+first cycle. Eitherwise it will just give you in each cycle the percent
+of how close it was. Also try running it with the option -v for a
+verbose output.
+
+
+Spans and Channels
+------------------
+Zaptel provides telephony *channels* to the userspace applications. 
+Those channels are channels are incoreperated into logical units called
+*spans*.
+
+With digital telephony adapters (e.g: E1 or T1), a span normally 
+represents a single port. With analog telephony a span typically
+represents a PCI adapter or a similar logical unit.
+
+Both channels and spans are identified by enumerating numbers (beginning
+with 1). The number of the channel is the lowest unused one when it is
+generated, and ditto for spans.
+
+
+PROCFS Interface: /proc/zap
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+A simple way to get the current list of spans and channels each span
+contains is the files under /proc/zaptel . /proc/zaptel is generated by
+zaptel as it loads. As each span registers to Zaptel, a file under
+/proc/zaptel is created for it. The name of that file is the number of
+that span.
+
+Each file has a 1-line title for the span followed by an empty line and
+then a line for each channel of the span. 
+
+The title line shows the number of the span, its name and title, and 
+(potentially) the alarms in which it is.
+
+The channel line for each channel shows its channel number, name and the
+actual signalling assigned to it through ztcfg.
 
 
 What is the license for the zaptel driver?

Modified: team/tzafrir/kernelmove_14/TODO
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/TODO?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/TODO (original)
+++ team/tzafrir/kernelmove_14/TODO Mon Jul 23 11:32:03 2007
@@ -4,6 +4,8 @@
 * Basic 2.4 build.
 * install.
 
+* Double-check wctdm24xxp (on 2.4, mainly).
+* get rid of EXPORT_ALL_VARIABLES
 * install does not install kernel/xpp/utils
 * Rename Makefile.kernel26 to Kbuild .
 * 2.4 subdirectories includes.

Modified: team/tzafrir/kernelmove_14/build_tools/genmodconf
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/build_tools/genmodconf?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/build_tools/genmodconf (original)
+++ team/tzafrir/kernelmove_14/build_tools/genmodconf Mon Jul 23 11:32:03 2007
@@ -42,7 +42,7 @@
 	exit 1
     fi
 elif [ "${1}" = "linux26" ]; then
-    toolver=`/sbin/modprobe --version | awk '{print $$3;}' | cut -d. -f2 | cut -d- -f1`
+    toolver=`/sbin/modprobe --version 2>/dev/null| awk '{print $3}' | cut -d. -f2 | cut -d- -f1`
     if [ ${toolver} -ge 2 ]; then
 	cmdopts=\$CMDLINE_OPTS
     fi

Modified: team/tzafrir/kernelmove_14/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/firmware/Makefile?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/firmware/Makefile (original)
+++ team/tzafrir/kernelmove_14/firmware/Makefile Mon Jul 23 11:32:03 2007
@@ -20,6 +20,7 @@
 OCT6114_064_VERSION:=1.05.01
 OCT6114_128_VERSION:=1.05.01
 TC400M_VERSION:=MR5.6
+VPMADT032_VERSION:=1.07
 
 FIRMWARE_URL:=http://ftp.digium.com/pub/telephony/firmware/releases
 
@@ -33,11 +34,13 @@
 FIRMWARE:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz)
 FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz)
 FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz)
+FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz)
 
 # Build a list of object files if hotplug will not be used
 OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.o)
+#OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032.o)
 
 # If "fetch" is used, --continue is not a valid option.
 ifeq ($(WGET),wget)
@@ -128,6 +131,29 @@
 	@echo "Firmware zaptel-fw-tc400m.bin is already installed with required version $(TC400M_VERSION)"
 endif
 
+zaptel-fw-vpmadt032-%.tar.gz: have_download
+ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" == "no" ] ) || ( [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ] && ! [ -f $(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ) || ( [ -d $(INSTALL_PREFIX)/lib/firmware ] && ! [ -f $(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes)
+	@echo "Attempting to download $@"
+	@if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi;
+	if test ! -f $@; then exit 1; fi; \
+	(cat $@ | gzip -d | tar -xf -)
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+	@echo "Installing zaptel-fw-vpmadt032.bin to hotplug firmware directories"
+	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
+		$(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+		rm -rf $(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-*; \
+		touch $(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION); \
+	fi
+	if [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
+		$(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(INSTALL_PREFIX)/lib/firmware; \
+		rm -rf $(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-vpmadt032-*; \
+		touch $(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION); \
+	fi
+endif
+else
+	@echo "Firmware zaptel-fw-vpmadt032.bin is already installed with required version $(VPMADT032_VERSION)"
+endif
+
 # Clean up any downloaded/extracted firmware packages
 dist-clean: clean
 	rm -f zaptel-fw-*.bin

Modified: team/tzafrir/kernelmove_14/firmware/firmware.xml
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/firmware/firmware.xml?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/firmware/firmware.xml (original)
+++ team/tzafrir/kernelmove_14/firmware/firmware.xml Mon Jul 23 11:32:03 2007
@@ -11,4 +11,8 @@
                         <defaultenabled>yes</defaultenabled>
 			<depend>wctc4xxp</depend>
                 </member>
+                <member name="FIRMWARE-VPMADT032" displayname="Digium VPMADT032" >
+                        <defaultenabled>yes</defaultenabled>
+			<depend>wctdm24xxp</depend>
+                </member>
 	</category>

Modified: team/tzafrir/kernelmove_14/kernel/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/Makefile?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/Makefile (original)
+++ team/tzafrir/kernelmove_14/kernel/Makefile Mon Jul 23 11:32:03 2007
@@ -6,4 +6,4 @@
 #
 #   make modules
 #
-# in the top-evel directory.
+# in the top-level directory.

Modified: team/tzafrir/kernelmove_14/kernel/pciradio.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/pciradio.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/pciradio.c (original)
+++ team/tzafrir/kernelmove_14/kernel/pciradio.c Mon Jul 23 11:32:03 2007
@@ -1709,7 +1709,7 @@
 
 			}
 
-			if (request_irq(pdev->irq, pciradio_interrupt, SA_SHIRQ, "pciradio", rad)) {
+			if (request_irq(pdev->irq, pciradio_interrupt, ZAP_IRQ_SHARED, "pciradio", rad)) {
 				printk("pciradio: Unable to request IRQ %d\n", pdev->irq);
 				if (rad->freeregion)
 					release_region(rad->ioaddr, 0xff);

Modified: team/tzafrir/kernelmove_14/kernel/tor2.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/tor2.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/tor2.c (original)
+++ team/tzafrir/kernelmove_14/kernel/tor2.c Mon Jul 23 11:32:03 2007
@@ -534,7 +534,7 @@
 	for (x = 0; x < 256; x++) tor->mem32[x] = 0x7f7f7f7f;
 
 
-	if (request_irq(tor->irq, tor2_intr, SA_INTERRUPT | SA_SHIRQ, "tor2", tor)) {
+	if (request_irq(tor->irq, tor2_intr, ZAP_IRQ_SHARED_DISABLED, "tor2", tor)) {
 		printk(KERN_ERR "Unable to request tormenta IRQ %d\n", tor->irq);
 		goto err_out_release_all;
 	}

Modified: team/tzafrir/kernelmove_14/kernel/torisa.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/torisa.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/torisa.c (original)
+++ team/tzafrir/kernelmove_14/kernel/torisa.c Mon Jul 23 11:32:03 2007
@@ -1068,7 +1068,7 @@
 		printk(KERN_ERR "No ISA tormenta card found at %05lx\n", base);
 		return -EIO;
 	}
-	if (request_irq(irq, torisa_intr, SA_INTERRUPT, "torisa", NULL)) {
+	if (request_irq(irq, torisa_intr, ZAP_IRQ_DISABLED, "torisa", NULL)) {
 		printk(KERN_ERR "Unable to request tormenta IRQ %d\n", irq);
 		return -EIO;
 	}

Modified: team/tzafrir/kernelmove_14/kernel/wcfxo.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wcfxo.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wcfxo.c (original)
+++ team/tzafrir/kernelmove_14/kernel/wcfxo.c Mon Jul 23 11:32:03 2007
@@ -895,7 +895,7 @@
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wcfxo_interrupt, SA_SHIRQ, "wcfxo", wc)) {
+			if (request_irq(pdev->irq, wcfxo_interrupt, ZAP_IRQ_SHARED, "wcfxo", wc)) {
 				printk("wcfxo: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->ioaddr, 0xff);

Modified: team/tzafrir/kernelmove_14/kernel/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wct1xxp.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wct1xxp.c (original)
+++ team/tzafrir/kernelmove_14/kernel/wct1xxp.c Mon Jul 23 11:32:03 2007
@@ -1318,7 +1318,7 @@
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, t1xxp_interrupt, SA_INTERRUPT | SA_SHIRQ, "t1xxp", wc)) {
+			if (request_irq(pdev->irq, t1xxp_interrupt, ZAP_IRQ_SHARED_DISABLED, "t1xxp", wc)) {
 				printk("t1xxp: Unable to request IRQ %d\n", pdev->irq);
 				kfree(wc);
 				return -EIO;

Modified: team/tzafrir/kernelmove_14/kernel/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wct4xxp/base.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wct4xxp/base.c (original)
+++ team/tzafrir/kernelmove_14/kernel/wct4xxp/base.c Mon Jul 23 11:32:03 2007
@@ -3691,14 +3691,14 @@
 
 
 #ifdef SUPPORT_GEN1
-			if (request_irq(pdev->irq, (dt->flags & FLAG_2NDGEN) ? t4_interrupt_gen2 :t4_interrupt, SA_INTERRUPT | SA_SHIRQ, (wc->numspans == 2) ? "wct2xxp" : "wct4xxp", wc)) 
+			if (request_irq(pdev->irq, (dt->flags & FLAG_2NDGEN) ? t4_interrupt_gen2 :t4_interrupt, ZAP_IRQ_SHARED_DISABLED, (wc->numspans == 2) ? "wct2xxp" : "wct4xxp", wc)) 
 #else
 			if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) {
 				printk("This driver does not support 1st gen modules\n");
 				kfree(wc);
 				return -ENODEV;
 			}	
-			if (request_irq(pdev->irq, t4_interrupt_gen2, SA_INTERRUPT | SA_SHIRQ, "t4xxp", wc)) 
+			if (request_irq(pdev->irq, t4_interrupt_gen2, ZAP_IRQ_SHARED_DISABLED, "t4xxp", wc)) 
 #endif
 			{
 				printk("t4xxp: Unable to request IRQ %d\n", pdev->irq);

Modified: team/tzafrir/kernelmove_14/kernel/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wctc4xxp/base.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wctc4xxp/base.c (original)
+++ team/tzafrir/kernelmove_14/kernel/wctc4xxp/base.c Mon Jul 23 11:32:03 2007
@@ -1689,7 +1689,7 @@
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wcdte_interrupt, SA_SHIRQ, "tc400b", wc)) {
+			if (request_irq(pdev->irq, wcdte_interrupt, ZAP_IRQ_SHARED, "tc400b", wc)) {
 				printk("wcdte error: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->iobase, 0xff);
@@ -1844,7 +1844,7 @@
 {
 	int res;
 
-	res = pci_module_init(&wcdte_driver);
+	res = zap_pci_module(&wcdte_driver);
 	if (res)
 		return -ENODEV;
 	return 0;

Modified: team/tzafrir/kernelmove_14/kernel/wctdm.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wctdm.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wctdm.c (original)
+++ team/tzafrir/kernelmove_14/kernel/wctdm.c Mon Jul 23 11:32:03 2007
@@ -2313,7 +2313,7 @@
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wctdm_interrupt, SA_SHIRQ, "wctdm", wc)) {
+			if (request_irq(pdev->irq, wctdm_interrupt, ZAP_IRQ_SHARED, "wctdm", wc)) {
 				printk("wctdm: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->ioaddr, 0xff);

Propchange: team/tzafrir/kernelmove_14/kernel/wctdm24xxp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 23 11:32:03 2007
@@ -1,0 +1,4 @@
+*.mod.c
+*.ko
+*.o
+*.cmd

Copied: team/tzafrir/kernelmove_14/kernel/wctdm24xxp/Makefile.kernel26 (from r2772, branches/1.4/wctdm24xxp/Makefile.kernel26)
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wctdm24xxp/Makefile.kernel26?view=diff&rev=2773&p1=branches/1.4/wctdm24xxp/Makefile.kernel26&r1=2772&p2=team/tzafrir/kernelmove_14/kernel/wctdm24xxp/Makefile.kernel26&r2=2773
==============================================================================
--- branches/1.4/wctdm24xxp/Makefile.kernel26 (original)
+++ team/tzafrir/kernelmove_14/kernel/wctdm24xxp/Makefile.kernel26 Mon Jul 23 11:32:03 2007
@@ -1,6 +1,6 @@
 obj-m += wctdm24xxp.o
 
-EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+EXTRA_CFLAGS := -I$(src)/.. -Wno-undef -DSTANDALONE_ZAPATA
 
 wctdm24xxp-objs := base.o GpakCust.o GpakApi.o
 

Modified: team/tzafrir/kernelmove_14/kernel/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wcte11xp.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wcte11xp.c (original)
+++ team/tzafrir/kernelmove_14/kernel/wcte11xp.c Mon Jul 23 11:32:03 2007
@@ -1517,7 +1517,7 @@
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, t1xxp_interrupt, SA_INTERRUPT | SA_SHIRQ, "wcte11xp", wc)) {
+			if (request_irq(pdev->irq, t1xxp_interrupt, ZAP_IRQ_SHARED_DISABLED, "wcte11xp", wc)) {
 				printk("wcte11xp: Unable to request IRQ %d\n", pdev->irq);
 				kfree(wc);
 				return -EIO;

Modified: team/tzafrir/kernelmove_14/kernel/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wcte12xp.c?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wcte12xp.c (original)
+++ team/tzafrir/kernelmove_14/kernel/wcte12xp.c Mon Jul 23 11:32:03 2007
@@ -1927,7 +1927,7 @@
 	/* Keep track of which device we are */
 	pci_set_drvdata(pdev, wc);
 	
-	if (request_irq(pdev->irq, te12xp_interrupt, SA_SHIRQ, te12xp_driver.name, wc)) {
+	if (request_irq(pdev->irq, te12xp_interrupt, ZAP_IRQ_SHARED, te12xp_driver.name, wc)) {
 		module_printk("Unable to request IRQ %d\n", pdev->irq);
 		if (wc->freeregion)
 			release_region(wc->iobase, 0xff);
@@ -2012,7 +2012,7 @@
 {
 	int res;
 
-	res = pci_module_init(&te12xp_driver);
+	res = zap_pci_module(&te12xp_driver);
 
 	return res ? -ENODEV : 0;
 }

Modified: team/tzafrir/kernelmove_14/kernel/xpp/.version
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/xpp/.version?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/xpp/.version (original)
+++ team/tzafrir/kernelmove_14/kernel/xpp/.version Mon Jul 23 11:32:03 2007
@@ -1,1 +1,1 @@
-trunk-r3965
+trunk-r4372

Modified: team/tzafrir/kernelmove_14/kernel/xpp/ChangeLog
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/xpp/ChangeLog?view=diff&rev=2773&r1=2772&r2=2773
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/xpp/ChangeLog (original)
+++ team/tzafrir/kernelmove_14/kernel/xpp/ChangeLog Mon Jul 23 11:32:03 2007
@@ -1,3 +1,24 @@
+Thu Jul 12 2007 Oron Peled <oron at actcom.co.il> - xpp.r4372
+  * Update to zaptel-1.2.18 and zaptel-1.4.3 (r4308 onward)
+  * Fix a critical race with zaptel synchronization (r4362)
+  * Added a /proc/xpp/cmds for statistics about command timing (r4360)

[... 10177 lines stripped ...]

More information about the svn-commits mailing list