* @return void
*
* ****************************************************************/
-void packBytes(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos, uint32_t val, uint8_t valSize)
+void packBytes(uint8_t *buf, uint16_t *bytePos, uint8_t *bitPos, uint32_t val, uint8_t valSize)
{
uint32_t temp;
uint8_t bytePart1;
void fillRarPdu(RarInfo *rarInfo)
{
uint8_t *rarPdu = rarInfo->rarPdu;
- uint16_t totalBits = 0;
- uint8_t numBytes = 0;
- uint8_t bytePos= 0;
+ uint16_t bytePos= 0;
uint8_t bitPos = 0;
/* RAR subheader fields */
timeAdv = rarInfo->ta;
ulGrant = 0; /* this will be done when implementing msg3 */
tmpCrnti = rarInfo->tcrnti;
-
- /* Calulating total number of bytes in buffer */
- totalBits = EBitSize + TBitSize + rapidSize + RBitSize + timeAdvSize \
- + ulGrantSize + tmpCrntiSize;
-
- /* add padding size */
- totalBits += RBitSize*2 + paddingLcidSize + paddingSize;
-
- /* Calulating total number of bytes in buffer */
- numBytes = totalBits/8;
- if(totalBits % 8)
- numBytes += 1;
-
- rarInfo->rarPduLen = numBytes;
+ rarInfo->rarPduLen = RAR_PAYLOAD_SIZE;
/* Initialize buffer */
- for(bytePos = 0; bytePos < numBytes; bytePos++)
+ for(bytePos = 0; bytePos < rarInfo->rarPduLen; bytePos++)
rarPdu[bytePos] = 0;
bytePos = 0;
void fillMsg4DlData(MacDlData *dlData, uint16_t msg4PduLen, uint8_t *msg4Pdu)
{
- uint8_t idx = 0;
-
- dlData->numPdu = 1;
- dlData->pduInfo[idx].lcId = MAC_LCID_CCCH;
- dlData->pduInfo[idx].pduLen = msg4PduLen;
- memcpy(dlData->pduInfo[idx].dlPdu, msg4Pdu, msg4PduLen);
+ dlData->pduInfo[dlData->numPdu].lcId = MAC_LCID_CCCH;
+ dlData->pduInfo[dlData->numPdu].pduLen = msg4PduLen;
+ memcpy(dlData->pduInfo[dlData->numPdu].dlPdu, msg4Pdu, msg4PduLen);
+ dlData->numPdu++;
}
/*************************************************
void macMuxPdu(MacDlData *dlData, MacCeInfo *macCeData, uint8_t *txPdu, uint16_t tbSize)
{
- uint8_t bytePos = 0;
+ uint16_t bytePos = 0;
uint8_t bitPos = 7;
uint8_t idx = 0;
uint8_t macPdu[tbSize];
break;
}
default:
- DU_LOG("\n MAC: Invalid LCID %d in mac pdu",lcid);
+ DU_LOG("\nERROR --> MAC: Invalid LCID %d in mac pdu",lcid);
break;
}
}
}
default:
- DU_LOG("\n MAC: Invalid LCID %d in mac pdu",lcid);
+ DU_LOG("\nERROR --> MAC: Invalid LCID %d in mac pdu",lcid);
break;
}
-
}
if(bytePos < tbSize && (tbSize-bytePos >= 1))
{