wip

Author: whitequark

software/glasgow/applet/interface/ethernet/__init__.py

@@ -1,7 +1,8 @@
 # Ref: IEEE Std 802.3-2018
 # Accession: G00098
 
-from typing import Iterable, AsyncIterator, BinaryIO
+from typing import BinaryIO
+from collections.abc import AsyncIterator
 import time
 import logging
 import asyncio
@@ -17,7 +18,7 @@
 from glasgow.arch.ieee802_3 import *
 from glasgow.gateware import cobs, ethernet
 from glasgow.protocol import snoop
-from glasgow.abstract import AbstractAssembly, GlasgowPin
+from glasgow.abstract import AbstractAssembly
 from glasgow.applet import GlasgowAppletV2
 from glasgow.applet.control.mdio import ControlMDIOInterface
 
@@ -69,15 +70,16 @@ def __init__(self, logger: logging.Logger, assembly: AbstractAssembly, *,
         self._rx_bypass = assembly.add_rw_register(component.rx_bypass)
         self._tx_bypass = assembly.add_rw_register(component.tx_bypass)
 
-        self._snoop: snoop.SnoopWriter = None
+        self._snoop: snoop.SnoopWriter | None = None
 
     def _log(self, message: str, *args):
         self._logger.log(self._level, "Ethernet: " + message, *args)
 
     @property
-    def snoop_file(self) -> BinaryIO:
+    def snoop_file(self) -> BinaryIO | None:
         if self._snoop is not None:
             return self._snoop.file
+        return None
 
     @snoop_file.setter
     def snoop_file(self, snoop_file):
@@ -128,6 +130,8 @@ class AbstractEthernetApplet(GlasgowAppletV2):
         sudo ip link set glasgow0 up
     """
     required_revision = "C0"
+    eth_iface: AbstractEthernetInterface
+    mdio_iface: ControlMDIOInterface
 
     @classmethod
     def add_setup_arguments(cls, parser):
@@ -208,7 +212,7 @@ async def forward_tx():
                                 self.logger.warning("packet bad (crc)")
                             count_bad += 1
                         await asyncio.sleep(args.delay)
-                    except asyncio.TimeoutError:
+                    except TimeoutError:
                         self.logger.warning("packet lost")
                         count_lost += 1
             finally:

software/glasgow/applet/interface/ethernet/rgmii/__init__.py

@@ -4,17 +4,14 @@
 # Accession: G00099
 
 import logging
-import asyncio
 
 from amaranth import *
-from amaranth.lib import enum, wiring, io, cdc
-from amaranth.lib.wiring import In, Out
+from amaranth.lib import io
 
 from glasgow.arch.ieee802_3 import *
 from glasgow.gateware.ethernet import AbstractDriver
 from glasgow.gateware.iostream import StreamIOBuffer
 from glasgow.gateware.ports import PortGroup
-from glasgow.gateware.pll import PLL
 from glasgow.gateware.iodelay import IODelay
 from glasgow.abstract import AbstractAssembly, GlasgowPin
 from glasgow.applet.interface.ethernet import AbstractEthernetInterface, AbstractEthernetApplet

software/glasgow/gateware/ethernet.py

@@ -1,5 +1,5 @@
 from amaranth import *
-from amaranth.lib import enum, data, wiring, stream, io, cdc
+from amaranth.lib import data, wiring, stream
 from amaranth.lib.wiring import In, Out
 from amaranth.lib.crc.catalog import CRC32_ETHERNET
 

software/glasgow/support/os_network.py

@@ -45,7 +45,7 @@ async def send(self, packets: list[Buffer]):
         except BlockingIOError: # write until the buffer is full
             pass
 
-    async def recv(self, *, length=65536) -> list[Buffer]:
+    async def recv(self, *, length=65536) -> list[bytes]:
         """"Receive packets.
 
         To improve throughput, :meth:`recv` dequeues all available packets. Packets longer than