Make MMIO devices not have control of the address of exceptions

1 files changed, 5 insertions, 11 deletions

diff --git a/src/basic_uart.rs b/src/basic_uart.rs
index 8317950..0e209ba 100644
--- a/src/basic_uart.rs
+++ b/src/basic_uart.rs
@@ -13,7 +13,7 @@ use std::time::Duration;
 
 use nix::fcntl::fcntl;
 use nix::fcntl::{FcntlArg, OFlag};
-use trve::exceptions::{MemoryException, MemoryExceptionType};
+use trve::exceptions::MemoryExceptionType;
 use trve::mem::MemDeviceInterface;
 
 /// byte 0: rx/tx
@@ -77,26 +77,20 @@ impl BasicUart {
 }
 
 impl MemDeviceInterface for BasicUart {
-    fn write_byte(&self, addr: u64, value: u8) -> Result<(), MemoryException> {
+    fn write_byte(&self, addr: u64, value: u8) -> Result<(), MemoryExceptionType> {
         match addr {
             0 => {
                 self.write(value);
                 Ok(())
             }
-            _ => Err(MemoryException {
-                type_: MemoryExceptionType::AccessFault,
-                addr,
-            }),
+            _ => Err(MemoryExceptionType::AccessFault),
         }
     }
-    fn read_byte(&self, addr: u64) -> Result<u8, MemoryException> {
+    fn read_byte(&self, addr: u64) -> Result<u8, MemoryExceptionType> {
         match addr {
             0 => Ok(self.read()),
             1 => Ok(1 | (self.can_read() as u8) << 1),
-            _ => Err(MemoryException {
-                type_: MemoryExceptionType::AccessFault,
-                addr,
-            }),
+            _ => Err(MemoryExceptionType::AccessFault),
         }
     }
 }