diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-27 20:31:47 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:24:13 +0100 |
| commit | 34f6e5ebe63f46ccf4ce97899c66a83f6f39d355 (patch) | |
| tree | 9845e5068beffa43e5e1a9f03ba799489d4746d4 /src/encoding.cpp | |
| parent | 474685e26ec4574aa2fab782b93bc50c23104905 (diff) | |
tbf: Make tfi private and update the code
All logging code that used tbf->tfi is now using tbf_name to
print the the TBF. External code is now using tfi() which is
inlined and should result in the same code being generated as
before (+debug code that can be stripped).
Diffstat (limited to 'src/encoding.cpp')
| -rw-r--r-- | src/encoding.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/encoding.cpp b/src/encoding.cpp index 9eda8efb..4604cb81 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -219,7 +219,7 @@ void Encoding::write_packet_uplink_assignment( bitvec_write_field(dest, wp,0x0,1); // USF_GRANULARITY bitvec_write_field(dest, wp,0x1,1); // switch TFI : on - bitvec_write_field(dest, wp,tbf->tfi,5);// TFI + bitvec_write_field(dest, wp,tbf->tfi(),5);// TFI bitvec_write_field(dest, wp,0x0,1); // bitvec_write_field(dest, wp,0x0,1); // TBF Starting Time = off @@ -292,7 +292,7 @@ void Encoding::write_packet_downlink_assignment(RlcMacDownlink_t * block, uint8_ block->u.Packet_Downlink_Assignment.Frequency_Parameters.u.ARFCN = tbf->trx->arfcn; // ARFCN block->u.Packet_Downlink_Assignment.Exist_DOWNLINK_TFI_ASSIGNMENT = 0x1; // DOWNLINK TFI ASSIGNMENT = on - block->u.Packet_Downlink_Assignment.DOWNLINK_TFI_ASSIGNMENT = tbf->tfi; // TFI + block->u.Packet_Downlink_Assignment.DOWNLINK_TFI_ASSIGNMENT = tbf->tfi(); // TFI block->u.Packet_Downlink_Assignment.Exist_Power_Control_Parameters = 0x1; // Power Control Parameters = on block->u.Packet_Downlink_Assignment.Power_Control_Parameters.ALPHA = alpha; // ALPHA @@ -366,8 +366,8 @@ void Encoding::write_packet_uplink_ack(struct gprs_rlcmac_bts *bts, uint16_t mod_sns_half = (tbf->sns >> 1) - 1; char bit; - LOGP(DRLCMACUL, LOGL_DEBUG, "Sending Ack/Nack for TFI=%d " - "(final=%d)\n", tbf->tfi, final); + LOGP(DRLCMACUL, LOGL_DEBUG, "Encoding Ack/Nack for %s " + "(final=%d)\n", tbf_name(tbf), final); block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = 0x0; // N+13 @@ -376,7 +376,7 @@ void Encoding::write_packet_uplink_ack(struct gprs_rlcmac_bts *bts, block->u.Packet_Uplink_Ack_Nack.MESSAGE_TYPE = 0x9; // Packet Downlink Assignment block->u.Packet_Uplink_Ack_Nack.PAGE_MODE = 0x0; // Normal Paging - block->u.Packet_Uplink_Ack_Nack.UPLINK_TFI = tbf->tfi; // Uplink TFI + block->u.Packet_Uplink_Ack_Nack.UPLINK_TFI = tbf->tfi(); // Uplink TFI block->u.Packet_Uplink_Ack_Nack.UnionType = 0x0; // PU_AckNack_GPRS = on block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.CHANNEL_CODING_COMMAND = bts->initial_cs_ul - 1; // CS1 |