cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

bts: Remove global state from gprs_rlcmac_send_data_block_acknowledged

This commit is contained in:
Holger Hans Peter Freyther 2013-10-17 15:21:10 +02:00
parent 9f521cd4af
commit 4ffc260869
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gprs_rlcmac.h
View File

@ -221,6 +221,7 @@ int gprs_rlcmac_rcv_data_block_acknowledged(struct gprs_rlcmac_bts *bts,
uint8_t *data, uint8_t len, int8_t rssi);
struct msgb *gprs_rlcmac_send_data_block_acknowledged(
struct gprs_rlcmac_bts *bts,
struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts);
struct msgb *gprs_rlcmac_send_uplink_ack(struct gprs_rlcmac_bts *bts,

2
src/gprs_rlcmac_data.cpp
View File

@ -1157,9 +1157,9 @@ static struct msgb *llc_dequeue(struct gprs_rlcmac_tbf *tbf)
* The messages are fragmented and forwarded as data blocks.
*/
struct msgb *gprs_rlcmac_send_data_block_acknowledged(
struct gprs_rlcmac_bts *bts,
struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts)
{
struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts;
struct rlc_dl_header *rh;
struct rlc_li_field *li;
uint8_t block_length; /* total length of block, including spare bits */

7
src/gprs_rlcmac_sched.cpp
View File

@ -166,7 +166,8 @@ static struct msgb *sched_select_ctrl_msg(struct gprs_rlcmac_bts *bts,
return NULL;
}
struct msgb *sched_select_downlink(uint8_t trx, uint8_t ts, uint32_t fn,
static struct msgb *sched_select_downlink(struct gprs_rlcmac_bts *bts,
uint8_t trx, uint8_t ts, uint32_t fn,
uint8_t block_nr, struct gprs_rlcmac_pdch *pdch)
{
struct msgb *msg = NULL;
@ -197,7 +198,7 @@ struct msgb *sched_select_downlink(uint8_t trx, uint8_t ts, uint32_t fn,
/* next TBF to handle ressource is the next one */
pdch->next_dl_tfi = (tfi + 1) & 31;
/* generate DL data block */
msg = gprs_rlcmac_send_data_block_acknowledged(tbf, fn,
msg = gprs_rlcmac_send_data_block_acknowledged(bts, tbf, fn,
ts);
break;
}
@ -276,7 +277,7 @@ int gprs_rlcmac_rcv_rts_block(uint8_t trx, uint8_t ts, uint16_t arfcn,
/* Prio 2: select data message for downlink */
if (!msg)
msg = sched_select_downlink(trx, ts, fn, block_nr, pdch);
msg = sched_select_downlink(bts, trx, ts, fn, block_nr, pdch);
/* Prio 3: send dummy contol message */
if (!msg)