diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index f193dfa4..589bd8f9 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -90,7 +90,7 @@ int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, 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 0367ad02..f4860758 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -289,7 +289,7 @@ static struct msgb *sched_dummy(void) } 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; @@ -300,8 +300,6 @@ int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts, 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; pdch = &bts->trx[trx].pdch[ts]; @@ -370,7 +368,7 @@ int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts, 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 165b60cf..75a2d5f3 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -139,7 +139,7 @@ static int handle_ph_readytosend_ind(struct femtol1_hdl *fl1h, 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 790789c8..36cf9adc 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -264,11 +264,11 @@ static int pcu_rx_data_cnf(struct gsm_pcu_if_data *data_cnf) } // 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 @@ static int pcu_rx_rts_req(struct gsm_pcu_if_rts_req *rts_req) 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 865c833d..b2a9832e 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -124,7 +124,7 @@ int pcu_sock_send(struct msgb *msg); #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 2f93a6e3..1071ba30 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -206,11 +206,11 @@ static unsigned fn_add_blocks(unsigned fn, unsigned blocks) } 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 @@ static void request_dl_rlc_block(struct gprs_rlcmac_tbf *tbf, 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 { @@ -636,7 +636,7 @@ static gprs_rlcmac_ul_tbf *establish_ul_tbf_two_phase(BTS *the_bts, bts = the_bts->bts_data(); /* needed to set last_rts_fn in the PDCH object */ - request_dl_rlc_block(bts, trx_no, ts_no, 0, fn); + request_dl_rlc_block(bts, trx_no, ts_no, fn); /* simulate RACH, this sends an Immediate Assignment Uplink on the AGCH */ the_bts->rcv_rach(0x73, rach_fn, qta); @@ -741,7 +741,7 @@ static void transmit_dl_data(BTS *the_bts, uint32_t tlli, uint32_t *fn, 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);