diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-17 15:38:23 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:20:45 +0100 |
| commit | 485860cc31ba66b016bc4641b9a88705aa67c0f6 (patch) | |
| tree | 1ac3bb3ec91417061612238c656046fd2a653ef5 /src | |
| parent | d507ce6b854b4cc61560c50ad7d044e689bd6b40 (diff) | |
bts: Remove global state from write_packet_uplink_assignment
Diffstat (limited to 'src')
| -rw-r--r-- | src/gprs_rlcmac.cpp | 5 | ||||
| -rw-r--r-- | src/gprs_rlcmac.h | 4 | ||||
| -rw-r--r-- | src/gprs_rlcmac_data.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index 419470b6..7ab187fc 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -587,13 +587,14 @@ int write_immediate_assignment(bitvec * dest, uint8_t downlink, uint8_t ra, } /* generate uplink assignment */ -void write_packet_uplink_assignment(bitvec * dest, uint8_t old_tfi, +void write_packet_uplink_assignment( + struct gprs_rlcmac_bts *bts, + bitvec * dest, uint8_t old_tfi, uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli, struct gprs_rlcmac_tbf *tbf, uint8_t poll, uint8_t alpha, uint8_t gamma, int8_t ta_idx) { // TODO We should use our implementation of encode RLC/MAC Control messages. - struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts; unsigned wp = 0; uint8_t ts; diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index a26127b9..7a246226 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -168,7 +168,9 @@ int write_immediate_assignment(bitvec * dest, uint8_t downlink, uint8_t ra, uint32_t fn, uint8_t single_block, uint8_t alpha, uint8_t gamma, int8_t ta_idx); -void write_packet_uplink_assignment(bitvec * dest, uint8_t old_tfi, +void write_packet_uplink_assignment( + struct gprs_rlcmac_bts *bts, + bitvec * dest, uint8_t old_tfi, uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli, struct gprs_rlcmac_tbf *tbf, uint8_t poll, uint8_t alpha, uint8_t gamma, int8_t ta_idx); diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp index af320c79..f72ea409 100644 --- a/src/gprs_rlcmac_data.cpp +++ b/src/gprs_rlcmac_data.cpp @@ -1000,7 +1000,7 @@ struct msgb *gprs_rlcmac_send_packet_uplink_assignment( } bitvec_unhex(ass_vec, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); - write_packet_uplink_assignment(ass_vec, tbf->tfi, + write_packet_uplink_assignment(bts, ass_vec, tbf->tfi, (tbf->direction == GPRS_RLCMAC_DL_TBF), tbf->tlli, tbf->tlli_valid, new_tbf, POLLING_ASSIGNMENT_UL, bts->alpha, bts->gamma, -1); |