diff options
author | Max <msuraev@sysmocom.de> | 2016-07-20 13:05:05 +0200 |
---|---|---|
committer | Holger Freyther <holger@freyther.de> | 2016-07-26 00:20:23 +0000 |
commit | 878bd1f296379ffba949d6fcae2938c13406df5b (patch) | |
tree | e5e75617922f6217a0901523ee1350be28481845 /src | |
parent | 1d7644b23a5901c84dd99f6202a0ed98d003ae91 (diff) |
Remove useless ARFCN parameter
ARFCN is already part of TRX struct so there's no need to supply it
explicitly in a separate parameter. I've tested and those are the same
anyway.
Change-Id: I8e975c52cbc819427880093b1e5371fe1f8ce460
Diffstat (limited to 'src')
-rw-r--r-- | src/gprs_rlcmac.h | 2 | ||||
-rw-r--r-- | src/gprs_rlcmac_sched.cpp | 6 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/sysmo_l1_if.c | 2 | ||||
-rw-r--r-- | src/pcu_l1_if.cpp | 6 | ||||
-rw-r--r-- | src/pcu_l1_if.h | 2 |
5 files changed, 8 insertions, 10 deletions
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, |