aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2010-12-24 12:22:34 +0100
committerHarald Welte <laforge@gnumonks.org>2010-12-24 12:22:34 +0100
commit85bded8b50cd90379ccc9fd44c9f6f9471348873 (patch)
treed5b3544fc4373e05c21f44f10bf083b450a2c6bc
parentcd103a9a5d8630b7a9644c44a776774c575f1cc3 (diff)
BTS VTY: Order bts-trx-ts-lchan in 'show lchan'
-rw-r--r--openbsc/src/bsc_vty.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/openbsc/src/bsc_vty.c b/openbsc/src/bsc_vty.c
index d4fda1062..5474b910d 100644
--- a/openbsc/src/bsc_vty.c
+++ b/openbsc/src/bsc_vty.c
@@ -780,10 +780,9 @@ static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan)
{
int idx;
- vty_out(vty, "Lchan %u in Timeslot %u of TRX %u in BTS %u, Type %s%s",
- lchan->nr, lchan->ts->nr, lchan->ts->trx->nr,
- lchan->ts->trx->bts->nr, gsm_lchant_name(lchan->type),
- VTY_NEWLINE);
+ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s",
+ lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr,
+ lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE);
vty_out(vty, " Connection: %u, State: %s%s",
lchan->conn ? 1: 0,
gsm_lchans_name(lchan->state), VTY_NEWLINE);
@@ -822,11 +821,10 @@ static void lchan_dump_short_vty(struct vty *vty, struct gsm_lchan *lchan)
lchan->meas_rep_idx, 1);
mr = &lchan->meas_rep[idx];
- vty_out(vty, "Lchan: %u Timeslot: %u TRX: %u BTS: %u Type: %s - L1 MS Power: %u dBm "
- "RXL-FULL-dl: %4d dBm RXL-FULL-ul: %4d dBm%s",
- lchan->nr, lchan->ts->nr, lchan->ts->trx->nr,
- lchan->ts->trx->bts->nr, gsm_lchant_name(lchan->type),
- mr->ms_l1.pwr,
+ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u, Type %s - "
+ "L1 MS Power: %u dBm RXL-FULL-dl: %4d dBm RXL-FULL-ul: %4d dBm%s",
+ lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr,
+ lchan->nr, gsm_lchant_name(lchan->type), mr->ms_l1_pwr,
rxlev2dbm(mr->dl.full.rx_lev),
rxlev2dbm(mr->ul.full.rx_lev),
VTY_NEWLINE);