Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG-RAN
Commits
83a3f6ac
Commit
83a3f6ac
authored
Nov 02, 2022
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small bugfix
parent
e6e12b87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
14 deletions
+16
-14
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+14
-13
targets/ARCH/rfsimulator/simulator.c
targets/ARCH/rfsimulator/simulator.c
+2
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
83a3f6ac
...
@@ -640,19 +640,20 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -640,19 +640,20 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
}
}
}
}
//configure SRS for secondary cell
if
(
scc
)
{
int
curr_bwp
=
NRRIV2BW
(
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
//configure SRS for secondary cell
int
curr_bwp
=
NRRIV2BW
(
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
RC
.
nrmac
[
Mod_idP
]
->
setup_srs_config
[
0
]
=
calloc
(
1
,
sizeof
(
NR_SetupRelease_SRS_Config_t
));
config_srs
(
RC
.
nrmac
[
Mod_idP
]
->
setup_srs_config
[
0
],
RC
.
nrmac
[
Mod_idP
]
->
setup_srs_config
[
0
]
=
calloc
(
1
,
sizeof
(
NR_SetupRelease_SRS_Config_t
));
NULL
,
config_srs
(
RC
.
nrmac
[
Mod_idP
]
->
setup_srs_config
[
0
],
curr_bwp
,
NULL
,
0
,
//lets assume ue_id = 0.
curr_bwp
,
0
,
//res_id = 0 for initial BWP
0
,
//lets assume ue_id = 0.
1
);
//do_srsg
0
,
//res_id = 0 for initial BWP
1
);
//do_srsg
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
return
0
;
return
0
;
...
...
targets/ARCH/rfsimulator/simulator.c
View file @
83a3f6ac
...
@@ -494,7 +494,8 @@ static bool flushInput(rfsimulator_state_t *t, int timeout, int nsamps_for_initi
...
@@ -494,7 +494,8 @@ static bool flushInput(rfsimulator_state_t *t, int timeout, int nsamps_for_initi
AssertFatal
(
(
conn_sock
=
accept
(
t
->
listen_sock
,
NULL
,
NULL
))
!=
-
1
,
""
);
AssertFatal
(
(
conn_sock
=
accept
(
t
->
listen_sock
,
NULL
,
NULL
))
!=
-
1
,
""
);
setblocking
(
conn_sock
,
notBlocking
);
setblocking
(
conn_sock
,
notBlocking
);
allocCirBuf
(
t
,
conn_sock
);
allocCirBuf
(
t
,
conn_sock
);
LOG_I
(
HW
,
"A client connected, sending the current time
\n
"
);
openair0_timestamp
ts
=
t
->
lastWroteTS
>
1
?
t
->
lastWroteTS
-
1
:
0
;
LOG_I
(
HW
,
"A client connected, sending the current time %lu
\n
"
,
ts
);
c16_t
v
=
{
0
};
c16_t
v
=
{
0
};
void
*
samplesVoid
[
t
->
tx_num_channels
];
void
*
samplesVoid
[
t
->
tx_num_channels
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment