diff options
author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-12-07 15:50:35 +0100 |
---|---|---|
committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-12-15 15:19:43 +0100 |
commit | 3b802e3c4ab59e6714d42298ca7b0b793e063f21 (patch) | |
tree | 80b8a7744404e084a8780761869417aaeebdbd52 | |
parent | 690a734ebf392af8a8c8f443b2099e491d5aef3e (diff) |
edge: Rename rcv_data_block_acknowledged
This commit renames rcv_data_block_acknowledged to
rcv_data_block_acknowledged_gprs to separate it from EGPRS data block
decoding.
Sponsored-by: On-Waves ehf
-rw-r--r-- | src/bts.cpp | 6 | ||||
-rw-r--r-- | src/bts.h | 2 | ||||
-rw-r--r-- | src/tbf.h | 2 | ||||
-rw-r--r-- | src/tbf_ul.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/bts.cpp b/src/bts.cpp index 9f313c5c..8a99d61e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -727,7 +727,7 @@ void gprs_rlcmac_pdch::add_paging(struct gprs_rlcmac_paging *pag) * * The blocks are defragmented and forwarded as LLC frames, if complete. */ -int gprs_rlcmac_pdch::rcv_data_block_acknowledged(uint8_t *data, uint8_t len, +int gprs_rlcmac_pdch::rcv_data_block_acknowledged_gprs(uint8_t *data, uint8_t len, struct pcu_l1_meas *meas) { struct gprs_rlcmac_ul_tbf *tbf; @@ -741,7 +741,7 @@ int gprs_rlcmac_pdch::rcv_data_block_acknowledged(uint8_t *data, uint8_t len, return 0; } - return tbf->rcv_data_block_acknowledged(data, len, meas); + return tbf->rcv_data_block_acknowledged_gprs(data, len, meas); } void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, uint32_t fn) @@ -1202,7 +1202,7 @@ int gprs_rlcmac_pdch::rcv_block_gprs(uint8_t *data, uint32_t fn, switch (payload) { case GPRS_RLCMAC_DATA_BLOCK: - rc = rcv_data_block_acknowledged(data, len, meas); + rc = rcv_data_block_acknowledged_gprs(data, len, meas); break; case GPRS_RLCMAC_CONTROL_BLOCK: block = bitvec_alloc(len); @@ -103,7 +103,7 @@ struct gprs_rlcmac_pdch { #ifdef __cplusplus private: - int rcv_data_block_acknowledged(uint8_t *data, uint8_t len, + int rcv_data_block_acknowledged_gprs(uint8_t *data, uint8_t len, struct pcu_l1_meas *meas); int rcv_control_block(bitvec *rlc_block, uint32_t fn); @@ -421,7 +421,7 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf { struct msgb *create_ul_ack(uint32_t fn); /* blocks were acked */ - int rcv_data_block_acknowledged(const uint8_t *data, size_t len, + int rcv_data_block_acknowledged_gprs(const uint8_t *data, size_t len, struct pcu_l1_meas *meas); /* TODO: extract LLC class? */ diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index a79657d7..aa81b538 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -262,7 +262,7 @@ struct msgb *gprs_rlcmac_ul_tbf::create_ul_ack(uint32_t fn) return msg; } -int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged(const uint8_t *data, +int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged_gprs(const uint8_t *data, size_t len, struct pcu_l1_meas *meas) { struct rlc_ul_header *rh = (struct rlc_ul_header *)data; |