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

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Dec 18 16:59:15 CST 2007 

Author: tzafrir
Date: Tue Dec 18 16:59:14 2007
New Revision: 3523

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3523
Log:
Merge xpp r5151 (with zaptel-perl changes) as well as the rest of the
sync:


Merged revisions 3312,3317,3322,3328-3329,3343,3347,3350-3351,3356,3362,3366-3367,3371,3374,3378,3382-3383,3387-3388,3390,3393,3396,3399,3402,3406,3408,3412,3416-3417,3421,3425,3427,3431,3434-3435,3438,3442,3446,3449,3455,3460-3461,3466-3467,3476,3490,3494-3495,3501,3508,3511,3513,3515-3516 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.4

................
r3312 | qwell | 2007-12-05 02:15:36 +0200 (Wed, 05 Dec 2007) | 1 line

Fix URL for HPEC README.
................
r3317 | kpfleming | 2007-12-05 05:24:43 +0200 (Wed, 05 Dec 2007) | 2 lines

the previous addition of fields to zt_spaninfo added an 'lbo' field, but none of the drivers for digital cards actually populate that field... this is now corrected

................
r3322 | mattf | 2007-12-06 18:41:43 +0200 (Thu, 06 Dec 2007) | 9 lines

Merged revisions 3321 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3321 | mattf | 2007-12-06 10:40:22 -0600 (Thu, 06 Dec 2007) | 1 line

Don't mangle old value of this register.  Just set it without the reset bit set
........

................
r3328 | kpfleming | 2007-12-06 21:44:03 +0200 (Thu, 06 Dec 2007) | 10 lines

Merged revisions 3327 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3327 | kpfleming | 2007-12-06 13:42:13 -0600 (Thu, 06 Dec 2007) | 2 lines

make the TC400B driver tolerant of incoming G.723.1 frames in all possible formats (6.3kb/s, 5.3kb/s and SID)

........

................
r3329 | kpfleming | 2007-12-06 21:54:06 +0200 (Thu, 06 Dec 2007) | 2 lines

minor formatting changes

................
r3343 | kpfleming | 2007-12-07 21:39:05 +0200 (Fri, 07 Dec 2007) | 2 lines

as suggested by tzafrir on asterisk-dev, remove some code duplication when handling ZT_SPANCONFIG

................
r3347 | kpfleming | 2007-12-08 00:13:20 +0200 (Sat, 08 Dec 2007) | 10 lines

Merged revisions 3346 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3346 | kpfleming | 2007-12-07 16:12:46 -0600 (Fri, 07 Dec 2007) | 2 lines

revert a change that caused some problems and wasn't necessary

........

................
r3350 | dbailey | 2007-12-08 00:57:26 +0200 (Sat, 08 Dec 2007) | 2 lines

Add ability to adjust fxo gains on wctdm drivers

................
r3351 | sruffell | 2007-12-08 01:50:59 +0200 (Sat, 08 Dec 2007) | 4 lines

The previous cleanup wasn't quite working when there were multiple old
modules in the modules.dep folder.  Moved the cleanup to external script
for the time being.

................
r3356 | mspiceland | 2007-12-08 04:20:09 +0200 (Sat, 08 Dec 2007) | 1 line


................
r3362 | mspiceland | 2007-12-08 05:13:20 +0200 (Sat, 08 Dec 2007) | 4 lines

Adding back Kevin's change that was lost on my last merge.  \------------------------------------------------------------------------
r3343 | kpfleming | 2007-12-07 13:39:05 -0600 (Fri, 07 Dec 2007) | 2 lines

as suggested by tzafrir on asterisk-dev, remove some code duplication when handling ZT_SPANCONFIG
................
r3366 | kpfleming | 2007-12-08 19:28:28 +0200 (Sat, 08 Dec 2007) | 13 lines

Merged revisions 3365 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3365 | kpfleming | 2007-12-08 11:04:11 -0600 (Sat, 08 Dec 2007) | 5 lines

clean up firmware handling across wct4xxp, wctc4xxp, wctdm24xxp and wcte12xp drivers to use consistent methods
add non-hotplug firmware loading support to wctdm24xxp and wcte12xp
add license and copyright headers to various files that did not have them
clean up header inclusion in some files

........

................
r3367 | kpfleming | 2007-12-08 19:37:16 +0200 (Sat, 08 Dec 2007) | 2 lines

revert an unnecessary change

................
r3371 | mattf | 2007-12-08 21:55:17 +0200 (Sat, 08 Dec 2007) | 9 lines

Merged revisions 3370 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3370 | mattf | 2007-12-08 13:52:33 -0600 (Sat, 08 Dec 2007) | 1 line

Add GPL disclaimers to some headers without them
........

................
r3374 | mspiceland | 2007-12-09 00:41:55 +0200 (Sun, 09 Dec 2007) | 10 lines

Merged revisions 3373 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3373 | mspiceland | 2007-12-08 16:39:28 -0600 (Sat, 08 Dec 2007) | 2 lines

Verbose vpm test block should only be printed in debug mode.

........

................
r3378 | tzafrir | 2007-12-09 22:29:48 +0200 (Sun, 09 Dec 2007) | 5 lines

Ignore some generated files.

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

................
r3382 | tzafrir | 2007-12-10 18:45:23 +0200 (Mon, 10 Dec 2007) | 2 lines

Do document ZAPTEL_SYNC_TICK.

................
r3383 | kpfleming | 2007-12-10 18:54:39 +0200 (Mon, 10 Dec 2007) | 3 lines

for broken analog ports, retain the signaling type that would have been supported if the port wasn't broken
in ztscan, report the port types of analog ports instead of the signaling type

................
r3387 | kpfleming | 2007-12-10 19:03:07 +0200 (Mon, 10 Dec 2007) | 10 lines

Merged revisions 3386 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3386 | kpfleming | 2007-12-10 11:02:17 -0600 (Mon, 10 Dec 2007) | 2 lines

cosmetic fix for TE120P cards

........

................
r3388 | kpfleming | 2007-12-10 19:06:40 +0200 (Mon, 10 Dec 2007) | 4 lines

fix firmware object names for non-hotplug firmware for wctc4xxp, wcte12xp and wctdm24xxp
add VPM reporting in 'devicetype' to wcte12xp
fix VPM reporting in 'devicetype' for wctdm24xxp so it actually works

................
r3390 | kpfleming | 2007-12-10 19:26:04 +0200 (Mon, 10 Dec 2007) | 10 lines

Merged revisions 3389 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3389 | kpfleming | 2007-12-10 11:24:59 -0600 (Mon, 10 Dec 2007) | 2 lines

remove explicit references to 5.3kb/s mode in wctc4xxp driver, as the driver can now accept both 5.3kb/s and 6.3kb/s (but will still only generate 6.3kb/s)

........

................
r3393 | kpfleming | 2007-12-10 22:31:28 +0200 (Mon, 10 Dec 2007) | 2 lines

report 'location' for cards supported by wct4xxp using the 'order' switches on the card when possible

................
r3396 | tzafrir | 2007-12-10 22:53:43 +0200 (Mon, 10 Dec 2007) | 3 lines

* Add a list of userspace subdirectories (just like for kernel).
* Make it saner to enable/disable them.

................
r3399 | tzafrir | 2007-12-11 00:54:29 +0200 (Tue, 11 Dec 2007) | 4 lines

Don't build wctdm24xxp/ in 2.4:

wctdm24xxp/base.c needs <linux/workqueue.h> .

................
r3402 | mspiceland | 2007-12-11 01:09:35 +0200 (Tue, 11 Dec 2007) | 13 lines

Merged revisions 3400 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3400 | mspiceland | 2007-12-10 17:01:23 -0600 (Mon, 10 Dec 2007) | 5 lines

Small change to prevent scary messages (one's with "Failed" in them) to users
without hardware echo cancellation modules installed.  In case they actually
have one instead, we still report some info in debug mode to help find
where in the init the module failed for troubleshooting.

........

................
r3406 | mspiceland | 2007-12-11 02:10:25 +0200 (Tue, 11 Dec 2007) | 14 lines

Merged revisions 3405 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3405 | mspiceland | 2007-12-10 18:07:19 -0600 (Mon, 10 Dec 2007) | 6 lines

If we detect that we have a VPMADT032 module but there is an error during
initialization, we don't proceed and register with Zaptel.  This will prevent
customers with faulty VPMADT032 modules from going undetected.  Customers
can always load with vpmsupport=0 to proceed with this error but will do so
knowingly.

........

................
r3408 | mattf | 2007-12-11 02:23:25 +0200 (Tue, 11 Dec 2007) | 9 lines

Merged revisions 3407 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3407 | mattf | 2007-12-10 18:21:56 -0600 (Mon, 10 Dec 2007) | 1 line

Make sure we wait long enough for the VPMADT032 to boot before we interact with it again
........

................
r3412 | mspiceland | 2007-12-11 02:58:33 +0200 (Tue, 11 Dec 2007) | 10 lines

Merged revisions 3411 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3411 | mspiceland | 2007-12-10 18:53:29 -0600 (Mon, 10 Dec 2007) | 2 lines

Reverting changes from 3405 so that I can do this the correct way.

........

................
r3416 | tzafrir | 2007-12-11 09:56:40 +0200 (Tue, 11 Dec 2007) | 5 lines

Fix the typo for the case of using M= instead of SUBDIRS= .

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

................
r3417 | tzafrir | 2007-12-11 10:43:22 +0200 (Tue, 11 Dec 2007) | 7 lines

Rename Makefile.kernel26 to Kbuild (in subdirectories alone):
* kernel 2.6 build system >= 2.6.9 will use this directly.
* Kernels 2.6.0-2.6.8 will still use the legacy name 'Makefile'.
* Also fix a typo in 1.4/wcte12xp/Makefile (already fixed in 1.2).
* 1.4/wctc4xxp/Makefile should not include userspace targets in the
  Kbuild file - those have a different syntax.

................
r3421 | tzafrir | 2007-12-11 11:41:07 +0200 (Tue, 11 Dec 2007) | 2 lines

Fix and document zttest -c <count> .

................
r3425 | tzafrir | 2007-12-11 17:50:51 +0200 (Tue, 11 Dec 2007) | 7 lines

* uninstall-modules: put in build_tools, and remove language suffix.
* Close bug #11511.
* Some other cleanups of uninstall-modules.

Merged revisions 3420,3424 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3427 | kpfleming | 2007-12-11 18:38:04 +0200 (Tue, 11 Dec 2007) | 10 lines

Merged revisions 3426 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3426 | kpfleming | 2007-12-11 10:37:28 -0600 (Tue, 11 Dec 2007) | 2 lines

we don't need a message telling the user that they don't have a VPMADT032, that will only serve to confuse them

........

................
r3431 | kpfleming | 2007-12-11 19:33:06 +0200 (Tue, 11 Dec 2007) | 12 lines

Merged revisions 3430 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3430 | kpfleming | 2007-12-11 11:27:00 -0600 (Tue, 11 Dec 2007) | 4 lines

coding guidelines cleanup
report results of failure to initialize a VPMADT032 module all the way up the process, so that a card with a failed VPM won't be left in a partially-operational state
clean up early exits from wctdm_init_one() to undo all previously completed steps

........

................
r3434 | tzafrir | 2007-12-11 20:03:38 +0200 (Tue, 11 Dec 2007) | 3 lines

This Makefile should be Kbuild. A legacy redirection will closely
follow.

................
r3435 | tzafrir | 2007-12-11 20:17:29 +0200 (Tue, 11 Dec 2007) | 2 lines

A legacy Kbuild Makefile for xpp/ .

................
r3438 | qwell | 2007-12-11 21:44:47 +0200 (Tue, 11 Dec 2007) | 4 lines

Use correct syntax for test comparisons.

Closes issue #11519, reported and patched by eliel.

................
r3442 | mattf | 2007-12-12 01:09:13 +0200 (Wed, 12 Dec 2007) | 9 lines

Merged revisions 3441 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3441 | mattf | 2007-12-11 17:08:07 -0600 (Tue, 11 Dec 2007) | 1 line

Lower this to fix compatibility related bugs
........

................
r3446 | tzafrir | 2007-12-12 10:53:45 +0200 (Wed, 12 Dec 2007) | 5 lines

ztd-eth: Fix a cast warning on earlier 2.6 kernels.

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

................
r3449 | kpfleming | 2007-12-12 19:41:55 +0200 (Wed, 12 Dec 2007) | 2 lines

remove duplicate setting of 'devicetype'... reported by tzafrir on #asterisk-dev

................
r3455 | qwell | 2007-12-12 23:59:32 +0200 (Wed, 12 Dec 2007) | 4 lines

If these are going to cause the script to exit, we really need to explain why.

Issue 10902, patch by snuffy

................
r3460 | tzafrir | 2007-12-13 17:55:52 +0200 (Thu, 13 Dec 2007) | 2 lines

Convert a constant '0' return value to a void. From #10851 .

................
r3461 | kpfleming | 2007-12-13 18:10:15 +0200 (Thu, 13 Dec 2007) | 2 lines

remove tone_zone_init() completely, since it just initializing the array to contain all zero (NULL) entries and it will already be that way since it is a module-level static variable

................
r3466 | tzafrir | 2007-12-13 20:54:29 +0200 (Thu, 13 Dec 2007) | 2 lines

Using live_zap now to crash^debug zaptel on other computers.

................
r3467 | tzafrir | 2007-12-13 20:58:09 +0200 (Thu, 13 Dec 2007) | 2 lines

Show zaptel sync master in /proc/zaptel/N . Closes issue #10329 .

................
r3476 | kpfleming | 2007-12-14 00:59:45 +0200 (Fri, 14 Dec 2007) | 10 lines

Merged revisions 3475 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3475 | kpfleming | 2007-12-13 16:59:16 -0600 (Thu, 13 Dec 2007) | 2 lines

remove some code that is not compatible with modern versions of pppd

........

................
r3490 | kpfleming | 2007-12-15 01:47:31 +0200 (Sat, 15 Dec 2007) | 7 lines

(merging dtmf-twister branch plus a few fixes)

move DTMF/MF generation into tonezone.c (libtonezone) so that it can happen at runtime instead of compile time; this allows for DTMF/MF to be different on a zone-by-zone basis without requiring a recompile of Zaptel

set DTMF 'twist' for Brazil (zone 'br') to 2dB


................
r3494 | tzafrir | 2007-12-16 19:43:20 +0200 (Sun, 16 Dec 2007) | 8 lines

Simplify udev rules so they will be in line with ones provided by
distributions and allow simple overriding of file permissions.

Closes issue #11276 .

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

................
r3495 | tzafrir | 2007-12-16 22:45:22 +0200 (Sun, 16 Dec 2007) | 2 lines

Make sure the asciidoc menu is deep enough.

................
r3501 | tzafrir | 2007-12-18 00:04:12 +0200 (Tue, 18 Dec 2007) | 2 lines

Detect some extra X101P clones out there.

................
r3508 | tzafrir | 2007-12-18 17:36:20 +0200 (Tue, 18 Dec 2007) | 28 lines

xpp r5151:
  * xpd_pri: Basically ready.
  * PCM synchronization changes:
    - Each Astribank unit ticks independently. Each with its own PLL.
    - HOST synchronization is gone. Loading of xpp will no longer cause
      useless 250 ticks per second if you have no Astribank.
    - Synchronization from the zaptel sync master requires setting
      ZAPTEL as sync source (xpp_sync ZAPTEL).
  * rx_tasklet is now a parameter of the module xpp, rather than of xpp_usb.
  * New FPGA firmware: 5128 (1151) / 5122 (1141, 1131):
    - Fixes synchronization issues.
    - PRI module: E1 should now work.
  * perl module and utilities:
    - Modules no longer magically scan system on initialization.
    - Scanning is by calling explicit methods.
    - "Serial" has been renamed "Label". It is basically unique, but 
      should be modifieble.
    - Some basic documentation of zaptel perl modules.
  * Default sort order of zt_registration is back to SORT_CONNCTOR.
  * zt_registration proc file now shows the number of span registered to 
    if registered. Try: grep . /proc/xpp/XBUS-*/XPD-*/zt_registration
  * genzaptelconf: Allow using a custom command instead of
    /etc/init.d/asterisk to start/stop asterisk.
  * Fixed the typo "Slagish".

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

................
r3511 | tzafrir | 2007-12-18 18:36:12 +0200 (Tue, 18 Dec 2007) | 2 lines

Block r3509 from 1.4 .

................
r3513 | kpfleming | 2007-12-18 19:23:12 +0200 (Tue, 18 Dec 2007) | 2 lines

remove some accidentally merged properties

................
r3515 | tzafrir | 2007-12-18 20:00:03 +0200 (Tue, 18 Dec 2007) | 6 lines

Enable xpp_usb in the sysconfig file as xpp no longer generates many
interrupts when there's no hardware connected.

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

................
r3516 | kpfleming | 2007-12-18 20:36:14 +0200 (Tue, 18 Dec 2007) | 2 lines

even though it's not very logical, having a 'next sample' number of zero for a sample is valid, so restore the ability to set one

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

Added:
    team/tzafrir/sysfs/build_tools/uninstall-modules
      - copied unchanged from r3516, branches/1.4/build_tools/uninstall-modules
    team/tzafrir/sysfs/wct4xxp/Kbuild
      - copied unchanged from r3516, branches/1.4/wct4xxp/Kbuild
    team/tzafrir/sysfs/wctc4xxp/Kbuild
      - copied unchanged from r3516, branches/1.4/wctc4xxp/Kbuild
    team/tzafrir/sysfs/wctdm24xxp/Kbuild
      - copied unchanged from r3516, branches/1.4/wctdm24xxp/Kbuild
    team/tzafrir/sysfs/wcte12xp/   (props changed)
      - copied from r3516, branches/1.4/wcte12xp/
    team/tzafrir/sysfs/wcte12xp/GpakApi.c
      - copied unchanged from r3516, branches/1.4/wcte12xp/GpakApi.c
    team/tzafrir/sysfs/wcte12xp/GpakApi.h
      - copied unchanged from r3516, branches/1.4/wcte12xp/GpakApi.h
    team/tzafrir/sysfs/wcte12xp/GpakErrs.h
      - copied unchanged from r3516, branches/1.4/wcte12xp/GpakErrs.h
    team/tzafrir/sysfs/wcte12xp/GpakHpi.h
      - copied unchanged from r3516, branches/1.4/wcte12xp/GpakHpi.h
    team/tzafrir/sysfs/wcte12xp/Kbuild
      - copied unchanged from r3516, branches/1.4/wcte12xp/Kbuild
    team/tzafrir/sysfs/wcte12xp/Makefile
      - copied unchanged from r3516, branches/1.4/wcte12xp/Makefile
    team/tzafrir/sysfs/wcte12xp/base.c
      - copied unchanged from r3516, branches/1.4/wcte12xp/base.c
    team/tzafrir/sysfs/wcte12xp/gpakenum.h
      - copied unchanged from r3516, branches/1.4/wcte12xp/gpakenum.h
    team/tzafrir/sysfs/wcte12xp/vpmadt032.c
      - copied unchanged from r3516, branches/1.4/wcte12xp/vpmadt032.c
    team/tzafrir/sysfs/wcte12xp/vpmadt032.h
      - copied unchanged from r3516, branches/1.4/wcte12xp/vpmadt032.h
    team/tzafrir/sysfs/wcte12xp/wcte12xp.h
      - copied unchanged from r3516, branches/1.4/wcte12xp/wcte12xp.h
    team/tzafrir/sysfs/xpp/Kbuild
      - copied unchanged from r3516, branches/1.4/xpp/Kbuild
    team/tzafrir/sysfs/xpp/utils/zconf/XppUtils.pm
      - copied unchanged from r3516, branches/1.4/xpp/utils/zconf/XppUtils.pm
    team/tzafrir/sysfs/xpp/xbus-pcm.c
      - copied unchanged from r3516, branches/1.4/xpp/xbus-pcm.c
    team/tzafrir/sysfs/xpp/xbus-pcm.h
      - copied unchanged from r3516, branches/1.4/xpp/xbus-pcm.h
    team/tzafrir/sysfs/xpp/xframe_queue.c
      - copied unchanged from r3516, branches/1.4/xpp/xframe_queue.c
    team/tzafrir/sysfs/xpp/xframe_queue.h
      - copied unchanged from r3516, branches/1.4/xpp/xframe_queue.h
Removed:
    team/tzafrir/sysfs/gendigits.c
    team/tzafrir/sysfs/wct4xxp/Makefile.kernel26
    team/tzafrir/sysfs/wctc4xxp/Makefile.kernel26
    team/tzafrir/sysfs/wctdm24xxp/Makefile.kernel26
    team/tzafrir/sysfs/wcte12xp.c
    team/tzafrir/sysfs/xpp/README.metering
Modified:
    team/tzafrir/sysfs/   (props changed)
    team/tzafrir/sysfs/Makefile
    team/tzafrir/sysfs/README
    team/tzafrir/sysfs/README.hpec
    team/tzafrir/sysfs/build_tools/genudevrules
    team/tzafrir/sysfs/digits.h
    team/tzafrir/sysfs/doc/zttest.8
    team/tzafrir/sysfs/firmware/Makefile
    team/tzafrir/sysfs/ppp/zaptel.c
    team/tzafrir/sysfs/tonezone.c
    team/tzafrir/sysfs/tonezone.h
    team/tzafrir/sysfs/tor2.c
    team/tzafrir/sysfs/torisa.c
    team/tzafrir/sysfs/wct1xxp.c
    team/tzafrir/sysfs/wct4xxp/Makefile
    team/tzafrir/sysfs/wct4xxp/base.c
    team/tzafrir/sysfs/wctc4xxp/Makefile
    team/tzafrir/sysfs/wctc4xxp/base.c
    team/tzafrir/sysfs/wctdm.c
    team/tzafrir/sysfs/wctdm24xxp/GpakApi.c
    team/tzafrir/sysfs/wctdm24xxp/GpakApi.h
    team/tzafrir/sysfs/wctdm24xxp/GpakCust.c
    team/tzafrir/sysfs/wctdm24xxp/GpakCust.h
    team/tzafrir/sysfs/wctdm24xxp/GpakHpi.h
    team/tzafrir/sysfs/wctdm24xxp/Makefile
    team/tzafrir/sysfs/wctdm24xxp/base.c
    team/tzafrir/sysfs/wctdm24xxp/gpakErrs.h
    team/tzafrir/sysfs/wctdm24xxp/gpakenum.h
    team/tzafrir/sysfs/wctdm24xxp/wctdm24xxp.h
    team/tzafrir/sysfs/wcte11xp.c
    team/tzafrir/sysfs/wcusb.c
    team/tzafrir/sysfs/xpp/.version
    team/tzafrir/sysfs/xpp/Changelog_xpp
    team/tzafrir/sysfs/xpp/Makefile   (contents, props changed)
    team/tzafrir/sysfs/xpp/README.Astribank
    team/tzafrir/sysfs/xpp/card_bri.c
    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_global.c
    team/tzafrir/sysfs/xpp/card_global.h
    team/tzafrir/sysfs/xpp/card_pri.c
    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/init_card_9_29
    team/tzafrir/sysfs/xpp/utils/example_default_zaptel
    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/test_parse.c
    team/tzafrir/sysfs/xpp/utils/xpp_blink
    team/tzafrir/sysfs/xpp/utils/xpp_fxloader
    team/tzafrir/sysfs/xpp/utils/xpp_fxloader.usermap
    team/tzafrir/sysfs/xpp/utils/xpp_sync
    team/tzafrir/sysfs/xpp/utils/zapconf
    team/tzafrir/sysfs/xpp/utils/zaptel_drivers
    team/tzafrir/sysfs/xpp/utils/zaptel_hardware
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Chans.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Hardware.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Hardware/USB.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Span.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Xpp.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Xpp/Xpd.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/ztd-eth.c
    team/tzafrir/sysfs/ztscan.c
    team/tzafrir/sysfs/zttest.c

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- branch-1.2-blocked (original)
+++ branch-1.2-blocked Tue Dec 18 16:59:14 2007
@@ -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
+/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201,3509

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

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 18 16:59:14 2007
@@ -1,49 +1,47 @@
-sethdlc-new
-ztdiag
-zttool
-ztspeed
-ztmonitor
-ztcfg
-zonedata.lo
-torisatool
-tor2fw.h
-radfw.h
-tonezone.lo
-tones.h
-makefw
-libtonezone.so.1.0
-gendigits
-fxstest
-zttest
-fxotune
-patlooptest
-hdlcstress
-ztcfg-dude
-hdlctest
-timertest
-pattest
-hdlcgen
-usbfxstest
-patgen
-hdlcverify
+*.a
 *.ko
 *.mod.c
+*.so
 .*.cmd
 .tmp_versions
-*.so
-*.a
+Module.symvers
+Modules.symvers
+README.html
+autom4te.cache
+config.log
+config.status
+fw2h
+fxotune
+fxstest
+hdlcgen
+hdlcstress
+hdlctest
+hdlcverify
+libtonezone.so.1.0
+makefw
+makeopts
+menuselect-tree
+menuselect.makedeps
+menuselect.makeopts
+missing
+patgen
+patlooptest
+pattest
+radfw.h
+sethdlc-new
+timertest
+tonezone.lo
+tor2fw.h
+torisatool
+usbfxstest
 version.h
 vpm450m_fw.h
-fw2h
-autom4te.cache
-missing
-makeopts
-menuselect.makeopts
-menuselect.makedeps
-config.log
-config.status
-menuselect-tree
-Modules.symvers
-Module.symvers
-README.html
+zonedata.lo
+ztcfg
+ztcfg-dude
+ztdiag
+ztmonitor
 ztscan
+ztspeed
+zttest
+zttool

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 18 16:59:14 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-3308
+/branches/1.4:1-3522

Modified: team/tzafrir/sysfs/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/Makefile?view=diff&rev=3523&r1=3522&r2=3523
==============================================================================
--- team/tzafrir/sysfs/Makefile (original)
+++ team/tzafrir/sysfs/Makefile Tue Dec 18 16:59:14 2007
@@ -91,15 +91,22 @@
 endif
 
 ifeq ($(BUILDVER),linux24)
-MENUSELECT_MODULES+=xpp wctc4xxp zttranscode
+MENUSELECT_MODULES+=xpp wctc4xxp wctdm24xxp zttranscode
 endif
 
 ifeq ($(findstring xpp,$(MENUSELECT_MODULES)),)
   BUILD_XPP:=yes
 endif
 
-TOPDIR_MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode wcte12xp
-SUBDIR_MODULES:=wct4xxp wctc4xxp xpp wctdm24xxp
+SUBDIRS_UTILS_ALL:= xpp/utils ppp
+SUBDIRS_UTILS	:=
+ifeq ($(BUILD_XPP),yes)
+  SUBDIRS_UTILS	+= xpp/utils
+endif
+#SUBDIRS_UTILS	+= ppp
+
+TOPDIR_MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
+SUBDIR_MODULES:=wct4xxp wctc4xxp xpp wctdm24xxp wcte12xp
 TOPDIR_MODULES+=$(MODULES_EXTRA)
 SUBDIR_MODULES+=$(SUBDIRS_EXTRA)
 BUILD_TOPDIR_MODULES:=$(filter-out $(MENUSELECT_MODULES),$(TOPDIR_MODULES))
@@ -259,14 +266,14 @@
 
 libs: $(LTZ_SO) $(LTZ_A)
 
-xpp-utils:
-ifeq (yes,$(BUILD_XPP))
-	@$(MAKE) -C xpp/utils
-endif
+utils-subdirs:
+	@for dir in $(SUBDIRS_UTILS); do \
+		$(MAKE) -C $$dir; \
+	done
 
 programs: libs utils
 
-utils: $(BINS) xpp-utils
+utils: $(BINS) utils-subdirs
 
 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
@@ -304,9 +311,6 @@
 tonezone.lo: tonezone.c
 	$(CC) -c $(CFLAGS) -o $@ $^
 
-tones.h: gendigits
-	./gendigits > $@
-
 tor2fw.h: tormenta2.rbt makefw 
 	./makefw $< tor2fw > $@
 
@@ -316,10 +320,7 @@
 makefw: makefw.c
 	$(HOSTCC) -o $@ $^
 
-gendigits: gendigits.c
-	$(HOSTCC) -o $@ $^ -lm
-
-prereq: config.status tones.h tor2fw.h radfw.h version.h
+prereq: config.status tor2fw.h radfw.h version.h
 
 zttool.o: zaptel.h
 zttool.o: CFLAGS+=$(NEWT_INCLUDE)
@@ -380,6 +381,9 @@
 wctdm24xxp/wctdm24xxp.o:
 	$(MAKE) -C wctdm24xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
 
+wcte12xp/wcte12xp.o:
+	$(MAKE) -C wcte12xp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
 pciradio.o: radfw.h
 
 ztdummy.o: ztdummy.h
@@ -389,15 +393,13 @@
 
 $(filter-out zaptel.o,$(BUILD_TOPDIR_MODULES:%=%.o)) zaptel-base.o: %.o: %.c zaptel.h
 	$(CC) $(KFLAGS) -o $@ -c $<
-
-zaptel.c: tones.h
 endif
 
 stackcheck: checkstack modules
 	./checkstack *.ko */*.ko
 
 README.html: README
-	$(ASCIIDOC) -n -a toc $<
+	$(ASCIIDOC) -n -a toc -a toclevel=3 $<
 
 xpp/README.Astribank.html: xpp/README.Astribank
 	cd $(@D); $(ASCIIDOC) -o $(@F) -n -a toc $(<F)
@@ -442,7 +444,7 @@
 
 install-programs: install-utils install-libs install-include
 
-install-utils: utils install-xpp
+install-utils: utils install-utils-subdirs
 ifneq (,$(BINS))
 	install -d $(DESTDIR)$(BIN_DIR)
 	install  $(BINS) $(DESTDIR)$(BIN_DIR)/
@@ -485,10 +487,10 @@
 endif
 	$(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
 
-install-xpp:
-ifeq (yes,$(BUILD_XPP))
-	@$(MAKE) -C xpp/utils install
-endif
+install-utils-subdirs:
+	@for dir in $(SUBDIRS_UTILS); do \
+		$(MAKE) -C $$dir install; \
+	done
 
 install-include:
 	$(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
@@ -530,30 +532,25 @@
 uninstall-hotplug:
 	$(MAKE) -C firmware hotplug-uninstall DESTDIR=$(DESTDIR)
 
+BASENAMES=$(sort $(shell for x in $(ALL_MODULES); do basename $x; done))
 uninstall-modules:
 ifeq ($(BUILDVER),linux24)
 else
-	for x in $(ALL_MODULES); do \
+	@./build_tools/uninstall-modules $(DESTDIR)/lib/modules/$(KVERS) $(BASENAMES)
+	@for x in $(ALL_MODULES); do \
 		rm -f $(DESTDIR)/lib/modules/$(KVERS)/extra/$$x ; \
 		rm -f $(DESTDIR)/lib/modules/$(KVERS)/misc/$$x ; \
 		rm -f $(DESTDIR)/lib/modules/$(KVERS)/zaptel/$$x ; \
 	done;
 endif
 
+BASENAMES=$(sort $(shell for mod in $(ALL_MODULES); do basename $$mod; done))
+
 install-modules: $(INSTALL_MODULES) uninstall-modules
 ifeq ($(BUILDVER),linux24)
 	$(INSTALL) -d $(DESTDIR)$(MOD_DIR)
 	$(INSTALL) -m 644 $(INSTALL_MODULES) $(DESTDIR)$(MOD_DIR)
 else
-	@# Delete any existing drivers before installing the new ones.  This
-	@# prevents problems when upgrading from a previous version of zaptel 
-	@# where the drivers may have been in a different location. In this
-	@# case, when depmod is run, the old drivers may be found and used
-	@# before the new drivers.
-	@for mod in $(INSTALL_MODULES); do \
-		rm -f `cat $(DESTDIR)/lib/modules/$(KVERS)/modules.dep | \
-			cut -d : -f 1 | grep -m 1 $$mod`; \
-	done;
 	$(KMAKE_INST)
   ifneq (,$(wildcard datamods/syncppp.ko))
 	$(MAKE) -C datamods install
@@ -610,10 +607,12 @@
   ifneq (,$(KSRC))
 	$(KMAKE) clean
   endif
-	$(MAKE) -C xpp/utils clean
 else
 	$(MAKE) -C wct4xxp clean
 endif
+	@for dir in $(SUBDIRS_UTILS_ALL); do \
+		$(MAKE) -C $$dir clean; \
+	done
 	$(MAKE) -C firmware clean
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h
@@ -658,6 +657,6 @@
 
 .EXPORT_ALL_VARIABLES:
 
-.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-xpp xpp-utils uninstall-modules
-
-endif
+.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
+
+endif

Modified: team/tzafrir/sysfs/README
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/README?view=diff&rev=3523&r1=3522&r2=3523
==============================================================================
--- team/tzafrir/sysfs/README (original)
+++ team/tzafrir/sysfs/README Tue Dec 18 16:59:14 2007
@@ -239,26 +239,39 @@
   make install DESTDIR=$PWD/target DYNFS=
 
 
-Test Install: live_ast
+Test Install: live_zap
 ^^^^^^^^^^^^^^^^^^^^^^
 If you need to test a version of Zaptel without touching the version
 installed on your system, you can use the script live_zap . Note,
 however, that it may take some extra configuration to be used right.
 
-Basica usage:
+Basic usage:
 
   ./configure
   make
-  ./live_ast install # instead of 'make install'
-  ./live_ast config  # instead of 'make config'
-  ./live_ast unload  # instead of '/etc/init.d/zaptel stop'
-  ./live_ast load    # instead of '/etc/init.d/zaptel start'
+  ./live_zap install # instead of 'make install'
+  ./live_zap config  # instead of 'make config'
+  ./live_zap unload  # instead of '/etc/init.d/zaptel stop'
+  ./live_zap load    # instead of '/etc/init.d/zaptel start'
 
 Everything is installed under the subdirectory live/ . You will probably
 need to adjust MODULES . Generally you should not edit the script
 itself, but , rather, edit live/live.conf . Please let me know if you
 needed to change anything in the script beyond changing live.conf so I
 can include useful fixes.
+
+Testing on a different maching:
+
+  ./configure
+  make
+  ./live_zap install # instead of 'make install'
+  ./live_zap config  # instead of 'make config'
+  ./live_zap rsync root at remotehost
+  ssh root at remotehost
+  # in the remote host:
+  cd /tmp
+  ./live_zap unload
+  ./live_zap load
 
 
 ./configure Options

Modified: team/tzafrir/sysfs/README.hpec
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/README.hpec?view=diff&rev=3523&r1=3522&r2=3523
==============================================================================
--- team/tzafrir/sysfs/README.hpec (original)
+++ team/tzafrir/sysfs/README.hpec Tue Dec 18 16:59:14 2007
@@ -18,4 +18,4 @@
 
 See the README on the Digium FTP site for further information:
 
-ftp://ftp.digium.com/pub/telephony/hpec/README
+http://downloads.digium.com/pub/telephony/hpec/README

Modified: team/tzafrir/sysfs/build_tools/genudevrules
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/build_tools/genudevrules?view=diff&rev=3523&r1=3522&r2=3523
==============================================================================
--- team/tzafrir/sysfs/build_tools/genudevrules (original)
+++ team/tzafrir/sysfs/build_tools/genudevrules Tue Dec 18 16:59:14 2007
@@ -21,11 +21,15 @@
 fi
 
 cat <<EOF
+# udev rules to generate the /dev/zap device files (if not yet provided 
+# by your distribution):
+KERNEL${match}"zapctl", NAME="zap/ctl"
+KERNEL${match}"zaptranscode", NAME="zap/transcode"
+KERNEL${match}"zaptimer", NAME="zap/timer"
+KERNEL${match}"zapchannel", NAME="zap/channel"
+KERNEL${match}"zappseudo", NAME="zap/pseudo"
+KERNEL${match}"zap[0-9]*", NAME="zap/%n"
+
 # zaptel devices with ownership/permissions for running as non-root
-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+SUBSYSTEM=="zaptel",  OWNER="asterisk", GROUP="asterisk", MODE="0660"
 EOF

Modified: team/tzafrir/sysfs/digits.h
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/digits.h?view=diff&rev=3523&r1=3522&r2=3523
==============================================================================
--- team/tzafrir/sysfs/digits.h (original)
+++ team/tzafrir/sysfs/digits.h Tue Dec 18 16:59:14 2007
@@ -1,5 +1,5 @@
 /*
- * Zapata Telephony Telephony
+ * Zapata Telephony
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,25 +17,27 @@
  *
  * Use DTMF/MFv1 tables 
  */
+
 #ifndef _DIGITS_H
 #define _DIGITS_H
 
-#define DEFAULT_DTMF_LENGTH	100 * 8
-#define DEFAULT_MFV1_LENGTH	60 * 8
-#define	PAUSE_LENGTH		500 * 8
+#define DEFAULT_DTMF_LENGTH	100 * ZT_CHUNKSIZE
+#define DEFAULT_MFV1_LENGTH	60 * ZT_CHUNKSIZE
+#define	PAUSE_LENGTH		500 * ZT_CHUNKSIZE
 
 /* At the end of silence, the tone stops */
-static struct zt_tone dtmf_silence =
-	{ 0, 0, 0, 0, 0, 0, DEFAULT_DTMF_LENGTH, NULL };
+static struct zt_tone dtmf_silence = {
+	.tonesamples = DEFAULT_DTMF_LENGTH,
+};
 
 /* At the end of silence, the tone stops */
-static struct zt_tone mfv1_silence =
-	{ 0, 0, 0, 0, 0, 0, DEFAULT_MFV1_LENGTH, NULL };
+static struct zt_tone mfv1_silence = {
+	.tonesamples = DEFAULT_MFV1_LENGTH,
+};
 
 /* A pause in the dialing */
-static struct zt_tone tone_pause =
-	{ 0, 0, 0, 0, 0, 0, PAUSE_LENGTH, NULL };
-
-#include "tones.h"
+static struct zt_tone tone_pause = {
+	.tonesamples = PAUSE_LENGTH,
+};
 
 #endif 

Modified: team/tzafrir/sysfs/doc/zttest.8
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/doc/zttest.8?view=diff&rev=3523&r1=3522&r2=3523
==============================================================================
--- team/tzafrir/sysfs/doc/zttest.8 (original)
+++ team/tzafrir/sysfs/doc/zttest.8 Tue Dec 18 16:59:14 2007
@@ -25,6 +25,14 @@
 Be more verbose: print one line per test.
 .RE
 
+.B -c 
+.I count
+.RS
+Run for 
+.I count
+times instead of running forever.
+.RE
+
 .SH FILES
 .B /dev/zap/pseudo
 .RS

Modified: team/tzafrir/sysfs/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/firmware/Makefile?view=diff&rev=3523&r1=3522&r2=3523
==============================================================================
--- team/tzafrir/sysfs/firmware/Makefile (original)
+++ team/tzafrir/sysfs/firmware/Makefile Tue Dec 18 16:59:14 2007
@@ -1,5 +1,5 @@
 #
-# Asterisk -- A telephony toolkit for Linux.
+# Zaptel
 # 
 # Makefile for firmware downloading/installation
 #
@@ -63,7 +63,7 @@
 
 # Download and extract firmware tarballs
 zaptel-fw-oct6114-064-%.tar.gz: have_download
-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)
+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; \
@@ -86,7 +86,7 @@
 endif
 
 zaptel-fw-oct6114-128-%.tar.gz: have_download
-ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" == "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_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-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_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; \
@@ -109,7 +109,7 @@
 endif
 
 zaptel-fw-tc400m-%.tar.gz: have_download
-ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" == "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_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-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_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; \
@@ -132,7 +132,7 @@
 endif
 
 zaptel-fw-vpmadt032-%.tar.gz: have_download

[... 18706 lines stripped ...]

More information about the svn-commits mailing list