bts, tbf: Make rcvd_dl_ack a method of the DL TBF
This method is only userul for DL TBFs so move it. As a result
gprs_rlcmac_pdch::rcv_control_ack needs to work with dl_tbfs.
Ticket: SYS#389
Sponsored-by: On-Waves ehf
diff --git a/src/bts.cpp b/src/bts.cpp
index cc963ed..4c22736 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -818,7 +818,7 @@
void gprs_rlcmac_pdch::rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *ack_nack, uint32_t fn)
{
int8_t tfi = 0; /* must be signed */
- struct gprs_rlcmac_tbf *tbf;
+ struct gprs_rlcmac_dl_tbf *tbf;
int rc;
tfi = ack_nack->DOWNLINK_TFI;
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 93b337f..d9c55f3 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -1486,7 +1486,7 @@
return 0;
}
-int gprs_rlcmac_tbf::rcvd_dl_ack(uint8_t final_ack, uint8_t ssn, uint8_t *rbb)
+int gprs_rlcmac_dl_tbf::rcvd_dl_ack(uint8_t final_ack, uint8_t ssn, uint8_t *rbb)
{
LOGP(DRLCMACDL, LOGL_DEBUG, "%s downlink acknowledge\n", tbf_name(this));
diff --git a/src/tbf.h b/src/tbf.h
index 8fd7237..04ae191 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -125,7 +125,6 @@
struct msgb *create_dl_ass(uint32_t fn);
struct msgb *create_ul_ass(uint32_t fn);
struct msgb *create_ul_ack(uint32_t fn);
- int rcvd_dl_ack(uint8_t final, uint8_t ssn, uint8_t *rbb);
int snd_ul_ud();
/* blocks were acked */
@@ -354,6 +353,7 @@
const uint16_t pdu_delay_csec,
const uint8_t *data, const uint16_t len);
+ int rcvd_dl_ack(uint8_t final, uint8_t ssn, uint8_t *rbb);
};
struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf {