kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-07 15:19:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enhancements for zaptel+bsd (bug #1781)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-04 15:44:14 +00:00
parent aa2795cc46
commit 103bb4a334
16 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -127,6 +127,7 @@ endif
#CFLAGS+=-DOLD_DSP_ROUTINES
CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
LIBEDIT=editline/libedit.a
apps/Makefile
+1
View File
@@ -38,6 +38,7 @@ endif
#APPS+=app_rpt.so
APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
CFLAGS+=-fPIC
apps/app_flash.c
+4
View File
@@ -21,7 +21,11 @@
#include <asterisk/image.h>
#include <asterisk/options.h>
#include <sys/ioctl.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
#include <string.h>
#include <errno.h>
#include <stdlib.h>
apps/app_intercom.c
+3 -2
View File
@@ -26,14 +26,15 @@
#include <stdlib.h>
#include <pthread.h>
#include <sys/time.h>
#ifdef __linux__
#include <netinet/in.h>
#if defined(__linux__)
#include <linux/soundcard.h>
#elif defined(__FreeBSD__)
#include <sys/soundcard.h>
#else
#include <soundcard.h>
#endif
#include <netinet/in.h>
#ifdef __OpenBSD__
#define DEV_DSP "/dev/audio"
apps/app_meetme.c
+5 -1
View File
@@ -31,9 +31,13 @@
#include <errno.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <pthread.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
static char *tdesc = "MeetMe conference bridge";
apps/app_rpt.c
+5
View File
@@ -61,7 +61,12 @@ enum {REM_OFF,REM_MONITOR,REM_TX};
#include <sys/ioctl.h>
#include <math.h>
#include <tonezone.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
static char *tdesc = "Radio Repeater / Remote Base version 0.2 05/30/2004";
static int debug = 0;
apps/app_zapbarge.c
+6 -1
View File
@@ -32,9 +32,14 @@
#include <string.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <pthread.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
static char *tdesc = "Barge in on Zap channel application";
static char *app = "ZapBarge";
apps/app_zapras.c
+4
View File
@@ -33,7 +33,11 @@
#include <pthread.h>
/* Need some zaptel help here */
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
static char *tdesc = "Zap RAS Application";
apps/app_zapscan.c
+6 -1
View File
@@ -33,9 +33,14 @@
#include <string.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <pthread.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
static char *tdesc = "Scan Zap channels application";
static char *app = "ZapScan";
astman/Makefile
+8 -1
View File
@@ -2,7 +2,14 @@
# Don't use ast mm routines
#
CFLAGS+=-DNO_AST_MM
OSARCH=$(shell uname -s)
ifeq (${OSARCH},FreeBSD)
CFLAGS+=-I/usr/local/include -L/usr/local/lib
endif
TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else echo "none" ; fi)
TARGET=$(shell if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi)
all: depend $(TARGET)
install:
@@ -19,7 +26,7 @@ clean:
rm -f *.o astman .depend
astman: astman.o ../md5.o
$(CC) -o astman astman.o ../md5.o -lnewt
$(CC) $(CFLAGS) -o astman astman.o ../md5.o -lnewt
ifneq ($(wildcard .depend),)
include .depend
channel.c
+4
View File
@@ -40,7 +40,11 @@
#include <asterisk/utils.h>
#ifdef ZAPTEL_OPTIMIZATIONS
#include <sys/ioctl.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
#ifndef ZT_TIMERPING
#error "You need newer zaptel! Please cvs update zaptel"
#endif
channels/Makefile
+3 -1
View File
@@ -55,6 +55,7 @@ CHANNEL_LIBS+=chan_oss.so
endif
CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
@@ -66,7 +67,7 @@ CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
# xxx CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
@@ -89,6 +90,7 @@ CFLAGS+=#-DVOFRDUMPER
ZAPDIR=/usr/lib
CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
channels/chan_iax2.c
+4
View File
@@ -57,7 +57,11 @@
#include <sys/stat.h>
#ifdef IAX_TRUNKING
#include <sys/ioctl.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
#endif
#ifdef MYSQL_FRIENDS
#include <mysql/mysql.h>
channels/chan_zap.c
+4
View File
@@ -46,7 +46,11 @@
#include <stdint.h>
#include <unistd.h>
#include <sys/ioctl.h>
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
#include <math.h>
#include <tonezone.h>
#include <ctype.h>
res/Makefile
+1
View File
@@ -17,6 +17,7 @@ CRYPTO_LIBS=-lssl -lcrypto
CFLAGS+=
CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
#
# Work around buggy RedHat 9.0
#
res/res_musiconhold.c
+4
View File
@@ -37,7 +37,11 @@
#include <sys/stat.h>
#include <dirent.h>
#ifdef ZAPATA_MOH
#ifdef __linux__
#include <linux/zaptel.h>
#else
#include <zaptel.h>
#endif /* __linux__ */
#endif
#include <unistd.h>
#include <sys/ioctl.h>