Use Amaranth SoC GPIO peripheral.

Author: jfng

my_design/design.py

@@ -6,12 +6,11 @@
 from amaranth.lib import wiring
 from amaranth.lib.wiring import connect
 
-from amaranth_soc import csr, wishbone
+from amaranth_soc import csr, wishbone, gpio
 from amaranth_soc.csr.wishbone import WishboneCSRBridge
 
 from amaranth_vexriscv.vexriscv import VexRiscv
 
-from amaranth_orchard.base.gpio import GPIOPeripheral
 from amaranth_orchard.memory.spimemio import SPIMemIO
 from amaranth_orchard.io.uart import UARTPeripheral
 from amaranth_orchard.memory.sram import SRAMPeripheral
@@ -86,12 +85,16 @@ def elaborate(self, platform):
         # LED GPIOs
 
         led_gpio_provider = platform.providers.LEDGPIOProvider()
-        led_gpio = GPIOPeripheral(pins=led_gpio_provider.pins)
-        csr_decoder.add(led_gpio.bus, name="led_gpio", addr=self.csr_led_gpio_base - self.csr_base)
+        led_gpio = gpio.Peripheral(pin_count=8, addr_width=4, data_width=8)
 
         m.submodules.led_gpio_provider = led_gpio_provider
         m.submodules.led_gpio = led_gpio
 
+        for n in range(8):
+            connect(m, led_gpio.pins[n], led_gpio_provider.pins[n])
+
+        csr_decoder.add(led_gpio.bus, name="led_gpio", addr=self.csr_led_gpio_base - self.csr_base)
+
         # UART
 
         uart_provider = platform.providers.UARTProvider()
@@ -119,12 +122,16 @@ def elaborate(self, platform):
         # Button GPIOs
 
         #btn_gpio_provider = platform.providers.ButtonGPIOProvider()
-        #btn_gpio = GPIOPeripheral(pins=btn_gpio_provider.pins)
-        #csr_decoder.add(btn_gpio.bus, name="btn_gpio", addr=self.csr_btn_gpio_base - self.csr_base)
+        #btn_gpio = gpio.Peripheral(pin_count=2, addr_width=4, data_width=8)
 
         #m.submodules.btn_gpio_provider = btn_gpio_provider
         #m.submodules.btn_gpio = btn_gpio
 
+        #for n in range(2):
+        #    connect(m, btn_gpio.pins[n], btn_gpio_provider.pins[n])
+
+        #csr_decoder.add(btn_gpio.bus, name="btn_gpio", addr=self.csr_btn_gpio_base - self.csr_base)
+
         # Wishbone-CSR bridge
 
         wb_to_csr = WishboneCSRBridge(csr_decoder.bus, data_width=32)

my_design/software/main.c

@@ -7,8 +7,6 @@ static const uintptr_t kernel_base = 0x00800000;
 static const uintptr_t dtb_base = 0x00f80000;
 
 void main() {
-	unsigned last_buttons = 0, next_buttons = 0;
-
 	puts("🐱: nyaa~!\r\n");
 
 	puts("SoC type: ");
@@ -29,13 +27,15 @@ void main() {
 
 	puts("Initialised!\r\n");
 
-	while (1) {
-		// // Listen for button presses
-		// next_buttons = BTN_GPIO->in;
-		// if ((next_buttons & 1U) && !(last_buttons & 1U))
-		// 	puts("button 1 pressed!\n");
-		// if ((next_buttons & 2U) && !(last_buttons & 2U))
-		// 	puts("button 2 pressed!\n");
-		// last_buttons = next_buttons;
-	};
+	//unsigned last_buttons = 0;
+	//unsigned next_buttons = 0;
+	//while (1) {
+	//	// Listen for button presses
+	//	next_buttons = BTN_GPIO->input;
+	//	if ((next_buttons & 1U) && !(last_buttons & 1U))
+	//		puts("button 1 pressed!\n");
+	//	if ((next_buttons & 2U) && !(last_buttons & 2U))
+	//		puts("button 2 pressed!\n");
+	//	last_buttons = next_buttons;
+	//};
 }