1 files changed, 5 insertions, 3 deletions

diff --git a/rsnix/src/ahci.rs b/rsnix/src/ahci.rs
index 427345d..9a49431 100644
--- a/rsnix/src/ahci.rs
+++ b/rsnix/src/ahci.rs
@@ -54,7 +54,6 @@ const ATA_WRITE_DMA_EXT: u8 = 0x35;
 struct Disk {
     port: usize,  // port register base = ABAR + 0x100
     clb: usize,   // command list, 1024 B (32 × 32 B), 256 B aligned
-    fis: usize,   // FIS receive area, 256 B aligned
     ct: usize,    // command table, 256 B, 128 B aligned
     buf: usize,   // 4 KiB DMA data buffer (page aligned)
     sectors: u64, // total sectors (LBA48 from IDENTIFY)
@@ -175,7 +174,6 @@ fn start_port(abar: usize, port_idx: u32) -> Option<Disk> {
     let mut d = Disk {
         port,
         clb,
-        fis,
         ct,
         buf,
         sectors: 0,
@@ -389,8 +387,12 @@ fn issue(d: &Disk, cmd: u8, lba: u64, count: u32, write: bool) -> Result<(), ()>
     Ok(())
 }
 
+fn disks() -> &'static mut [Option<Disk>; MAX_DISKS] {
+    unsafe { &mut *core::ptr::addr_of_mut!(DISKS) }
+}
+
 fn active() -> Option<&'static Disk> {
-    unsafe { DISKS.get(ACTIVE).and_then(|d| d.as_ref()) }
+    disks().get(unsafe { ACTIVE }).and_then(|d| d.as_ref())
 }
 
 /// DMA `count` sectors starting at `lba` into the selected disk's buffer.