Commit 914c792d authored by Robert Schmidt's avatar Robert Schmidt

TODOs to support more than 16bit PDUs

parent 31134547
...@@ -3729,6 +3729,7 @@ int nfapi_nr_p7_message_pack(void *pMessageBuf, void *pPackedBuf, uint32_t packe ...@@ -3729,6 +3729,7 @@ int nfapi_nr_p7_message_pack(void *pMessageBuf, void *pPackedBuf, uint32_t packe
uint8_t *end = (uint8_t *)pPackedBuf + packedBufLen; uint8_t *end = (uint8_t *)pPackedBuf + packedBufLen;
// process the header // process the header
// TODO do as in 3.1
if (!(push16(pMessageHeader->phy_id, &pWritePackedMessage, end) && push16(pMessageHeader->message_id, &pWritePackedMessage, end) if (!(push16(pMessageHeader->phy_id, &pWritePackedMessage, end) && push16(pMessageHeader->message_id, &pWritePackedMessage, end)
&& push16(0 /*pMessageHeader->message_length*/, &pWritePackedMessage, end) && push16(0 /*pMessageHeader->message_length*/, &pWritePackedMessage, end)
&& push16(pMessageHeader->m_segment_sequence, &pWritePackedMessage, end) && push16(pMessageHeader->m_segment_sequence, &pWritePackedMessage, end)
...@@ -3830,6 +3831,7 @@ int nfapi_nr_p7_message_pack(void *pMessageBuf, void *pPackedBuf, uint32_t packe ...@@ -3830,6 +3831,7 @@ int nfapi_nr_p7_message_pack(void *pMessageBuf, void *pPackedBuf, uint32_t packe
uintptr_t msgEnd = (uintptr_t)pWritePackedMessage; uintptr_t msgEnd = (uintptr_t)pWritePackedMessage;
uint32_t packedMsgLen = msgEnd - msgHead; uint32_t packedMsgLen = msgEnd - msgHead;
uint16_t packedMsgLen16; uint16_t packedMsgLen16;
// TB can be bigger that 0xffff, what now here?
if (packedMsgLen > 0xFFFF || packedMsgLen > packedBufLen) { if (packedMsgLen > 0xFFFF || packedMsgLen > packedBufLen) {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "Packed message length error %d, buffer supplied %d\n", packedMsgLen, packedBufLen); NFAPI_TRACE(NFAPI_TRACE_ERROR, "Packed message length error %d, buffer supplied %d\n", packedMsgLen, packedBufLen);
return -1; return -1;
......
...@@ -479,7 +479,7 @@ int vnf_nr_p7_pack_and_send_p7_msg(vnf_p7_t* vnf_p7, nfapi_p7_message_header_t* ...@@ -479,7 +479,7 @@ int vnf_nr_p7_pack_and_send_p7_msg(vnf_p7_t* vnf_p7, nfapi_p7_message_header_t*
if(p7_connection) if(p7_connection)
{ {
int send_result = 0; int send_result = 0;
uint8_t buffer[65536]; uint8_t buffer[65536]; // increase
header->m_segment_sequence = NFAPI_P7_SET_MSS(0, 0, p7_connection->sequence_number); header->m_segment_sequence = NFAPI_P7_SET_MSS(0, 0, p7_connection->sequence_number);
......
...@@ -76,7 +76,7 @@ typedef struct { ...@@ -76,7 +76,7 @@ typedef struct {
/// length of PDU to encode /// length of PDU to encode
uint32_t sdu_len; uint32_t sdu_len;
/// sdu from MAC interface (this is "a" in 36.212) /// sdu from MAC interface (this is "a" in 36.212)
uint8_t sdu[65536]; uint8_t sdu[262144];
/// Pointer to the payload /// Pointer to the payload
uint8_t *b; uint8_t *b;
/// Pointers to transport block segments /// Pointers to transport block segments
......
...@@ -813,7 +813,7 @@ static void pf_dl(module_id_t module_id, ...@@ -813,7 +813,7 @@ static void pf_dl(module_id_t module_id,
sched_pdsch->nrOfLayers, sched_pdsch->nrOfLayers,
tda_info->nrOfSymbols, tda_info->nrOfSymbols,
sched_pdsch->dmrs_parms.N_PRB_DMRS * sched_pdsch->dmrs_parms.N_DMRS_SLOT, sched_pdsch->dmrs_parms.N_PRB_DMRS * sched_pdsch->dmrs_parms.N_DMRS_SLOT,
sched_ctrl->num_total_bytes + oh, min(sched_ctrl->num_total_bytes + oh, 0xfc00), // to avoid nFAPI packets > 0xffff
min_rbSize, min_rbSize,
max_rbSize, max_rbSize,
&TBS, &TBS,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment