diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-17 18:12:18 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:20:45 +0100 |
commit | b19d7268c3fb0be3d1e0dc2a95678b89372b7484 (patch) | |
tree | d209b4c5eb851bf69216f43237b1cd2294c5f9be | |
parent | 1af73f6c81719c5db76d64619019500709b679d1 (diff) |
bts: Remove global state from gprs_rlcmac_rcv_rts_block
-rw-r--r-- | src/gprs_rlcmac.h | 3 | ||||
-rw-r--r-- | src/gprs_rlcmac_sched.cpp | 4 | ||||
-rw-r--r-- | src/pcu_l1_if.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 333829fe..a9c5b3db 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -234,7 +234,8 @@ struct msgb *gprs_rlcmac_send_uplink_ack(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, uint32_t fn); -int gprs_rlcmac_rcv_rts_block(uint8_t trx, uint8_t ts, uint16_t arfcn, +int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts, + uint8_t trx, uint8_t ts, uint16_t arfcn, uint32_t fn, uint8_t block_nr); int gprs_rlcmac_imm_ass_cnf(uint8_t *data, uint32_t fn); diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 82e587a2..a7c2581d 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -225,10 +225,10 @@ struct msgb *sched_dummy(void) return msg; } -int gprs_rlcmac_rcv_rts_block(uint8_t trx, uint8_t ts, uint16_t arfcn, +int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts, + uint8_t trx, uint8_t ts, uint16_t arfcn, uint32_t fn, uint8_t block_nr) { - struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts; struct gprs_rlcmac_pdch *pdch; struct gprs_rlcmac_tbf *poll_tbf = NULL, *dl_ass_tbf = NULL, *ul_ass_tbf = NULL, *ul_ack_tbf = NULL; diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 29b2e936..26564bec 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -248,7 +248,7 @@ static int pcu_rx_data_cnf(struct gsm_pcu_if_data *data_cnf) extern "C" int pcu_rx_rts_req_pdtch(uint8_t trx, uint8_t ts, uint16_t arfcn, uint32_t fn, uint8_t block_nr) { - return gprs_rlcmac_rcv_rts_block(trx, ts, arfcn, fn, block_nr); + return gprs_rlcmac_rcv_rts_block(gprs_rlcmac_bts, trx, ts, arfcn, fn, block_nr); } static int pcu_rx_rts_req(struct gsm_pcu_if_rts_req *rts_req) |