No subject


Thu Jul 12 09:23:04 CDT 2007


................
r4564 | sruffell | 2008-10-10 15:37:48 -0700 (Fri, 10 Oct 2008) | 5 lines

- Ensure that the source format is considered when selecting a transcoder.
- When a command is to be retried, turn off the TX_COMPLETE flag before
  resubmitting it to the hardware. This should elimate some of the warnings
  printed to the kernel log in the wctc4xxp_transmit_cmd function.

................
r4567 | sruffell | 2008-10-15 11:57:01 -0700 (Wed, 15 Oct 2008) | 3 lines

Zaptel should always notify user mode whenever it has received buffers to
process.

................
r4569 | sruffell | 2008-10-15 14:09:24 -0700 (Wed, 15 Oct 2008) | 2 lines

Fixing typo...there is not a rebufpolicy.

................
r4570 | tzafrir | 2008-10-20 03:26:55 -0700 (Mon, 20 Oct 2008) | 3 lines

Uninstall other versions of zaptel modules on install, rather than 
uninstall dahdi twice.

................
r4571 | tzafrir | 2008-10-20 05:13:31 -0700 (Mon, 20 Oct 2008) | 2 lines

zapconf: Fix number in error message in case of unknown channel type.

................
r4572 | tzafrir | 2008-10-22 02:22:49 -0700 (Wed, 22 Oct 2008) | 2 lines

xpp FXS init script: Do use high-pass filter.

................
r4573 | tzafrir | 2008-10-30 13:14:26 -0700 (Thu, 30 Oct 2008) | 2 lines

Use correct length for the Zaptel transcoder device name.

................
r4578 | tzafrir | 2008-11-10 12:41:54 -0800 (Mon, 10 Nov 2008) | 4 lines

xpp init_card_2_30: no need to check environment in verify mode.

Fixes #13832 in Zaptel.

................
r4579 | sruffell | 2008-11-13 14:19:24 -0800 (Thu, 13 Nov 2008) | 4 lines

Make a message about the host cacheline size being unsupported a debug only
message.  The voicebus interface still works whether the cacheline size is
supported or not, but the message is confusing to users.

................
r4581 | tzafrir | 2008-11-16 11:26:07 -0800 (Sun, 16 Nov 2008) | 9 lines

Fixed USB firmware that caused some bad bioses to hang on boot.

The BIOSes included in a number of motherboards could hang from an
Astribank firmware newer than 1.2.20.1 / 1.4.5.1 . This was due to an
some incorrect USB information in the firmware. This firmware fixes it.

Merged revisions 4580 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r4582 | sruffell | 2008-11-17 11:43:23 -0800 (Mon, 17 Nov 2008) | 7 lines

- Fix for race condition of encoder and decoder are allocated at the same time
  in the driver.  This would result in -EBUSY returns from the
  DAHDI_TC_ALLOCATE ioctl.
- Increase the length of the receive descriptor ring from 8 to 32 to reduce
  the probability of running out of receive descriptors.


................
r4584 | tzafrir | 2008-11-18 03:36:45 -0800 (Tue, 18 Nov 2008) | 6 lines

xpp_pri: Fix T1 CRC initialization
         Clock synchronization when sync is not from first port.

Merged revisions 4583 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r4585 | sruffell | 2008-11-18 13:12:19 -0800 (Tue, 18 Nov 2008) | 2 lines

Fix typo that was preventing compilation of wctc4xxp.

................
r4586 | qwell | 2008-11-21 12:14:19 -0800 (Fri, 21 Nov 2008) | 5 lines

Fix a think-o in numeric comparison.  Swap order to make it more clear.

(closes issue #13813)
Reported by: ys

................
r4588 | tzafrir | 2008-11-25 13:01:04 -0800 (Tue, 25 Nov 2008) | 4 lines

Fix handling of an invalid timing (sync) parameter in DAHDI_SPANCONFIG.

Fixing issue #13954 in zaptel 1.4

................
r4589 | tzafrir | 2008-11-30 03:02:49 -0800 (Sun, 30 Nov 2008) | 5 lines

xpp/firmwares/README: firmwares is no longer a separate distribution.
Fix README (better late than never). 

xpp rev. 6403.

................
r4590 | tzafrir | 2008-11-30 04:10:03 -0800 (Sun, 30 Nov 2008) | 8 lines

xpp: PCM changes and related bugfixes.

* Power-denial signalling is now sent to Zaptel to decide if we're LS or
  KS (and not hang up ourselves always).
* Fix card_fxo's caller_id_style=1 (FSK).
* Macro XPD_CHAN: s/xpd->chans[i]/XPD_CHAN(xpd, i)/  to reduce diff from DAHDI.


................
r4591 | tzafrir | 2008-11-30 06:45:28 -0800 (Sun, 30 Nov 2008) | 3 lines

cvt_zapdahdi: convert source files between Zaptel and DAHDI
              Helps showing the real changes

................
r4592 | sruffell | 2008-12-04 15:01:48 -0800 (Thu, 04 Dec 2008) | 6 lines

- Ensure that the sample size is set correctly when decoding G723 packets.
- Do not use an already built channel if the source and destination formats do
  not match the formats we want.  This fixes a regression introduced by the
  new transcoder interface where a translation path from one complex codec to
  another can result in garbled audio.

................
r4593 | sruffell | 2008-12-04 15:09:28 -0800 (Thu, 04 Dec 2008) | 4 lines

Service the transmit descriptor ring before the receive descriptor ring so
that commands that are still sitting on the transmit descriptor ring are not
completed twice.

................

Added:
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/LICENSE.LGPL
      - copied unchanged from r4593, branches/1.4/LICENSE.LGPL
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/build_tools/cvt_zapdahdi
      - copied unchanged from r4593, branches/1.4/build_tools/cvt_zapdahdi
Removed:
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctc4xxp/codec_test.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/calibrate_slics
Modified:
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/   (props changed)
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/Makefile
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/README
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/bittest.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/build_tools/test_kernel_git
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/complex.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/firmware/Makefile
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/fxotune.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/fxotune.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/fxstest.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/hdlcgen.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/hdlcstress.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/hdlctest.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/hdlcverify.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/adt_lec.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/adt_lec.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/arith.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/digits.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/fasthdlc.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/fxo_modes.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/hpec/hpec.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/hpec/hpec_user.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/hpec/hpec_zaptel.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/jpah.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/kb1ec.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/kb1ec_const.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/makefw.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/mg2ec.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/mg2ec_const.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/pciradio.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/proslic.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/tor2-hw.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/tor2.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/torisa.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/voicebus.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/voicebus.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcfxo.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wct1xxp.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wct4xxp/base.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wct4xxp/vpm450m.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wct4xxp/vpm450m.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wct4xxp/wct4xxp-diag.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wct4xxp/wct4xxp.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctc4xxp/Kbuild
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctc4xxp/Makefile
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctc4xxp/base.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/GpakApi.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/GpakApi.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/GpakCust.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/GpakCust.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/GpakHpi.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/base.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/gpakErrs.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/gpakenum.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wctdm24xxp/wctdm24xxp.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte11xp.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/GpakApi.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/GpakApi.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/GpakErrs.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/GpakHpi.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/base.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/gpakenum.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/vpmadt032.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/vpmadt032.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcte12xp/wcte12xp.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcusb.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/wcusb.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/.version
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/Changelog_xpp
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/Kbuild
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/card_bri.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/card_fxo.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/card_fxs.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/card_global.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/card_pri.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/firmwares/FPGA_1141.hex
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/firmwares/FPGA_1151.hex
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/firmwares/FPGA_FXS.hex
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/firmwares/README
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/firmwares/USB_FW.hex
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/init_card_1_30
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/init_card_2_30
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/init_card_3_30
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/init_card_4_30
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/Makefile
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/fpga_load.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/lszaptel
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/xpp_fxloader   (contents, props changed)
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/zapconf
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/zconf/Zaptel.pm
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/zconf/Zaptel/Chans.pm
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xbus-core.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xbus-pcm.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xbus-pcm.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xframe_queue.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xpd.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xpp_zap.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xpp_zap.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xproto.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/xpp/xproto.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/zaptel-base.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/zaptel.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/zconfig.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/ztd-eth.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/ztd-loc.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/ztdummy.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/ztdummy.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/ztdynamic.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/kernel/zttranscode.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/live_zap
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/mkfilter.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/patgen.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/patlooptest.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/pattest.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/ppp/zaptel.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/sethdlc-new.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/sethdlc.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/timertest.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/tonezone.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/tonezone.h
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/torisatool.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/usbfxstest.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/zonedata.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/ztcfg-dude.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/ztcfg.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/ztdiag.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/ztmonitor.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/ztscan.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/ztspeed.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/zttest.c
    team/mspiceland/zaptel-1.4-adtapiupdatefor117/zttool.c

Propchange: team/mspiceland/zaptel-1.4-adtapiupdatefor117/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/mspiceland/zaptel-1.4-adtapiupdatefor117/
------------------------------------------------------------------------------
--- branch-1.2-blocked (original)
+++ branch-1.2-blocked Fri Dec 12 16:39:49 2008
@@ -1,1 +1,1 @@
-/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201,3509,3645,3833,3847,3917,3951,4037-4038,4117,4233
+/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201,3509,3645,3833,3847,3917,3951,4037-4038,4117,4233,4442,4461-4463,4510

Propchange: team/mspiceland/zaptel-1.4-adtapiupdatefor117/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/mspiceland/zaptel-1.4-adtapiupdatefor117/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 12 16:39:49 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-4412
+/branches/1.4:1-4594

Modified: team/mspiceland/zaptel-1.4-adtapiupdatefor117/Makefile
URL: http://svn.digium.com/view/zaptel/team/mspiceland/zaptel-1.4-adtapiupdatefor117/Makefile?view=diff&rev=4595&r1=4594&r2=4595
==============================================================================
--- team/mspiceland/zaptel-1.4-adtapiupdatefor117/Makefile (original)
+++ team/mspiceland/zaptel-1.4-adtapiupdatefor117/Makefile Fri Dec 12 16:39:49 2008
@@ -16,6 +16,7 @@
 
 ifeq ($(MAKELEVEL),0)
 PWD:=$(shell pwd)
+export PWD
 endif
 
 ifeq ($(ARCH),)
@@ -41,6 +42,7 @@
   endif
 endif
 KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2)
+KVERS_POINT:=$(shell echo $(KVERS) | cut -d. -f3 | cut -d- -f1)
 KINCLUDES:=$(KSRC)/include
 
 # We use the kernel's .config file as an indication that the KSRC
@@ -102,8 +104,16 @@
 endif
 
 ifeq ($(BUILDVER),linux24)
-MENUSELECT_MODULES+=xpp wctc4xxp wctdm24xxp zttranscode
-endif
+INCOMPAT_MODULES:=xpp wcte12xp wctc4xxp wctdm24xxp zttranscode
+endif
+
+ifeq ($(BUILDVER),linux26)
+ifneq ($(findstring $(KVERS_POINT),1 2 3 4 5 6 7 8),)
+INCOMPAT_MODULES:=wcte12xp wctc4xxp wctdm24xxp zttranscode
+endif
+endif
+
+MENUSELECT_MODULES+=$(sort $(INCOMPAT_MODULES))
 
 ifeq ($(findstring xpp,$(MENUSELECT_MODULES)),)
   BUILD_XPP:=yes
@@ -212,7 +222,7 @@
   ifneq (,$(CHKCONFIG))
     ADD_INITD	:= $(CHKCONFIG) --add zaptel
   else
-    ifndef (,$(UPDATE_RCD))
+    ifneq (,$(UPDATE_RCD))
       ADD_INITD	:= $(UPDATE_RCD) zaptel defaults 15 30
     endif
   endif
@@ -305,7 +315,7 @@
 endif
 	$(KMAKE) modules
 
-version.h:
+version.h: FORCE
 	@ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
 	@if cmp -s $@.tmp $@ ; then :; else \
 		mv $@.tmp $@ ; \
@@ -435,6 +445,17 @@
 	@echo "###   make config"
 	@echo "###"
 	@echo "###################################################"
+ifneq ($(INCOMPAT_MODULES),)
+	@echo "***************************************************"
+	@echo "***"
+	@echo "*** WARNING:"
+	@echo "*** The following modules were not installed due to"
+	@echo "*** being incompatible with your $(KVERS) kernel."
+	@echo "***"
+	@echo "*** $(INCOMPAT_MODULES)"
+	@echo "***"
+	@echo "***************************************************"
+endif
 
 install-programs: install-utils install-libs install-include
 
@@ -456,7 +477,7 @@
 		/sbin/update-modules ; \
 	fi
 
-install-firmware:
+install-firmware: menuselect.makeopts
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	$(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 endif
@@ -479,7 +500,6 @@
 	/sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
   endif
 endif
-	$(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
 
 install-utils-subdirs:
 	@for dir in $(SUBDIRS_UTILS); do \
@@ -488,6 +508,8 @@
 
 install-include:
 	$(INSTALL) -D -m 644 kernel/zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
+	$(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
+	@rm -rf $(DESTDIR)$(includedir)/dahdi
 
 devices:
 ifneq (yes,$(DYNFS))
@@ -539,7 +561,7 @@
 		rm -rf /lib/modules/$(KVERS)/dahdi; \
 		echo "done."; \
 	fi
-	build_tools/uninstall-modules dahdi $(KVERS)
+	build_tools/uninstall-modules zaptel $(KVERS)
 endif
 	$(KMAKE_INST)
 endif
@@ -657,7 +679,9 @@
 	@echo "Generating input for menuselect ..."
 	@build_tools/make_tree > $@
 
-.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules tests devel data stackcheck install-udev config update install-programs install-modules install-include install-libs install-utils-subdirs utils-subdirs uninstall-modules
+.PHONY: menuselect distclean dist-clean clean all _all install b410p devices programs modules tests devel data stackcheck install-udev config update install-programs install-modules install-include install-libs install-utils-subdirs utils-subdirs uninstall-modules
+
+FORCE:
 
 endif
 

Modified: team/mspiceland/zaptel-1.4-adtapiupdatefor117/README
URL: http://svn.digium.com/view/zaptel/team/mspiceland/zaptel-1.4-adtapiupdatefor117/README?view=diff&rev=4595&r1=4594&r2=4595
==============================================================================
--- team/mspiceland/zaptel-1.4-adtapiupdatefor117/README (original)
+++ team/mspiceland/zaptel-1.4-adtapiupdatefor117/README Fri Dec 12 16:39:49 2008
@@ -44,7 +44,9 @@
 Other Drivers
 ~~~~~~~~~~~~~
 - pciradio: Zapata Telephony PCI Quad Radio Interface
-- wctc4xxp: Digium hardware transcoder cards (also need zttranscode)
+- wctc4xxp: Digium hardware transcoder cards (also need zttranscode).
+  Note that this driver requires Asterisk 1.4.22 or above because the
+  interface used by codec_zap was changed in zaptel-1.4.12.
 - ztd-eth: TDM over Ethernet (TDMoE) driver. Requires ztdynamic
 - ztd-loc: Mirror a local span. Requires ztdynamic
 - ztdummy: A dummy driver that only provides a zaptel timing source.
@@ -68,7 +70,7 @@
 
 Kernel Source / "Headers"
 ~~~~~~~~~~~~~~~~~~~~~~~~~
-- Building zaptel requires a kernel build tree.
+- Building Zaptel requires a kernel build tree.
 - This should basically be at least a partial kernel source tree and
   most importantly, the exact kernel .config file used for the build as
   well as several files generated at kernel build time.
@@ -104,13 +106,13 @@
 - 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".
-- If you don't have any zaptel hardware, you need ztdummy. ztdummy takes
+- If you don't have any Zaptel hardware, you need ztdummy. ztdummy takes
   its timing from the kernel. It can use either of the following:
-  * ztdummy on i386/x86_64 with kernels >= 2.6.22 can (and should) use 
-    high resolution times (CONFIG_HIGH_RES_TIMERS), and (if available, 
+  * ztdummy on i386/x86_64 with kernels >= 2.6.22 can (and should) use
+    high resolution timers (CONFIG_HIGH_RES_TIMERS), and (if available),
     the system HPET. This shows as "source: HRTimer". This is
     recommended.
-  * ztdummy on i386/x86_64 and later kernels (>= 2.6.15) can use the 
+  * ztdummy on i386/x86_64 with kernels >= 2.6.15 can use the 
     system's RTC (Real Time Clock). This shows as "source: RTC".
   * Failing that, on Linux 2.6 kernels with HZ=1000 (was the default
     before 2.6.13). This shows as "source: Linux26".
@@ -120,7 +122,7 @@
     possible on 2.4). This shows as: "source: UHCI".
 
 
-A Build System
+Build System
 ~~~~~~~~~~~~~~
 gcc and friends. Generally you will need to install the package gcc.
 There may be cases where you will need a specific version of gcc to build
@@ -272,7 +274,7 @@
 needed to change anything in the script beyond changing live.conf so I
 can include useful fixes.
 
-Testing on a different maching:
+Testing on a different machine:
 
   ./configure
   make
@@ -283,6 +285,29 @@
   # in the remote host:
   cd /tmp
   ./live_zap unload
+  ./live_zap load
+
+live_zap also has a command called "exec" to execute commands from the
+installed environment. e.g.:
+
+  ./live_zap exec lszaptel
+

[... 18369 lines stripped ...]



More information about the zaptel-commits mailing list