From 476b030b41e9820b2a9e9818e004573bdb08af4b Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Fri, 6 Aug 2021 23:28:19 +0100 Subject: [PATCH] rename wait for vblank functions --- agb/src/display/mod.rs | 2 +- agb/src/interrupt.rs | 2 +- agb/src/lib.rs | 6 +++--- agb/src/syscall.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agb/src/display/mod.rs b/agb/src/display/mod.rs index 6fcfb493..a05b137f 100644 --- a/agb/src/display/mod.rs +++ b/agb/src/display/mod.rs @@ -104,7 +104,7 @@ unsafe fn set_graphics_settings(settings: GraphicsSettings) { /// Waits until vblank using a busy wait loop, this should almost never be used. /// I only say almost because whilst I don't believe there to be a reason to use /// this I can't rule it out. -pub fn busy_wait_for_VBlank() { +pub fn busy_wait_for_vblank() { while VCOUNT.get() >= 160 {} while VCOUNT.get() < 160 {} } diff --git a/agb/src/interrupt.rs b/agb/src/interrupt.rs index 8e1b7549..3965e43b 100644 --- a/agb/src/interrupt.rs +++ b/agb/src/interrupt.rs @@ -389,7 +389,7 @@ impl VBlank { VBlank {} } pub fn wait_for_vblank(&self) { - crate::syscall::wait_for_VBlank(); + crate::syscall::wait_for_vblank(); } } diff --git a/agb/src/lib.rs b/agb/src/lib.rs index 618021a7..ae534632 100644 --- a/agb/src/lib.rs +++ b/agb/src/lib.rs @@ -142,15 +142,15 @@ pub extern "C" fn main() -> ! { #[cfg(test)] fn assert_image_output(image: &str) { - display::busy_wait_for_VBlank(); - display::busy_wait_for_VBlank(); + display::busy_wait_for_vblank(); + display::busy_wait_for_vblank(); let mut mgba = crate::mgba::Mgba::new().unwrap(); mgba.print( format_args!("image:{}", image), crate::mgba::DebugLevel::Info, ) .unwrap(); - display::busy_wait_for_VBlank(); + display::busy_wait_for_vblank(); } #[cfg(test)] diff --git a/agb/src/syscall.rs b/agb/src/syscall.rs index b0496ca7..b4a912e5 100644 --- a/agb/src/syscall.rs +++ b/agb/src/syscall.rs @@ -40,7 +40,7 @@ pub fn wait_for_interrupt() { } #[allow(non_snake_case)] -pub fn wait_for_VBlank() { +pub fn wait_for_vblank() { unsafe { asm!( "swi 0x05",