From 9e5863684df8609c0b22a4296e7e382c0f66b8d5 Mon Sep 17 00:00:00 2001
From: Alex Forencich <alex@alexforencich.com>
Date: Sat, 5 Dec 2020 01:32:41 -0800
Subject: [PATCH] Add from_raw_payload, pad frames to min length in
 from_payload

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

diff --git a/cocotbext/eth/gmii.py b/cocotbext/eth/gmii.py
index a46526f..446f0d5 100644
--- a/cocotbext/eth/gmii.py
+++ b/cocotbext/eth/gmii.py
@@ -50,11 +50,17 @@ class GmiiFrame(object):
             self.error = error
 
     @classmethod
-    def from_payload(cls, payload, add_fcs=True):
+    def from_payload(cls, payload, min_len=60):
+        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)
+
+    @classmethod
+    def from_raw_payload(cls, payload):
         data = bytearray(ETH_PREAMBLE)
         data.extend(payload)
-        if add_fcs:
-            data.extend(struct.pack('<L', zlib.crc32(payload)))
         return cls(data)
 
     def get_preamble_len(self):
diff --git a/cocotbext/eth/xgmii.py b/cocotbext/eth/xgmii.py
index 164c235..2d9afcd 100644
--- a/cocotbext/eth/xgmii.py
+++ b/cocotbext/eth/xgmii.py
@@ -52,11 +52,17 @@ class XgmiiFrame(object):
             self.ctrl = ctrl
 
     @classmethod
-    def from_payload(cls, payload, add_fcs=True):
+    def from_payload(cls, payload, min_len=60):
+        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)
+
+    @classmethod
+    def from_raw_payload(cls, payload):
         data = bytearray(ETH_PREAMBLE)
         data.extend(payload)
-        if add_fcs:
-            data.extend(struct.pack('<L', zlib.crc32(payload)))
         return cls(data)
 
     def get_preamble_len(self):