wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scope fixes

Browse Source
This commit is contained in:
Blaise Tine
2020-10-14 09:19:26 -07:00
parent 58b8e82908
commit 301cc45740
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/opae/vx_scope.cpp
View File

@@ -58,8 +58,6 @@ static std::mutex g_timeout_mutex;
static void timeout_callback(fpga_handle fpga) { static void timeout_callback(fpga_handle fpga) {
std::this_thread::sleep_for(std::chrono::seconds{60}); std::this_thread::sleep_for(std::chrono::seconds{60});
if (!g_timeout_mutex.try_lock())
return;
vx_scope_stop(fpga, HANG_TIMEOUT); vx_scope_stop(fpga, HANG_TIMEOUT);
fpgaClose(fpga); fpgaClose(fpga);
exit(0); exit(0);

2
driver/opae/vx_scope.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#define HANG_TIMEOUT 60 //#define HANG_TIMEOUT 60
int vx_scope_start(fpga_handle hfpga, uint64_t delay = -1); int vx_scope_start(fpga_handle hfpga, uint64_t delay = -1);

2
hw/opae/vortex_afu.sv
View File

@@ -1066,7 +1066,7 @@ wire scope_changed = `SCOPE_TRIGGER;
VX_scope #( VX_scope #(
.DATAW ($bits({`SCOPE_DATA_LIST,`SCOPE_UPDATE_LIST})), .DATAW ($bits({`SCOPE_DATA_LIST,`SCOPE_UPDATE_LIST})),
.BUSW (64), .BUSW (64),
.SIZE (100), .SIZE (4096),
.UPDW ($bits({`SCOPE_UPDATE_LIST})) .UPDW ($bits({`SCOPE_UPDATE_LIST}))
) scope ( ) scope (
.clk (clk), .clk (clk),