williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use global init/cleanup function

Browse Source
This commit is contained in:
Andreas Eversberg
2017-01-13 07:28:31 +01:00
parent bc028cd4d3
commit 2d8d7e62c1
9 changed files with 83 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cnetz/main.c
View File

@@ -244,13 +244,9 @@ int main(int argc, char *argv[])
print_image();
/* init functions */
if (use_mncc_sock) {
rc = mncc_init("/tmp/bsc_mncc");
if (rc < 0) {
fprintf(stderr, "Failed to setup MNCC socket. Quitting!\n");
goto fail;
}
}
rc = init_common(station_id, 7);
if (rc < 0)
goto fail;
scrambler_init();
init_sysinfo();
dsp_init();
@@ -261,11 +257,6 @@ int main(int argc, char *argv[])
}
init_coding();
cnetz_init();
rc = call_init(station_id, call_audiodev, samplerate, latency, 7, loopback);
if (rc < 0) {
fprintf(stderr, "Failed to create call control instance. Quitting!\n");
goto fail;
}
/* check for mandatory OgK */
for (i = 0; i < num_kanal; i++) {
@@ -326,9 +317,7 @@ int main(int argc, char *argv[])
fail:
/* cleanup functions */
call_cleanup();
if (use_mncc_sock)
mncc_exit();
cleanup_common();
flush_db();