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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
d4045fd8
Commit
d4045fd8
authored
Oct 31, 2025
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/clarifiyWhitespace' into integration_2025_w44 (!3727)
Clarify whitespace
parents
a8de9733
330c4fce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
28 deletions
+29
-28
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+1
-1
radio/USRP/usrp_lib.cpp
radio/USRP/usrp_lib.cpp
+28
-27
No files found.
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
d4045fd8
...
@@ -82,7 +82,7 @@ void print_ue_mac_stats(const module_id_t mod, const int frame_rx, const int slo
...
@@ -82,7 +82,7 @@ void print_ue_mac_stats(const module_id_t mod, const int frame_rx, const int slo
for
(
int
i
=
1
;
i
<
nb
+
1
;
i
++
)
for
(
int
i
=
1
;
i
<
nb
+
1
;
i
++
)
cur
+=
snprintf
(
cur
,
end
-
cur
,
"/%lu"
,
mac
->
stats
.
dl
.
rounds
[
i
]);
cur
+=
snprintf
(
cur
,
end
-
cur
,
"/%lu"
,
mac
->
stats
.
dl
.
rounds
[
i
]);
cur
+=
snprintf
(
cur
,
end
-
cur
,
"
\n
U
l
harq: %lu"
,
mac
->
stats
.
ul
.
rounds
[
0
]);
cur
+=
snprintf
(
cur
,
end
-
cur
,
"
\n
U
L
harq: %lu"
,
mac
->
stats
.
ul
.
rounds
[
0
]);
for
(
nb
=
NR_MAX_HARQ_ROUNDS_FOR_STATS
-
1
;
nb
>
1
;
nb
--
)
for
(
nb
=
NR_MAX_HARQ_ROUNDS_FOR_STATS
-
1
;
nb
>
1
;
nb
--
)
if
(
mac
->
stats
.
ul
.
rounds
[
nb
])
if
(
mac
->
stats
.
ul
.
rounds
[
nb
])
break
;
break
;
...
...
radio/USRP/usrp_lib.cpp
View file @
d4045fd8
...
@@ -488,38 +488,39 @@ static int trx_usrp_write(openair0_device *device,
...
@@ -488,38 +488,39 @@ static int trx_usrp_write(openair0_device *device,
buff_tx
[
i
][
j
]
=
simde_mm256_slli_epi16
(
tmp
,
4
);
buff_tx
[
i
][
j
]
=
simde_mm256_slli_epi16
(
tmp
,
4
);
}
}
}
}
}
}
s
->
tx_md
.
has_time_spec
=
true
;
s
->
tx_md
.
has_time_spec
=
true
;
s
->
tx_md
.
start_of_burst
=
(
s
->
tx_count
==
0
)
?
true
:
first_packet_state
;
s
->
tx_md
.
start_of_burst
=
(
s
->
tx_count
==
0
)
?
true
:
first_packet_state
;
s
->
tx_md
.
end_of_burst
=
last_packet_state
;
s
->
tx_md
.
end_of_burst
=
last_packet_state
;
s
->
tx_md
.
time_spec
=
uhd
::
time_spec_t
::
from_ticks
(
timestamp
,
s
->
sample_rate
);
s
->
tx_md
.
time_spec
=
uhd
::
time_spec_t
::
from_ticks
(
timestamp
,
s
->
sample_rate
);
s
->
tx_count
++
;
s
->
tx_count
++
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO
,
1
);
// bit 13 enables gpio
if
((
flags_gpio
&
TX_GPIO_CHANGE
)
!=
0
)
{
// push GPIO bits
s
->
usrp
->
set_command_time
(
s
->
tx_md
.
time_spec
);
s
->
usrp
->
set_gpio_attr
(
s
->
gpio_bank
,
"OUT"
,
flags_gpio
,
MAN_MASK
);
s
->
usrp
->
clear_command_time
();
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO
,
0
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO
,
1
);
if
(
cc
>
1
)
{
// bit 13 enables gpio
std
::
vector
<
void
*>
buff_ptrs
;
if
((
flags_gpio
&
TX_GPIO_CHANGE
)
!=
0
)
{
// push GPIO bits
s
->
usrp
->
set_command_time
(
s
->
tx_md
.
time_spec
);
s
->
usrp
->
set_gpio_attr
(
s
->
gpio_bank
,
"OUT"
,
flags_gpio
,
MAN_MASK
);
s
->
usrp
->
clear_command_time
();
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO
,
0
);
if
(
cc
>
1
)
{
for
(
int
i
=
0
;
i
<
cc
;
i
++
)
std
::
vector
<
void
*>
buff_ptrs
;
buff_ptrs
.
push_back
(
&
(((
int16_t
*
)
buff_tx
[
i
])[
0
]))
;
for
(
int
i
=
0
;
i
<
cc
;
i
++
)
ret
=
(
int
)
s
->
tx_stream
->
send
(
buff_ptrs
,
nsamps
,
s
->
tx_md
);
buff_ptrs
.
push_back
(
&
(((
int16_t
*
)
buff_tx
[
i
])[
0
]));
}
else
{
ret
=
(
int
)
s
->
tx_stream
->
send
(
&
(((
int16_t
*
)
buff_tx
[
0
])[
0
]),
nsamps
,
s
->
tx_md
);
ret
=
(
int
)
s
->
tx_stream
->
send
(
buff_ptrs
,
nsamps
,
s
->
tx_md
);
}
}
else
{
ret
=
(
int
)
s
->
tx_stream
->
send
(
&
(((
int16_t
*
)
buff_tx
[
0
])[
0
]),
nsamps
,
s
->
tx_md
);
}
if
(
ret
!=
nsamps
)
LOG_E
(
HW
,
"[xmit] tx samples %d != %d
\n
"
,
ret
,
nsamps
);
if
(
ret
!=
nsamps
)
{
return
ret
;
LOG_E
(
HW
,
"[xmit] tx samples %d != %d
\n
"
,
ret
,
nsamps
);
}
return
ret
;
}
else
{
}
else
{
pthread_mutex_lock
(
&
write_thread
->
mutex_write
);
pthread_mutex_lock
(
&
write_thread
->
mutex_write
);
...
...
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