Fix up gpio tests

Author: robtaylor

chipflow_digital_ip/io/_gpio.py

@@ -44,9 +44,13 @@ class GPIOPeripheral(wiring.Component):
     """
 
     def __init__(self, *, pin_count, addr_width=4, data_width=8, input_stages=2):
-        if pin_count > 32:
+        if type(pin_count) is not int:
+            raise TypeError(f"Pin count must be a positive integer, not {pin_count}")
+
+        if pin_count > 32 or pin_count <= 0:
             # TODO: why?
-            raise ValueError(f"Pin pin_count must be lesser than or equal to 32, not {pin_count}")
+            raise ValueError(f"Pin pin_count must be a postive integrer less than 32, not {pin_count}")
+
         self._gpio = gpio.Peripheral(pin_count=pin_count,
                                      addr_width=addr_width,
                                      data_width=data_width,

tests/test_gpio.py

@@ -3,8 +3,11 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 import unittest
+import warnings
+
 from amaranth import *
 from amaranth.sim import *
+from amaranth.hdl import UnusedElaboratable
 
 from chipflow_digital_ip.io import GPIOPeripheral
 
@@ -24,11 +27,18 @@ def test_init(self):
 
     def test_init_wrong_pin_count(self):
         with self.assertRaisesRegex(TypeError,
-                r"Pin count must be a positive integer, not 'foo'"):
+                r"Pin count must be a positive integer, not foo"):
             GPIOPeripheral(pin_count="foo", addr_width=2, data_width=8)
-        with self.assertRaisesRegex(TypeError,
-                r"Pin count must be a positive integer, not 0"):
+        with self.assertRaisesRegex(ValueError,
+                r"Pin pin_count must be a postive integrer less than 32, not -1"):
+            GPIOPeripheral(pin_count=-1, addr_width=2, data_width=8)
+        with self.assertRaisesRegex(ValueError,
+                r"Pin pin_count must be a postive integrer less than 32, not 0"):
             GPIOPeripheral(pin_count=0, addr_width=2, data_width=8)
+        with self.assertRaisesRegex(ValueError,
+                r"Pin pin_count must be a postive integrer less than 32, not 33"):
+            GPIOPeripheral(pin_count=33, addr_width=2, data_width=8)
+
 
     def test_init_wrong_input_stages(self):
         with self.assertRaisesRegex(TypeError,
@@ -53,6 +63,9 @@ def test_smoke_test(self):
         """
         Smoke test GPIO. We assume that amaranth-soc GPIO tests are fully testing functionality.
         """
+
+        warnings.simplefilter(action="ignore", category=UnusedElaboratable)
+
         dut = GPIOPeripheral(pin_count=4, addr_width=2, data_width=8)
 
         mode_addr   = 0x0