[svn-commits] tzafrir: branch tzafrir/sysfs r3130 - in /team/tzafrir/sysfs: ./ build_tools/...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu Oct 11 00:42:58 2007
New Revision: 3130

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3130
Log:
Merged revisions 2934,2937,2941,2946-2948,2950,2952-2959,2961,2963,2967,2969,2971-2972,2977,2980,2984-2986,2988,2990-2992,2995,2998-2999,3006,3008,3011-3012,3014,3016-3017,3020,3029,3032,3035,3038,3041,3044-3045,3048,3051-3052,3056,3061,3064,3067,3070,3073,3076,3079,3082,3087,3090,3094,3097,3100,3106,3113,3121 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.4

................
r2934 | qwell | 2007-08-22 18:04:10 +0300 (Wed, 22 Aug 2007) | 4 lines

Reverse logic which checks for existing zaptel.conf

Issue 10527, reported by arcivanov.

................
r2937 | qwell | 2007-08-23 00:02:15 +0300 (Thu, 23 Aug 2007) | 14 lines

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

........
r2936 | qwell | 2007-08-22 16:01:14 -0500 (Wed, 22 Aug 2007) | 6 lines

Don't try to create devices 250 and above in udev.

Closes issue 10522, fix found by me (but I'm not going to take
 credit for the code, since it already existed in trunk
 for some reason)

........

................
r2941 | mattf | 2007-08-23 19:42:45 +0300 (Thu, 23 Aug 2007) | 9 lines

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

........
r2940 | mattf | 2007-08-23 11:41:36 -0500 (Thu, 23 Aug 2007) | 1 line

Increase CWCID reliability on analog modules significantly. (although if you have problems with pulse dialing on high REN loads, see the comment to revert the value back to its previous value).  Thanks Kinsey and Rick.
........

................
r2946 | mattf | 2007-08-24 22:25:20 +0300 (Fri, 24 Aug 2007) | 1 line

Beginning backport of trunk to 1.4
................
r2947 | mattf | 2007-08-24 22:39:22 +0300 (Fri, 24 Aug 2007) | 1 line

More backport code
................
r2948 | mattf | 2007-08-24 22:41:49 +0300 (Fri, 24 Aug 2007) | 1 line

Let's not exclusive framer interrupts by default
................
r2950 | qwell | 2007-08-24 23:47:55 +0300 (Fri, 24 Aug 2007) | 13 lines

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

(closes issue #10555)
........
r2949 | qwell | 2007-08-24 15:46:20 -0500 (Fri, 24 Aug 2007) | 4 lines

Fix an issue that caused only MG2 and possibly HPEC to work.

Issue 10555, patch by me.

........

................
r2952 | tzafrir | 2007-08-25 20:15:12 +0300 (Sat, 25 Aug 2007) | 2 lines

Do install the hdlc network interface script.

................
r2953 | tzafrir | 2007-08-26 02:02:50 +0300 (Sun, 26 Aug 2007) | 2 lines

Enable the sync tick patch.

................
r2954 | tzafrir | 2007-08-26 02:04:57 +0300 (Sun, 26 Aug 2007) | 2 lines

zaptel.init: Allow passing extra arguments (e.g.: -c conffig) to ztcfg.

................
r2955 | tzafrir | 2007-08-26 02:22:40 +0300 (Sun, 26 Aug 2007) | 3 lines

In theory there should be no editing of the init.d script needed.
So document how we can configure it without editing.

................
r2956 | tzafrir | 2007-08-26 13:24:05 +0300 (Sun, 26 Aug 2007) | 3 lines

Allow 'make clean' to work without a valid KSRC (for those building just
'programs').

................
r2957 | tzafrir | 2007-08-26 13:27:05 +0300 (Sun, 26 Aug 2007) | 2 lines

What is -O4 anyway?

................
r2958 | tzafrir | 2007-08-27 09:31:20 +0300 (Mon, 27 Aug 2007) | 5 lines

* Skip cleaning modules if KSRC is not defined: it is optional if you 
  build userspace alone ("make programs").
* Pass HOTPLUG_FIRMWARE explicitly to kernel 2.6 makefile. This is to 
  help eventually remove .EXPORT_ALL_VARIABLES from Makefile.

................
r2959 | tzafrir | 2007-08-27 09:49:36 +0300 (Mon, 27 Aug 2007) | 2 lines

Reduce the noise when building xpp/ .

................
r2961 | tzafrir | 2007-08-27 10:15:08 +0300 (Mon, 27 Aug 2007) | 5 lines

Enact the init.d script when not installing to a DESTDIR.

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

................
r2963 | qwell | 2007-08-28 00:42:29 +0300 (Tue, 28 Aug 2007) | 11 lines

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

........
r2962 | qwell | 2007-08-27 16:38:48 -0500 (Mon, 27 Aug 2007) | 3 lines

Make sure we build the static version of libtonezone
 (and as a side-effect, all of the programs) with -fPIC

........

................
r2967 | russell | 2007-08-28 18:38:03 +0300 (Tue, 28 Aug 2007) | 2 lines

Add Russian tones.  (issue #7953, hanabana)

................
r2969 | russell | 2007-08-28 20:53:13 +0300 (Tue, 28 Aug 2007) | 1 line

fix index for ru tones.  Thanks to Malcolm for pointing this out.
................
r2971 | mattf | 2007-08-28 21:16:51 +0300 (Tue, 28 Aug 2007) | 1 line

Make sure the target name is not the same as the directory name.  Thanks Josh :-)
................
r2972 | mattf | 2007-08-28 21:48:10 +0300 (Tue, 28 Aug 2007) | 1 line

Revert the patlooptest changes
................
r2977 | russell | 2007-08-30 20:02:02 +0300 (Thu, 30 Aug 2007) | 4 lines

Remove some code that could never be executed.  Instead of fixing the if statement,
I just removed it.  The contents of this global array are guaranteed to be zeroed
out for us on load.

................
r2980 | russell | 2007-08-30 20:18:22 +0300 (Thu, 30 Aug 2007) | 1 line

remove an unnecessary memset of the global ifaces array on module init
................
r2984 | kpfleming | 2007-08-31 00:52:59 +0300 (Fri, 31 Aug 2007) | 2 lines

don't know how this was missed when i upgraded the interrupt flags before...

................
r2985 | kpfleming | 2007-08-31 00:53:26 +0300 (Fri, 31 Aug 2007) | 10 lines

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

........
r2983 | kpfleming | 2007-08-30 16:48:55 -0500 (Thu, 30 Aug 2007) | 2 lines

add a proper plugin for Zaptel support in pppd, so that it can be used with any distro-supplied version of pppd instead of requiring a patched copy from the Digium download site

........

................
r2986 | tilghman | 2007-08-31 01:47:42 +0300 (Fri, 31 Aug 2007) | 2 lines

Add two fields to the spanconfig struct (at the bottom, as suggested by tzafrir), with a define to let modules know that it's there

................
r2988 | qwell | 2007-08-31 18:56:18 +0300 (Fri, 31 Aug 2007) | 5 lines

CONFIG_FILE already has DESTDIR prepend to it.
It is not needed here.

Issue 10619, patch by djflux

................
r2990 | tzafrir | 2007-09-01 06:32:51 +0300 (Sat, 01 Sep 2007) | 9 lines

* Maintain the same meaning of DESTDIR and INSTALL_PREFIX as in main
  Makefile
* Document ppp support to the best of my knowledge.
* Err clearly if the VERSION was not found.
* Add some basic/broken detection of ppp in autoconf.

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

................
r2991 | file | 2007-09-04 17:09:35 +0300 (Tue, 04 Sep 2007) | 4 lines

(closes issue #10087)
Reported by: Matti
Remove comment that is no longer true. -1 will not cause the name to be used.

................
r2992 | tzafrir | 2007-09-04 19:16:26 +0300 (Tue, 04 Sep 2007) | 2 lines

Fixing the ZAPTEL_SYNC_TICK patch for zaptel-base.c (#9645)

................
r2995 | tzafrir | 2007-09-08 03:45:41 +0300 (Sat, 08 Sep 2007) | 5 lines

* Improve accuracy of zttest by using floats (#10312).
* Account only for the time of actually waiting for the clock.
* Clarify message for zttest -v .
* Don't print some digits that are not meaningful enough.

................
r2998 | tzafrir | 2007-09-08 14:48:51 +0300 (Sat, 08 Sep 2007) | 5 lines

Allow overriding the asciidoc command. This allows using asciidoc < 7.

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

................
r2999 | tzafrir | 2007-09-08 15:08:48 +0300 (Sat, 08 Sep 2007) | 3 lines

* Let autoconf figure out the switches for asciidoc.
* Remove some leftover set -x from previous debug...

................
r3006 | tzafrir | 2007-09-10 02:28:00 +0300 (Mon, 10 Sep 2007) | 10 lines

xpp.r4584:
* New firmware to fix FXS leds irregularities.
* Less noise at build time - don't echo version, test compile only once.
* zapconf can generate users.conf snippets.
* xpd_pri: initial version.
* ignore perlcheck.

Merged revisions 3004-3005 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3008 | tzafrir | 2007-09-10 02:42:01 +0300 (Mon, 10 Sep 2007) | 2 lines

Also probe for wcte12xp by default (before wcte11xp).

................
r3011 | russell | 2007-09-11 20:50:34 +0300 (Tue, 11 Sep 2007) | 3 lines

Make ringdebounce a module parameter
(closes issue #10218, pnlarsson

................
r3012 | russell | 2007-09-11 21:10:58 +0300 (Tue, 11 Sep 2007) | 7 lines

After committing the patch to make ringdebounce a module parameter in wctdm, I
went ahead and made the same change to wctdm24xxp.

*** Note that there is a discrepancy here.  wctdm uses 64 ms as the default ring
    debounce value while this module uses 128 ms.  I'm not sure which one is more
	appropriate, but they should certainly default to the same thing.

................
r3014 | file | 2007-09-14 00:33:14 +0300 (Fri, 14 Sep 2007) | 10 lines

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

........
r3013 | file | 2007-09-13 18:31:30 -0300 (Thu, 13 Sep 2007) | 2 lines

Add TE120P to init script.

........

................
r3016 | tzafrir | 2007-09-14 00:55:25 +0300 (Fri, 14 Sep 2007) | 5 lines

The order of modules load counts, if you have multiple cards.

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

................
r3017 | tzafrir | 2007-09-14 00:58:05 +0300 (Fri, 14 Sep 2007) | 2 lines

No need for a duplicate list of modules.

................
r3020 | tzafrir | 2007-09-15 03:07:19 +0300 (Sat, 15 Sep 2007) | 25 lines

New xpp release (Xorcom rev 4648):
* New firmware protocol version: 2.8 .
* New firmwares fix input ports offhook.
* Cleanup INFO() messages during module loading.

* USB: Receive queue with TASKLETS [r4600].  Controlled by rx_tasklet
  parameter to xpp_usb module (can be changed in runtime).
* The pcm_tasklet parameter in xpp module is deprecated:
  - Does not actually do anything.
  - If set during module loading, shows an ERR() message.
  - Also appears in /proc/xpp/sync

* FXS: Hardware DTMF detection by default, can be disabled
  by setting dtmf_detection=0 parameter to xpd_fxs.
  PCM is muted when DTMF key is pressed.

* zapconf:
  - Can now generate users.conf compatible with asterisk-gui.
  - Optional command-line arguments denoting which files to generate.
    Possible values are 'zaptel', 'zapata' and 'users'.
  - Defaults to creating zaptel and zapata.

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

................
r3029 | tzafrir | 2007-09-15 15:35:45 +0300 (Sat, 15 Sep 2007) | 4 lines

s/INSTALL_PREFIX/DESTDIR/ in firmware/Makefile .
The install target now won't fail in DESTDIR install, but will probably
do nothing.

................
r3032 | tzafrir | 2007-09-15 20:34:39 +0300 (Sat, 15 Sep 2007) | 2 lines

ZAPTEL_RATE is not a time period.

................
r3035 | tzafrir | 2007-09-15 22:29:02 +0300 (Sat, 15 Sep 2007) | 10 lines

Include the type of the ztdummy module in the desc (span description)
filed.

To check what type of module you built, use: 

  strings ztdummy.ko | grep type
  tr '%' '\n' <ztdummy.ko | grep -a type:

Or look at the span title line in /proc/zaptel .

................
r3038 | tzafrir | 2007-09-15 23:21:02 +0300 (Sat, 15 Sep 2007) | 10 lines

Include support for high-resolution timers for linux >= 2.6.22 (#10314).

Changes from the patch:
* Only support kernels >= 2.6.22, as hrtimer_forward is only exported as
  of that version.
* Adapted to my recent changes in ztdummy.c .
* Use ZAPTEL_TIME_NS instead of ZAPTEL_RATE
* Simplified ticks debug statement. Will only be used if debug=2 or
  debug=3 .

................
r3041 | mattf | 2007-09-15 23:40:49 +0300 (Sat, 15 Sep 2007) | 1 line

Remove silly CAS signalling conflicts... patch
................
r3044 | tzafrir | 2007-09-16 16:53:35 +0200 (Sun, 16 Sep 2007) | 3 lines

* Document ztdummy changes. 
* It's a (ztdummy) clock source, not ztdummy type.

................
r3045 | tzafrir | 2007-09-16 16:55:04 +0200 (Sun, 16 Sep 2007) | 4 lines

* Run fxotune automatically on startup.
* Make fxotune -s less verbose by default so it won't make noise
  for the init.d script.

................
r3048 | tilghman | 2007-09-17 21:32:36 +0200 (Mon, 17 Sep 2007) | 2 lines

Revert previous change on spaninfo and institute an ABI compatible call, to avoid breaking zaptel ABI compatibility between releases (closes issue #10745)

................
r3051 | tzafrir | 2007-09-18 11:55:39 +0200 (Tue, 18 Sep 2007) | 3 lines

Fix the ioctl ZT_CHANDIAG and enable it by default.
(Backport changeset 2384 from trunk)

................
r3052 | tzafrir | 2007-09-18 11:59:07 +0200 (Tue, 18 Sep 2007) | 2 lines

Give proper type for printk messages.

................
r3056 | tzafrir | 2007-09-18 12:21:15 +0200 (Tue, 18 Sep 2007) | 6 lines

Support building the kernel with M= instead of with SUBDIRS= , as used 
in some newer build systems. From xpp r4677.

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

................
r3061 | tzafrir | 2007-09-19 13:13:07 +0200 (Wed, 19 Sep 2007) | 3 lines

Clarify that ztcfg prints the channel map before actually configuring
channels.

................
r3064 | mattf | 2007-09-20 18:52:07 +0200 (Thu, 20 Sep 2007) | 1 line

Disable native bridging pending resolving of some issues
................
r3067 | qwell | 2007-09-20 20:42:35 +0200 (Thu, 20 Sep 2007) | 4 lines

Remove DESTDIR from CONFIG_FILE, since we don't want DESTDIR passed in as part of the -DZAPTEL_CONFIG.

Closes issue #10764, pointed out by cabal95

................
r3070 | tzafrir | 2007-09-21 21:36:14 +0200 (Fri, 21 Sep 2007) | 2 lines

fxotune must be run after ztcfg.

................
r3073 | tzafrir | 2007-09-22 00:14:33 +0200 (Sat, 22 Sep 2007) | 4 lines

Sort out print messages in ztdummy:
* Proper priority to every message.
* Remove a useless global.

................
r3076 | tzafrir | 2007-09-22 10:07:27 +0200 (Sat, 22 Sep 2007) | 10 lines

Makefile Automatically enabling Zaptel MMX support. Disabled by default
for now.
* To enable, build with ZAPTEL_MMX_AUTO=yes (or any other non-empty
  value)
* There is a white list of configuration values (without the prefix 
  CONFIG_). One of them needs to be set in order for CONFIG_ZAPTEL_MMX
  to be enabled.
* Only adds support for kernel 2.6 . If anybody finds a simple way to do
  the same with 2.4 - patches are welcomes.

................
r3079 | mattf | 2007-09-22 19:22:35 +0200 (Sat, 22 Sep 2007) | 2 lines

Disable that for now (DTMF detection)

................
r3082 | mattf | 2007-09-22 22:18:10 +0200 (Sat, 22 Sep 2007) | 1 line

Make some improvements in how we do event retrieval
................
r3087 | tzafrir | 2007-09-22 23:36:41 +0200 (Sat, 22 Sep 2007) | 5 lines

Re-disable dtmf_detection of the FXS module (From xpp rev 4712).

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

................
r3090 | tzafrir | 2007-09-23 02:53:19 +0200 (Sun, 23 Sep 2007) | 3 lines

Ignore errors from fxotune -s. The channel can be used e.g. if Asterisk
is already running.

................
r3094 | tilghman | 2007-09-26 22:11:36 +0200 (Wed, 26 Sep 2007) | 2 lines

Add a script to load package prerequisites (closes issue #10523)

................
r3097 | tzafrir | 2007-09-29 03:57:53 +0200 (Sat, 29 Sep 2007) | 3 lines

* Document the usage of ./configure .
* spacing.

................
r3100 | tzafrir | 2007-10-01 10:21:44 +0200 (Mon, 01 Oct 2007) | 2 lines

No need to met those to changes back into 1.4 .

................
r3106 | tzafrir | 2007-10-03 19:05:16 +0200 (Wed, 03 Oct 2007) | 16 lines

New xpp release: r4786:
* New firmware protocol version: 2.9 .
* fpga_load: initial clean-ups before interface split.
* genzaptelconf: Don't leave an empty directory behind (4784)
* Increase xpp poll_timeout to 1000ms - useful for CentOS 4 (r4781).
* Fix initialization anoyance: if AB don't answer to polls, don't
  waitfor_xpds, and show no waiting XPDs (r4725).
* Disable dtmf_detect by default once again (r4712).
* Don't check twice for asterisk to stop. The second test was done 
  while Asterisk was still stopping (r4708).
* Support building the kernel with M= instead of with SUBDIRS= , as
  used in some newer build systems (r4677).

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

................
r3113 | tzafrir | 2007-10-04 20:06:47 +0200 (Thu, 04 Oct 2007) | 8 lines

* install_prereq is not a build script. Move it to main directory
  (which is our scripts directory).
* Don't run/print install command when there's nothing to install.
* Fix install_prereq command in README .

Merged revisions 3109-3112 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3121 | tzafrir | 2007-10-07 17:05:04 +0200 (Sun, 07 Oct 2007) | 2 lines

Update the links section (including an on-line HTML copy of the README).

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

Added:
    team/tzafrir/sysfs/install_prereq
      - copied unchanged from r3121, branches/1.4/install_prereq
    team/tzafrir/sysfs/ppp/   (props changed)
      - copied from r3121, branches/1.4/ppp/
    team/tzafrir/sysfs/ppp/Makefile
      - copied unchanged from r3121, branches/1.4/ppp/Makefile
    team/tzafrir/sysfs/ppp/zaptel.c
      - copied unchanged from r3121, branches/1.4/ppp/zaptel.c
    team/tzafrir/sysfs/xpp/card_pri.c
      - copied unchanged from r3121, branches/1.4/xpp/card_pri.c
    team/tzafrir/sysfs/xpp/card_pri.h
      - copied unchanged from r3121, branches/1.4/xpp/card_pri.h
    team/tzafrir/sysfs/xpp/init_card_3_29
      - copied unchanged from r3121, branches/1.4/xpp/init_card_3_29
    team/tzafrir/sysfs/xpp/init_card_4_29
      - copied unchanged from r3121, branches/1.4/xpp/init_card_4_29
    team/tzafrir/sysfs/xpp/init_card_6_29
      - copied unchanged from r3121, branches/1.4/xpp/init_card_6_29
    team/tzafrir/sysfs/xpp/init_card_7_29
      - copied unchanged from r3121, branches/1.4/xpp/init_card_7_29
    team/tzafrir/sysfs/xpp/init_card_9_29
      - copied unchanged from r3121, branches/1.4/xpp/init_card_9_29
    team/tzafrir/sysfs/xpp/param_doc
      - copied unchanged from r3121, branches/1.4/xpp/param_doc
    team/tzafrir/sysfs/xpp/utils/example_default_zaptel
      - copied unchanged from r3121, branches/1.4/xpp/utils/example_default_zaptel
Removed:
    team/tzafrir/sysfs/build_tools/install_prereq
    team/tzafrir/sysfs/xpp/init_card_3_26
    team/tzafrir/sysfs/xpp/init_card_4_26
    team/tzafrir/sysfs/xpp/init_card_6_26
    team/tzafrir/sysfs/xpp/init_card_7_26
Modified:
    team/tzafrir/sysfs/   (props changed)
    team/tzafrir/sysfs/Makefile
    team/tzafrir/sysfs/Makefile.kernel26
    team/tzafrir/sysfs/README
    team/tzafrir/sysfs/configure
    team/tzafrir/sysfs/configure.ac
    team/tzafrir/sysfs/firmware/Makefile
    team/tzafrir/sysfs/fxotune.c
    team/tzafrir/sysfs/makeopts.in
    team/tzafrir/sysfs/patlooptest.c
    team/tzafrir/sysfs/wct4xxp/base.c
    team/tzafrir/sysfs/wct4xxp/wct4xxp.h
    team/tzafrir/sysfs/wctdm.c
    team/tzafrir/sysfs/wctdm24xxp/base.c
    team/tzafrir/sysfs/wctdm24xxp/wctdm24xxp.h
    team/tzafrir/sysfs/xpp/   (props changed)
    team/tzafrir/sysfs/xpp/.version
    team/tzafrir/sysfs/xpp/ChangeLog
    team/tzafrir/sysfs/xpp/Makefile
    team/tzafrir/sysfs/xpp/README.Astribank
    team/tzafrir/sysfs/xpp/README.metering
    team/tzafrir/sysfs/xpp/card_bri.c
    team/tzafrir/sysfs/xpp/card_bri.h
    team/tzafrir/sysfs/xpp/card_fxo.c
    team/tzafrir/sysfs/xpp/card_fxo.h
    team/tzafrir/sysfs/xpp/card_fxs.c
    team/tzafrir/sysfs/xpp/card_fxs.h
    team/tzafrir/sysfs/xpp/card_global.c
    team/tzafrir/sysfs/xpp/card_global.h
    team/tzafrir/sysfs/xpp/firmwares/FPGA_1141.hex
    team/tzafrir/sysfs/xpp/firmwares/FPGA_1151.hex
    team/tzafrir/sysfs/xpp/firmwares/FPGA_FXS.hex
    team/tzafrir/sysfs/xpp/utils/   (props changed)
    team/tzafrir/sysfs/xpp/utils/Makefile
    team/tzafrir/sysfs/xpp/utils/fpga_load.c
    team/tzafrir/sysfs/xpp/utils/genzaptelconf
    team/tzafrir/sysfs/xpp/utils/hexfile.c
    team/tzafrir/sysfs/xpp/utils/hexfile.h
    team/tzafrir/sysfs/xpp/utils/xpp_sync
    team/tzafrir/sysfs/xpp/utils/zapconf
    team/tzafrir/sysfs/xpp/utils/zaptel_hardware
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Chans.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Xpp.pm
    team/tzafrir/sysfs/xpp/utils/zt_registration
    team/tzafrir/sysfs/xpp/xbus-core.c
    team/tzafrir/sysfs/xpp/xbus-core.h
    team/tzafrir/sysfs/xpp/xbus-sysfs.c
    team/tzafrir/sysfs/xpp/xdefs.h
    team/tzafrir/sysfs/xpp/xpd.h
    team/tzafrir/sysfs/xpp/xpp_usb.c
    team/tzafrir/sysfs/xpp/xpp_zap.c
    team/tzafrir/sysfs/xpp/xpp_zap.h
    team/tzafrir/sysfs/xpp/xproto.c
    team/tzafrir/sysfs/xpp/xproto.h
    team/tzafrir/sysfs/xpp/zap_debug.h
    team/tzafrir/sysfs/zaptel-base.c
    team/tzafrir/sysfs/zaptel.h
    team/tzafrir/sysfs/zaptel.init
    team/tzafrir/sysfs/zaptel.sysconfig
    team/tzafrir/sysfs/zconfig.h
    team/tzafrir/sysfs/zonedata.c
    team/tzafrir/sysfs/ztcfg.c
    team/tzafrir/sysfs/ztdummy.c
    team/tzafrir/sysfs/zttest.c

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- branch-1.2-blocked (original)
+++ branch-1.2-blocked Thu Oct 11 00:42:58 2007
@@ -1,1 +1,1 @@
-/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878
+/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 11 00:42:58 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-2932
+/branches/1.4:1-3129

Modified: team/tzafrir/sysfs/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/Makefile?view=diff&rev=3130&r1=3129&r2=3130
==============================================================================
--- team/tzafrir/sysfs/Makefile (original)
+++ team/tzafrir/sysfs/Makefile Thu Oct 11 00:42:58 2007
@@ -138,7 +138,8 @@
   ALL_MODULES+=$(patsubst %,xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
 endif
 
-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+OPTFLAG=-O2
+CFLAGS+=-I. $(OPTFLAGS) -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 ifneq (,$(findstring ppc,$(UNAME_M)))
 CFLAGS_PPC:=-fsigned-char
 endif
@@ -146,7 +147,6 @@
 CFLAGS_x86_64:=-m64
 endif
 CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
-LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
 KFLAGS=-I$(KINCLUDES) -O6
 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
@@ -173,13 +173,13 @@
 
 KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
+KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=misc modules_install
 
 ROOT_PREFIX=
 
-CONFIG_FILE=$(DESTDIR)/etc/zaptel.conf
+CONFIG_FILE=/etc/zaptel.conf
 CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
 
 # sample makefile "trace print"
@@ -187,7 +187,7 @@
 
 CHKCONFIG	:= $(wildcard /sbin/chkconfig)
 UPDATE_RCD	:= $(wildcard /usr/sbin/update-rc.d)
-ifneq (,$(DESTDIR))
+ifeq (,$(DESTDIR))
   ifneq (,$(CHKCONFIG))
     ADD_INITD	:= $(CHKCONFIG) --add zaptel
   else
@@ -205,7 +205,7 @@
 RCCONF_DIR	:= $(firstword $(wildcard /etc/sysconfig /etc/default))
 
 NETSCR_DIR	:= $(firstword $(wildcard /etc/sysconfig/network-scripts ))
-ifneq (,$(NET_SCR_DIR))
+ifneq (,$(NETSCR_DIR))
   NETSCR_TARGET	:= $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc
   COPY_NETSCR	:= install -D ifup-hdlc $(NETSCR_TARGET)
 endif
@@ -239,6 +239,7 @@
 UTILS		= tor2ee zttool zttest ztmonitor ztspeed sethdlc-new ztcfg \
 		  ztcfg-dude usbfxstest fxstest fxotune ztdiag torisatool
 
+
 # Makefile mentions them. Source is not included (anynore?)
 UTILS		+= fxsdump ztprovision
 
@@ -271,7 +272,7 @@
 modules: prereq
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 ifeq ($(BUILDVER),linux26)
-	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
+	$(KMAKE) modules
 else
 modules: $(INSTALL_MODULES)
 endif
@@ -303,10 +304,10 @@
 tor2ee: LDLIBS+=-lpci
 
 zonedata.lo: zonedata.c
-	$(CC) -c $(LCFLAGS) -o $@ $^
+	$(CC) -c $(CFLAGS) -o $@ $^
 
 tonezone.lo: tonezone.c
-	$(CC) -c $(LCFLAGS) -o $@ $^
+	$(CC) -c $(CFLAGS) -o $@ $^
 
 tones.h: gendigits
 	./gendigits > $@
@@ -404,10 +405,10 @@
 	./checkstack *.ko */*.ko
 
 README.html: README
-	asciidoc -n -a toc $<
+	$(ASCIIDOC) -n -a toc $<
 
 xpp/README.Astribank.html: xpp/README.Astribank
-	cd $(@D); asciidoc -o $(@F) -n -a toc $(<F)
+	cd $(@D); $(ASCIIDOC) -o $(@F) -n -a toc $(<F)
 
 MISDNVERSION=1_1_3
 MISDNUSERVERSION=1_1_3
@@ -437,7 +438,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."
@@ -454,7 +455,7 @@
 	install  $(BINS) $(DESTDIR)$(BIN_DIR)/
 	install -d $(DESTDIR)$(MAN_DIR)
 	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
-ifneq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
+ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
 	$(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
 
@@ -465,9 +466,9 @@
 		/sbin/update-modules ; \
 	fi
 
-firmware:
+install-firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
-	$(MAKE) -C firmware hotplug-install
+	$(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR)
 endif
 
 install-libs: libs
@@ -531,7 +532,7 @@
 install-udev: devices
 
 uninstall-hotplug:
-	$(MAKE) -C firmware hotplug-uninstall
+	$(MAKE) -C firmware hotplug-uninstall DESTDIR=$(DESTDIR)
 
 uninstall-modules:
 ifeq ($(BUILDVER),linux24)
@@ -601,7 +602,9 @@
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
 ifeq ($(BUILDVER),linux26)
-	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
+  ifneq (,$(KSRC))
+	$(KMAKE) clean
+  endif
 	$(MAKE) -C xpp/utils clean
 else
 	$(MAKE) -C wct4xxp clean

Modified: team/tzafrir/sysfs/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/Makefile.kernel26?view=diff&rev=3130&r1=3129&r2=3130
==============================================================================
--- team/tzafrir/sysfs/Makefile.kernel26 (original)
+++ team/tzafrir/sysfs/Makefile.kernel26 Thu Oct 11 00:42:58 2007
@@ -1,7 +1,6 @@
-ifndef ECHO_CAN_NAME
-  ECHO_CAN_NAME	:= MG2
+ifdef ECHO_CAN_NAME
+	ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
 endif
-ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
 
 EXTRA_CFLAGS := -I$(src)
 EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
@@ -26,3 +25,24 @@
 
 EXTRA_CFLAGS += -DECHO_CAN_HPEC -I$(src)/hpec
 endif
+
+
+# set CONFIG_ZAPTEL_MMX for a number of CPU types.
+# Right now this part is not enabled, unless you build with
+# ZAPTEL_MMX_AUTO=something .
+ZAPMMX_WHITELIST_i386 = M586MMX M686 MPENTIUMII MPENTIUMIII MPENTIUMM \
+			    MPENTIUM4 MVIAC3_2
+
+ZAPMMX_WHITELIST_x86_64 = 
+
+# A list of configuration variables to test: CONFIG_M686 , etc.
+ZAPMMX_CONFIG_VARS := $(ZAPMMX_WHITELIST_$(ARCH):%=CONFIG_%)
+
+# expand them:
+ZAPMMX_CONFIG_VALS := $(strip  $(foreach var,$(ZAPMMX_CONFIG_VARS),$(var))  )
+ifneq (,$(ZAPTEL_MMX_AUTO))
+  ifneq (,$(ZAPMMX_CONFIG_VALS))
+    # TODO: make that 
+    CFLAGS_zaptel-base.o += -DCONFIG_ZAPTEL_MMX
+  endif
+endif

Modified: team/tzafrir/sysfs/README
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/README?view=diff&rev=3130&r1=3129&r2=3130
==============================================================================
--- team/tzafrir/sysfs/README (original)
+++ team/tzafrir/sysfs/README Thu Oct 11 00:42:58 2007
@@ -47,15 +47,15 @@
 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
+The script install_prereq should help you install the
 required packages. To see what it suggests, run:
 
-  build_tools/install_prereq test
+  ./install_prereq test
 
 You can either copy/paste that code to a terminal to run it, or just
 run:
 
-  build_tools/install_prereq test
+  ./install_prereq install
 
 
 Kernel Source / "Headers"
@@ -97,8 +97,11 @@
   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 on i386/amd64 and later kernels (>= 2.6.15) can (and should)
-    use the system's RTC (Real Time Clock).
+  * ztdummy on i386/x86_64 with kernels >= 2.6.22 can (and should) use 
+    high resolution times (CONFIG_HIGH_RES_TIMERS), and (if available, 
+    the system HPET.
+  * ztdummy on i386/x86_64 and later kernels (>= 2.6.15) can 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
@@ -169,6 +172,7 @@
 #make config
 ----------------------------------
 
+
 Build Tweaks
 ~~~~~~~~~~~~
 Selecting Modules and Utilities
@@ -178,6 +182,7 @@
 that you build (or rather: not build) is saved in the file 
 `menuselect.makeopts`. 
 
+
 Extra Modules
 ^^^^^^^^^^^^^
 To build extra modules / modules directory not included in the Zaptel 
@@ -189,6 +194,7 @@
 
 Note that those names are not guaranteed to continue to work on newer
 versions. Hopefully there will be no need for such extra configuration.
+
 
 Partial Build/Install
 ^^^^^^^^^^^^^^^^^^^^^
@@ -212,6 +218,7 @@
     * make install-include: install zaptel.h
   - make config: should be run once to configure 
 
+
 Building to a Subtree
 ^^^^^^^^^^^^^^^^^^^^^
 The following may be useful when testing the package or when preparing a
@@ -232,6 +239,26 @@
 attempting to generate device files. In that case, try:
 
   make install DESTDIR=$PWD/target DYNFS=
+
+
+./configure Options
+^^^^^^^^^^^^^^^^^^^
+The configure script various several tests and based on them generates
+some files ( build_tools/menuselect-deps and makeopts). You can pass it
+--with options and variable settings, for instance:
+
+  ./configure --without-ncurses CC="gcc-4.10"
+
+If you just want to recreate the same files without a full detection
+run, use:
+
+  ./config.status
+
+To re-run ./configure with the same parameters it was run with last
+time, use:
+
+  ./ocnfig.status --recheck
+
 
 zaptel.conf
 ~~~~~~~~~~~
@@ -333,6 +360,12 @@
 of how close it was. Also try running it with the option -v for a
 verbose output.
 
+To check the clock source that is built into ztdummy, you can either
+look at title of its span in /proc/zaptel file for a "source:" in the
+description. Or even run:
+
+  strings zaptel.ko | grep source:
+
 
 Spans and Channels
 ------------------
@@ -385,6 +418,26 @@
 
            2 XPP_FXS/0/0/1 FXOLS (In use)
 
+[[ppp]]
+PPP Support
+-----------
+Zaptel digital cards can provide data channels through ppp as
+point-to-point connections. This requires a plugin to the ppp daemon
+that is included in the ppp/ subdirectory. To install it:
+
+1. Make sure you have the PPP source / headers installed. On Debian:
+
+   apt-get install ppp-dev
+
+2. Run 'make' on the ppp subdirectory:
+
+   make -C ppp 
+   make -C ppp install
+
+3. Make sure your kernel has support for both PPP (which is common is
+   distribution kernels and for HDLC (much less common) - CONFIG_PPP and
+   CONFIG_HDLC .
+
 
 What is the license for the zaptel driver?
 ------------------------------------------
@@ -394,8 +447,7 @@
 
 If you wish to use the zaptel drivers in an application for which the 
 GPL is not appropriate (e.g. a proprietary embedded system), licenses
-under more flexible terms can be readily obtained through Digium, Inc. 
-at reasonable cost.
+under more flexible terms can be readily obtained through Digium, Inc.at reasonable cost.
 
 
 How do I report bugs or contribute?
@@ -411,7 +463,9 @@
 
 Links
 -----
-- http://asterisk.org/ - The Asterisk PBX
-- http://voip-info.org/
+- http://asterisk.org/[] - The Asterisk PBX
+- http://voip-info.org/[]
 - http://voip-info.org/wiki/view/Asterisk+Zaptel+Installation
 - http://www.zapatatelephony.org/ - A historical site.
+- http://rapid.tzafrir.org.il/docs/README.html[Up-to-date HTML version
+  of this file]

Modified: team/tzafrir/sysfs/configure
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/configure?view=diff&rev=3130&r1=3129&r2=3130
==============================================================================
--- team/tzafrir/sysfs/configure (original)
+++ team/tzafrir/sysfs/configure Thu Oct 11 00:42:58 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 2107 .
+# From configure.ac Revision: 2990 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -686,6 +686,8 @@
 USB_LIB
 USB_INCLUDE
 PBX_LIBUSB
+ASCIIDOC
+PPPD_VERSION
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1270,6 +1272,7 @@
   --with-ncurses=PATH     use ncurses files in PATH
   --with-newt=PATH        use newt files in PATH
   --with-usb=PATH         use libusb files in PATH
+  --with-ppp=PATH         Use ppp support from PATH
 
 Some influential environment variables:
   CC          C compiler command
@@ -5322,6 +5325,53 @@
 fi
 
 
+
+
+
+# for asciidoc before ver. 7, the backend must be stated explicitly:
+ASCIIDOC='asciidoc'
+asciidoc_ver=`asciidoc --version 2>&1 | awk '/^asciidoc /{print $2}' | cut -d. -f 1 | head -n 1`
+if test "$asciidoc_ver" != '' && test $asciidoc_ver -lt 7; then
+	ASCIIDOC="asciidoc -b xhtml"
+fi
+
+
+
+# Check whether --with-ppp was given.
+if test "${with_ppp+set}" = set; then
+  withval=$with_ppp;
+else
+  with_ppp=check
+
+fi
+
+# somebody will fix that
+default_ppp_path=/usr
+
+case "$with_ppp" in
+	yes|check) ppp_path="$default_ppp_path";;
+	no) ppp_path='' ;;
+	*) ppp_path="$with_ppp" ;;
+esac
+
+level_file="$ppp_path/include/pppd/patchlevel.h"
+PPP_VERSION=
+if test "$ppp_path" != '' && test -r "$level_file"; then
+	PPPD_VERSION=`awk -F '"' '/VERSION/ { print $$2; }' $level_file`
+fi
+
+case "$with_ppp" in
+	check|no) :;;
+	*)
+	# If we asked explicitly for ppp support
+	if test "$PPPD_VERSION" = ''; then
+		# but have not detected it
+		{ { echo "$as_me:$LINENO: error: failed to find pppd/patchlevel.h: no ppp support." >&5
+echo "$as_me: error: failed to find pppd/patchlevel.h: no ppp support." >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	;;
+esac
 
 
 
@@ -6026,11 +6076,13 @@
 USB_LIB!$USB_LIB$ac_delim
 USB_INCLUDE!$USB_INCLUDE$ac_delim
 PBX_LIBUSB!$PBX_LIBUSB$ac_delim
+ASCIIDOC!$ASCIIDOC$ac_delim
+PPPD_VERSION!$PPPD_VERSION$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: team/tzafrir/sysfs/configure.ac
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/configure.ac?view=diff&rev=3130&r1=3129&r2=3130
==============================================================================
--- team/tzafrir/sysfs/configure.ac (original)
+++ team/tzafrir/sysfs/configure.ac Thu Oct 11 00:42:58 2007
@@ -60,6 +60,47 @@
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
 AST_EXT_LIB([usb], [usb_init], [usb.h], [USB], [libusb])
 
+# for asciidoc before ver. 7, the backend must be stated explicitly:
+ASCIIDOC='asciidoc'
+asciidoc_ver=`asciidoc --version 2>&1 | awk '/^asciidoc /{print $2}' | cut -d. -f 1 | head -n 1`
+if test "$asciidoc_ver" != '' && test $asciidoc_ver -lt 7; then
+	ASCIIDOC="asciidoc -b xhtml"
+fi
+AC_SUBST(ASCIIDOC)
+
+AC_ARG_WITH(ppp,
+	    [AS_HELP_STRING([--with-ppp=PATH],[Use ppp support from PATH])],
+	    [],
+	    [with_ppp=check]
+	    )
+# somebody will fix that
+default_ppp_path=/usr
+
+case "$with_ppp" in
+	yes|check) ppp_path="$default_ppp_path";;
+	no) ppp_path='' ;;
+	*) ppp_path="$with_ppp" ;;
+esac
+
+level_file="$ppp_path/include/pppd/patchlevel.h"
+PPP_VERSION=
+if test "$ppp_path" != '' && test -r "$level_file"; then
+	PPPD_VERSION=`awk -F '"' '/VERSION/ { print $$2; }' $level_file`
+fi
+
+case "$with_ppp" in 
+	check|no) :;;
+	*) 
+	# If we asked explicitly for ppp support
+	if test "$PPPD_VERSION" = ''; then
+		# but have not detected it
+		AC_MSG_ERROR(failed to find pppd/patchlevel.h: no ppp support.)
+	fi
+	;;
+esac
+
+AC_SUBST(PPPD_VERSION)
+
 AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
 AC_OUTPUT
 

Modified: team/tzafrir/sysfs/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/firmware/Makefile?view=diff&rev=3130&r1=3129&r2=3130
==============================================================================
--- team/tzafrir/sysfs/firmware/Makefile (original)
+++ team/tzafrir/sysfs/firmware/Makefile Thu Oct 11 00:42:58 2007
@@ -63,22 +63,22 @@
 
 # Download and extract firmware tarballs
 zaptel-fw-oct6114-064-%.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-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(INSTALL_PREFIX)/lib/firmware ] && ! [ -f $(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes)
+ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" == "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_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-oct6114-064.bin to hotplug firmware directories"
-	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
-		$(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
-		rm -rf $(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-*; \
-		touch $(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION); \
-	fi
-	if [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
-		$(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(INSTALL_PREFIX)/lib/firmware; \
-		rm -rf $(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-oct6114-064-*; \
-		touch $(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION); \
+	if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
+		$(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware; \
+		rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-*; \

[... 12156 lines stripped ...]