Replaced MNCC by OSMO-CC

src/eurosignal/Makefile.am

@@ -18,6 +18,7 @@ eurosignal_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/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
@@ -27,7 +28,6 @@ eurosignal_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

src/eurosignal/eurosignal.c

@@ -28,7 +28,8 @@
 #include "../libsample/sample.h"
 #include "../libdebug/debug.h"
 #include "../libmobile/call.h"
-#include "../libmncc/cause.h"
+#include "../libmobile/cause.h"
+#include "../libosmocc/message.h"
 #include "eurosignal.h"
 #include "dsp.h"
 
@@ -42,10 +43,6 @@
 #define ACKNOWLEDGE_TIME2	4.6	/* announcement 1.7 s, pause 2.9 s */
 #define BEEP_TIME		4.0	/* beep after answer */
 
-/* Call reference for calls from mobile station to network
-   This offset of 0x400000000 is required for MNCC interface. */
-static int new_callref = 0x40000000;
-
 /* these calls are not associated with a transmitter */
 euro_call_t *ooo_call_list = NULL;
 
@@ -469,10 +466,9 @@ void euro_receive_id(euro_t *euro, char *id)
 
 	/* we want to send beep via MNCC */
 	if (id_list) {
+		uint32_t callref;
 		euro_call_t *call;
 		char dialing[32];
-		int callref;
-		int rc;
 
 		/* check if we already have a call that beeps */
 		for (call = ooo_call_list; call; call = call->next) {
@@ -485,13 +481,10 @@ void euro_receive_id(euro_t *euro, char *id)
 
 		/* create call and send setup */
 		PDEBUG_CHAN(DEURO, DEBUG_INFO, "Sending setup towards network.'\n");
-		callref = ++new_callref;
+		sprintf(dialing, "%d", count);
+		callref = call_up_setup(call->station_id, dialing, OSMO_CC_NETWORK_EUROSIGNAL_NONE, "");
 		call = euro_call_create(NULL, callref, id);
 		call_new_state(call, EURO_CALL_BEEPING);
-		sprintf(dialing, "%d", count);
-		rc = call_up_setup(callref, call->station_id, dialing);
-		if (rc < 0)
-			euro_call_destroy(call);
 	}
 }
 

src/eurosignal/main.c

@@ -239,7 +239,7 @@ int main(int argc, char *argv[])
 		printf("Base station for channel %s ready, please tune transmitter and/or receiver to %.4f MHz\n", kanal[i], euro_kanal2freq(kanal[i], fm) / 1e6);
 	}
 
-	main_mobile(&quit, latency, interval, NULL, station_id, 6);
+	main_mobile("eurosignal", &quit, latency, interval, NULL, station_id, 6);
 
 fail:
 	/* destroy transceiver instance */