diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-01-07 18:59:28 +0100 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-05 13:26:33 +0100 |
| commit | f2ba4cbf51ba5ec4183a9153ba2ce51df9050881 (patch) | |
| tree | 1157aea2e784fccff2328e116742182c596bf64b /src/tbf_ul.cpp | |
| parent | 7e7a261de0751bf2361e86761c7eb9fa7dbcdf9a (diff) | |
edge: Rename gprs_rlc_ul_header_egprs and gprs_rlc_ul_data_block_info
These struct names are more specific than necessary. They are used
for GPRS (uplink) already. In downlink direction, only a few fields
will be added to the header struct. Add addition,
gprs_rlc_ul_header_egprs does not map directly to an encoded
header, like many other 'header' structs do.
Change the names to fit both modes and both directions:
gprs_rlc_ul_header_egprs -> gprs_rlc_data_info
gprs_rlc_ul_data_block_info -> gprs_rlc_data_block_info
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/tbf_ul.cpp')
| -rw-r--r-- | src/tbf_ul.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 4abfaaa0..e81cd4bd 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -50,7 +50,7 @@ int gprs_rlcmac_ul_tbf::assemble_forward_llc(const gprs_rlc_data *_data) { const uint8_t *data = _data->block; uint8_t len = _data->len; - const struct gprs_rlc_ul_data_block_info *rdbi = &_data->block_info; + const struct gprs_rlc_data_block_info *rdbi = &_data->block_info; GprsCodingScheme cs = _data->cs; Decoding::RlcData frames[16], *frame; @@ -137,7 +137,7 @@ struct msgb *gprs_rlcmac_ul_tbf::create_ul_ack(uint32_t fn) } int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged( - const struct gprs_rlc_ul_header_egprs *rlc, + const struct gprs_rlc_data_info *rlc, uint8_t *data, uint8_t len, struct pcu_l1_meas *meas) { int8_t rssi = meas->have_rssi ? meas->rssi : 0; @@ -170,7 +170,7 @@ int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged( for (block_idx = 0; block_idx < rlc->num_data_blocks; block_idx++) { int num_chunks; uint8_t *rlc_data; - const struct gprs_rlc_ul_data_block_info *rdbi = + const struct gprs_rlc_data_block_info *rdbi = &rlc->block_info[block_idx]; bool need_rlc_data = false; struct gprs_rlc_data *block; @@ -301,7 +301,7 @@ int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged( && this->m_window.v_q() == this->m_window.v_r()) { /* if complete */ struct gprs_rlc_data *block = m_rlc.block(m_window.mod_sns(m_window.v_r() - 1)); - const struct gprs_rlc_ul_data_block_info *rdbi = + const struct gprs_rlc_data_block_info *rdbi = &block->block_info; LOGP(DRLCMACUL, LOGL_DEBUG, "- No gaps in received block, " @@ -324,7 +324,7 @@ int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged( } void gprs_rlcmac_ul_tbf::maybe_schedule_uplink_acknack( - const gprs_rlc_ul_header_egprs *rlc) + const gprs_rlc_data_info *rlc) { bool have_ti = rlc->block_info[0].ti || (rlc->num_data_blocks > 1 && rlc->block_info[1].ti); |