From 5883a96a03b0ddd572743d03fadab42e18924076 Mon Sep 17 00:00:00 2001
From: Eileen Yoon <eyn@gmx.com>
Date: Tue, 23 Jan 2024 23:26:30 +0900
Subject: [PATCH] hv/trace_dcp: Fix EPICSubheader enum type breakage

Really should move this to an EPIC tracer

Signed-off-by: Eileen Yoon <eyn@gmx.com>
---
 proxyclient/hv/trace_dcp.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/proxyclient/hv/trace_dcp.py b/proxyclient/hv/trace_dcp.py
index 832c597fc..21c9031e9 100644
--- a/proxyclient/hv/trace_dcp.py
+++ b/proxyclient/hv/trace_dcp.py
@@ -58,7 +58,7 @@ def update_wptr(self):
         raise NotImplementedError()
 
     def get_wptr(self):
-        return struct.unpack("<I", self.read_buf(2 * self.BLOCK_SIZE, 4))[0]
+        return struct.unpack("<I", self.read_buf(2 * self.BLOCK_STEP, 4))[0]
 
     def read_buf(self, off, size):
         return self.ep.dart.ioread(self.ep.stream, self.base + off, size)
@@ -144,15 +144,15 @@ def handle_ipc(self, data, dir=None):
 
     @msg(0x8a, DIR.RX, AFKEP_InitRB)
     def InitTX(self, msg):
-        off = msg.OFFSET * AFKRingBuf.BLOCK_SIZE
-        size = msg.SIZE * AFKRingBuf.BLOCK_SIZE
+        off = msg.OFFSET * AFKRingBuf.BLOCK_STEP
+        size = msg.SIZE * AFKRingBuf.BLOCK_STEP
         self.state.txbuf_info = (off, size)
         self.create_bufs()
 
     @msg(0x8b, DIR.RX, AFKEP_InitRB)
     def InitRX(self, msg):
-        off = msg.OFFSET * AFKRingBuf.BLOCK_SIZE
-        size = msg.SIZE * AFKRingBuf.BLOCK_SIZE
+        off = msg.OFFSET * AFKRingBuf.BLOCK_STEP
+        size = msg.SIZE * AFKRingBuf.BLOCK_STEP
         self.state.rxbuf_info = (off, size)
         self.create_bufs()
 
@@ -307,7 +307,7 @@ def handle_ipc(self, data, dir=None):
         sub = EPICSubHeader.parse_stream(fd)
 
         self.log(f"{dir}Ch {hdr.channel} Type {hdr.type} Ver {hdr.version} Tag {hdr.seq}")
-        self.log(f"  Len {sub.length} Ver {sub.version} Cat {sub.category} Type {sub.type:#x} Seq {sub.seq}")
+        self.log(f"  Len {sub.length} Ver {sub.version} Cat {sub.category} Type {int(sub.type):#x}/{sub.type} Seq {sub.seq}")
         # chexdump(data, print_fn=self.log)
 
         if sub.category == EPICCategory.REPORT: