kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix test programs build 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@641 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Michael Jerris 2009-02-03 19:48:04 +00:00
parent 8f27796167
commit 093bdd67df
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/openzap/Makefile.am
View File

@ -84,13 +84,13 @@ MYLIB=libopenzap.la
all: $(MYLIB) analogmod analog_emmod isdnmod boostmod ztmod wpmod all: $(MYLIB) analogmod analog_emmod isdnmod boostmod ztmod wpmod
noinst_PROGRAMS = testtones detect_tones detect_dtmf testisdn testboost testanalog #testapp testcid noinst_PROGRAMS = testtones detect_tones detect_dtmf testisdn testboost testanalog testapp testcid
#testapp_SOURCES = $(SRC)/testapp.c testapp_SOURCES = $(SRC)/testapp.c
#testapp_LDADD = libopenzap.la testapp_LDADD = libopenzap.la
#testapp_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) testapp_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
#testcid_SOURCES = $(SRC)/testcid.c testcid_SOURCES = $(SRC)/testcid.c
#testcid_LDADD = libopenzap.la testcid_LDADD = libopenzap.la
#testcid_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) testcid_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
testtones_SOURCES = $(SRC)/testtones.c testtones_SOURCES = $(SRC)/testtones.c
testtones_LDADD = libopenzap.la testtones_LDADD = libopenzap.la
testtones_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) testtones_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)

6
libs/openzap/src/testapp.c
View File

@ -45,13 +45,13 @@ int main(int argc, char *argv[])
zap_wait_flag_t flags = ZAP_READ; zap_wait_flag_t flags = ZAP_READ;
if (zap_channel_wait(chan, &flags, -1) == ZAP_FAIL) { if (zap_channel_wait(chan, &flags, -1) == ZAP_FAIL) {
printf("wait FAIL! %d [%s]\n", len, chan->last_error); printf("wait FAIL! %lu [%s]\n", len, chan->last_error);
} }
if (flags & ZAP_READ) { if (flags & ZAP_READ) {
if (zap_channel_read(chan, buf, &len) == ZAP_SUCCESS) { if (zap_channel_read(chan, buf, &len) == ZAP_SUCCESS) {
printf("READ: %d\n", len); printf("READ: %lu\n", len);
} else { } else {
printf("READ FAIL! %d [%s]\n", len, chan->last_error); printf("READ FAIL! %lu [%s]\n", len, chan->last_error);
break; break;
} }
} else { } else {

16
libs/openzap/src/testcid.c
View File

@ -21,7 +21,7 @@ int main(int argc, char *argv[])
int fd = -1; int fd = -1;
int16_t buf[160] = {0}; int16_t buf[160] = {0};
ssize_t len = 0; ssize_t len = 0;
int type, mlen; size_t type, mlen;
char *sp; char *sp;
char str[128] = ""; char str[128] = "";
char fbuf[256]; char fbuf[256];
@ -49,12 +49,12 @@ int main(int argc, char *argv[])
zap_fsk_data_init(&fsk_data, databuf, sizeof(databuf)); zap_fsk_data_init(&fsk_data, databuf, sizeof(databuf));
#if 1 #if 1
zap_fsk_data_add_mdmf(&fsk_data, MDMF_DATETIME, time_str, strlen(time_str)); zap_fsk_data_add_mdmf(&fsk_data, MDMF_DATETIME, (uint8_t *)time_str, strlen(time_str));
//zap_fsk_data_add_mdmf(&fsk_data, MDMF_DATETIME, "06091213", 8); //zap_fsk_data_add_mdmf(&fsk_data, MDMF_DATETIME, "06091213", 8);
zap_fsk_data_add_mdmf(&fsk_data, MDMF_PHONE_NUM, "14149361212", 7); zap_fsk_data_add_mdmf(&fsk_data, MDMF_PHONE_NUM, (uint8_t *)"14149361212", 7);
zap_fsk_data_add_mdmf(&fsk_data, MDMF_PHONE_NAME, "Fred Smith", 10); zap_fsk_data_add_mdmf(&fsk_data, MDMF_PHONE_NAME, (uint8_t *)"Fred Smith", 10);
for(x = 0; x < 0; x++) for(x = 0; x < 0; x++)
zap_fsk_data_add_mdmf(&fsk_data, MDMF_ALT_ROUTE, url, strlen(url)); zap_fsk_data_add_mdmf(&fsk_data, MDMF_ALT_ROUTE, (uint8_t *)url, strlen(url));
#else #else
zap_fsk_data_add_sdmf(&fsk_data, "06061234", "0"); zap_fsk_data_add_sdmf(&fsk_data, "06061234", "0");
//zap_fsk_data_add_sdmf(&state, "06061234", "5551212"); //zap_fsk_data_add_sdmf(&state, "06061234", "5551212");
@ -67,7 +67,7 @@ int main(int argc, char *argv[])
zap_fsk_modulator_init(&fsk_trans, FSK_BELL202, 8000, &fsk_data, -14, 180, 5, 300, my_write_sample, &foo); zap_fsk_modulator_init(&fsk_trans, FSK_BELL202, 8000, &fsk_data, -14, 180, 5, 300, my_write_sample, &foo);
zap_fsk_modulator_send_all((&fsk_trans)); zap_fsk_modulator_send_all((&fsk_trans));
printf("%d %d %d\n", fsk_data.dlen, foo.wrote, fsk_trans.est_bytes); printf("%lu %d %d\n", fsk_data.dlen, foo.wrote, fsk_trans.est_bytes);
if (fd > -1) { if (fd > -1) {
close (fd); close (fd);
@ -76,7 +76,7 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
if (zap_fsk_demod_init(&fsk_data, 8000, fbuf, sizeof(fbuf))) { if (zap_fsk_demod_init(&fsk_data, 8000, (uint8_t *)fbuf, sizeof(fbuf))) {
printf("wtf\n"); printf("wtf\n");
return 0; return 0;
} }
@ -96,7 +96,7 @@ int main(int argc, char *argv[])
zap_copy_string(str, sp, mlen+1); zap_copy_string(str, sp, mlen+1);
*(str+mlen) = '\0'; *(str+mlen) = '\0';
zap_clean_string(str); zap_clean_string(str);
printf("TYPE %d (%s) LEN %d VAL [%s]\n", type, zap_mdmf_type2str(type), mlen, str); printf("TYPE %lu (%s) LEN %lu VAL [%s]\n", type, zap_mdmf_type2str(type), mlen, str);
} }
zap_fsk_demod_destroy(&fsk_data); zap_fsk_demod_destroy(&fsk_data);