aboutsummaryrefslogtreecommitdiffstats
path: root/src/r2000/r2000.c
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2020-08-09 14:27:56 +0200
committerAndreas Eversberg <jolly@eversberg.eu>2020-12-29 11:11:41 +0100
commit2cb2d5f3acdaf13d979c9bf9efb74b34b7ceea70 (patch)
tree00487e68886b7a6dfd7432ffc1e05e655c958c3a /src/r2000/r2000.c
parentd0d14e2acfce32af69aa7692404e88931ecbf4b0 (diff)
Replaced MNCC by OSMO-CC
Diffstat (limited to 'src/r2000/r2000.c')
-rw-r--r--src/r2000/r2000.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/r2000/r2000.c b/src/r2000/r2000.c
index e6f6718..cdf935c 100644
--- a/src/r2000/r2000.c
+++ b/src/r2000/r2000.c
@@ -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;
}