diff options
| author | Max <msuraev@sysmocom.de> | 2017-09-01 11:00:39 +0200 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2017-09-01 11:08:06 +0200 |
| commit | b216c6b1652454d01f10c376a16bae864b717a1e (patch) | |
| tree | 0940466e1a1cc9131bad0179828415887dbaaa6d /src | |
| parent | 10e37a50893b2f452d9ddf8042e0e9b8c7368d94 (diff) | |
cosmetic: tighten direct-phy related code
* move the code to related SAPI case
* get rid of 'unused variable' warning if direct-phy is not used
Change-Id: If8cae6f3579cfdecc25bbe1d08fa88a4f664a03b
Diffstat (limited to 'src')
| -rw-r--r-- | src/pcu_l1_if.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 50e181e4..97eee9b8 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -163,9 +163,9 @@ static int pcu_tx_data_req(uint8_t trx, uint8_t ts, uint8_t sapi, void pcu_l1if_tx_pdtch(msgb *msg, uint8_t trx, uint8_t ts, uint16_t arfcn, uint32_t fn, uint8_t block_nr) { +#ifdef ENABLE_DIRECT_PHY struct gprs_rlcmac_bts *bts = bts_main_data(); -#ifdef ENABLE_DIRECT_PHY if (bts->trx[trx].fl1h) { l1if_pdch_req(bts->trx[trx].fl1h, ts, 0, fn, arfcn, block_nr, msg->data, msg->len); @@ -250,16 +250,7 @@ static int pcu_rx_data_ind(struct gsm_pcu_if_data *data_ind) struct gprs_rlcmac_bts *bts = bts_main_data(); int rc; pcu_l1_meas meas; - meas.set_rssi(data_ind->rssi); -#ifndef ENABLE_DIRECT_PHY - /* convert BER to % value */ - meas.set_ber(data_ind->ber10k / 100); - meas.set_bto(data_ind->ta_offs_qbits); - meas.set_link_qual(data_ind->lqual_cb / 10); - LOGP(DL1IF, LOGL_DEBUG, "Data indication with raw measurements " - "received: BER10k = %d, BTO = %d, Q = %d\n", data_ind->ber10k, - data_ind->ta_offs_qbits, data_ind->lqual_cb); -#endif + LOGP(DL1IF, LOGL_DEBUG, "Data indication received: sapi=%d arfcn=%d " "block=%d data=%s\n", data_ind->sapi, data_ind->arfcn, data_ind->block_nr, @@ -267,6 +258,15 @@ static int pcu_rx_data_ind(struct gsm_pcu_if_data *data_ind) switch (data_ind->sapi) { case PCU_IF_SAPI_PDTCH: + meas.set_rssi(data_ind->rssi); +#ifndef ENABLE_DIRECT_PHY + /* convert BER to % value */ + meas.set_ber(data_ind->ber10k / 100); + meas.set_bto(data_ind->ta_offs_qbits); + meas.set_link_qual(data_ind->lqual_cb / 10); + LOGP(DL1IF, LOGL_DEBUG, "Data indication with raw measurements received: BER10k = %d, BTO = %d, Q = %d\n", + data_ind->ber10k, data_ind->ta_offs_qbits, data_ind->lqual_cb); +#endif rc = pcu_rx_data_ind_pdtch(data_ind->trx_nr, data_ind->ts_nr, data_ind->data, data_ind->len, data_ind->fn, &meas); |