diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-06-08 11:05:45 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-06-22 10:39:06 +0200 |
| commit | 20f6fd1b63355b9a3ab1423cb24b73ca27f57243 (patch) | |
| tree | 2c2c07032358dd63a34c045ac04bc3da9eecb52d /src/bts.cpp | |
| parent | b4584ff6c433551f9b633d3e0c6d00380119fa89 (diff) | |
l1: Pass all L1 measurements upwards
Currently only the RSSI value is passed to the upper layers. Other
values like TA and BER which are needed for TA update respectively CS
selection are not propagated.
This commit introduces and passes a struct that contains a set of
measurement values.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/bts.cpp')
| -rw-r--r-- | src/bts.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bts.cpp b/src/bts.cpp index 608bd0e9..f94799b6 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -657,7 +657,8 @@ 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, int8_t rssi) +int gprs_rlcmac_pdch::rcv_data_block_acknowledged(uint8_t *data, uint8_t len, + struct pcu_l1_meas *meas) { struct gprs_rlcmac_ul_tbf *tbf; struct rlc_ul_header *rh = (struct rlc_ul_header *)data; @@ -692,7 +693,7 @@ int gprs_rlcmac_pdch::rcv_data_block_acknowledged(uint8_t *data, uint8_t len, in return 0; } - return tbf->rcv_data_block_acknowledged(data, len, rssi); + return tbf->rcv_data_block_acknowledged(data, len, meas); } void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, uint32_t fn) @@ -995,7 +996,8 @@ int gprs_rlcmac_pdch::rcv_control_block( /* received RLC/MAC block from L1 */ -int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, int8_t rssi) +int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, + struct pcu_l1_meas *meas) { unsigned payload = data[0] >> 6; bitvec *block; @@ -1003,7 +1005,7 @@ int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, int8_t switch (payload) { case GPRS_RLCMAC_DATA_BLOCK: - rc = rcv_data_block_acknowledged(data, len, rssi); + rc = rcv_data_block_acknowledged(data, len, meas); break; case GPRS_RLCMAC_CONTROL_BLOCK: block = bitvec_alloc(len); |