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
diff --git a/src/rlc.h b/src/rlc.h
index 46d821d..42c1307 100644
--- a/src/rlc.h
+++ b/src/rlc.h
@@ -60,7 +60,7 @@
return (RLC_MAX_SNS / 2) - 1;
}
-struct gprs_rlc_ul_data_block_info {
+struct gprs_rlc_data_block_info {
unsigned int data_len; /* EGPRS: N2, GPRS: N2-2, N-2 */
unsigned int bsn;
unsigned int ti;
@@ -70,7 +70,7 @@
unsigned int spb;
};
-struct gprs_rlc_ul_header_egprs {
+struct gprs_rlc_data_info {
GprsCodingScheme cs;
unsigned int r;
unsigned int si;
@@ -79,7 +79,7 @@
unsigned int rsb;
unsigned int num_data_blocks;
unsigned int data_offs_bits[2];
- struct gprs_rlc_ul_data_block_info block_info[2];
+ struct gprs_rlc_data_block_info block_info[2];
};
struct gprs_rlc_data {
@@ -91,7 +91,7 @@
/* block len of history */
uint8_t len;
- struct gprs_rlc_ul_data_block_info block_info;
+ struct gprs_rlc_data_block_info block_info;
GprsCodingScheme cs;
};