cellular-infrastructure
/
osmocom-analog
9
1
Fork 2
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

B-Netz: Rename special start digit for coin box phone type

This commit is contained in:
Andreas Eversberg 2016-11-13 06:39:14 +01:00
parent 2a4abc62b2
commit 34954b50de
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bnetz/bnetz.c
View File

@ -415,7 +415,7 @@ void bnetz_receive_telegramm(bnetz_t *bnetz, uint16_t telegramm, double level, d
bnetz->dial_type = DIAL_TYPE_METER;
break;
case 'U':
bnetz->dial_type = DIAL_TYPE_UNKNOWN;
bnetz->dial_type = DIAL_TYPE_METER_MUENZ;
break;
default:
PDEBUG(DBNETZ, DEBUG_NOTICE, "Received digit that is not a start digit ('Funkwahl'), aborting.\n");
@ -466,21 +466,21 @@ void bnetz_receive_telegramm(bnetz_t *bnetz, uint16_t telegramm, double level, d
switch (digit) {
case 's':
if (bnetz->dial_type != DIAL_TYPE_NOMETER) {
PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (no metering), aborting.\n");
PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (no metering support), aborting.\n");
bnetz_go_idle(bnetz);
return;
}
break;
case 'S':
if (bnetz->dial_type != DIAL_TYPE_METER) {
PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (metering), aborting.\n");
PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (metering support), aborting.\n");
bnetz_go_idle(bnetz);
return;
}
break;
case 'U':
if (bnetz->dial_type != DIAL_TYPE_UNKNOWN) {
PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (unknwon type), aborting.\n");
if (bnetz->dial_type != DIAL_TYPE_METER_MUENZ) {
PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (metering support, payphone), aborting.\n");
bnetz_go_idle(bnetz);
return;
}

2
src/bnetz/bnetz.h
View File

@ -35,7 +35,7 @@ enum dial_mode {
enum dial_type {
DIAL_TYPE_NOMETER,
DIAL_TYPE_METER,
DIAL_TYPE_UNKNOWN,
DIAL_TYPE_METER_MUENZ,
};
/* current state of paging mobile station */

2
src/bnetz/telegramm.c
View File

@ -38,7 +38,7 @@ static struct impulstelegramm impulstelegramme[] = {
/* Signale */
{ 's', "0111001000100010", 0x0000, "Funkwahl ohne Gebuehrenuebermittlung" },
{ 'S', "0111000100100100", 0x0000, "Funkwahl mit Gebuehrenuebermittlung" },
{ 'U', "0111000010101000", 0x0000, "Funkwahl (unbekannte Variante)" },
{ 'U', "0111000010101000", 0x0000, "Funkwahl mit Gebuehrenuebermittlung (Muenzfernsprecher)" },
{ 'e', "0111010000100001", 0x0000, "Funkwahlende" },
{ 't', "0111010101010101", 0x0000, "Trennsignal/Schlusssignal" },
/* Kanalbefehl B1 */