laforge
/
osmocom-analog
forked from cellular-infrastructure/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C-Netz: Minor cosmetic fixes

This commit is contained in:
Andreas Eversberg 2016-06-18 08:05:18 +02:00
parent d2c4ca4fa9
commit e10898c1e8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cnetz/cnetz.c
View File

@ -801,7 +801,7 @@ wbn:
PDEBUG(DCNETZ, DEBUG_NOTICE, "No free channel anymore, kicking transaction due to race condition!\n"); PDEBUG(DCNETZ, DEBUG_NOTICE, "No free channel anymore, kicking transaction due to race condition!\n");
destroy_transaction(trans); destroy_transaction(trans);
cnetz_go_idle(cnetz); cnetz_go_idle(cnetz);
break; break;
} }
if (spk == cnetz) { if (spk == cnetz) {
PDEBUG(DCNETZ, DEBUG_INFO, "Staying on combined calling + traffic channel %d\n", spk->sender.kanal); PDEBUG(DCNETZ, DEBUG_INFO, "Staying on combined calling + traffic channel %d\n", spk->sender.kanal);
@ -812,10 +812,13 @@ wbn:
/* sync RX time to current OgK time */ /* sync RX time to current OgK time */
spk->fsk_demod.bit_time = cnetz->fsk_demod.bit_time; spk->fsk_demod.bit_time = cnetz->fsk_demod.bit_time;
} }
/* set channel */
telegramm.frequenz_nr = spk->sender.kanal; telegramm.frequenz_nr = spk->sender.kanal;
/* change state to busy */
cnetz_new_state(spk, CNETZ_BUSY); cnetz_new_state(spk, CNETZ_BUSY);
/* schedule switching two slots ahead */ /* schedule switching two slots ahead */
cnetz_set_sched_dsp_mode(cnetz, DSP_MODE_SPK_K, 2); cnetz_set_sched_dsp_mode(cnetz, DSP_MODE_SPK_K, 2);
/* relink */
unlink_transaction(trans); unlink_transaction(trans);
link_transaction(trans, spk); link_transaction(trans, spk);
/* flush all other transactions, if any (in case of OgK/SpK) */ /* flush all other transactions, if any (in case of OgK/SpK) */
@ -1153,7 +1156,7 @@ void cnetz_receive_telegramm_spk_k(cnetz_t *cnetz, telegramm_t *telegramm)
break; break;
} }
valid_frame = 1; valid_frame = 1;
PDEBUG(DCNETZ, DEBUG_INFO, "Received ringback 'Rufton anschlaten Quittung' message.\n"); PDEBUG(DCNETZ, DEBUG_INFO, "Received ringback 'Rufton anschalten Quittung' message.\n");
if (trans->state != TRANS_RTA) if (trans->state != TRANS_RTA)
break; break;
timer_start(&trans->timer, 0.0375 * F_RTA); /* F_RTA frames */ timer_start(&trans->timer, 0.0375 * F_RTA); /* F_RTA frames */