diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2020-08-09 14:27:56 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2020-12-29 11:11:41 +0100 |
| commit | 2cb2d5f3acdaf13d979c9bf9efb74b34b7ceea70 (patch) | |
| tree | 00487e68886b7a6dfd7432ffc1e05e655c958c3a /src/bnetz | |
| parent | d0d14e2acfce32af69aa7692404e88931ecbf4b0 (diff) | |
Replaced MNCC by OSMO-CC
Diffstat (limited to 'src/bnetz')
| -rw-r--r-- | src/bnetz/Makefile.am | 3 | ||||
| -rw-r--r-- | src/bnetz/bnetz.c | 17 | ||||
| -rw-r--r-- | src/bnetz/main.c | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am index 7ea84ca..0e4789a 100644 --- a/src/bnetz/Makefile.am +++ b/src/bnetz/Makefile.am @@ -18,6 +18,7 @@ bnetz_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/libsquelch/libsquelch.a \ @@ -28,7 +29,6 @@ bnetz_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 @@ -44,7 +44,6 @@ bnetz_dialer_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 \ $(ALSA_LIBS) -lm diff --git a/src/bnetz/bnetz.c b/src/bnetz/bnetz.c index 1ea7002..725dd9b 100644 --- a/src/bnetz/bnetz.c +++ b/src/bnetz/bnetz.c @@ -27,15 +27,12 @@ #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 "bnetz.h" #include "telegramm.h" #include "dsp.h" -/* Call reference for calls from mobile station to network - This offset of 0x400000000 is required for MNCC interface. */ -static int new_callref = 0x40000000; - /* mobile originating call */ #define CARRIER_TO 0.08 /* 80 ms search for carrier */ #define DIALING_TO 3.8 /* timeout after channel allocation "Kanalbelegung" (according to FTZ 1727 Pfl 32 Clause 3.2.2.2.8) */ @@ -565,8 +562,6 @@ void bnetz_receive_telegramm(bnetz_t *bnetz, uint16_t telegramm) break; case DIAL_MODE_NUMBER2: if (digit == 'e') { - int callref = ++new_callref; - int rc; /* add 0 in front of number */ char dialing[sizeof(bnetz->dial_number) + 1] = "0"; strcpy(dialing + 1, bnetz->dial_number); @@ -594,13 +589,7 @@ void bnetz_receive_telegramm(bnetz_t *bnetz, uint16_t telegramm) /* setup call */ PDEBUG(DBNETZ, DEBUG_INFO, "Setup call to network.\n"); - rc = call_up_setup(callref, bnetz->station_id, dialing); - if (rc < 0) { - PDEBUG(DBNETZ, DEBUG_NOTICE, "Call rejected (cause %d), releasing.\n", -rc); - bnetz_release(bnetz, TRENN_COUNT); - return; - } - bnetz->callref = callref; + bnetz->callref = call_up_setup(bnetz->station_id, dialing, OSMO_CC_NETWORK_BNETZ_MUENZ, (bnetz->dial_type == DIAL_TYPE_METER_MUENZ) ? "MUENZ" : ""); break; } if (digit < '0' || digit > '9') { diff --git a/src/bnetz/main.c b/src/bnetz/main.c index 383a323..91bb2f5 100644 --- a/src/bnetz/main.c +++ b/src/bnetz/main.c @@ -194,7 +194,7 @@ int main(int argc, char *argv[]) printf("To call phone, switch transmitter (using paging signal) to %.3f MHz.\n", bnetz_kanal2freq(19, 0) / 1e6); } - main_mobile(&quit, latency, interval, NULL, station_id, 5); + main_mobile("bnetz", &quit, latency, interval, NULL, station_id, 5); fail: /* destroy transceiver instance */ |