minor typos and cosmetics in text

This commit is contained in:
MelwareDE 2008-02-22 17:01:46 +00:00
parent 523d570e2d
commit 42d240e32e
4 changed files with 24 additions and 24 deletions

View File

@ -4,7 +4,7 @@ INSTALL
Modify the Makefile to fit your system, especially the path to the Asterisk
include files.
To build the driver you will need an installed CAPI system, including header
To build the driver you will need an installed Capi system, including header
files.
To build the channel module:

View File

@ -58,7 +58,7 @@ PROC=$(shell uname -m)
AVERSION=$(shell if grep -q "VERSION_NUM 0104" $(ASTERISK_HEADER_DIR)/asterisk/version.h; then echo V1_4; fi)
LIBLINUX=
LIBLINUX=-lcapi20
DEBUG=-g #-pg
INCLUDE=-I$(ASTERISK_HEADER_DIR)
ifndef C4B
@ -73,7 +73,7 @@ endif
endif #C4B
ifdef C4B
LIBLINUX=-L/usr/local/lib -llinuxcapi20
LIBLINUX+=-L/usr/local/lib -llinuxcapi20
endif
CFLAGS=-pipe -fPIC -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
@ -119,13 +119,13 @@ config.h:
fi
@$(CC) $(CFLAGS) -c $*.c -o $*.o;
chan_capi.so: $(OBJECTS)
$(SHAREDOS): $(OBJECTS)
@if [ "$(V)" = "0" ]; then \
echo " [LD] $@ ($^)"; \
else \
echo "$(CC) -shared -Xlinker -x -o $@ $^ $(LIBLINUX) -lcapi20"; \
echo "$(CC) -shared -Xlinker -x -o $@ $^ $(LIBLINUX)"; \
fi
@$(CC) -shared -Xlinker -x -o $@ $^ $(LIBLINUX) -lcapi20
@$(CC) -shared -Xlinker -x -o $@ $^ $(LIBLINUX)
install: all
$(INSTALL) -d -m 755 $(MODULES_DIR)

32
README
View File

@ -32,7 +32,7 @@ Note:
Eicon DIVA Server cards are now named Dialogic(R) Diva(R).
This chan_capi version includes:
================================
=====================================================
- Multiple controller support
- CID,DNID (callling party, called party)
- CLIR/CLIP
@ -46,7 +46,7 @@ This chan_capi version includes:
- Use asterisks internal DSP functions for DTMF
- Alaw support
- Ulaw support!
- Dialogic CAPI echo cancelation (echocancel=1)
- Dialogic DSP echo cancelation (echocancel=1)
- Reject call waiting (ACO)
- DID for Point to Point mode (a.k.a overlap receiving)
- Rx/Tx gains using positive linar value (rxgain=1.0, txgain=1.0 means no change)
@ -60,12 +60,12 @@ This chan_capi version includes:
- report correct DIALSTATUS and HANGUPCAUSE.
- Updated to support the new frame->delivery field
- Compiles with different Asterisk versions (automatic build configuration)
- receive/send faxes over CAPI (see below)
- receive/send faxes for CAPI (see below)
- Fixes and compatibility for BSD (Jan Stocker and Hans Petter Selasky)
- Support 'type of number'.
- ISDN hold.
- CAPI Line Interconnect.
- Dialogic Diva VoIP/RTP
- CAPI VoIP/RTP
- CLI command "capi show channels" shows details on channel status.
- Asterisk 1.4 jitterbuffer configuration.
- some QSIG extensions (see README.qsig)
@ -101,7 +101,7 @@ The Dial string
's' : activate 'stay-online': don't disconnect CAPI connection on Hangup.
This is needed to give additional commands like CCBS after Hangup.
To really hangup the CAPI connection, use either capicommand(hangup)
or wait for chan-capi/network timeout (about 20 seconds).
or wait for chan_capi/network timeout (about 20 seconds).
If the <interface-name> is used in dialstring, be sure the name (specified
in capi.conf) does not start with 'contr' or 'g'.
@ -116,7 +116,7 @@ CLI commands
============
capi info:
Show chan-capi version info.
Show chan_capi version info.
Show status of available B-channels.
capi debug:
@ -134,7 +134,7 @@ capi chatinfo:
CAPI command application
========================
========================================
chan_capi provides an additional Asterisk application
capicommand()
With this application, special capi commands and features can be used.
@ -237,7 +237,7 @@ ECT:
exten => s,2,Dial(CAPI/contr1/1234,,M(capi3pty))
Peer link creation:
Create a reference for chan-capi to know who is the calling channel on Dial().
Create a reference for chan_capi to know who is the calling channel on Dial().
This is needed if you want to use CCBS/CCNR afterwards.
Example:
exten => s,1,capicommand(peerlink)
@ -251,9 +251,9 @@ Hangup in mode 'stay-online':
Set local party to 'busy' or 'free':
Set the local phone to status to 'busy' or 'free' when
awaiting a callback for CCBS/CCNR. If the network wants to
call you back for CCBS/CCNR, chan-capi normaly doesn't know
call you back for CCBS/CCNR, chan_capi normaly doesn't know
about the status of the extension who started the callback.
By default chan-capi assumes 'free', but you can change that
By default chan_capi assumes 'free', but you can change that
with:
exten => s,1,capicommand(ccpartybusy|${CCLINKAGEID}|yes)
or
@ -263,7 +263,7 @@ Call completion on subscriber busy (CCBS):
To receive a callback when the dialed and busy party becomes free, aka
call completion on subscriber busy, you can do the following:
Example:
exten => s,1,capicommand(peerlink) ;to let chan-capi know who is the calling channel.
exten => s,1,capicommand(peerlink) ;to let chan_capi know who is the calling channel.
exten => s,2,Dial(CAPI/contr1/123456,60,g) ;'g' to go-on with the dialplan on busy.
exten => s,3,NoOp(${CCLINKAGEID}) ;if this variable now contains a number, CCBS is possible.
;here you can ask the caller if CCBS shall be activated...
@ -347,12 +347,12 @@ exten => 12345678,2,Hangup
Short HOWTO of capicommand(receivefax...) and capicommand(sendfax...):
==========================================================================
========================================================================================
For those of you who have a CAPI card with an on-board DSP (like Dialogic Diva),
this allows you to receive/send faxes.
capicommand(receivefax|<filename>[|<stationid>|<headline>|<options>]):
------------------------------------------------------------
-------------------------------------------------------------------------
If you want to answer a channel in fax mode, use capicommand(receivefax|...)
instead of Answer()
If you use Answer(), you will be in voice mode. If the hardware DSP detects
@ -411,7 +411,7 @@ instead of normal digits, this call is then send to extension
'Kxxx'. Where 'xxx' stands for the KEYPAD digits sent.
CLI command "capi show channels"
================================
==============================================
This CLI command shows detailed info on all CAPI channels.
Column description:
Line-Name : the name of the interface as defined in capi.conf
@ -433,7 +433,7 @@ Column description:
Asterisk variables used/set by chan_capi
========================================
==========================================================
BCHANNELINFO
On incomming call, this variable is set with the B-channel information value:
@ -466,7 +466,7 @@ CCBSSTATUS
CCLINKAGEID
If a Call-Linkage-Id is received for CCBS/CCNR, this variable contains this Id.
But you need to use capicommand(peerlink) before dialing a CAPI channel, because
of a design problem in Asterisk, chan-capi is not able to set channel variables
of a design problem in Asterisk, chan_capi is not able to set channel variables
of the calling channel.
CONNECTEDNUMBER

View File

@ -40,7 +40,7 @@ faxdetect=off ;enable faxdetection and redirection to EXTEN 'fax' for incomin
;outgoing calls. (default='off', possible values: 'incoming','outgoing','both')
accountcode= ;PBX accountcode to use in CDRs
;amaflags=default;AMA flags for CDR ('default', 'omit', 'billing', or 'documentation')
context=capi-in ;context for incoming calls
context=isdn-in ;context for incoming calls
;holdtype=hold ;when the PBX puts the call on hold, ISDN HOLD will be used. If
;set to 'local' (default value), no hold is done and the PBX may
;play MOH.
@ -51,7 +51,7 @@ context=capi-in ;context for incoming calls
; drivers/pbx/telco which does not send SETUP or SENDING-COMPLETE.
;echosquelch=1 ;_VERY_PRIMITIVE_ echo suppression. Disable this before you start recording voicemail
;or your files may get choppy. (you can use capicommand(echosquelch|no) for this)
;echocancel=yes ;Dialogic Diva (CAPI) echo cancelation (yes=g165)
;echocancel=yes ;Dialogic Diva (Capi) echo cancelation (yes=g165)
;(possible values: 'no', 'yes', 'force', 'g164', 'g165')
echocancelold=yes;use facility selector 6 instead of correct 8 (necessary for older eicon drivers)
;echotail=64 ;echo cancel tail setting (default=0 for maximum)