csr.action: add an access strobe to the interface of R and W actions.

amaranth-lang · Feb 8, 2024 · d23f4a8 · d23f4a8
1 parent f284de2
commit d23f4a8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/amaranth_soc/csr/action.py b/amaranth_soc/csr/action.py
@@ -20,16 +20,22 @@ class R(FieldAction):
     port : :class:`FieldPort`
         Field port.
     r_data : Signal(shape)
-        Read data. Drives the :attr:`~FieldPort.r_data` signal of ``port``.
+        Read data. Drives ``port.r_data``. See :class:`FieldPort`.
+    r_stb : Signal()
+        Read strobe. Driven by ``port.r_stb``. See :class:`FieldPort`.
     """
     def __init__(self, shape):
         super().__init__(shape, access="r", members={
             "r_data": In(shape),
+            "r_stb":  Out(1)
         })
 
     def elaborate(self, platform):
         m = Module()
-        m.d.comb += self.port.r_data.eq(self.r_data)
+        m.d.comb += [
+            self.port.r_data.eq(self.r_data),
+            self.r_stb.eq(self.port.r_stb),
+        ]
         return m
 
 
@@ -46,16 +52,22 @@ class W(FieldAction):
     port : :class:`FieldPort`
         Field port.
     w_data : Signal(shape)
-        Write data. Driven by the :attr:`~FieldPort.w_data` signal of ``port``.
+        Write data. Driven by ``port.w_data``. See :class:`FieldPort`.
+    w_stb : Signal()
+        Write strobe. Driven by ``port.w_stb``. See :class:`FieldPort`.
     """
     def __init__(self, shape):
         super().__init__(shape, access="w", members={
             "w_data": Out(shape),
+            "w_stb":  Out(1),
         })
 
     def elaborate(self, platform):
         m = Module()
-        m.d.comb += self.w_data.eq(self.port.w_data)
+        m.d.comb += [
+            self.w_data.eq(self.port.w_data),
+            self.w_stb.eq(self.port.w_stb),
+        ]
         return m
 
 

diff --git a/tests/test_csr_action.py b/tests/test_csr_action.py
@@ -19,8 +19,10 @@ def test_sim(self):
 
         def process():
             yield dut.r_data.eq(0xa)
+            yield dut.port.r_stb.eq(1)
             yield Settle()
             self.assertEqual((yield dut.port.r_data), 0xa)
+            self.assertEqual((yield dut.r_stb), 1)
 
         sim = Simulator(dut)
         sim.add_process(process)
@@ -40,8 +42,10 @@ def test_sim(self):
 
         def process():
             yield dut.port.w_data.eq(0xa)
+            yield dut.port.w_stb.eq(1)
             yield Settle()
             self.assertEqual((yield dut.w_data), 0xa)
+            self.assertEqual((yield dut.w_stb), 1)
 
         sim = Simulator(dut)
         sim.add_process(process)