Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
VILLASframework
VILLASfpga
VILLASfpga
Commits
cad2103b
Commit
cad2103b
authored
Sep 15, 2018
by
Daniel Krebs
Browse files
rtds2gpu: get rid off those stupid warnings about virtual overload of dump()
parent
6d9e688c
Pipeline
#73445
failed with stages
in 2 minutes and 22 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
include/villas/fpga/ips/gpu2rtds.hpp
View file @
cad2103b
...
...
@@ -19,7 +19,10 @@ public:
bool
init
();
bool
dump
(
spdlog
::
level
::
level_enum
logLevel
=
spdlog
::
level
::
info
);
void
dump
()
{
dumpLog
();
}
bool
dumpLog
(
spdlog
::
level
::
level_enum
logLevel
=
spdlog
::
level
::
info
);
bool
startOnce
(
size_t
frameSize
);
size_t
getMaxFrameSize
();
...
...
include/villas/fpga/ips/rtds2gpu.hpp
View file @
cad2103b
...
...
@@ -32,7 +32,10 @@ public:
bool
init
();
bool
dump
(
spdlog
::
level
::
level_enum
logLevel
=
spdlog
::
level
::
info
);
void
dump
()
{
dumpLog
();
}
bool
dumpLog
(
spdlog
::
level
::
level_enum
logLevel
=
spdlog
::
level
::
info
);
bool
startOnce
(
const
MemoryBlock
&
mem
,
size_t
frameSize
,
size_t
dataOffset
,
size_t
doorbellOffset
);
...
...
lib/ips/rtds2gpu/gpu2rtds.cpp
View file @
cad2103b
...
...
@@ -39,7 +39,7 @@ Gpu2Rtds::startOnce(size_t frameSize)
return
true
;
}
bool
Gpu2Rtds
::
dump
(
spdlog
::
level
::
level_enum
logLevel
)
bool
Gpu2Rtds
::
dump
Log
(
spdlog
::
level
::
level_enum
logLevel
)
{
const
auto
frame_size
=
*
registerFrameSize
;
auto
status
=
*
registerStatus
;
...
...
lib/ips/rtds2gpu/rtds2gpu.cpp
View file @
cad2103b
...
...
@@ -31,7 +31,7 @@ bool Rtds2Gpu::init()
bool
Rtds2Gpu
::
dump
(
spdlog
::
level
::
level_enum
logLevel
)
bool
Rtds2Gpu
::
dump
Log
(
spdlog
::
level
::
level_enum
logLevel
)
{
const
auto
baseaddr
=
XRtds2gpu_Get_baseaddr
(
&
xInstance
);
const
auto
data_offset
=
XRtds2gpu_Get_data_offset
(
&
xInstance
);
...
...
tests/rtds2gpu.cpp
View file @
cad2103b
...
...
@@ -99,8 +99,8 @@ Test(fpga, rtds2gpu_loopback_dma, .description = "Rtds2Gpu")
cr_assert_not_null
(
gpu2rtds
,
"No Gpu2Rtds IP found"
);
cr_assert_not_null
(
rtds
,
"RTDS IP not found"
);
rtds2gpu
.
dump
(
spdlog
::
level
::
debug
);
gpu2rtds
->
dump
(
spdlog
::
level
::
debug
);
rtds2gpu
.
dump
Log
(
spdlog
::
level
::
debug
);
gpu2rtds
->
dump
Log
(
spdlog
::
level
::
debug
);
/* Allocate and prepare memory */
...
...
@@ -139,7 +139,7 @@ Test(fpga, rtds2gpu_loopback_dma, .description = "Rtds2Gpu")
while
(
not
rtds2gpu
.
isFinished
());
const
uint32_t
*
doorbellDst
=
&
dmaMemDst
[
DOORBELL_OFFSET
];
rtds2gpu
.
dump
(
spdlog
::
level
::
info
);
rtds2gpu
.
dump
Log
(
spdlog
::
level
::
info
);
rtds2gpu
.
dumpDoorbell
(
*
doorbellDst
);
cr_assert
(
memcmp
(
dataSrc
,
dataDst
,
FRAME_SIZE
)
==
0
,
"Memory not equal"
);
...
...
Write
Preview
Supports
Markdown
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