From 6632da2a222f9bf7d8c28cd55974a70798443753 Mon Sep 17 00:00:00 2001 From: Antoine van Gelder Date: Mon, 6 Jan 2025 15:33:40 +0200 Subject: [PATCH] repo: post-rebase fixes --- cynthion/python/Makefile | 8 ++-- .../python/src/gateware/facedancer/top.py | 12 ++--- firmware/Cargo.toml | 2 +- .../src/generated/usb2_ep_control/reset.rs | 48 ------------------- .../src/generated/usb2_ep_out/reset.rs | 48 ------------------- firmware/lunasoc-hal/Cargo.toml | 16 +++---- firmware/lunasoc-hal/examples/blinky.rs | 2 +- firmware/lunasoc-hal/examples/blinky_pac.rs | 2 +- firmware/lunasoc-hal/examples/interrupts.rs | 2 +- .../lunasoc-hal/examples/interrupts_pac.rs | 2 +- firmware/lunasoc-hal/examples/uart.rs | 2 +- firmware/lunasoc-hal/examples/uart_pac.rs | 2 +- firmware/lunasoc-hal/src/usb.rs | 42 ++++++++-------- .../.cargo/config.toml | 0 .../CHANGELOG.md | 0 .../Cargo.toml | 2 +- .../LICENSE.txt | 0 .../Makefile | 8 ++-- .../README.md | 2 +- .../build.rs | 0 .../device.x | 0 .../src/cpu.rs | 0 .../src/csr.rs | 0 .../src/generated.rs | 0 .../src/generated/advertiser.rs | 0 .../src/generated/advertiser/control.rs | 0 .../src/generated/generic.rs | 0 .../src/generated/generic/raw.rs | 0 .../src/generated/gpio0.rs | 0 .../src/generated/gpio0/input.rs | 0 .../src/generated/gpio0/mode.rs | 0 .../src/generated/gpio0/output.rs | 0 .../src/generated/gpio0/set_clr.rs | 0 .../src/generated/gpio1.rs | 0 .../src/generated/gpio1/input.rs | 0 .../src/generated/gpio1/mode.rs | 0 .../src/generated/gpio1/output.rs | 0 .../src/generated/gpio1/set_clr.rs | 0 .../src/generated/info.rs | 0 .../src/generated/info/version.rs | 0 .../src/generated/interrupt.rs | 0 .../src/generated/leds.rs | 0 .../src/generated/leds/input.rs | 0 .../src/generated/leds/mode.rs | 0 .../src/generated/leds/output.rs | 0 .../src/generated/leds/set_clr.rs | 0 .../src/generated/spi0.rs | 0 .../src/generated/spi0/cs.rs | 0 .../src/generated/spi0/data.rs | 0 .../src/generated/spi0/phy.rs | 0 .../src/generated/spi0/status.rs | 0 .../src/generated/timer0.rs | 0 .../src/generated/timer0/counter.rs | 0 .../src/generated/timer0/enable.rs | 0 .../src/generated/timer0/ev_enable.rs | 0 .../src/generated/timer0/ev_pending.rs | 0 .../src/generated/timer0/reload.rs | 0 .../src/generated/timer1.rs | 0 .../src/generated/timer1/counter.rs | 0 .../src/generated/timer1/enable.rs | 0 .../src/generated/timer1/ev_enable.rs | 0 .../src/generated/timer1/ev_pending.rs | 0 .../src/generated/timer1/reload.rs | 0 .../src/generated/uart0.rs | 0 .../src/generated/uart0/divisor.rs | 0 .../src/generated/uart0/rx_avail.rs | 0 .../src/generated/uart0/rx_data.rs | 0 .../src/generated/uart0/tx_data.rs | 0 .../src/generated/uart0/tx_ready.rs | 0 .../src/generated/uart1.rs | 0 .../src/generated/uart1/divisor.rs | 0 .../src/generated/uart1/rx_avail.rs | 0 .../src/generated/uart1/rx_data.rs | 0 .../src/generated/uart1/tx_data.rs | 0 .../src/generated/uart1/tx_ready.rs | 0 .../src/generated/usb0.rs | 0 .../src/generated/usb0/control.rs | 0 .../src/generated/usb0/ev_enable.rs | 0 .../src/generated/usb0/ev_pending.rs | 0 .../src/generated/usb0/status.rs | 0 .../src/generated/usb0_ep_control.rs | 0 .../src/generated/usb0_ep_control/control.rs | 0 .../src/generated/usb0_ep_control/data.rs | 0 .../generated/usb0_ep_control/ev_enable.rs | 0 .../generated/usb0_ep_control/ev_pending.rs | 0 .../src/generated/usb0_ep_control}/reset.rs | 8 ++-- .../src/generated/usb0_ep_control/status.rs | 0 .../src/generated/usb0_ep_in.rs | 0 .../src/generated/usb0_ep_in/data.rs | 0 .../src/generated/usb0_ep_in/endpoint.rs | 0 .../src/generated/usb0_ep_in/ev_enable.rs | 0 .../src/generated/usb0_ep_in/ev_pending.rs | 0 .../src/generated/usb0_ep_in/pid.rs | 0 .../src/generated/usb0_ep_in}/reset.rs | 8 ++-- .../src/generated/usb0_ep_in/stall.rs | 0 .../src/generated/usb0_ep_in/status.rs | 0 .../src/generated/usb0_ep_out.rs | 0 .../src/generated/usb0_ep_out/control.rs | 0 .../src/generated/usb0_ep_out/data.rs | 0 .../src/generated/usb0_ep_out/enable.rs | 0 .../src/generated/usb0_ep_out/endpoint.rs | 0 .../src/generated/usb0_ep_out/ev_enable.rs | 0 .../src/generated/usb0_ep_out/ev_pending.rs | 0 .../src/generated/usb0_ep_out/pid.rs | 0 .../src/generated/usb0_ep_out/prime.rs | 0 .../src/generated/usb0_ep_out}/reset.rs | 8 ++-- .../src/generated/usb0_ep_out/stall.rs | 0 .../src/generated/usb0_ep_out/status.rs | 0 .../src/generated/usb1.rs | 0 .../src/generated/usb1/control.rs | 0 .../src/generated/usb1/ev_enable.rs | 0 .../src/generated/usb1/ev_pending.rs | 0 .../src/generated/usb1/status.rs | 0 .../src/generated/usb1_ep_control.rs | 0 .../src/generated/usb1_ep_control/control.rs | 0 .../src/generated/usb1_ep_control/data.rs | 0 .../generated/usb1_ep_control/ev_enable.rs | 0 .../generated/usb1_ep_control/ev_pending.rs | 0 .../src/generated/usb1_ep_control}/reset.rs | 8 ++-- .../src/generated/usb1_ep_control/status.rs | 0 .../src/generated/usb1_ep_in.rs | 0 .../src/generated/usb1_ep_in/data.rs | 0 .../src/generated/usb1_ep_in/endpoint.rs | 0 .../src/generated/usb1_ep_in/ev_enable.rs | 0 .../src/generated/usb1_ep_in/ev_pending.rs | 0 .../src/generated/usb1_ep_in/pid.rs | 0 .../src/generated/usb1_ep_in}/reset.rs | 8 ++-- .../src/generated/usb1_ep_in/stall.rs | 0 .../src/generated/usb1_ep_in/status.rs | 0 .../src/generated/usb1_ep_out.rs | 0 .../src/generated/usb1_ep_out/control.rs | 0 .../src/generated/usb1_ep_out/data.rs | 0 .../src/generated/usb1_ep_out/enable.rs | 0 .../src/generated/usb1_ep_out/endpoint.rs | 0 .../src/generated/usb1_ep_out/ev_enable.rs | 0 .../src/generated/usb1_ep_out/ev_pending.rs | 0 .../src/generated/usb1_ep_out/pid.rs | 0 .../src/generated/usb1_ep_out/prime.rs | 0 .../src/generated/usb1_ep_out}/reset.rs | 8 ++-- .../src/generated/usb1_ep_out/stall.rs | 0 .../src/generated/usb1_ep_out/status.rs | 0 .../src/generated/usb2.rs | 0 .../src/generated/usb2/control.rs | 0 .../src/generated/usb2/ev_enable.rs | 0 .../src/generated/usb2/ev_pending.rs | 0 .../src/generated/usb2/status.rs | 0 .../src/generated/usb2_ep_control.rs | 0 .../src/generated/usb2_ep_control/control.rs | 0 .../src/generated/usb2_ep_control/data.rs | 0 .../generated/usb2_ep_control/ev_enable.rs | 0 .../generated/usb2_ep_control/ev_pending.rs | 0 .../src/generated/usb2_ep_control/reset.rs | 48 +++++++++++++++++++ .../src/generated/usb2_ep_control/status.rs | 0 .../src/generated/usb2_ep_in.rs | 0 .../src/generated/usb2_ep_in/data.rs | 0 .../src/generated/usb2_ep_in/endpoint.rs | 0 .../src/generated/usb2_ep_in/ev_enable.rs | 0 .../src/generated/usb2_ep_in/ev_pending.rs | 0 .../src/generated/usb2_ep_in/pid.rs | 0 .../src/generated/usb2_ep_in}/reset.rs | 8 ++-- .../src/generated/usb2_ep_in/stall.rs | 0 .../src/generated/usb2_ep_in/status.rs | 0 .../src/generated/usb2_ep_out.rs | 0 .../src/generated/usb2_ep_out/control.rs | 0 .../src/generated/usb2_ep_out/data.rs | 0 .../src/generated/usb2_ep_out/enable.rs | 0 .../src/generated/usb2_ep_out/endpoint.rs | 0 .../src/generated/usb2_ep_out/ev_enable.rs | 0 .../src/generated/usb2_ep_out/ev_pending.rs | 0 .../src/generated/usb2_ep_out/pid.rs | 0 .../src/generated/usb2_ep_out/prime.rs | 0 .../src/generated/usb2_ep_out/reset.rs | 48 +++++++++++++++++++ .../src/generated/usb2_ep_out/stall.rs | 0 .../src/generated/usb2_ep_out/status.rs | 0 .../src/lib.rs | 0 .../src/macros.rs | 0 .../svd/moondancer.svd} | 18 +++---- firmware/moondancer/Cargo.toml | 4 +- firmware/moondancer/src/gcp/moondancer.rs | 8 ++-- firmware/moondancer/src/lib.rs | 2 +- 180 files changed, 192 insertions(+), 192 deletions(-) delete mode 100644 firmware/facedancer-pac/src/generated/usb2_ep_control/reset.rs delete mode 100644 firmware/facedancer-pac/src/generated/usb2_ep_out/reset.rs rename firmware/{facedancer-pac => moondancer-pac}/.cargo/config.toml (100%) rename firmware/{facedancer-pac => moondancer-pac}/CHANGELOG.md (100%) rename firmware/{facedancer-pac => moondancer-pac}/Cargo.toml (95%) rename firmware/{facedancer-pac => moondancer-pac}/LICENSE.txt (100%) rename firmware/{facedancer-pac => moondancer-pac}/Makefile (72%) rename firmware/{facedancer-pac => moondancer-pac}/README.md (76%) rename firmware/{facedancer-pac => moondancer-pac}/build.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/device.x (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/cpu.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/csr.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/advertiser.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/advertiser/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/generic.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/generic/raw.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio0.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio0/input.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio0/mode.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio0/output.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio0/set_clr.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio1.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio1/input.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio1/mode.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio1/output.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/gpio1/set_clr.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/info.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/info/version.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/interrupt.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/leds.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/leds/input.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/leds/mode.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/leds/output.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/leds/set_clr.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/spi0.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/spi0/cs.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/spi0/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/spi0/phy.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/spi0/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer0.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer0/counter.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer0/enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer0/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer0/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer0/reload.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer1.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer1/counter.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer1/enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer1/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer1/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/timer1/reload.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart0.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart0/divisor.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart0/rx_avail.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart0/rx_data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart0/tx_data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart0/tx_ready.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart1.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart1/divisor.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart1/rx_avail.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart1/rx_data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart1/tx_data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/uart1/tx_ready.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_control/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_control/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_control/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_control/ev_pending.rs (100%) rename firmware/{facedancer-pac/src/generated/usb1_ep_control => moondancer-pac/src/generated/usb0_ep_control}/reset.rs (90%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_control/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in/endpoint.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in/pid.rs (100%) rename firmware/{facedancer-pac/src/generated/usb1_ep_in => moondancer-pac/src/generated/usb0_ep_in}/reset.rs (90%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in/stall.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_in/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/endpoint.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/pid.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/prime.rs (100%) rename firmware/{facedancer-pac/src/generated/usb0_ep_control => moondancer-pac/src/generated/usb0_ep_out}/reset.rs (90%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/stall.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb0_ep_out/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_control/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_control/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_control/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_control/ev_pending.rs (100%) rename firmware/{facedancer-pac/src/generated/usb1_ep_out => moondancer-pac/src/generated/usb1_ep_control}/reset.rs (90%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_control/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in/endpoint.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in/pid.rs (100%) rename firmware/{facedancer-pac/src/generated/usb2_ep_in => moondancer-pac/src/generated/usb1_ep_in}/reset.rs (90%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in/stall.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_in/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/endpoint.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/pid.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/prime.rs (100%) rename firmware/{facedancer-pac/src/generated/usb0_ep_out => moondancer-pac/src/generated/usb1_ep_out}/reset.rs (90%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/stall.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb1_ep_out/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_control/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_control/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_control/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_control/ev_pending.rs (100%) create mode 100644 firmware/moondancer-pac/src/generated/usb2_ep_control/reset.rs rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_control/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in/endpoint.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in/pid.rs (100%) rename firmware/{facedancer-pac/src/generated/usb0_ep_in => moondancer-pac/src/generated/usb2_ep_in}/reset.rs (90%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in/stall.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_in/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/control.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/data.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/endpoint.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/ev_enable.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/ev_pending.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/pid.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/prime.rs (100%) create mode 100644 firmware/moondancer-pac/src/generated/usb2_ep_out/reset.rs rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/stall.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/generated/usb2_ep_out/status.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/lib.rs (100%) rename firmware/{facedancer-pac => moondancer-pac}/src/macros.rs (100%) rename firmware/{facedancer-pac/svd/facedancer.svd => moondancer-pac/svd/moondancer.svd} (99%) diff --git a/cynthion/python/Makefile b/cynthion/python/Makefile index 9f39de87..1d611961 100644 --- a/cynthion/python/Makefile +++ b/cynthion/python/Makefile @@ -5,19 +5,19 @@ UART ?= /dev/ttyACM0 # - gateware ------------------------------------------------------------------ analyzer: - python3 -m cynthion.gateware.analyzer.top --output build/$@.bit + python -m cynthion.gateware.analyzer.top --output build/$@.bit selftest: mkdir -p build/ - python3 -m cynthion.gateware.selftest.top --output build/$@.bit + python -m cynthion.gateware.selftest.top --output build/$@.bit facedancer: mkdir -p build/gensvd/ - python3 -m cynthion.gateware.facedancer.top --output build/$@.bit + python -m cynthion.gateware.facedancer.top --output build/$@.bit svd: mkdir -p build/gensvd/ - python3 -m cynthion.gateware.facedancer.top --generate-svd > build/gensvd/facedancer.svd + python -m cynthion.gateware.facedancer.top --generate-svd > build/gensvd/moondancer.svd # - helpers ------------------------------------------------------------------- diff --git a/cynthion/python/src/gateware/facedancer/top.py b/cynthion/python/src/gateware/facedancer/top.py index 3c5901fc..c62d15c2 100644 --- a/cynthion/python/src/gateware/facedancer/top.py +++ b/cynthion/python/src/gateware/facedancer/top.py @@ -16,8 +16,6 @@ from luna.gateware.usb.usb2.device import USBDevice -from luna.gateware.utils.cdc import synchronize - from luna_soc.gateware.core import blockram, spiflash, timer, uart, usb2 from luna_soc.gateware.core.spiflash import ECP5ConfigurationFlashInterface, SPIPHYController from luna_soc.gateware.cpu import InterruptController, VexRiscv @@ -411,8 +409,10 @@ def elaborate(self, platform): # - build --------------------------------------------------------------------- if __name__ == "__main__": - from luna import configure_default_logging, top_level_cli + from luna import configure_default_logging from luna.gateware.platform import get_appropriate_platform + #from luna import top_level_cli + from luna_soc import top_level_cli # configure logging configure_default_logging() @@ -435,9 +435,9 @@ def elaborate(self, platform): design = Top(clock_frequency_hz=clock_frequency_hz, domain=domain) # generate soc sdk - from luna_soc.generate.svd import GenerateSVD - with open("build/gensvd/facedancer.svd", "w") as f: - GenerateSVD = GenerateSVD(design).generate(file=f) + #from luna_soc.generate.svd import GenerateSVD + #with open("build/gensvd/moondancer.svd", "w") as f: + # GenerateSVD = GenerateSVD(design).generate(file=f) # invoke cli _overrides = { diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml index 7fc369e7..5e86f3c8 100644 --- a/firmware/Cargo.toml +++ b/firmware/Cargo.toml @@ -3,7 +3,7 @@ members = [ "ladybug", "libgreat", "lunasoc-hal", - "facedancer-pac", + "moondancer-pac", "moondancer", "smolusb", ] diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_control/reset.rs b/firmware/facedancer-pac/src/generated/usb2_ep_control/reset.rs deleted file mode 100644 index d596fdaa..00000000 --- a/firmware/facedancer-pac/src/generated/usb2_ep_control/reset.rs +++ /dev/null @@ -1,48 +0,0 @@ -#[doc = "Register `reset` reader"] -pub type R = crate::R; -#[doc = "Register `reset` writer"] -pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; -#[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] -pub type _0_R = crate::FieldReader; -#[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type _0_W<'a, REG> = crate::FieldWriter<'a, REG, 7>; -impl R { - #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] - #[inline(always)] - pub fn _0(&self) -> _0_R { - _0_R::new((self.bits >> 1) & 0x7f) - } -} -impl W { - #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] - #[inline(always)] - #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) - } - #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] - #[inline(always)] - #[must_use] - pub fn _0(&mut self) -> _0_W { - _0_W::new(self, 1) - } -} -#[doc = "TODO amaranth_soc/csr/reg.py:471\n\nYou can [`read`](crate::generic::Reg::read) this register and get [`reset::R`](R). You can [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero) this register using [`reset::W`](W). You can also [`modify`](crate::generic::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."] -pub struct RESET_SPEC; -impl crate::RegisterSpec for RESET_SPEC { - type Ux = u8; -} -#[doc = "`read()` method returns [`reset::R`](R) reader structure"] -impl crate::Readable for RESET_SPEC {} -#[doc = "`write(|w| ..)` method takes [`reset::W`](W) writer structure"] -impl crate::Writable for RESET_SPEC { - type Safety = crate::Unsafe; - const ZERO_TO_MODIFY_FIELDS_BITMAP: u8 = 0; - const ONE_TO_MODIFY_FIELDS_BITMAP: u8 = 0; -} -#[doc = "`reset()` method sets reset to value 0"] -impl crate::Resettable for RESET_SPEC { - const RESET_VALUE: u8 = 0; -} diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/reset.rs b/firmware/facedancer-pac/src/generated/usb2_ep_out/reset.rs deleted file mode 100644 index d596fdaa..00000000 --- a/firmware/facedancer-pac/src/generated/usb2_ep_out/reset.rs +++ /dev/null @@ -1,48 +0,0 @@ -#[doc = "Register `reset` reader"] -pub type R = crate::R; -#[doc = "Register `reset` writer"] -pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; -#[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] -pub type _0_R = crate::FieldReader; -#[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type _0_W<'a, REG> = crate::FieldWriter<'a, REG, 7>; -impl R { - #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] - #[inline(always)] - pub fn _0(&self) -> _0_R { - _0_R::new((self.bits >> 1) & 0x7f) - } -} -impl W { - #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] - #[inline(always)] - #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) - } - #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] - #[inline(always)] - #[must_use] - pub fn _0(&mut self) -> _0_W { - _0_W::new(self, 1) - } -} -#[doc = "TODO amaranth_soc/csr/reg.py:471\n\nYou can [`read`](crate::generic::Reg::read) this register and get [`reset::R`](R). You can [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero) this register using [`reset::W`](W). You can also [`modify`](crate::generic::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."] -pub struct RESET_SPEC; -impl crate::RegisterSpec for RESET_SPEC { - type Ux = u8; -} -#[doc = "`read()` method returns [`reset::R`](R) reader structure"] -impl crate::Readable for RESET_SPEC {} -#[doc = "`write(|w| ..)` method takes [`reset::W`](W) writer structure"] -impl crate::Writable for RESET_SPEC { - type Safety = crate::Unsafe; - const ZERO_TO_MODIFY_FIELDS_BITMAP: u8 = 0; - const ONE_TO_MODIFY_FIELDS_BITMAP: u8 = 0; -} -#[doc = "`reset()` method sets reset to value 0"] -impl crate::Resettable for RESET_SPEC { - const RESET_VALUE: u8 = 0; -} diff --git a/firmware/lunasoc-hal/Cargo.toml b/firmware/lunasoc-hal/Cargo.toml index de753e0c..b135b775 100644 --- a/firmware/lunasoc-hal/Cargo.toml +++ b/firmware/lunasoc-hal/Cargo.toml @@ -33,10 +33,10 @@ default = [ # select softcore minerva = [ - "facedancer-pac/minerva", + "moondancer-pac/minerva", ] vexriscv = [ - "facedancer-pac/vexriscv", + "moondancer-pac/vexriscv", ] # use nightly features @@ -73,24 +73,24 @@ riscv-rt = { version = "=0.11.0" } [[example]] name = "blinky" -required-features = ["facedancer-pac/rt"] +required-features = ["moondancer-pac/rt"] [[example]] name = "blinky_pac" -required-features = ["facedancer-pac/rt"] +required-features = ["moondancer-pac/rt"] [[example]] name = "interrupts" -required-features = ["facedancer-pac/rt"] +required-features = ["moondancer-pac/rt"] [[example]] name = "interrupts_pac" -required-features = ["facedancer-pac/rt"] +required-features = ["moondancer-pac/rt"] [[example]] name = "uart" -required-features = ["facedancer-pac/rt"] +required-features = ["moondancer-pac/rt"] [[example]] name = "uart_pac" -required-features = ["facedancer-pac/rt"] +required-features = ["moondancer-pac/rt"] diff --git a/firmware/lunasoc-hal/examples/blinky.rs b/firmware/lunasoc-hal/examples/blinky.rs index 376aff81..f62a42d3 100644 --- a/firmware/lunasoc-hal/examples/blinky.rs +++ b/firmware/lunasoc-hal/examples/blinky.rs @@ -5,7 +5,7 @@ use panic_halt as _; use riscv_rt::entry; use lunasoc_hal as hal; -use facedancer_pac as pac; +use moondancer_pac as pac; use hal::hal::delay::DelayUs; diff --git a/firmware/lunasoc-hal/examples/blinky_pac.rs b/firmware/lunasoc-hal/examples/blinky_pac.rs index b8835f04..c2050bec 100644 --- a/firmware/lunasoc-hal/examples/blinky_pac.rs +++ b/firmware/lunasoc-hal/examples/blinky_pac.rs @@ -4,7 +4,7 @@ use panic_halt as _; use riscv_rt::entry; -use facedancer_pac as pac; +use moondancer_pac as pac; const SYSTEM_CLOCK_FREQUENCY: u32 = pac::clock::sysclk(); diff --git a/firmware/lunasoc-hal/examples/interrupts.rs b/firmware/lunasoc-hal/examples/interrupts.rs index 5f33d793..0f206b03 100644 --- a/firmware/lunasoc-hal/examples/interrupts.rs +++ b/firmware/lunasoc-hal/examples/interrupts.rs @@ -7,7 +7,7 @@ use panic_halt as _; use riscv_rt::entry; use lunasoc_hal as hal; -use facedancer_pac as pac; +use moondancer_pac as pac; lunasoc_hal::impl_serial! { Serial: pac::UART0, diff --git a/firmware/lunasoc-hal/examples/interrupts_pac.rs b/firmware/lunasoc-hal/examples/interrupts_pac.rs index 00a9d9e2..7f65b52a 100644 --- a/firmware/lunasoc-hal/examples/interrupts_pac.rs +++ b/firmware/lunasoc-hal/examples/interrupts_pac.rs @@ -4,7 +4,7 @@ use panic_halt as _; use riscv_rt::entry; -use facedancer_pac as pac; +use moondancer_pac as pac; use pac::csr; #[entry] diff --git a/firmware/lunasoc-hal/examples/uart.rs b/firmware/lunasoc-hal/examples/uart.rs index 99ef3162..dab8d041 100644 --- a/firmware/lunasoc-hal/examples/uart.rs +++ b/firmware/lunasoc-hal/examples/uart.rs @@ -7,7 +7,7 @@ use panic_halt as _; use riscv_rt::entry; use lunasoc_hal as hal; -use facedancer_pac as pac; +use moondancer_pac as pac; use hal::hal::delay::DelayUs; diff --git a/firmware/lunasoc-hal/examples/uart_pac.rs b/firmware/lunasoc-hal/examples/uart_pac.rs index 4b459577..926eb534 100644 --- a/firmware/lunasoc-hal/examples/uart_pac.rs +++ b/firmware/lunasoc-hal/examples/uart_pac.rs @@ -4,7 +4,7 @@ use panic_halt as _; use riscv_rt::entry; -use facedancer_pac as pac; +use moondancer_pac as pac; const SYSTEM_CLOCK_FREQUENCY: u32 = pac::clock::sysclk(); diff --git a/firmware/lunasoc-hal/src/usb.rs b/firmware/lunasoc-hal/src/usb.rs index 93c6d052..3719db6c 100644 --- a/firmware/lunasoc-hal/src/usb.rs +++ b/firmware/lunasoc-hal/src/usb.rs @@ -161,16 +161,16 @@ macro_rules! impl_usb { // un-prime all OUT endpoints and disable interface for endpoint_number in 0..smolusb::EP_MAX_ENDPOINTS as u8 { self.ep_out - .epno() - .write(|w| unsafe { w.epno().bits(endpoint_number) }); - self.ep_out.prime().write(|w| w.prime().bit(false)); + .endpoint() + .write(|w| unsafe { w.number().bits(endpoint_number) }); + self.ep_out.prime().write(|w| w.primed().bit(false)); } - self.ep_out.enable().write(|w| w.enable().bit(false)); + self.ep_out.enable().write(|w| w.enabled().bit(false)); // reset FIFOs - self.ep_control.reset().write(|w| w.high().bit(true)); - self.ep_in.reset() .write(|w| w.high().bit(true)); - self.ep_out.reset() .write(|w| w.high().bit(true)); + self.ep_control.reset().write(|w| w.fifo().bit(true)); + self.ep_in.reset() .write(|w| w.fifo().bit(true)); + self.ep_out.reset() .write(|w| w.fifo().bit(true)); // connect device self.device.control().modify(|_, w| w.connect().bit(true)); @@ -195,16 +195,16 @@ macro_rules! impl_usb { // un-prime all OUT endpoints and disable interface for endpoint_number in 0..smolusb::EP_MAX_ENDPOINTS as u8 { self.ep_out - .epno() - .write(|w| unsafe { w.epno().bits(endpoint_number) }); - self.ep_out.prime().write(|w| w.prime().bit(false)); + .endpoint() + .write(|w| unsafe { w.number().bits(endpoint_number) }); + self.ep_out.prime().write(|w| w.primed().bit(false)); } - self.ep_out.enable().write(|w| w.enable().bit(false)); + self.ep_out.enable().write(|w| w.enabled().bit(false)); // reset FIFOs - self.ep_control.reset().write(|w| w.high().bit(true)); - self.ep_in.reset() .write(|w| w.high().bit(true)); - self.ep_out.reset() .write(|w| w.high().bit(true)); + self.ep_control.reset().write(|w| w.fifo().bit(true)); + self.ep_in.reset() .write(|w| w.fifo().bit(true)); + self.ep_out.reset() .write(|w| w.fifo().bit(true)); } /// Perform a bus reset of the device. @@ -216,9 +216,9 @@ macro_rules! impl_usb { self.set_address(0); // reset FIFOs - self.ep_control.reset().write(|w| w.high().bit(true)); - self.ep_in.reset() .write(|w| w.high().bit(true)); - self.ep_out.reset() .write(|w| w.high().bit(true)); + self.ep_control.reset().write(|w| w.fifo().bit(true)); + self.ep_in.reset() .write(|w| w.fifo().bit(true)); + self.ep_out.reset() .write(|w| w.fifo().bit(true)); // clear status for all IN endpoints for endpoint in 0..(smolusb::EP_MAX_ENDPOINTS as u8) { @@ -257,14 +257,14 @@ macro_rules! impl_usb { /// Stall the given IN endpoint number. fn stall_endpoint_in(&self, endpoint_number: u8) { - self.ep_in.reset().write(|w| w.high().bit(true)); + self.ep_in.reset().write(|w| w.fifo().bit(true)); self.ep_in.stall().write(|w| w.stalled().bit(true)); self.ep_in.endpoint().write(|w| unsafe { w.number().bits(endpoint_number) }); } /// Stall the given OUT endpoint number. fn stall_endpoint_out(&self, endpoint_number: u8) { - self.ep_out.reset().write(|w| w.high().bit(true)); + self.ep_out.reset().write(|w| w.fifo().bit(true)); self.ep_out.endpoint().write(|w| unsafe { w.number().bits(endpoint_number) }); self.ep_out.stall().write(|w| w.stalled().bit(true)); } @@ -402,7 +402,7 @@ macro_rules! impl_usb { // 0. clear receive fifo in case the previous transaction wasn't handled if self.ep_out.status().read().have().bit() { log::warn!(" {} priming out endpoint {} with unread data", stringify!($USBX), endpoint_number); - self.ep_out.reset().write(|w| w.high().bit(true)); + self.ep_out.reset().write(|w| w.fifo().bit(true)); } // 1. select endpoint @@ -479,7 +479,7 @@ macro_rules! impl_usb { if timeout == 0 { log::warn!(" {} clear tx", stringify!($USBX)); } else if timeout > DEFAULT_TIMEOUT { - self.ep_in.reset().write(|w| w.high().bit(true)); + self.ep_in.reset().write(|w| w.fifo().bit(true)); unsafe { self.clear_tx_ack_active(endpoint_number); } diff --git a/firmware/facedancer-pac/.cargo/config.toml b/firmware/moondancer-pac/.cargo/config.toml similarity index 100% rename from firmware/facedancer-pac/.cargo/config.toml rename to firmware/moondancer-pac/.cargo/config.toml diff --git a/firmware/facedancer-pac/CHANGELOG.md b/firmware/moondancer-pac/CHANGELOG.md similarity index 100% rename from firmware/facedancer-pac/CHANGELOG.md rename to firmware/moondancer-pac/CHANGELOG.md diff --git a/firmware/facedancer-pac/Cargo.toml b/firmware/moondancer-pac/Cargo.toml similarity index 95% rename from firmware/facedancer-pac/Cargo.toml rename to firmware/moondancer-pac/Cargo.toml index b43f9d6f..288ae73d 100644 --- a/firmware/facedancer-pac/Cargo.toml +++ b/firmware/moondancer-pac/Cargo.toml @@ -7,7 +7,7 @@ description = "A peripheral access crate for the Cynthion Moondancer SoC" categories = ["embedded", "hardware-support", "no-std"] keywords = ["cynthion", "luna", "riscv", "peripheral", "usb"] repository = "https://github.com/greatscottgadgets/cynthion" -documentation = "https://docs.rs/facedancer-pac" +documentation = "https://docs.rs/moondancer-pac" edition = "2021" rust-version = "1.68" include = ["src/**/*", "README.md", "device.x", "build.rs"] diff --git a/firmware/facedancer-pac/LICENSE.txt b/firmware/moondancer-pac/LICENSE.txt similarity index 100% rename from firmware/facedancer-pac/LICENSE.txt rename to firmware/moondancer-pac/LICENSE.txt diff --git a/firmware/facedancer-pac/Makefile b/firmware/moondancer-pac/Makefile similarity index 72% rename from firmware/facedancer-pac/Makefile rename to firmware/moondancer-pac/Makefile index db99419b..0d034091 100644 --- a/firmware/facedancer-pac/Makefile +++ b/firmware/moondancer-pac/Makefile @@ -2,14 +2,14 @@ # # cargo install svd2rust form -SVD := ../../cynthion/python/build/gensvd/facedancer.svd +SVD := ../../cynthion/python/build/gensvd/moondancer.svd svd2rust: rm -rf build src/generated.rs src/generated/ mkdir build - cp $(SVD) svd/facedancer.svd - svd2rust -i svd/facedancer.svd -o build/ --target riscv --make_mod --ident-formats-theme legacy + cp $(SVD) svd/moondancer.svd + svd2rust -i svd/moondancer.svd -o build/ --target riscv --make_mod --ident-formats-theme legacy mv build/mod.rs src/generated.rs @# TODO uncomment once we no longer have to poly-fill 'target_has_atomic' @# see: https://github.com/rust-lang/rust/issues/94039 @@ -24,4 +24,4 @@ doc: cargo doc --no-deps --all-features --document-private-items --open distclean: - rm -rf build/ target/ src/generated.rs src/generated/ svd/facedancer.svd + rm -rf build/ target/ src/generated.rs src/generated/ svd/moondancer.svd diff --git a/firmware/facedancer-pac/README.md b/firmware/moondancer-pac/README.md similarity index 76% rename from firmware/facedancer-pac/README.md rename to firmware/moondancer-pac/README.md index 85ee5e6d..cb353ce9 100644 --- a/firmware/facedancer-pac/README.md +++ b/firmware/moondancer-pac/README.md @@ -1,3 +1,3 @@ -## facedancer-pac +## moondancer-pac A peripheral access crate for the Cynthion Moondancer SoC. diff --git a/firmware/facedancer-pac/build.rs b/firmware/moondancer-pac/build.rs similarity index 100% rename from firmware/facedancer-pac/build.rs rename to firmware/moondancer-pac/build.rs diff --git a/firmware/facedancer-pac/device.x b/firmware/moondancer-pac/device.x similarity index 100% rename from firmware/facedancer-pac/device.x rename to firmware/moondancer-pac/device.x diff --git a/firmware/facedancer-pac/src/cpu.rs b/firmware/moondancer-pac/src/cpu.rs similarity index 100% rename from firmware/facedancer-pac/src/cpu.rs rename to firmware/moondancer-pac/src/cpu.rs diff --git a/firmware/facedancer-pac/src/csr.rs b/firmware/moondancer-pac/src/csr.rs similarity index 100% rename from firmware/facedancer-pac/src/csr.rs rename to firmware/moondancer-pac/src/csr.rs diff --git a/firmware/facedancer-pac/src/generated.rs b/firmware/moondancer-pac/src/generated.rs similarity index 100% rename from firmware/facedancer-pac/src/generated.rs rename to firmware/moondancer-pac/src/generated.rs diff --git a/firmware/facedancer-pac/src/generated/advertiser.rs b/firmware/moondancer-pac/src/generated/advertiser.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/advertiser.rs rename to firmware/moondancer-pac/src/generated/advertiser.rs diff --git a/firmware/facedancer-pac/src/generated/advertiser/control.rs b/firmware/moondancer-pac/src/generated/advertiser/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/advertiser/control.rs rename to firmware/moondancer-pac/src/generated/advertiser/control.rs diff --git a/firmware/facedancer-pac/src/generated/generic.rs b/firmware/moondancer-pac/src/generated/generic.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/generic.rs rename to firmware/moondancer-pac/src/generated/generic.rs diff --git a/firmware/facedancer-pac/src/generated/generic/raw.rs b/firmware/moondancer-pac/src/generated/generic/raw.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/generic/raw.rs rename to firmware/moondancer-pac/src/generated/generic/raw.rs diff --git a/firmware/facedancer-pac/src/generated/gpio0.rs b/firmware/moondancer-pac/src/generated/gpio0.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio0.rs rename to firmware/moondancer-pac/src/generated/gpio0.rs diff --git a/firmware/facedancer-pac/src/generated/gpio0/input.rs b/firmware/moondancer-pac/src/generated/gpio0/input.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio0/input.rs rename to firmware/moondancer-pac/src/generated/gpio0/input.rs diff --git a/firmware/facedancer-pac/src/generated/gpio0/mode.rs b/firmware/moondancer-pac/src/generated/gpio0/mode.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio0/mode.rs rename to firmware/moondancer-pac/src/generated/gpio0/mode.rs diff --git a/firmware/facedancer-pac/src/generated/gpio0/output.rs b/firmware/moondancer-pac/src/generated/gpio0/output.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio0/output.rs rename to firmware/moondancer-pac/src/generated/gpio0/output.rs diff --git a/firmware/facedancer-pac/src/generated/gpio0/set_clr.rs b/firmware/moondancer-pac/src/generated/gpio0/set_clr.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio0/set_clr.rs rename to firmware/moondancer-pac/src/generated/gpio0/set_clr.rs diff --git a/firmware/facedancer-pac/src/generated/gpio1.rs b/firmware/moondancer-pac/src/generated/gpio1.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio1.rs rename to firmware/moondancer-pac/src/generated/gpio1.rs diff --git a/firmware/facedancer-pac/src/generated/gpio1/input.rs b/firmware/moondancer-pac/src/generated/gpio1/input.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio1/input.rs rename to firmware/moondancer-pac/src/generated/gpio1/input.rs diff --git a/firmware/facedancer-pac/src/generated/gpio1/mode.rs b/firmware/moondancer-pac/src/generated/gpio1/mode.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio1/mode.rs rename to firmware/moondancer-pac/src/generated/gpio1/mode.rs diff --git a/firmware/facedancer-pac/src/generated/gpio1/output.rs b/firmware/moondancer-pac/src/generated/gpio1/output.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio1/output.rs rename to firmware/moondancer-pac/src/generated/gpio1/output.rs diff --git a/firmware/facedancer-pac/src/generated/gpio1/set_clr.rs b/firmware/moondancer-pac/src/generated/gpio1/set_clr.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/gpio1/set_clr.rs rename to firmware/moondancer-pac/src/generated/gpio1/set_clr.rs diff --git a/firmware/facedancer-pac/src/generated/info.rs b/firmware/moondancer-pac/src/generated/info.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/info.rs rename to firmware/moondancer-pac/src/generated/info.rs diff --git a/firmware/facedancer-pac/src/generated/info/version.rs b/firmware/moondancer-pac/src/generated/info/version.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/info/version.rs rename to firmware/moondancer-pac/src/generated/info/version.rs diff --git a/firmware/facedancer-pac/src/generated/interrupt.rs b/firmware/moondancer-pac/src/generated/interrupt.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/interrupt.rs rename to firmware/moondancer-pac/src/generated/interrupt.rs diff --git a/firmware/facedancer-pac/src/generated/leds.rs b/firmware/moondancer-pac/src/generated/leds.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/leds.rs rename to firmware/moondancer-pac/src/generated/leds.rs diff --git a/firmware/facedancer-pac/src/generated/leds/input.rs b/firmware/moondancer-pac/src/generated/leds/input.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/leds/input.rs rename to firmware/moondancer-pac/src/generated/leds/input.rs diff --git a/firmware/facedancer-pac/src/generated/leds/mode.rs b/firmware/moondancer-pac/src/generated/leds/mode.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/leds/mode.rs rename to firmware/moondancer-pac/src/generated/leds/mode.rs diff --git a/firmware/facedancer-pac/src/generated/leds/output.rs b/firmware/moondancer-pac/src/generated/leds/output.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/leds/output.rs rename to firmware/moondancer-pac/src/generated/leds/output.rs diff --git a/firmware/facedancer-pac/src/generated/leds/set_clr.rs b/firmware/moondancer-pac/src/generated/leds/set_clr.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/leds/set_clr.rs rename to firmware/moondancer-pac/src/generated/leds/set_clr.rs diff --git a/firmware/facedancer-pac/src/generated/spi0.rs b/firmware/moondancer-pac/src/generated/spi0.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/spi0.rs rename to firmware/moondancer-pac/src/generated/spi0.rs diff --git a/firmware/facedancer-pac/src/generated/spi0/cs.rs b/firmware/moondancer-pac/src/generated/spi0/cs.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/spi0/cs.rs rename to firmware/moondancer-pac/src/generated/spi0/cs.rs diff --git a/firmware/facedancer-pac/src/generated/spi0/data.rs b/firmware/moondancer-pac/src/generated/spi0/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/spi0/data.rs rename to firmware/moondancer-pac/src/generated/spi0/data.rs diff --git a/firmware/facedancer-pac/src/generated/spi0/phy.rs b/firmware/moondancer-pac/src/generated/spi0/phy.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/spi0/phy.rs rename to firmware/moondancer-pac/src/generated/spi0/phy.rs diff --git a/firmware/facedancer-pac/src/generated/spi0/status.rs b/firmware/moondancer-pac/src/generated/spi0/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/spi0/status.rs rename to firmware/moondancer-pac/src/generated/spi0/status.rs diff --git a/firmware/facedancer-pac/src/generated/timer0.rs b/firmware/moondancer-pac/src/generated/timer0.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer0.rs rename to firmware/moondancer-pac/src/generated/timer0.rs diff --git a/firmware/facedancer-pac/src/generated/timer0/counter.rs b/firmware/moondancer-pac/src/generated/timer0/counter.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer0/counter.rs rename to firmware/moondancer-pac/src/generated/timer0/counter.rs diff --git a/firmware/facedancer-pac/src/generated/timer0/enable.rs b/firmware/moondancer-pac/src/generated/timer0/enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer0/enable.rs rename to firmware/moondancer-pac/src/generated/timer0/enable.rs diff --git a/firmware/facedancer-pac/src/generated/timer0/ev_enable.rs b/firmware/moondancer-pac/src/generated/timer0/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer0/ev_enable.rs rename to firmware/moondancer-pac/src/generated/timer0/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/timer0/ev_pending.rs b/firmware/moondancer-pac/src/generated/timer0/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer0/ev_pending.rs rename to firmware/moondancer-pac/src/generated/timer0/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/timer0/reload.rs b/firmware/moondancer-pac/src/generated/timer0/reload.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer0/reload.rs rename to firmware/moondancer-pac/src/generated/timer0/reload.rs diff --git a/firmware/facedancer-pac/src/generated/timer1.rs b/firmware/moondancer-pac/src/generated/timer1.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer1.rs rename to firmware/moondancer-pac/src/generated/timer1.rs diff --git a/firmware/facedancer-pac/src/generated/timer1/counter.rs b/firmware/moondancer-pac/src/generated/timer1/counter.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer1/counter.rs rename to firmware/moondancer-pac/src/generated/timer1/counter.rs diff --git a/firmware/facedancer-pac/src/generated/timer1/enable.rs b/firmware/moondancer-pac/src/generated/timer1/enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer1/enable.rs rename to firmware/moondancer-pac/src/generated/timer1/enable.rs diff --git a/firmware/facedancer-pac/src/generated/timer1/ev_enable.rs b/firmware/moondancer-pac/src/generated/timer1/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer1/ev_enable.rs rename to firmware/moondancer-pac/src/generated/timer1/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/timer1/ev_pending.rs b/firmware/moondancer-pac/src/generated/timer1/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer1/ev_pending.rs rename to firmware/moondancer-pac/src/generated/timer1/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/timer1/reload.rs b/firmware/moondancer-pac/src/generated/timer1/reload.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/timer1/reload.rs rename to firmware/moondancer-pac/src/generated/timer1/reload.rs diff --git a/firmware/facedancer-pac/src/generated/uart0.rs b/firmware/moondancer-pac/src/generated/uart0.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart0.rs rename to firmware/moondancer-pac/src/generated/uart0.rs diff --git a/firmware/facedancer-pac/src/generated/uart0/divisor.rs b/firmware/moondancer-pac/src/generated/uart0/divisor.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart0/divisor.rs rename to firmware/moondancer-pac/src/generated/uart0/divisor.rs diff --git a/firmware/facedancer-pac/src/generated/uart0/rx_avail.rs b/firmware/moondancer-pac/src/generated/uart0/rx_avail.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart0/rx_avail.rs rename to firmware/moondancer-pac/src/generated/uart0/rx_avail.rs diff --git a/firmware/facedancer-pac/src/generated/uart0/rx_data.rs b/firmware/moondancer-pac/src/generated/uart0/rx_data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart0/rx_data.rs rename to firmware/moondancer-pac/src/generated/uart0/rx_data.rs diff --git a/firmware/facedancer-pac/src/generated/uart0/tx_data.rs b/firmware/moondancer-pac/src/generated/uart0/tx_data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart0/tx_data.rs rename to firmware/moondancer-pac/src/generated/uart0/tx_data.rs diff --git a/firmware/facedancer-pac/src/generated/uart0/tx_ready.rs b/firmware/moondancer-pac/src/generated/uart0/tx_ready.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart0/tx_ready.rs rename to firmware/moondancer-pac/src/generated/uart0/tx_ready.rs diff --git a/firmware/facedancer-pac/src/generated/uart1.rs b/firmware/moondancer-pac/src/generated/uart1.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart1.rs rename to firmware/moondancer-pac/src/generated/uart1.rs diff --git a/firmware/facedancer-pac/src/generated/uart1/divisor.rs b/firmware/moondancer-pac/src/generated/uart1/divisor.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart1/divisor.rs rename to firmware/moondancer-pac/src/generated/uart1/divisor.rs diff --git a/firmware/facedancer-pac/src/generated/uart1/rx_avail.rs b/firmware/moondancer-pac/src/generated/uart1/rx_avail.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart1/rx_avail.rs rename to firmware/moondancer-pac/src/generated/uart1/rx_avail.rs diff --git a/firmware/facedancer-pac/src/generated/uart1/rx_data.rs b/firmware/moondancer-pac/src/generated/uart1/rx_data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart1/rx_data.rs rename to firmware/moondancer-pac/src/generated/uart1/rx_data.rs diff --git a/firmware/facedancer-pac/src/generated/uart1/tx_data.rs b/firmware/moondancer-pac/src/generated/uart1/tx_data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart1/tx_data.rs rename to firmware/moondancer-pac/src/generated/uart1/tx_data.rs diff --git a/firmware/facedancer-pac/src/generated/uart1/tx_ready.rs b/firmware/moondancer-pac/src/generated/uart1/tx_ready.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/uart1/tx_ready.rs rename to firmware/moondancer-pac/src/generated/uart1/tx_ready.rs diff --git a/firmware/facedancer-pac/src/generated/usb0.rs b/firmware/moondancer-pac/src/generated/usb0.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0.rs rename to firmware/moondancer-pac/src/generated/usb0.rs diff --git a/firmware/facedancer-pac/src/generated/usb0/control.rs b/firmware/moondancer-pac/src/generated/usb0/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0/control.rs rename to firmware/moondancer-pac/src/generated/usb0/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb0/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb0/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb0/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb0/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb0/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb0/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb0/status.rs b/firmware/moondancer-pac/src/generated/usb0/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0/status.rs rename to firmware/moondancer-pac/src/generated/usb0/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_control.rs b/firmware/moondancer-pac/src/generated/usb0_ep_control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_control.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_control.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_control/control.rs b/firmware/moondancer-pac/src/generated/usb0_ep_control/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_control/control.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_control/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_control/data.rs b/firmware/moondancer-pac/src/generated/usb0_ep_control/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_control/data.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_control/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_control/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb0_ep_control/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_control/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_control/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_control/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb0_ep_control/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_control/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_control/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_control/reset.rs b/firmware/moondancer-pac/src/generated/usb0_ep_control/reset.rs similarity index 90% rename from firmware/facedancer-pac/src/generated/usb1_ep_control/reset.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_control/reset.rs index d596fdaa..5d6c301c 100644 --- a/firmware/facedancer-pac/src/generated/usb1_ep_control/reset.rs +++ b/firmware/moondancer-pac/src/generated/usb0_ep_control/reset.rs @@ -2,8 +2,8 @@ pub type R = crate::R; #[doc = "Register `reset` writer"] pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; #[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] pub type _0_R = crate::FieldReader; #[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] @@ -19,8 +19,8 @@ impl W { #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) } #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_control/status.rs b/firmware/moondancer-pac/src/generated/usb0_ep_control/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_control/status.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_control/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/data.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/data.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/endpoint.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/endpoint.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/endpoint.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/endpoint.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/pid.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/pid.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/pid.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/pid.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/reset.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/reset.rs similarity index 90% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/reset.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/reset.rs index 2e923332..c81fdec7 100644 --- a/firmware/facedancer-pac/src/generated/usb1_ep_in/reset.rs +++ b/firmware/moondancer-pac/src/generated/usb0_ep_in/reset.rs @@ -2,8 +2,8 @@ pub type R = crate::R; #[doc = "Register `reset` writer"] pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; #[doc = "Field `_1` reader - TODO amaranth_soc/csr/reg.py:471"] pub type _1_R = crate::FieldReader; #[doc = "Field `_1` writer - TODO amaranth_soc/csr/reg.py:471"] @@ -19,8 +19,8 @@ impl W { #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) } #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/stall.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/stall.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/stall.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/stall.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/status.rs b/firmware/moondancer-pac/src/generated/usb0_ep_in/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/status.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_in/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/control.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/control.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/data.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/data.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/enable.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/enable.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/endpoint.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/endpoint.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/endpoint.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/endpoint.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/pid.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/pid.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/pid.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/pid.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/prime.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/prime.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/prime.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/prime.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_control/reset.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/reset.rs similarity index 90% rename from firmware/facedancer-pac/src/generated/usb0_ep_control/reset.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/reset.rs index d596fdaa..5d6c301c 100644 --- a/firmware/facedancer-pac/src/generated/usb0_ep_control/reset.rs +++ b/firmware/moondancer-pac/src/generated/usb0_ep_out/reset.rs @@ -2,8 +2,8 @@ pub type R = crate::R; #[doc = "Register `reset` writer"] pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; #[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] pub type _0_R = crate::FieldReader; #[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] @@ -19,8 +19,8 @@ impl W { #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) } #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/stall.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/stall.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/stall.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/stall.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/status.rs b/firmware/moondancer-pac/src/generated/usb0_ep_out/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/status.rs rename to firmware/moondancer-pac/src/generated/usb0_ep_out/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb1.rs b/firmware/moondancer-pac/src/generated/usb1.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1.rs rename to firmware/moondancer-pac/src/generated/usb1.rs diff --git a/firmware/facedancer-pac/src/generated/usb1/control.rs b/firmware/moondancer-pac/src/generated/usb1/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1/control.rs rename to firmware/moondancer-pac/src/generated/usb1/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb1/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb1/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb1/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb1/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb1/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb1/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb1/status.rs b/firmware/moondancer-pac/src/generated/usb1/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1/status.rs rename to firmware/moondancer-pac/src/generated/usb1/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_control.rs b/firmware/moondancer-pac/src/generated/usb1_ep_control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_control.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_control.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_control/control.rs b/firmware/moondancer-pac/src/generated/usb1_ep_control/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_control/control.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_control/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_control/data.rs b/firmware/moondancer-pac/src/generated/usb1_ep_control/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_control/data.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_control/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_control/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb1_ep_control/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_control/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_control/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_control/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb1_ep_control/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_control/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_control/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/reset.rs b/firmware/moondancer-pac/src/generated/usb1_ep_control/reset.rs similarity index 90% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/reset.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_control/reset.rs index d596fdaa..5d6c301c 100644 --- a/firmware/facedancer-pac/src/generated/usb1_ep_out/reset.rs +++ b/firmware/moondancer-pac/src/generated/usb1_ep_control/reset.rs @@ -2,8 +2,8 @@ pub type R = crate::R; #[doc = "Register `reset` writer"] pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; #[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] pub type _0_R = crate::FieldReader; #[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] @@ -19,8 +19,8 @@ impl W { #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) } #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_control/status.rs b/firmware/moondancer-pac/src/generated/usb1_ep_control/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_control/status.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_control/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/data.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/data.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/endpoint.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/endpoint.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/endpoint.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/endpoint.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/pid.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/pid.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/pid.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/pid.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/reset.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/reset.rs similarity index 90% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/reset.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/reset.rs index 2e923332..c81fdec7 100644 --- a/firmware/facedancer-pac/src/generated/usb2_ep_in/reset.rs +++ b/firmware/moondancer-pac/src/generated/usb1_ep_in/reset.rs @@ -2,8 +2,8 @@ pub type R = crate::R; #[doc = "Register `reset` writer"] pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; #[doc = "Field `_1` reader - TODO amaranth_soc/csr/reg.py:471"] pub type _1_R = crate::FieldReader; #[doc = "Field `_1` writer - TODO amaranth_soc/csr/reg.py:471"] @@ -19,8 +19,8 @@ impl W { #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) } #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/stall.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/stall.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/stall.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/stall.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_in/status.rs b/firmware/moondancer-pac/src/generated/usb1_ep_in/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_in/status.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_in/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/control.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/control.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/data.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/data.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/enable.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/enable.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/endpoint.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/endpoint.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/endpoint.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/endpoint.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/pid.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/pid.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/pid.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/pid.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/prime.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/prime.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/prime.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/prime.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_out/reset.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/reset.rs similarity index 90% rename from firmware/facedancer-pac/src/generated/usb0_ep_out/reset.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/reset.rs index d596fdaa..5d6c301c 100644 --- a/firmware/facedancer-pac/src/generated/usb0_ep_out/reset.rs +++ b/firmware/moondancer-pac/src/generated/usb1_ep_out/reset.rs @@ -2,8 +2,8 @@ pub type R = crate::R; #[doc = "Register `reset` writer"] pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; #[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] pub type _0_R = crate::FieldReader; #[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] @@ -19,8 +19,8 @@ impl W { #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) } #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/stall.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/stall.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/stall.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/stall.rs diff --git a/firmware/facedancer-pac/src/generated/usb1_ep_out/status.rs b/firmware/moondancer-pac/src/generated/usb1_ep_out/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb1_ep_out/status.rs rename to firmware/moondancer-pac/src/generated/usb1_ep_out/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb2.rs b/firmware/moondancer-pac/src/generated/usb2.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2.rs rename to firmware/moondancer-pac/src/generated/usb2.rs diff --git a/firmware/facedancer-pac/src/generated/usb2/control.rs b/firmware/moondancer-pac/src/generated/usb2/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2/control.rs rename to firmware/moondancer-pac/src/generated/usb2/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb2/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb2/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb2/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb2/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb2/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb2/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb2/status.rs b/firmware/moondancer-pac/src/generated/usb2/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2/status.rs rename to firmware/moondancer-pac/src/generated/usb2/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_control.rs b/firmware/moondancer-pac/src/generated/usb2_ep_control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_control.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_control.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_control/control.rs b/firmware/moondancer-pac/src/generated/usb2_ep_control/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_control/control.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_control/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_control/data.rs b/firmware/moondancer-pac/src/generated/usb2_ep_control/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_control/data.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_control/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_control/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb2_ep_control/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_control/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_control/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_control/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb2_ep_control/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_control/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_control/ev_pending.rs diff --git a/firmware/moondancer-pac/src/generated/usb2_ep_control/reset.rs b/firmware/moondancer-pac/src/generated/usb2_ep_control/reset.rs new file mode 100644 index 00000000..5d6c301c --- /dev/null +++ b/firmware/moondancer-pac/src/generated/usb2_ep_control/reset.rs @@ -0,0 +1,48 @@ +#[doc = "Register `reset` reader"] +pub type R = crate::R; +#[doc = "Register `reset` writer"] +pub type W = crate::W; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] +pub type _0_R = crate::FieldReader; +#[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type _0_W<'a, REG> = crate::FieldWriter<'a, REG, 7>; +impl R { + #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] + #[inline(always)] + pub fn _0(&self) -> _0_R { + _0_R::new((self.bits >> 1) & 0x7f) + } +} +impl W { + #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] + #[inline(always)] + #[must_use] + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) + } + #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] + #[inline(always)] + #[must_use] + pub fn _0(&mut self) -> _0_W { + _0_W::new(self, 1) + } +} +#[doc = "TODO amaranth_soc/csr/reg.py:471\n\nYou can [`read`](crate::generic::Reg::read) this register and get [`reset::R`](R). You can [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero) this register using [`reset::W`](W). You can also [`modify`](crate::generic::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."] +pub struct RESET_SPEC; +impl crate::RegisterSpec for RESET_SPEC { + type Ux = u8; +} +#[doc = "`read()` method returns [`reset::R`](R) reader structure"] +impl crate::Readable for RESET_SPEC {} +#[doc = "`write(|w| ..)` method takes [`reset::W`](W) writer structure"] +impl crate::Writable for RESET_SPEC { + type Safety = crate::Unsafe; + const ZERO_TO_MODIFY_FIELDS_BITMAP: u8 = 0; + const ONE_TO_MODIFY_FIELDS_BITMAP: u8 = 0; +} +#[doc = "`reset()` method sets reset to value 0"] +impl crate::Resettable for RESET_SPEC { + const RESET_VALUE: u8 = 0; +} diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_control/status.rs b/firmware/moondancer-pac/src/generated/usb2_ep_control/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_control/status.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_control/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/data.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/data.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/endpoint.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/endpoint.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/endpoint.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/endpoint.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/pid.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/pid.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/pid.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/pid.rs diff --git a/firmware/facedancer-pac/src/generated/usb0_ep_in/reset.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/reset.rs similarity index 90% rename from firmware/facedancer-pac/src/generated/usb0_ep_in/reset.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/reset.rs index 2e923332..c81fdec7 100644 --- a/firmware/facedancer-pac/src/generated/usb0_ep_in/reset.rs +++ b/firmware/moondancer-pac/src/generated/usb2_ep_in/reset.rs @@ -2,8 +2,8 @@ pub type R = crate::R; #[doc = "Register `reset` writer"] pub type W = crate::W; -#[doc = "Field `high` writer - TODO amaranth_soc/csr/reg.py:471"] -pub type HIGH_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; #[doc = "Field `_1` reader - TODO amaranth_soc/csr/reg.py:471"] pub type _1_R = crate::FieldReader; #[doc = "Field `_1` writer - TODO amaranth_soc/csr/reg.py:471"] @@ -19,8 +19,8 @@ impl W { #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] #[must_use] - pub fn high(&mut self) -> HIGH_W { - HIGH_W::new(self, 0) + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) } #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] #[inline(always)] diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/stall.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/stall.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/stall.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/stall.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_in/status.rs b/firmware/moondancer-pac/src/generated/usb2_ep_in/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_in/status.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_in/status.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/control.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/control.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/control.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/control.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/data.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/data.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/data.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/data.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/enable.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/enable.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/endpoint.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/endpoint.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/endpoint.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/endpoint.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/ev_enable.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/ev_enable.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/ev_enable.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/ev_enable.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/ev_pending.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/ev_pending.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/ev_pending.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/ev_pending.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/pid.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/pid.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/pid.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/pid.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/prime.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/prime.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/prime.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/prime.rs diff --git a/firmware/moondancer-pac/src/generated/usb2_ep_out/reset.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/reset.rs new file mode 100644 index 00000000..5d6c301c --- /dev/null +++ b/firmware/moondancer-pac/src/generated/usb2_ep_out/reset.rs @@ -0,0 +1,48 @@ +#[doc = "Register `reset` reader"] +pub type R = crate::R; +#[doc = "Register `reset` writer"] +pub type W = crate::W; +#[doc = "Field `fifo` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type FIFO_W<'a, REG> = crate::BitWriter<'a, REG>; +#[doc = "Field `_0` reader - TODO amaranth_soc/csr/reg.py:471"] +pub type _0_R = crate::FieldReader; +#[doc = "Field `_0` writer - TODO amaranth_soc/csr/reg.py:471"] +pub type _0_W<'a, REG> = crate::FieldWriter<'a, REG, 7>; +impl R { + #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] + #[inline(always)] + pub fn _0(&self) -> _0_R { + _0_R::new((self.bits >> 1) & 0x7f) + } +} +impl W { + #[doc = "Bit 0 - TODO amaranth_soc/csr/reg.py:471"] + #[inline(always)] + #[must_use] + pub fn fifo(&mut self) -> FIFO_W { + FIFO_W::new(self, 0) + } + #[doc = "Bits 1:7 - TODO amaranth_soc/csr/reg.py:471"] + #[inline(always)] + #[must_use] + pub fn _0(&mut self) -> _0_W { + _0_W::new(self, 1) + } +} +#[doc = "TODO amaranth_soc/csr/reg.py:471\n\nYou can [`read`](crate::generic::Reg::read) this register and get [`reset::R`](R). You can [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero) this register using [`reset::W`](W). You can also [`modify`](crate::generic::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."] +pub struct RESET_SPEC; +impl crate::RegisterSpec for RESET_SPEC { + type Ux = u8; +} +#[doc = "`read()` method returns [`reset::R`](R) reader structure"] +impl crate::Readable for RESET_SPEC {} +#[doc = "`write(|w| ..)` method takes [`reset::W`](W) writer structure"] +impl crate::Writable for RESET_SPEC { + type Safety = crate::Unsafe; + const ZERO_TO_MODIFY_FIELDS_BITMAP: u8 = 0; + const ONE_TO_MODIFY_FIELDS_BITMAP: u8 = 0; +} +#[doc = "`reset()` method sets reset to value 0"] +impl crate::Resettable for RESET_SPEC { + const RESET_VALUE: u8 = 0; +} diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/stall.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/stall.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/stall.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/stall.rs diff --git a/firmware/facedancer-pac/src/generated/usb2_ep_out/status.rs b/firmware/moondancer-pac/src/generated/usb2_ep_out/status.rs similarity index 100% rename from firmware/facedancer-pac/src/generated/usb2_ep_out/status.rs rename to firmware/moondancer-pac/src/generated/usb2_ep_out/status.rs diff --git a/firmware/facedancer-pac/src/lib.rs b/firmware/moondancer-pac/src/lib.rs similarity index 100% rename from firmware/facedancer-pac/src/lib.rs rename to firmware/moondancer-pac/src/lib.rs diff --git a/firmware/facedancer-pac/src/macros.rs b/firmware/moondancer-pac/src/macros.rs similarity index 100% rename from firmware/facedancer-pac/src/macros.rs rename to firmware/moondancer-pac/src/macros.rs diff --git a/firmware/facedancer-pac/svd/facedancer.svd b/firmware/moondancer-pac/svd/moondancer.svd similarity index 99% rename from firmware/facedancer-pac/svd/facedancer.svd rename to firmware/moondancer-pac/svd/moondancer.svd index aa4b2dcc..8e9c3217 100644 --- a/firmware/facedancer-pac/svd/facedancer.svd +++ b/firmware/moondancer-pac/svd/moondancer.svd @@ -1789,7 +1789,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -2029,7 +2029,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -2323,7 +2323,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -2607,7 +2607,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -2847,7 +2847,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -3141,7 +3141,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -3425,7 +3425,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -3665,7 +3665,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 @@ -3959,7 +3959,7 @@ read-write - high + fifo TODO amaranth_soc/csr/reg.py:471 0 1 diff --git a/firmware/moondancer/Cargo.toml b/firmware/moondancer/Cargo.toml index 4a89a4ff..03c4d998 100644 --- a/firmware/moondancer/Cargo.toml +++ b/firmware/moondancer/Cargo.toml @@ -38,10 +38,10 @@ ladybug = ["ladybug/enable"] # select softcore minerva = [ - "facedancer-pac/minerva", + "moondancer-pac/minerva", ] vexriscv = [ - "facedancer-pac/vexriscv", + "moondancer-pac/vexriscv", ] vexriscv_dcache = [] diff --git a/firmware/moondancer/src/gcp/moondancer.rs b/firmware/moondancer/src/gcp/moondancer.rs index 101249f1..f53bbd08 100644 --- a/firmware/moondancer/src/gcp/moondancer.rs +++ b/firmware/moondancer/src/gcp/moondancer.rs @@ -592,13 +592,13 @@ impl Moondancer { _arguments: &[u8], ) -> GreatResult> { // 0. clear receive fifo in case the previous transaction wasn't handled - if self.usb0.ep_out.have().read().have().bit() { + if self.usb0.ep_out.status().read().have().bit() { log::warn!("Re-enabling interface with unread data: Usb0"); - self.usb0.ep_out.reset().write(|w| w.reset().bit(true)); + self.usb0.ep_out.reset().write(|w| w.fifo().bit(true)); } // 1. re-enable ep_out interface - self.usb0.ep_out.enable().write(|w| w.enable().bit(true)); + self.usb0.ep_out.enable().write(|w| w.enabled().bit(true)); debug!("MD moondancer::ep_out_interface_enable()"); @@ -706,7 +706,7 @@ impl Moondancer { if timeout == 0 { warn!(" moondancer clear tx ep{}", endpoint_number); } else if timeout > hal::usb::DEFAULT_TIMEOUT { - self.usb0.ep_in.reset().write(|w| w.high().bit(true)); + self.usb0.ep_in.reset().write(|w| w.fifo().bit(true)); unsafe { self.usb0.clear_tx_ack_active(endpoint_number); } diff --git a/firmware/moondancer/src/lib.rs b/firmware/moondancer/src/lib.rs index 21bcb528..2d8d02e5 100644 --- a/firmware/moondancer/src/lib.rs +++ b/firmware/moondancer/src/lib.rs @@ -20,7 +20,7 @@ pub mod util; pub use error::FirmwareError; pub use libgreat::error::GreatResult; pub use libgreat::firmware::BoardInformation; -pub use facedancer_pac as pac; +pub use moondancer_pac as pac; // - constants ----------------------------------------------------------------