GKaszewski/k-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: ByteOffset newtype for window/register/ring offsets; named virtio-gpu cmd fields

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-10-27 21:52:33 +01:00
parent 842d14987c
commit 7b8258b231
13 changed files with 145 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/hw-virtio/src/mmio.rs
View File

@@ -1,26 +1,28 @@
use types::address::ByteOffset;
pub trait MmioAccess {
fn read(&self, offset: usize) -> u32;
fn write(&self, offset: usize, val: u32);
fn read(&self, offset: ByteOffset) -> u32;
fn write(&self, offset: ByteOffset, val: u32);
}
pub const MAGIC: u32 = 0x74726976;
pub const REG_MAGIC: usize = 0x000;
pub const REG_VERSION: usize = 0x004;
pub const REG_DEVICE_ID: usize = 0x008;
pub const REG_STATUS: usize = 0x070;
pub const REG_GUEST_PAGE_SIZE: usize = 0x028;
pub const REG_FEATURES_SEL: usize = 0x014;
pub const REG_FEATURES: usize = 0x010;
pub const REG_DRIVER_FEATURES_SEL: usize = 0x024;
pub const REG_DRIVER_FEATURES: usize = 0x020;
pub const REG_QUEUE_SEL: usize = 0x030;
pub const REG_QUEUE_NUM_MAX: usize = 0x034;
pub const REG_QUEUE_NUM: usize = 0x038;
pub const REG_QUEUE_PFN: usize = 0x040;
pub const REG_QUEUE_NOTIFY: usize = 0x050;
pub const REG_INTERRUPT_STATUS: usize = 0x060;
pub const REG_INTERRUPT_ACK: usize = 0x064;
pub const REG_MAGIC: ByteOffset = ByteOffset::new(0x000);
pub const REG_VERSION: ByteOffset = ByteOffset::new(0x004);
pub const REG_DEVICE_ID: ByteOffset = ByteOffset::new(0x008);
pub const REG_STATUS: ByteOffset = ByteOffset::new(0x070);
pub const REG_GUEST_PAGE_SIZE: ByteOffset = ByteOffset::new(0x028);
pub const REG_FEATURES_SEL: ByteOffset = ByteOffset::new(0x014);
pub const REG_FEATURES: ByteOffset = ByteOffset::new(0x010);
pub const REG_DRIVER_FEATURES_SEL: ByteOffset = ByteOffset::new(0x024);
pub const REG_DRIVER_FEATURES: ByteOffset = ByteOffset::new(0x020);
pub const REG_QUEUE_SEL: ByteOffset = ByteOffset::new(0x030);
pub const REG_QUEUE_NUM_MAX: ByteOffset = ByteOffset::new(0x034);
pub const REG_QUEUE_NUM: ByteOffset = ByteOffset::new(0x038);
pub const REG_QUEUE_PFN: ByteOffset = ByteOffset::new(0x040);
pub const REG_QUEUE_NOTIFY: ByteOffset = ByteOffset::new(0x050);
pub const REG_INTERRUPT_STATUS: ByteOffset = ByteOffset::new(0x060);
pub const REG_INTERRUPT_ACK: ByteOffset = ByteOffset::new(0x064);
pub const STATUS_ACK: u32 = 1;
pub const STATUS_DRIVER: u32 = 2;
@@ -42,11 +44,11 @@ impl Registers {
}
impl MmioAccess for Registers {
fn read(&self, offset: usize) -> u32 {
fn read(&self, offset: ByteOffset) -> u32 {
self.0.read(offset)
}
fn write(&self, offset: usize, val: u32) {
fn write(&self, offset: ByteOffset, val: u32) {
self.0.write(offset, val)
}
}