This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Max gerrit-no-reply at lists.osmocom.orgReview at https://gerrit.osmocom.org/554 Remove useless ARFCN parameter ARFCN is already part of TRX struct so there's no need to supply it explicitly in a separate parameter. Change-Id: I8e975c52cbc819427880093b1e5371fe1f8ce460 --- M src/gprs_rlcmac.h M src/gprs_rlcmac_sched.cpp M src/osmo-bts-sysmo/sysmo_l1_if.c M src/pcu_l1_if.cpp M src/pcu_l1_if.h M tests/tbf/TbfTest.cpp 6 files changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/54/554/1 diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index f193dfa..589bd8f 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -90,7 +90,7 @@ const char *imsi); int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts, - uint8_t trx, uint8_t ts, uint16_t arfcn, + uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr); int gprs_alloc_max_dl_slots_per_ms(struct gprs_rlcmac_bts *bts, diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 0367ad0..f486075 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -289,7 +289,7 @@ } int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts, - uint8_t trx, uint8_t ts, uint16_t arfcn, + uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr) { struct gprs_rlcmac_pdch *pdch; @@ -299,8 +299,6 @@ uint8_t usf = 0x7; struct msgb *msg = NULL; uint32_t poll_fn, sba_fn; - -#warning "ARFCN... it is already in the TRX..... is it consistent with it?" if (trx >= 8 || ts >= 8) return -EINVAL; @@ -370,7 +368,7 @@ gprs_bssgp_update_frames_sent(); /* send PDTCH/PACCH to L1 */ - pcu_l1if_tx_pdtch(msg, trx, ts, arfcn, fn, block_nr); + pcu_l1if_tx_pdtch(msg, trx, ts, bts->trx[trx].arfcn, fn, block_nr); return 0; } diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c index c072c1a..dc4ebf7 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -156,7 +156,7 @@ case GsmL1_Sapi_Pdtch: case GsmL1_Sapi_Pacch: rc = pcu_rx_rts_req_pdtch(fl1h->trx_no, rts_ind->u8Tn, - rts_ind->u16Arfcn, rts_ind->u32Fn, rts_ind->u8BlockNbr); + rts_ind->u32Fn, rts_ind->u8BlockNbr); case GsmL1_Sapi_Ptcch: // FIXME default: diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 790789c..36cf9ad 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -264,11 +264,11 @@ } // FIXME: remove this, when changed from c++ to c. -extern "C" int pcu_rx_rts_req_pdtch(uint8_t trx, uint8_t ts, uint16_t arfcn, +extern "C" int pcu_rx_rts_req_pdtch(uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr) { return gprs_rlcmac_rcv_rts_block(bts_main_data(), - trx, ts, arfcn, fn, block_nr); + trx, ts, fn, block_nr); } static int pcu_rx_rts_req(struct gsm_pcu_if_rts_req *rts_req) @@ -282,7 +282,7 @@ switch (rts_req->sapi) { case PCU_IF_SAPI_PDTCH: pcu_rx_rts_req_pdtch(rts_req->trx_nr, rts_req->ts_nr, - rts_req->arfcn, rts_req->fn, rts_req->block_nr); + rts_req->fn, rts_req->block_nr); break; case PCU_IF_SAPI_PTCCH: /* FIXME */ diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index 865c833..b2a9832 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -124,7 +124,7 @@ #ifdef __cplusplus extern "C" { #endif -int pcu_rx_rts_req_pdtch(uint8_t trx, uint8_t ts, uint16_t arfcn, +int pcu_rx_rts_req_pdtch(uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr); int pcu_rx_data_ind_pdtch(uint8_t trx, uint8_t ts, uint8_t *data, diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 2f93a6e..a5d56cb 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -206,11 +206,11 @@ } static void request_dl_rlc_block(struct gprs_rlcmac_bts *bts, - uint8_t trx_no, uint8_t ts_no, uint16_t arfcn, + uint8_t trx_no, uint8_t ts_no, uint32_t *fn, uint8_t *block_nr = NULL) { uint8_t bn = fn2bn(*fn); - gprs_rlcmac_rcv_rts_block(bts, trx_no, ts_no, arfcn, *fn, bn); + gprs_rlcmac_rcv_rts_block(bts, trx_no, ts_no, *fn, bn); *fn = fn_add_blocks(*fn, 1); bn += 1; if (block_nr) @@ -221,7 +221,7 @@ uint32_t *fn, uint8_t *block_nr = NULL) { request_dl_rlc_block(tbf->bts->bts_data(), tbf->trx->trx_no, - tbf->control_ts, tbf->trx->arfcn, fn, block_nr); + tbf->control_ts, fn, block_nr); } enum test_tbf_final_ack_mode { @@ -741,7 +741,7 @@ if (!(slots & (1 << ts_no))) continue; gprs_rlcmac_rcv_rts_block(the_bts->bts_data(), - dl_tbf->trx->trx_no, ts_no, 0, + dl_tbf->trx->trx_no, ts_no, *fn, bn); } *fn = fn_add_blocks(*fn, 1); -- To view, visit https://gerrit.osmocom.org/554 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e975c52cbc819427880093b1e5371fe1f8ce460 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Max <msuraev at sysmocom.de>