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

minor fixes of some prints; fix NMT message counter bug

Browse Source
This commit is contained in:
Andreas Eversberg
2018-12-23 19:44:05 +01:00
parent ea5e17a036
commit 5311f44daa
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nmt/countries.c
View File

@@ -174,8 +174,8 @@ void nmt_country_list(int nmt_system)
int ch_from = 0, ch_to = 0;
char ch_string[256];
printf("TA from\tTA to\tYY Code\tChannels\t\tShort\tCountry (Provider)\n");
printf("------------------------------------------------------------------------------------------------\n");
printf("TA from\tTA to\tYY Code\tChannels\t\t\tShort\tCountry (Provider)\n");
printf("--------------------------------------------------------------------------------------------------------\n");
for (i = 0; nmt_country[i].short_name; i++) {
if (nmt_system != nmt_country[i].system)
continue;
@@ -197,6 +197,7 @@ void nmt_country_list(int nmt_system)
else
printf("\n");
}
printf("\nFor listing channels of the NMT %d system use '-N %d' as first option.\n", 1350 - nmt_system, 1350 - nmt_system);
}
int nmt_country_by_short_name(int nmt_system, const char *short_name)

11
src/nmt/nmt.c
View File

@@ -140,11 +140,11 @@ static struct nmt_channels {
const char *short_name;
const char *long_name;
} nmt_channels[] = {
{ 0, CHAN_TYPE_CC, "CC", "calling channel (incomming calls)" },
{ 900, CHAN_TYPE_CCA, "CCA", "calling channel for group A mobiles with odd secret key (incomming calls)" },
{ 900, CHAN_TYPE_CCB, "CCB", "calling channel for group B mobiles with even secret key (incomming calls)" },
{ 0, CHAN_TYPE_TC, "TC", "traffic channel (outgoing calls)" },
{ 900, CHAN_TYPE_AC_TC, "AC/TC","combined access & traffic channel (outgoing calls)" },
{ 0, CHAN_TYPE_CC, "CC", "calling channel (calls to mobile)" },
{ 900, CHAN_TYPE_CCA, "CCA", "calling channel for group A mobiles with odd secret key (calls to mobile)" },
{ 900, CHAN_TYPE_CCB, "CCB", "calling channel for group B mobiles with even secret key (calls to mobile)" },
{ 0, CHAN_TYPE_TC, "TC", "traffic channel (calls from mobile)" },
{ 900, CHAN_TYPE_AC_TC, "AC/TC","combined access & traffic channel (calls from mobile)" },
{ 0, CHAN_TYPE_CC_TC, "CC/TC","combined calling & traffic channel (both way calls)" },
{ 0, CHAN_TYPE_TEST, "TEST", "test channel" },
{ 0, 0, NULL, NULL }
@@ -1078,6 +1078,7 @@ static void tx_mt_channel(nmt_t *nmt, frame_t *frame)
} else
PDEBUG_CHAN(DNMT, DEBUG_NOTICE, "Staying on CC/TC channel #%d.\n", tc->sender.kanal);
nmt_new_state(tc, STATE_MT_IDENT);
tc->tx_frame_count = 0;
/* assign channel on 'nmt' to 'tc' */
frame->mt = NMT_MESSAGE_2b;