From f2ba4cbf51ba5ec4183a9153ba2ce51df9050881 Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Thu, 7 Jan 2016 18:59:28 +0100 Subject: 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 --- src/decoding.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/decoding.cpp') diff --git a/src/decoding.cpp b/src/decoding.cpp index abaa97f4..45716413 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -180,7 +180,7 @@ static int parse_extensions_gprs(const uint8_t *data, unsigned int data_len, } int Decoding::rlc_data_from_ul_data( - const struct gprs_rlc_ul_data_block_info *rdbi, GprsCodingScheme cs, + const struct gprs_rlc_data_block_info *rdbi, GprsCodingScheme cs, const uint8_t *data, RlcData *chunks, unsigned int chunks_size, uint32_t *tlli) { @@ -369,7 +369,7 @@ void Decoding::extract_rbb(const uint8_t *rbb, char *show_rbb) show_rbb[64] = '\0'; } -int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_ul_header_egprs *rlc, +int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_data_info *rlc, const uint8_t *data, GprsCodingScheme cs) { const struct gprs_rlc_ul_header_egprs_3 *egprs3; @@ -464,7 +464,7 @@ int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_ul_header_egprs *rlc, * \returns the number of bytes copied */ unsigned int Decoding::rlc_copy_to_aligned_buffer( - const struct gprs_rlc_ul_header_egprs *rlc, + const struct gprs_rlc_data_info *rlc, unsigned int data_block_idx, const uint8_t *src, uint8_t *buffer) { @@ -474,7 +474,7 @@ unsigned int Decoding::rlc_copy_to_aligned_buffer( uint8_t c, last_c; uint8_t *dst; - const struct gprs_rlc_ul_data_block_info *rdbi; + const struct gprs_rlc_data_block_info *rdbi; OSMO_ASSERT(data_block_idx < rlc->num_data_blocks); rdbi = &rlc->block_info[data_block_idx]; @@ -514,7 +514,7 @@ unsigned int Decoding::rlc_copy_to_aligned_buffer( * buffer otherwise. */ const uint8_t *Decoding::rlc_get_data_aligned( - const struct gprs_rlc_ul_header_egprs *rlc, + const struct gprs_rlc_data_info *rlc, unsigned int data_block_idx, const uint8_t *src, uint8_t *buffer) { -- cgit v1.2.3