Replace UART with that from amaranth-soc RFC

Signed-off-by: gatecat <[email protected]>

Author: gatecat

my_design/design.py

@@ -186,7 +186,7 @@ def elaborate(self, platform):
 
         # UART
         for i in range(self.uart_count):
-            uart = UARTPeripheral(init_divisor=int(25e6//115200))
+            uart = UARTPeripheral(init_divisor=int(25e6//115200), addr_width=5)
             base_addr = self.csr_uart_base + i * self.periph_offset
             csr_decoder.add(uart.bus, name=f"uart_{i}", addr=base_addr - self.csr_base)
             sw.add_periph("uart", f"UART_{i}", base_addr)

my_design/software/main.c

@@ -2,9 +2,9 @@
 #include "generated/soc.h"
 
 char uart_getch_block(volatile uart_regs_t *uart) {
-    while (!uart->rx_avail)
+    while (!(uart->rx.status & 0x1))
         ;
-    return uart->rx_data;
+    return uart->rx.data;
 }
 
 uint32_t spi_xfer(volatile spi_regs_t *spi, uint32_t data, uint32_t width) {
@@ -43,6 +43,9 @@ void i2c_stop(volatile i2c_regs_t *i2c) {
 }
 
 void main() {
+    uart_init(UART_0, 25000000/115200);
+    uart_init(UART_1, 25000000/115200);
+
     puts("🐱: nyaa~!\r\n");
 
     puts("SoC type: ");