maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_warnings_gcc13' into integration_2023_w29

Browse Source
This commit is contained in:
Robert Schmidt
2023-07-21 14:06:41 +02:00
parent 526c84f4f2 e04554dcb0
commit 1f8e95833c
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/T/tracer/to_vcd.c
+3 -5
View File
@@ -345,11 +345,9 @@ int main(int n, char **v)
/* setup traces */ /* setup traces */
for (i = 0; i < nvars; i++) { for (i = 0; i < nvars; i++) {
char format[256]; char format[256];
if (strlen(vars[i].arg) + strlen(vars[i].vcd_name) > 256-16) abort(); int ret = snprintf(format, 256, "%c [%s] %s", vars[i].boolean ? 'b' : 'l', vars[i].arg, vars[i].vcd_name);
sprintf(format, "%c [%s] %s", if (ret > 255)
vars[i].boolean ? 'b' : 'l', abort();
vars[i].arg,
vars[i].vcd_name);
textlog = new_textlog(h, database, vars[i].event, format); textlog = new_textlog(h, database, vars[i].event, format);
logger_add_view(textlog, vcd_view); logger_add_view(textlog, vcd_view);
on_off(database, vars[i].event, is_on, 1); on_off(database, vars[i].event, is_on, 1);
openair1/SCHED_UE/phy_procedures_lte_ue.c
+2 -2
View File
@@ -644,7 +644,7 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
LTE_DL_FRAME_PARMS *frame_parms=&ue->frame_parms; LTE_DL_FRAME_PARMS *frame_parms=&ue->frame_parms;
uint8_t nCCE0,nCCE1,nCCE2,nCCE3,harq_ack1,harq_ack0,harq_ack3,harq_ack2; uint8_t nCCE0,nCCE1,nCCE2,nCCE3,harq_ack1,harq_ack0,harq_ack3,harq_ack2;
ANFBmode_t bundling_flag; ANFBmode_t bundling_flag;
uint16_t n1_pucch0=0,n1_pucch1=0,n1_pucch2=0,n1_pucch3=0,n1_pucch_inter; uint16_t n1_pucch0 = 0, n1_pucch1 = 0, n1_pucch2 = 0, n1_pucch3 = 0, n1_pucch_inter = 0;
static uint8_t candidate_dl[9]; // which downlink(s) the current ACK/NACK is associating to static uint8_t candidate_dl[9]; // which downlink(s) the current ACK/NACK is associating to
uint8_t last_dl=0xff; // the last downlink with valid DL-DCI. for calculating the PUCCH resource index uint8_t last_dl=0xff; // the last downlink with valid DL-DCI. for calculating the PUCCH resource index
int sf; int sf;
@@ -951,7 +951,7 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
// proc->frame_tx%1024, // proc->frame_tx%1024,
// proc->subframe_tx,n1_pucch_inter, // proc->subframe_tx,n1_pucch_inter,
// b[0],b[1]); // b[0],b[1]);
return(n1_pucch_inter); return n1_pucch_inter;
} else if ((bundling_flag==multiplexing)&&(SR==0)) { // Table 10.1 } else if ((bundling_flag==multiplexing)&&(SR==0)) { // Table 10.1
if (subframe == 3) { if (subframe == 3) {
LOG_I(PHY, "sbuframe=%d \n",subframe); LOG_I(PHY, "sbuframe=%d \n",subframe);
openair1/SIMULATION/TOOLS/random_channel.c
+3 -2
View File
@@ -1723,8 +1723,9 @@ void free_channel_desc_scm(channel_desc_t *ch) {
free(ch); free(ch);
} }
void set_channeldesc_owner(channel_desc_t *cdesc, uint32_t module_id) { void set_channeldesc_owner(channel_desc_t *cdesc, channelmod_moduleid_t module_id)
cdesc->module_id=module_id; {
cdesc->module_id = module_id;
} }
void set_channeldesc_name(channel_desc_t *cdesc,char *modelname) { void set_channeldesc_name(channel_desc_t *cdesc,char *modelname) {