Sebastian Held patches15/0012-reformatted.patch
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7314 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
@@ -1421,6 +1421,7 @@ do_RRCConnectionSetup(
|
|||||||
if (*SRB_configList) {
|
if (*SRB_configList) {
|
||||||
free(*SRB_configList);
|
free(*SRB_configList);
|
||||||
}
|
}
|
||||||
|
|
||||||
*SRB_configList = CALLOC(1,sizeof(SRB_ToAddModList_t));
|
*SRB_configList = CALLOC(1,sizeof(SRB_ToAddModList_t));
|
||||||
|
|
||||||
/// SRB1
|
/// SRB1
|
||||||
@@ -1626,8 +1627,7 @@ do_RRCConnectionSetup(
|
|||||||
|
|
||||||
if (frame_parms->frame_type == 0) { // FDD
|
if (frame_parms->frame_type == 0) { // FDD
|
||||||
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 5+(ue_context_pP->local_uid%10); // Isr = 5 (every 10 subframes, offset=2+UE_id mod3)
|
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 5+(ue_context_pP->local_uid%10); // Isr = 5 (every 10 subframes, offset=2+UE_id mod3)
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
switch (frame_parms->tdd_config) {
|
switch (frame_parms->tdd_config) {
|
||||||
case 1:
|
case 1:
|
||||||
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(ue_context_pP->local_uid&1)+((
|
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(ue_context_pP->local_uid&1)+((
|
||||||
@@ -1900,7 +1900,7 @@ do_RRCConnectionReconfiguration(
|
|||||||
#ifdef Rel10
|
#ifdef Rel10
|
||||||
, SCellToAddMod_r10_t *SCell_config
|
, SCellToAddMod_r10_t *SCell_config
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -451,6 +451,7 @@ static void *UE_thread_synch(void *arg)
|
|||||||
printf("Unknown number of RBs %d\n",UE->lte_frame_parms.N_RB_DL);
|
printf("Unknown number of RBs %d\n",UE->lte_frame_parms.N_RB_DL);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -535,6 +536,7 @@ static void *UE_thread_tx(void *arg)
|
|||||||
perror("[SCHED] eNB tx thread: sched_setattr failed\n");
|
perror("[SCHED] eNB tx thread: sched_setattr failed\n");
|
||||||
return &UE_thread_tx_retval;
|
return &UE_thread_tx_retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -891,6 +893,7 @@ void *UE_thread(void *arg)
|
|||||||
|
|
||||||
DevAssert( UE->lte_frame_parms.nb_antennas_rx <= 2 );
|
DevAssert( UE->lte_frame_parms.nb_antennas_rx <= 2 );
|
||||||
void* rxp[2];
|
void* rxp[2];
|
||||||
|
|
||||||
for (int i=0; i<UE->lte_frame_parms.nb_antennas_rx; i++)
|
for (int i=0; i<UE->lte_frame_parms.nb_antennas_rx; i++)
|
||||||
rxp[i] = (dummy_dump==0) ? (void*)&rxdata[i][rxpos] : (void*)dummy[i];
|
rxp[i] = (dummy_dump==0) ? (void*)&rxdata[i][rxpos] : (void*)dummy[i];
|
||||||
|
|
||||||
@@ -914,6 +917,7 @@ void *UE_thread(void *arg)
|
|||||||
|
|
||||||
DevAssert( UE->lte_frame_parms.nb_antennas_tx <= 2 );
|
DevAssert( UE->lte_frame_parms.nb_antennas_tx <= 2 );
|
||||||
void* txp[2];
|
void* txp[2];
|
||||||
|
|
||||||
for (int i=0; i<UE->lte_frame_parms.nb_antennas_tx; i++)
|
for (int i=0; i<UE->lte_frame_parms.nb_antennas_tx; i++)
|
||||||
txp[i] = (void*)&txdata[i][txpos];
|
txp[i] = (void*)&txdata[i][txpos];
|
||||||
|
|
||||||
@@ -1068,6 +1072,7 @@ void *UE_thread(void *arg)
|
|||||||
int fail = pthread_mutex_lock(&UE->mutex_synch);
|
int fail = pthread_mutex_lock(&UE->mutex_synch);
|
||||||
int instance_cnt_synch = UE->instance_cnt_synch;
|
int instance_cnt_synch = UE->instance_cnt_synch;
|
||||||
fail = fail || pthread_mutex_unlock(&UE->mutex_synch);
|
fail = fail || pthread_mutex_unlock(&UE->mutex_synch);
|
||||||
|
|
||||||
if (fail) {
|
if (fail) {
|
||||||
LOG_E( PHY, "[SCHED][UE] error (un-)locking mutex for UE synch\n" );
|
LOG_E( PHY, "[SCHED][UE] error (un-)locking mutex for UE synch\n" );
|
||||||
exit_fun("noting to add");
|
exit_fun("noting to add");
|
||||||
|
|||||||
Reference in New Issue
Block a user