From a73c0b734ec07b7a779200b1933a016f3d1c400d Mon Sep 17 00:00:00 2001
From: Alex Forencich <alex@alexforencich.com>
Date: Mon, 4 Jan 2021 22:42:53 -0800
Subject: [PATCH] Support override of tx_complete

---
 cocotbext/eth/gmii.py  | 10 ++++++----
 cocotbext/eth/xgmii.py | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cocotbext/eth/gmii.py b/cocotbext/eth/gmii.py
index d3dab4a..f7075a8 100644
--- a/cocotbext/eth/gmii.py
+++ b/cocotbext/eth/gmii.py
@@ -55,21 +55,23 @@ class GmiiFrame:
         else:
             self.data = bytearray(data)
             self.error = error
+
+        if tx_complete is not None:
             self.tx_complete = tx_complete
 
     @classmethod
-    def from_payload(cls, payload, min_len=60):
+    def from_payload(cls, payload, min_len=60, tx_complete=None):
         payload = bytearray(payload)
         if len(payload) < min_len:
             payload.extend(bytearray(min_len-len(payload)))
         payload.extend(struct.pack('<L', zlib.crc32(payload)))
-        return cls.from_raw_payload(payload)
+        return cls.from_raw_payload(payload, tx_complete=tx_complete)
 
     @classmethod
-    def from_raw_payload(cls, payload):
+    def from_raw_payload(cls, payload, tx_complete=None):
         data = bytearray(ETH_PREAMBLE)
         data.extend(payload)
-        return cls(data)
+        return cls(data, tx_complete=tx_complete)
 
     def get_preamble_len(self):
         return self.data.index(EthPre.SFD)+1
diff --git a/cocotbext/eth/xgmii.py b/cocotbext/eth/xgmii.py
index 20466dc..f22007c 100644
--- a/cocotbext/eth/xgmii.py
+++ b/cocotbext/eth/xgmii.py
@@ -57,21 +57,23 @@ class XgmiiFrame:
         else:
             self.data = bytearray(data)
             self.ctrl = ctrl
+
+        if tx_complete is not None:
             self.tx_complete = tx_complete
 
     @classmethod
-    def from_payload(cls, payload, min_len=60):
+    def from_payload(cls, payload, min_len=60, tx_complete=None):
         payload = bytearray(payload)
         if len(payload) < min_len:
             payload.extend(bytearray(min_len-len(payload)))
         payload.extend(struct.pack('<L', zlib.crc32(payload)))
-        return cls.from_raw_payload(payload)
+        return cls.from_raw_payload(payload, tx_complete=tx_complete)
 
     @classmethod
-    def from_raw_payload(cls, payload):
+    def from_raw_payload(cls, payload, tx_complete=None):
         data = bytearray(ETH_PREAMBLE)
         data.extend(payload)
-        return cls(data)
+        return cls(data, tx_complete=tx_complete)
 
     def get_preamble_len(self):
         return self.data.index(EthPre.SFD)+1