Move to new modular capi20 implementation

step2

Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
This commit is contained in:
Karsten Keil 2011-10-21 10:47:50 +02:00
parent ba6c742ee2
commit 10a60ab5f5
25 changed files with 105 additions and 110 deletions

View File

@ -343,7 +343,7 @@ uninstall-libLIBRARIES:
clean-libLIBRARIES:
-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
libcapi20dyn.a: $(libcapi20dyn_a_OBJECTS) $(libcapi20dyn_a_DEPENDENCIES)
libcapi20dyn.a: $(libcapi20dyn_a_OBJECTS) $(libcapi20dyn_a_DEPENDENCIES)
-rm -f libcapi20dyn.a
$(libcapi20dyn_a_AR) libcapi20dyn.a $(libcapi20dyn_a_OBJECTS) $(libcapi20dyn_a_LIBADD)
$(RANLIB) libcapi20dyn.a
@ -401,13 +401,13 @@ clean-modulesLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
lib_capi_mod_fritzbox.la: $(lib_capi_mod_fritzbox_la_OBJECTS) $(lib_capi_mod_fritzbox_la_DEPENDENCIES)
lib_capi_mod_fritzbox.la: $(lib_capi_mod_fritzbox_la_OBJECTS) $(lib_capi_mod_fritzbox_la_DEPENDENCIES)
$(lib_capi_mod_fritzbox_la_LINK) -rpath $(modulesdir) $(lib_capi_mod_fritzbox_la_OBJECTS) $(lib_capi_mod_fritzbox_la_LIBADD) $(LIBS)
lib_capi_mod_rcapi.la: $(lib_capi_mod_rcapi_la_OBJECTS) $(lib_capi_mod_rcapi_la_DEPENDENCIES)
lib_capi_mod_rcapi.la: $(lib_capi_mod_rcapi_la_OBJECTS) $(lib_capi_mod_rcapi_la_DEPENDENCIES)
$(lib_capi_mod_rcapi_la_LINK) -rpath $(modulesdir) $(lib_capi_mod_rcapi_la_OBJECTS) $(lib_capi_mod_rcapi_la_LIBADD) $(LIBS)
lib_capi_mod_std.la: $(lib_capi_mod_std_la_OBJECTS) $(lib_capi_mod_std_la_DEPENDENCIES)
lib_capi_mod_std.la: $(lib_capi_mod_std_la_OBJECTS) $(lib_capi_mod_std_la_DEPENDENCIES)
$(lib_capi_mod_std_la_LINK) -rpath $(modulesdir) $(lib_capi_mod_std_la_OBJECTS) $(lib_capi_mod_std_la_LIBADD) $(LIBS)
libcapi20.la: $(libcapi20_la_OBJECTS) $(libcapi20_la_DEPENDENCIES)
libcapi20.la: $(libcapi20_la_OBJECTS) $(libcapi20_la_DEPENDENCIES)
$(libcapi20_la_LINK) -rpath $(libdir) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS)
mostlyclean-compile:

View File

@ -17,7 +17,7 @@ if it doesn't exist look for
To set the remote machine, the above file need to have
the following line
REMOTE <driver> <remote hostname|ip-address> <remote port>
Drivers:
* fritzbox - Remote CAPI via FRITZ!Box
* rcapi - Melware Remote CAPI

View File

@ -7459,7 +7459,7 @@ m4_if([$1],[LT_INIT],[
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
[_LT_ENABLE_FAST_INSTALL])
[_LT_ENABLE_FAST_INSTALL])
])
])# _LT_SET_OPTIONS
@ -7915,7 +7915,7 @@ _LT_DECL(, macro_revision, 0)
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
@ -8430,7 +8430,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
[_AM_PROG_TAR([v7])])])
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
@ -8838,4 +8838,3 @@ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR

View File

@ -1,10 +1,10 @@
/*
* CAPI 2.0 library
*
*
* 2002-03-27 - Added remote capi features.
* Armin Schindler <armin@melware.de>
*
* This program is free software and may be modified and
* This program is free software and may be modified and
* distributed under the terms of the GNU Public License.
*
*/
@ -24,11 +24,11 @@
#include <stdarg.h>
#define _LINUX_LIST_H
#include <linux/capi.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include "capi20.h"
#include "capi_mod.h"
@ -179,7 +179,7 @@ static char *skip_nonwhitespace(char *s)
{
while (*s && !isspace(*s)) s++;
return s;
}
}
/*
* read config file
@ -207,7 +207,7 @@ static int read_config(void)
continue;
if (!(strncmp(s, "REMOTE", 6))) {
s = skip_nonwhitespace(s);
t = skip_whitespace(s);
s = skip_nonwhitespace(t);
if (*s) *s++ = 0;
@ -442,7 +442,7 @@ void cleanup_buffers_for_ncci(unsigned char applid, unsigned ncci)
{
struct applinfo *ap;
unsigned i;
assert(validapplid(applid));
ap = applinfo[applid];
@ -460,7 +460,7 @@ void cleanup_buffers_for_plci(unsigned char applid, unsigned plci)
{
struct applinfo *ap;
unsigned i;
assert(validapplid(applid));
ap = applinfo[applid];
@ -474,7 +474,7 @@ void cleanup_buffers_for_plci(unsigned char applid, unsigned plci)
}
}
/*
/*
* CAPI2.0 functions
*/
@ -656,7 +656,7 @@ unsigned capi20_isinstalled( void ) {
/* backwards-compatible: check standard interface fist */
psList = psModuleList;
while ( psList != NULL ) {
if ( !strcasecmp( psList -> psMod -> pnName, "standard" ) ) {
psModule = psList -> psMod;
capi_fd = psModule -> psOperations -> IsInstalled();
@ -851,7 +851,7 @@ capi20_get_version(unsigned Ctrl, unsigned char *Buf)
return psModule -> psOperations -> GetVersion( capi_fd, Ctrl, Buf );
}
unsigned char *
unsigned char *
capi20_get_serial_number(unsigned Ctrl, unsigned char *Buf)
{
if (capi20_isinstalled() != CapiNoError)
@ -885,14 +885,14 @@ capi20_waitformessage(unsigned ApplID, struct timeval *TimeOut)
if (!validapplid(ApplID))
return CapiIllAppNr;
fd = applid2fd(ApplID);
FD_SET(fd, &rfds);
if (select(fd + 1, &rfds, NULL, NULL, TimeOut) < 1)
return CapiReceiveQueueEmpty;
return CapiNoError;
}

View File

@ -1,7 +1,7 @@
/*
* CAPI 2.0 library
*
* This program is free software and may be modified and
* This program is free software and may be modified and
* distributed under the terms of the GNU Public License.
*
*/
@ -78,4 +78,3 @@ int capi20ext_ncci_opencount(unsigned applid, unsigned ncci);
#endif
#endif /* __CAPI20_H */

View File

@ -257,7 +257,7 @@ static unsigned fritzboxRelease( int nSock, int nApplId ) {
* \param pnMsg message pointer
* \return error code (CapiNoError or CapiMsgOSResourceErr on error)
*/
static unsigned fritzboxPutMessage( int nSock, unsigned nApplId, unsigned char *pnMsg ) {
static unsigned fritzboxPutMessage( int nSock, unsigned nApplId, unsigned char *pnMsg ) {
unsigned char anSendBuffer[ SEND_BUFSIZ ];
int nNum;
int nLen = CAPIMSG_LEN( pnMsg );
@ -283,7 +283,7 @@ static unsigned fritzboxPutMessage( int nSock, unsigned nApplId, unsigned char *
memcpy( anSendBuffer + 3, pnMsg, sizeof( anSendBuffer ) - 3 );
nLen += 3;
/* write data to socket */
/* write data to socket */
nNum = write( nSock, anSendBuffer, nLen );
if ( nNum != nLen ) {
CapiDebug( 3, "Error: Unable send CAPI_PUT_MESSAGE (nApplId: %d, Ctrl: %d, Cmd: %d, SubCmd: %d)", nApplId, anSendBuffer[ 11 ] & 0x7F, CAPIMSG_COMMAND( pnMsg ), CAPIMSG_SUBCOMMAND( pnMsg ) );
@ -322,18 +322,18 @@ static int readSocket( int nSock, unsigned char *pnBuffer, int nLen ) {
nTotLen -= nActLen;
nReadLen += nActLen;
}
nActLen = 0;
}
if ( nActLen > 0 ) {
nReadLen += nActLen;
}
if ( nReadLen != nOrigLen ) {
return 0;
}
if ( nLen == 0 ) {
nLen = nOrigLen;
}
@ -410,7 +410,7 @@ static unsigned fritzboxGetMessage( int nSock, unsigned nApplId, unsigned char *
pnBuffer[ 29 ] = ( nData >> 56 ) & 0xFF;
}
CapiDebug( 3, "CAPI_GET_MESSAGE (nApplId: %d, Ctrl: %d)", nApplId, pnBuffer[ 8 ] & 0x7F );
CapiDebug( 3, "CAPI_GET_MESSAGE (nApplId: %d, Ctrl: %d)", nApplId, pnBuffer[ 8 ] & 0x7F );
/* keep buffer */
return CapiNoError;

View File

@ -4,7 +4,7 @@
#define CAPI20_FB_MANUF "AVM Berlin"
#define CAPI20_FB_SERIAL "0004711"
#define CAPI20_FB_VERSION_MAJOR 0
#define CAPI20_FB_VERSION_MINOR 5
#define CAPI20_FB_VERSION_MAJOR 0
#define CAPI20_FB_VERSION_MINOR 5
#endif

View File

@ -59,7 +59,7 @@ static int rcapiOpenSocket( void ) {
if ( !connect( nHandle, ( struct sockaddr * ) &sAddr, sizeof( sAddr ) ) ) {
/* no errors, return handle */
return nHandle;
}
}
}
close( nHandle );
@ -290,7 +290,7 @@ static unsigned rcapiPutMessage( int nSock, unsigned nApplId, unsigned char *pnM
/* write data to socket */
nNum = write( nSock, anSendBuffer, nLen );
if ( nNum != nLen ) {
return CapiMsgOSResourceErr;
return CapiMsgOSResourceErr;
}
return CapiNoError;

View File

@ -1,12 +1,12 @@
/*
*
*
* CAPI 2.0 Interface for Linux
*
*
* Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
*
* This program is free software and may be modified and
*
* This program is free software and may be modified and
* distributed under the terms of the GNU Public License.
*
*
*/
#ifndef __CAPICMD_H__
#define __CAPICMD_H__
@ -112,4 +112,3 @@
#define CAPI_INFO_RESP CAPICMD(CAPI_INFO,CAPI_RESP)
#endif /* __CAPICMD_H__ */

View File

@ -1,6 +1,6 @@
/*
* $Id: capidyn.c,v 1.1 2009/05/08 21:02:02 buzz Exp $
*
*
* $Log: capidyn.c,v $
* Revision 1.1 2009/05/08 21:02:02 buzz
* Add new libcapi20
@ -123,7 +123,7 @@ capi20_get_version(unsigned Ctrl, unsigned char *Buf)
static unsigned char *
(*fptr_capi20_get_serial_number)(unsigned, unsigned char *);
unsigned char *
unsigned char *
capi20_get_serial_number(unsigned Ctrl, unsigned char *Buf)
{
if (loadlib() < 0)

View File

@ -1,6 +1,6 @@
/*
*
* This program is free software and may be modified and
* This program is free software and may be modified and
* distributed under the terms of the GNU Public License.
*
*/

View File

@ -2,7 +2,7 @@
#define __CAPIUTILS_H__
/*
* This program is free software and may be modified and
* This program is free software and may be modified and
* distributed under the terms of the GNU Public License.
*/
@ -224,7 +224,7 @@ typedef struct {
_cdword Function;
#ifndef CAPI_LIBRARY_V2
_cstruct Globalconfiguration;
#endif
#endif
_cstruct HLC;
_cword Info;
_cstruct InfoElement;
@ -241,7 +241,7 @@ typedef struct {
_cstruct Useruserdata;
#ifndef CAPI_LIBRARY_V2
_cstruct SendingComplete;
#endif
#endif
unsigned char *Data;
/* intern */
@ -385,7 +385,7 @@ char *capi_message2str(_cbyte * msg);
#ifndef CAPI_LIBRARY_V2
#define CONNECT_REQ_GLOBALCONFIGURATION(x) ((x)->Globalconfiguration)
/* all layer parameter */
#endif
#endif
#define CONNECT_REQ_BC(x) ((x)->BC)
/* Bearer Capability */
#define CONNECT_REQ_LLC(x) ((x)->LLC)

View File

@ -475,7 +475,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
exit ;;
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@ -603,22 +603,22 @@ EOF
long cpu = sysconf (_SC_CPU_VERSION);
switch (cpu)
{
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
case CPU_PA_RISC2_0:
{
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
case CPU_PA_RISC2_0:
#if defined(_SC_KERNEL_BITS)
switch (bits)
{
case 64: puts ("hppa2.0w"); break;
case 32: puts ("hppa2.0n"); break;
default: puts ("hppa2.0"); break;
} break;
switch (bits)
{
case 64: puts ("hppa2.0w"); break;
case 32: puts ("hppa2.0n"); break;
default: puts ("hppa2.0"); break;
} break;
#else /* !defined(_SC_KERNEL_BITS) */
puts ("hppa2.0"); break;
puts ("hppa2.0"); break;
#endif
default: puts ("hppa1.0"); break;
}
default: puts ("hppa1.0"); break;
}
exit (0);
}
EOF
@ -785,14 +785,14 @@ EOF
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
@ -855,7 +855,7 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
echo frv-unknown-linux-gnu
echo frv-unknown-linux-gnu
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -950,7 +950,7 @@ EOF
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -965,7 +965,7 @@ EOF
echo x86_64-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@ -1073,7 +1073,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
# UnixWare 7.x, OpenUNIX and OpenServer 6.
# UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
@ -1309,7 +1309,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;

View File

@ -166,10 +166,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
-chorusrdb)
os=-chorusrdb
-chorusrdb)
os=-chorusrdb
basic_machine=$1
;;
;;
-hiux*)
os=-hiuxwe2
;;
@ -393,7 +393,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
abacus)
abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@ -1426,7 +1426,7 @@ case $basic_machine in
os=-aout
;;
c4x-* | tic4x-*)
os=-coff
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
@ -1480,7 +1480,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
*-knuth)
*-knuth)
os=-mmixware
;;
*-wec)

View File

@ -10799,7 +10799,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
if test "${lt_cv_dlopen_self+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@ -10895,7 +10895,7 @@ $as_echo_n "checking whether a statically linked program can dlopen itself... "
if test "${lt_cv_dlopen_self_static+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@ -13933,4 +13933,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

View File

@ -1,6 +1,6 @@
/*
*
* This program is free software and may be modified and
* This program is free software and may be modified and
* distributed under the terms of the GNU Public License.
*
*/
@ -96,58 +96,58 @@ char *capi_info2str(_cword reason)
/*-- error information concerning requested services -----*/
case 0x3001:
return "B1 protocol not supported";
case 0x3002:
case 0x3002:
return "B2 protocol not supported";
case 0x3003:
case 0x3003:
return "B3 protocol not supported";
case 0x3004:
case 0x3004:
return "B1 protocol parameter not supported";
case 0x3005:
case 0x3005:
return "B2 protocol parameter not supported";
case 0x3006:
case 0x3006:
return "B3 protocol parameter not supported";
case 0x3007:
case 0x3007:
return "B protocol combination not supported";
case 0x3008:
case 0x3008:
return "NCPI not supported";
case 0x3009:
case 0x3009:
return "CIP Value unknown";
case 0x300A:
case 0x300A:
return "Flags not supported (reserved bits)";
case 0x300B:
case 0x300B:
return "Facility not supported";
case 0x300C:
case 0x300C:
return "Data length not supported by current protocol";
case 0x300D:
case 0x300D:
return "Reset procedure not supported by current protocol";
/*-- informations about the clearing of a physical connection -----*/
case 0x3301:
case 0x3301:
return "Protocol error layer 1 (broken line or B-channel removed by signalling protocol)";
case 0x3302:
case 0x3302:
return "Protocol error layer 2";
case 0x3303:
case 0x3303:
return "Protocol error layer 3";
case 0x3304:
case 0x3304:
return "Another application got that call";
/*-- T.30 specific reasons -----*/
case 0x3311:
case 0x3311:
return "Connecting not successful (remote station is no FAX G3 machine)";
case 0x3312:
case 0x3312:
return "Connecting not successful (training error)";
case 0x3313:
case 0x3313:
return "Disconnected before transfer (remote station does not support transfer mode, e.g. resolution)";
case 0x3314:
case 0x3314:
return "Disconnected during transfer (remote abort)";
case 0x3315:
case 0x3315:
return "Disconnected during transfer (remote procedure error, e.g. unsuccessful repetition of T.30 commands)";
case 0x3316:
case 0x3316:
return "Disconnected during transfer (local tx data underrun)";
case 0x3317:
case 0x3317:
return "Disconnected during transfer (local rx data overflow)";
case 0x3318:
case 0x3318:
return "Disconnected during transfer (local abort)";
case 0x3319:
case 0x3319:
return "Illegal parameter coding (e.g. SFF coding error)";
/*-- disconnect causes from the network according to ETS 300 102-1/Q.931 -----*/
@ -155,7 +155,7 @@ char *capi_info2str(_cword reason)
case 0x3482: return "No route to specified transit network";
case 0x3483: return "No route to destination";
case 0x3486: return "Channel unacceptable";
case 0x3487:
case 0x3487:
return "Call awarded and being delivered in an established channel";
case 0x3490: return "Normal call clearing";
case 0x3491: return "User busy";
@ -413,10 +413,10 @@ static unsigned char *cpars[] = {
#ifdef _BIG_ENDIAN
#define wordTLcpy(x,y) *(_cword *)(x)=bswap_16(*(_cword *)(y));
#define dwordTLcpy(x,y) *(_cdword *)(x)=bswap_32(*(_cdword *)(y));
#define wordTRcpy(x,y) *(_cword *)(y)=bswap_16(*(_cword *)(x));
#define dwordTRcpy(x,y) *(_cdword *)(y)=bswap_32(*(_cdword *)(x));
#define qwordTLcpy(x,y) *(_cqword *)(x)=bswap_64(*(_cqword *)(y));
#define qwordTRcpy(x,y) *(_cqword *)(y)=bswap_64(*(_cqword *)(x));

View File

@ -8409,4 +8409,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# sh-indentation:2
# End:
# vi:sw=2