From 301cc4574079f40dc370884e2fe10b51e9e75d2d Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@iam-ssh1.research.intel-research.net>
Date: Wed, 14 Oct 2020 09:19:26 -0700
Subject: [PATCH] scope fixes

---
 driver/opae/vx_scope.cpp | 2 --
 driver/opae/vx_scope.h   | 2 +-
 hw/opae/vortex_afu.sv    | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/driver/opae/vx_scope.cpp b/driver/opae/vx_scope.cpp
index 337a3f25..55cce38f 100644
--- a/driver/opae/vx_scope.cpp
+++ b/driver/opae/vx_scope.cpp
@@ -58,8 +58,6 @@ static std::mutex g_timeout_mutex;
 
 static void timeout_callback(fpga_handle fpga) {
     std::this_thread::sleep_for(std::chrono::seconds{60});
-    if (!g_timeout_mutex.try_lock())
-        return;
     vx_scope_stop(fpga, HANG_TIMEOUT);
     fpgaClose(fpga);
     exit(0);
diff --git a/driver/opae/vx_scope.h b/driver/opae/vx_scope.h
index 2bb09c4a..edd26cb4 100644
--- a/driver/opae/vx_scope.h
+++ b/driver/opae/vx_scope.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define HANG_TIMEOUT 60
+//#define HANG_TIMEOUT 60
 
 int vx_scope_start(fpga_handle hfpga, uint64_t delay = -1);
 
diff --git a/hw/opae/vortex_afu.sv b/hw/opae/vortex_afu.sv
index 0c76eedb..49783361 100644
--- a/hw/opae/vortex_afu.sv
+++ b/hw/opae/vortex_afu.sv
@@ -1066,7 +1066,7 @@ wire scope_changed = `SCOPE_TRIGGER;
 VX_scope #(
   .DATAW    ($bits({`SCOPE_DATA_LIST,`SCOPE_UPDATE_LIST})),
   .BUSW     (64),
-  .SIZE     (100),
+  .SIZE     (4096),
   .UPDW     ($bits({`SCOPE_UPDATE_LIST}))
 ) scope (
   .clk      (clk),