← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dahdi-tools/saucy

« back to all changes in this revision

Viewing changes to zonedata.c

  • Committer: Stefan Lesicnik
  • Date: 2011-05-08 12:22:46 UTC
  • mfrom: (2.1.4 sid)
  • Revision ID: stefan@lsd.co.za-20110508122246-lh6k2x1uy8pl3vdi
Tags: 1:2.4.1-1ubuntu1
http://bugs.debian.org/581076
http://bugs.debian.org/582094
https://launchpad.net/bugs/493304
* Merge from Debian. Remaining changes:
  - Bug Fix: If linux-headers are not installed, don't block, and print
    information for the user.
  - added debian/dahdi.postinst
  - added --error-handler=init_failed to debian/rules
  - Changes from Debian:
    - debian/control: Change Maintainer
    - debian/control: Removed Uploaders field.
    - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
    - debian/control: Package dahdi Depends on dahdi-dkms | dahdi-source
* debian/control: Added gawk as dependency for dkms build (LP: #493304)
* New upstream release (Closes: #581076, #582094).
* Patches hardware_rescan, perl_fix_noserial, perl_fix_transportdir,
  astribank_allow_ignoreend, init_unload_modules and wcb4xxp_extra_trunk
  dropped: merged upstream.
* dahdi-linux 2.3.0 is required (extra config options for dahdi_cfg).
* Convert to dpkg v.3 format.
* Standards version: 3.9.1.0 (No change needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
zonedata.c
979
979
                .mfr1_level = -7,
980
980
                .mfr2_level = -8,
981
981
        },
 
982
        {
 
983
                .zone = 43,
 
984
                .country = "mo",
 
985
                .description = "Macao,China",
 
986
                .ringcadence = { 1000, 4000 },
 
987
                .tones = {
 
988
                        /* References: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
 
989
                        { DAHDI_TONE_DIALTONE, "425" },
 
990
                        { DAHDI_TONE_BUSY, "425/500,0/500" },
 
991
                        { DAHDI_TONE_RINGTONE, "425/1000,0/4000" },
 
992
                        { DAHDI_TONE_CONGESTION, "425/250,0/250" },
 
993
                        { DAHDI_TONE_CALLWAIT, "425/200,0/600" },
 
994
                        /* RECORD TONE - not specified */
 
995
                        { DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
 
996
                        { DAHDI_TONE_INFO, "950/333,1400/333,1800/333,0/1000" },
 
997
                        /* STUTTER TONE - not specified */
 
998
                        { DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
 
999
        },
 
1000
                .dtmf_high_level = -10,
 
1001
                .dtmf_low_level = -10,
 
1002
                .mfr1_level = -10,
 
1003
                .mfr2_level = -8,
 
1004
        },
982
1005
        { .zone = -1 }
983
1006
};