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
wangwenhui
OpenXG-RAN
Commits
5cdfcc4c
Commit
5cdfcc4c
authored
Mar 05, 2020
by
WANG Tsu-Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix after merge
parent
e08b5c1c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
common/utils/T/T_defs.h
common/utils/T/T_defs.h
+1
-1
targets/ARCH/COMMON/common_lib.h
targets/ARCH/COMMON/common_lib.h
+1
-0
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+13
-10
No files found.
common/utils/T/T_defs.h
View file @
5cdfcc4c
...
@@ -73,7 +73,7 @@ typedef struct {
...
@@ -73,7 +73,7 @@ typedef struct {
}
T_cache_t
;
}
T_cache_t
;
/* number of VCD functions (to be kept up to date! see in T_messages.txt) */
/* number of VCD functions (to be kept up to date! see in T_messages.txt) */
#define VCD_NUM_FUNCTIONS (24
8
)
#define VCD_NUM_FUNCTIONS (24
9
)
/* number of VCD variables (to be kept up to date! see in T_messages.txt) */
/* number of VCD variables (to be kept up to date! see in T_messages.txt) */
#define VCD_NUM_VARIABLES (187)
#define VCD_NUM_VARIABLES (187)
...
...
targets/ARCH/COMMON/common_lib.h
View file @
5cdfcc4c
...
@@ -286,6 +286,7 @@ typedef struct {
...
@@ -286,6 +286,7 @@ typedef struct {
int
cc
;
int
cc
;
signed
char
first_packet
;
signed
char
first_packet
;
signed
char
last_packet
;
signed
char
last_packet
;
int
flags_msb
;
}
openair0_write_package_t
;
}
openair0_write_package_t
;
typedef
struct
{
typedef
struct
{
...
...
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
5cdfcc4c
...
@@ -458,7 +458,7 @@ static int trx_usrp_write(openair0_device *device,
...
@@ -458,7 +458,7 @@ static int trx_usrp_write(openair0_device *device,
pthread_mutex_lock
(
&
write_thread
->
mutex_write
);
pthread_mutex_lock
(
&
write_thread
->
mutex_write
);
if
(
write_thread
->
count_write
>=
MAX_WRITE_THREAD_PACKAGE
){
if
(
write_thread
->
count_write
>=
MAX_WRITE_THREAD_PACKAGE
){
LOG_W
(
"Buffer overflow, count_write = %d, start = %d end = %d, resetting write package
\n
"
,
write_thread
->
count_write
,
write_thread
->
start
,
write_thread
->
end
);
LOG_W
(
HW
,
"Buffer overflow, count_write = %d, start = %d end = %d, resetting write package
\n
"
,
write_thread
->
count_write
,
write_thread
->
start
,
write_thread
->
end
);
write_thread
->
end
=
write_thread
->
start
;
write_thread
->
end
=
write_thread
->
start
;
write_thread
->
count_write
=
0
;
write_thread
->
count_write
=
0
;
}
}
...
@@ -469,6 +469,7 @@ static int trx_usrp_write(openair0_device *device,
...
@@ -469,6 +469,7 @@ static int trx_usrp_write(openair0_device *device,
write_package
[
end
].
cc
=
cc
;
write_package
[
end
].
cc
=
cc
;
write_package
[
end
].
first_packet
=
first_packet_state
;
write_package
[
end
].
first_packet
=
first_packet_state
;
write_package
[
end
].
last_packet
=
last_packet_state
;
write_package
[
end
].
last_packet
=
last_packet_state
;
write_package
[
end
].
flags_msb
=
flags_msb
;
for
(
int
i
=
0
;
i
<
cc
;
i
++
)
for
(
int
i
=
0
;
i
<
cc
;
i
++
)
write_package
[
end
].
buff
[
i
]
=
buff
[
i
];
write_package
[
end
].
buff
[
i
]
=
buff
[
i
];
write_thread
->
count_write
++
;
write_thread
->
count_write
++
;
...
@@ -504,6 +505,7 @@ void *trx_usrp_write_thread(void * arg){
...
@@ -504,6 +505,7 @@ void *trx_usrp_write_thread(void * arg){
int
cc
;
int
cc
;
signed
char
first_packet
;
signed
char
first_packet
;
signed
char
last_packet
;
signed
char
last_packet
;
int
flags_msb
;
while
(
1
){
while
(
1
){
pthread_mutex_lock
(
&
write_thread
->
mutex_write
);
pthread_mutex_lock
(
&
write_thread
->
mutex_write
);
...
@@ -519,6 +521,7 @@ void *trx_usrp_write_thread(void * arg){
...
@@ -519,6 +521,7 @@ void *trx_usrp_write_thread(void * arg){
cc
=
write_package
[
start
].
cc
;
cc
=
write_package
[
start
].
cc
;
first_packet
=
write_package
[
start
].
first_packet
;
first_packet
=
write_package
[
start
].
first_packet
;
last_packet
=
write_package
[
start
].
last_packet
;
last_packet
=
write_package
[
start
].
last_packet
;
flags_msb
=
write_package
[
start
].
flags_msb
;
write_thread
->
start
=
(
write_thread
->
start
+
1
)
%
MAX_WRITE_THREAD_PACKAGE
;
write_thread
->
start
=
(
write_thread
->
start
+
1
)
%
MAX_WRITE_THREAD_PACKAGE
;
write_thread
->
count_write
--
;
write_thread
->
count_write
--
;
pthread_mutex_unlock
(
&
write_thread
->
mutex_write
);
pthread_mutex_unlock
(
&
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