From de82bb171c9a8258e732806ece7f7f101b1cb6d1 Mon Sep 17 00:00:00 2001
From: Michel Heily <michelheily@gmail.com>
Date: Thu, 15 Sep 2022 01:21:11 +0300
Subject: [PATCH] Fix bad use statements after refactoring

Former-commit-id: d7e01c4d78058e62905cc3bb7a19e01b02d80882
Former-commit-id: a887db8f429ae4c495071bc8e2678d3e8d007dbe
---
 core/src/gpu/render/bitmap.rs | 2 +-
 core/src/gpu/render/text.rs   | 3 +--
 core/src/lib.rs               | 8 +++-----
 core/src/mgba_debug.rs        | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/gpu/render/bitmap.rs b/core/src/gpu/render/bitmap.rs
index 3ffc81e..9e18ea4 100644
--- a/core/src/gpu/render/bitmap.rs
+++ b/core/src/gpu/render/bitmap.rs
@@ -6,7 +6,7 @@ use super::super::Rgb15;
 
 use super::{utils, MODE5_VIEWPORT, SCREEN_VIEWPORT};
 
-use crate::Bus;
+use crate::prelude::BusIO;
 use rustboyadvance_utils::index2d;
 
 impl Gpu {
diff --git a/core/src/gpu/render/text.rs b/core/src/gpu/render/text.rs
index 10b3df7..a9851f6 100644
--- a/core/src/gpu/render/text.rs
+++ b/core/src/gpu/render/text.rs
@@ -4,8 +4,7 @@ use super::super::consts::*;
 use super::super::Rgb15;
 use super::super::{Gpu, PixelFormat, SCREEN_BLOCK_SIZE};
 use super::{utils, ViewPort};
-
-use crate::Bus;
+use crate::prelude::BusIO;
 
 use rustboyadvance_utils::index2d;
 
diff --git a/core/src/lib.rs b/core/src/lib.rs
index f30f5ad..77882ab 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -44,13 +44,11 @@ pub use interrupt::Interrupt;
 pub use interrupt::SharedInterruptFlags;
 pub mod gba;
 pub use gba::GameBoyAdvance;
-pub mod bus;
 pub mod dma;
 pub mod keypad;
-pub mod timer;
-pub use bus::*;
 mod mgba_debug;
 pub(crate) mod overrides;
+pub mod timer;
 
 #[cfg(feature = "debugger")]
 pub mod debugger;
@@ -97,7 +95,6 @@ impl From<zip::result::ZipError> for GBAError {
 }
 
 pub mod prelude {
-    pub use super::arm7tdmi;
     pub use super::cartridge::{Cartridge, GamepakBuilder};
     #[cfg(feature = "debugger")]
     pub use super::debugger::Debugger;
@@ -105,7 +102,8 @@ pub mod prelude {
     pub use super::sound::interface::{
         AudioInterface, DynAudioInterface, NullAudio, SimpleAudioInterface,
     };
-    pub use super::Bus;
     pub use super::{GBAError, GBAResult, GameBoyAdvance};
+    pub use arm7tdmi;
+    pub use arm7tdmi::memory::{Addr, BusIO, MemoryAccess, MemoryAccessWidth, MemoryInterface};
     pub use rustboyadvance_utils::{read_bin_file, write_bin_file};
 }
diff --git a/core/src/mgba_debug.rs b/core/src/mgba_debug.rs
index 0f54b2e..a5a8972 100644
--- a/core/src/mgba_debug.rs
+++ b/core/src/mgba_debug.rs
@@ -4,8 +4,8 @@ use std::str;
 use log::log;
 use log::Level;
 
-use super::bus::Bus;
-use super::iodev::consts::{REG_DEBUG_ENABLE, REG_DEBUG_FLAGS, REG_DEBUG_STRING};
+use super::arm7tdmi::memory::BusIO;
+use crate::iodev::consts::{REG_DEBUG_ENABLE, REG_DEBUG_FLAGS, REG_DEBUG_STRING};
 
 pub const DEBUG_STRING_SIZE: usize = 0x100;