diff options
| author | Pavel Baturko <pabftk@gmail.com> | 2012-11-16 16:16:40 +0000 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2012-11-16 14:47:54 +0100 |
| commit | 2879e77bd3720f261330dad2ef7f14d6a0988421 (patch) | |
| tree | 2ee5b27875eaa7a7ac9b884f3017e7b1bab26e1c /src | |
| parent | 50c3ca922b3d43f33f4e550e7a47b09af6dffc24 (diff) | |
Fix wrong print of scan freq when using gsm_print_arfcn twice for the same log message
Diffstat (limited to 'src')
| -rw-r--r-- | src/host/layer23/src/mobile/gsm322.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index ffecfc37..2201a1b6 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -83,6 +83,8 @@ static int gsm322_nb_meas_ind(struct osmocom_ms *ms, uint16_t arfcn, /* wait before doing neighbour cell reselecton due to a better cell again */ #define GSM58_RESEL_THRESHOLD 15 +#define ARFCN_TEXT_LEN 10 + //#define TEST_INCLUDE_SERV /* @@ -2768,6 +2770,7 @@ static int gsm322_cs_powerscan(struct osmocom_ms *ms) struct gsm322_cellsel *cs = &ms->cellsel; struct gsm_settings *set = &ms->settings; int i, s = -1, e; + char s_text[ARFCN_TEXT_LEN], e_text[ARFCN_TEXT_LEN]; uint8_t mask, flags; again: @@ -2850,9 +2853,11 @@ static int gsm322_cs_powerscan(struct osmocom_ms *ms) } } + strncpy(s_text, gsm_print_arfcn(index2arfcn(s)), ARFCN_TEXT_LEN); + strncpy(e_text, gsm_print_arfcn(index2arfcn(e)), ARFCN_TEXT_LEN); LOGP(DCS, LOGL_DEBUG, "Scanning frequencies. (%s..%s)\n", - gsm_print_arfcn(index2arfcn(s)), - gsm_print_arfcn(index2arfcn(e))); + s_text, + e_text); /* start scan on radio interface */ if (!cs->powerscan) { @@ -3448,6 +3453,7 @@ struct gsm322_ba_list *gsm322_cs_ba_range(struct osmocom_ms *ms, { static struct gsm322_ba_list ba; int lower, higher; + char lower_text[ARFCN_TEXT_LEN], higher_text[ARFCN_TEXT_LEN]; memset(&ba, 0, sizeof(ba)); @@ -3465,9 +3471,11 @@ struct gsm322_ba_list *gsm322_cs_ba_range(struct osmocom_ms *ms, higher += 1024-512; } range++; + strncpy(lower_text, gsm_print_arfcn(index2arfcn(lower)), ARFCN_TEXT_LEN); + strncpy(higher_text, gsm_print_arfcn(index2arfcn(higher)), ARFCN_TEXT_LEN); LOGP(DCS, LOGL_INFO, "Use BA range: %s..%s\n", - gsm_print_arfcn(index2arfcn(lower)), - gsm_print_arfcn(index2arfcn(higher))); + lower_text, + higher_text); /* GSM 05.08 6.3 */ while (1) { ba.freq[lower >> 3] |= 1 << (lower & 7); |