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

Replaced MNCC by OSMO-CC

Browse Source
This commit is contained in:
Andreas Eversberg
2020-08-09 14:27:56 +02:00
parent d0d14e2acf
commit 2cb2d5f3ac
65 changed files with 740 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/r2000/Makefile.am
View File

@@ -15,6 +15,7 @@ radiocom2000_LDADD = \
$(top_builddir)/src/liboptions/liboptions.a \
$(top_builddir)/src/libdebug/libdebug.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libosmocc/libosmocc.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libjitter/libjitter.a \
@@ -26,7 +27,6 @@ radiocom2000_LDADD = \
$(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsample/libsample.a \
$(top_builddir)/src/libg711/libg711.a \
-lm

2
src/r2000/main.c
View File

@@ -363,7 +363,7 @@ int main(int argc, char *argv[])
r2000_check_channels();
main_mobile(&quit, latency, interval, NULL, station_id, 9);
main_mobile("radiocom2000", &quit, latency, interval, NULL, station_id, 9);
fail:
/* destroy transceiver instance */

20
src/r2000/r2000.c
View File

@@ -27,7 +27,8 @@
#include <time.h>
#include "../libsample/sample.h"
#include "../libdebug/debug.h"
#include "../libmncc/cause.h"
#include "../libmobile/cause.h"
#include "../libosmocc/message.h"
#include "r2000.h"
//#include "transaction.h"
#include "frame.h"
@@ -45,10 +46,6 @@
#define SUPER_TIME2 20.0 /* time to release after loosing supervisory signal */
#define RELEASE_TIME 2.0 /* time to wait for release response */
/* Call reference for calls from station mobile to network
This offset of 0x400000000 is required for MNCC interface. */
static int new_callref = 0x40000000;
/* definition of bands and channels */
#define CHANNEL_SPACING 0.0125
@@ -900,20 +897,9 @@ static void tx_alert(r2000_t *r2000, frame_t *frame)
static int setup_call(r2000_t *r2000)
{
int callref = ++new_callref;
int rc;
/* make call toward network */
PDEBUG(DR2000, DEBUG_INFO, "Setup call to network.\n");
/* must set callref, since MNCC may directly call call_down_answer to trigger recall, nested in call_up_setup */
r2000->callref = callref;
rc = call_up_setup(callref, subscriber2string(&r2000->subscriber), r2000->subscriber.dialing);
if (rc < 0) {
PDEBUG(DR2000, DEBUG_NOTICE, "Call rejected (cause %d), releasing.\n", -rc);
r2000->callref = 0;
r2000_release(r2000);
return rc;
}
r2000->callref = call_up_setup(subscriber2string(&r2000->subscriber), r2000->subscriber.dialing, OSMO_CC_NETWORK_R2000_NONE, "");
return 0;
}