Big dump of newer xpp code.

For finer details and separate commits, you are advised to look into the
commit log of dahdi-{linux,tools}.

xpp.r7150

* 116x Astribanks:
 - Support for the TwinStar capability and for FXO and (BRI|PRI) on
   same device.
 - New control protocol ("MPP").
 - astribank_hextool - a low-level firmware loading tool instead of
   fpga_load .
 - astribank_tool - Other MPP activities .
 - Can still reset (but just that) through older protocol.
 - astribank_hexload is required for loading FPGA firmware for USB_FW.hex 
   rev > 6885.
 - USB_FW rev. 7071 . 
 - More modular FPGA firmware (1161 only).
 - FPGA_1161.hex rev. 7131. PIC_TYPE_* rev. 7107.
 - software-settings of some capabilities with astribank_allow .

* XPP:
  - init_card_* script are less verbose.
  - Reduced rate of "Is a DAHDI sync master" message.
  - Replace member bus_id with dev_name() and set_dev_name() for
    building with 2.6.30.
  - Conditionally remove 'owner' property of procfs was dropped in 2.6.30.
  - astribank_hook now enabled by default.
  - Has an optional hook for TwinStar.

* BRI:
  - hardhdlc support: The bri_dchan patch is no longer needed.
  - If bri_dchan patch applied: old code is used, and "dchan" is used.
  - If not: new code and "hardhdlc" is used.
  - zapconf will generate the right configuration, depending on the new
    sysfs driver attribute bri_hardhdlc, but default to "dchan" as
    before if not explicitly told.
  - Bugfix: explicitly turn off leds on startup.

* FXS:
  - Initialization and calibration fixes.
  - Notify the user just one about wrong VMWI config

* Dahdi-perl:
  - Fix detection of empty slots in wctdm.
  - Fix working with ethmf's extra file in /proc/zaptel
  - Improved detection of Rhino cards.
  - dahdi_genconf's generated text better explains files are generated.
  - /etc/xpp_order - allow specifiying an explicit order for
    Astribanks to register with Zaptel.
  - Dahdi::Xpp::Mpp - A wrapper around astribank_tool .

* dahdi.init:
  - A separate waitfor_xpds script. May now have a wait-loop in
    some cases.
  - xpp_sync needs to only be called after dahdi_cfg .
    (for the PRI module).



git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4641 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 23 insertions, 16 deletions

diff --git a/kernel/xpp/utils/genconf_parameters b/kernel/xpp/utils/genconf_parameters
index d1b8f62..66adab9 100644
--- a/kernel/xpp/utils/genconf_parameters
+++ b/kernel/xpp/utils/genconf_parameters
@@ -1,19 +1,19 @@
 #
-# /etc/dahdi/genconf_parameters
+# /etc/genconf_parameters
 #
 # This file contains parameters that affect the
-# dahdi_genconf configurator generator.
+# zapconf configuration generator.
 #
 # Syntax:
 # 	* A comment from '#' to end of line
 # 	* Blank lines ignored
 # 	* Whitespace at end of line trimmed
 # 	* Single valued items:
-# 	     key <whitespaces...> value
+# 	     key <whitespace...> value
 # 	* List valued items:
 # 	     key
-# 	     <whitespaces...>value1
-# 	     <whitespaces...>value2
+# 	     <whitespace...>value1
+# 	     <whitespace...>value2
 # 	     ...
 #
 
@@ -21,27 +21,27 @@
 # extension number will be channel_number+base_exten . The default is:
 #base_exten		4000
 #
-# Make FXS (analog phones) extentions answer immediately (sets
+# Make FXS (analog phones) extensions answer immediately (sets
 # 'immediate = yes' for them in zapata.conf). Don't enable this before 
 # you're read documentation about this option.
 #fxs_immediate		yes
 #
 # For FXS (analog phones) - use KS or LS? ks is the only method for
 # Asterisk to provide disconnect supervision and thus it would normally
-# be preffered and is the default.
+# be preferred and is the default.
 #fxs_default_start	ls
 #
 # For FXO (analog lines) - use KS or LS? KS is the default and is
-# normally the better choice as it allows detecting handups on many
+# normally the better choice as it allows detecting hang-ups on many
 # lines.
 #fxo_default_start	ls
 
-# Set tone zone values. This is used for playing tones (busy, dialtone
+# Set tone zone values. This is used for playing tones (busy, dial-tone
 # and such). The default is 'us'. This sets the value for both loadzone
 # and defaultzone in zaptel.conf .
 #lc_country		il
 
-# The dialplan contenxt into which to send trunks in zapata.conf or
+# The dialplan context into which to send trunks in zapata.conf or
 # users.conf. The default value is:
 #context_lines		from-pstn
 #
@@ -49,7 +49,7 @@
 # users.conf. The default value is:
 #context_phones		from-internal
 #
-# Two extea contexts for the input ports and output ports of an
+# Two extra contexts for the input ports and output ports of an
 # Astribank. Default values are:
 #context_input		astbank-input
 #context_output		astbank-output
@@ -78,16 +78,23 @@
 # phones.
 #brint_overlap
 
-# bri_hardhdlc: If this parameter is set to 'yes', in the entries for
-# BRI cards 'hardhdlc' will be used instead of 'dchan' (an alias for
-# 'fcshdlc').
-#bri_hardhdlc		yes
+# bri_hardhdlc:
+#   'yes'  - forces BRI cards to use 'hardhdlc' signalling.
+#   'no'   - forces BRI cards to use 'dchan' (an alias for 'fcshdlc').
+#            It is usefull only for zaptel with the bristuff patch.
+#
+# If it is left out or set to 'auto':
+#   * Information supplied by the driver is used to decide:
+#     - Currently implemented for Astribanks.
+#     - Taken from /sys/bus/xpds/drivers/bri/dchan_hardhdlc.
+#   * Without this info, falls back to 'dchan'.
+#bri_hardhdlc		auto
 
 # For MFC/R2 Support: 'R2' will make E1 spans CAS and with the
 # 'r2_idle_bits' bit in zaptel.conf . It will also make zapconf default
 # to generating the channels of this card in unicall.conf rather than in
 # zapata.conf . The meaning of this may be extended somehow to support
-# R2 through openr2/chan_dahdi later on.
+# R2 through openr2/chan_zap later on.
 #pri_connection_type	R2
 #r2_idle_bits		1101