Merge pull request #43 from Neotron-Compute/vga-tidyup

VGA tidyup

Author: jonathanpallant

src/main.rs

@@ -167,7 +167,6 @@ struct Pins {
 	i2s_dac_data: Pin<bank0::Gpio26, Function<pac::PIO1>>,
 	i2s_bit_clock: Pin<bank0::Gpio27, Function<pac::PIO1>>,
 	i2s_lr_clock: Pin<bank0::Gpio28, Function<pac::PIO1>>,
-	pico_led: Pin<bank0::Gpio25, Output<PushPull>>,
 }
 
 // -----------------------------------------------------------------------------
@@ -468,6 +467,11 @@ impl Hardware {
 		delay: cortex_m::delay::Delay,
 	) -> (Hardware, IrqPin) {
 		let hal_pins = rp_pico::Pins::new(bank, pads, sio, resets);
+		// We construct the pin here and then throw it away. Then Core 1 does
+		// some unsafe writes to the GPIO_SET/GPIO_CLEAR registers to set/clear
+		// pin 25 to track render loop timing. This avoids trying to 'move' the pin
+		// over to Core 1.
+		let _pico_led = hal_pins.led.into_push_pull_output();
 
 		(
 			Hardware {
@@ -607,7 +611,6 @@ impl Hardware {
 					i2s_dac_data: hal_pins.gpio26.into_mode(),
 					i2s_bit_clock: hal_pins.gpio27.into_mode(),
 					i2s_lr_clock: hal_pins.gpio28.into_mode(),
-					pico_led: hal_pins.led.into_mode(),
 				},
 
 				// We are in SPI MODE 0. This means we change the COPI pin on the
@@ -1183,10 +1186,7 @@ pub extern "C" fn configuration_set(_buffer: common::ApiByteSlice) -> common::Re
 
 /// Does this Neotron BIOS support this video mode?
 pub extern "C" fn video_is_valid_mode(mode: common::video::Mode) -> bool {
-	mode == common::video::Mode::new(
-		common::video::Timing::T640x480,
-		common::video::Format::Text8x16,
-	)
+	vga::test_video_mode(mode)
 }
 
 /// Switch to a new video mode.
@@ -1643,16 +1643,6 @@ extern "C" fn time_ticks_per_second() -> common::Ticks {
 	common::Ticks(1000)
 }
 
-/// Called when DMA raises IRQ0; i.e. when a DMA transfer to the pixel FIFO or
-/// the timing FIFO has completed.
-#[interrupt]
-#[link_section = ".data"]
-fn DMA_IRQ_0() {
-	unsafe {
-		vga::irq();
-	}
-}
-
 static IRQ_PIN: Mutex<RefCell<Option<IrqPin>>> = Mutex::new(RefCell::new(None));
 
 /// Called when we get a SIO interrupt on the main bank of GPIO pins.

src/vga/font16.rs

@@ -30,10 +30,7 @@
 //! SUCH DAMAGE.
 
 /// An 8x16 font
-pub static FONT: super::Font = super::Font {
-	height: 16,
-	data: &DATA,
-};
+pub static FONT: super::Font = super::Font { data: &DATA };
 
 /// Our font data - arranged as 256 glyphs of 1 byte/row x 16 row/glyph.
 #[link_section = ".data"]

src/vga/font8.rs

@@ -32,10 +32,7 @@
 //! SUCH DAMAGE.
 
 /// An 8x16 font
-pub static FONT: super::Font = super::Font {
-	height: 8,
-	data: &DATA,
-};
+pub static FONT: super::Font = super::Font { data: &DATA };
 
 /// Our font data - arranged as 256 glyphs of 1 byte/row x 8 row/glyph.
 #[link_section = ".data"]