feat: devices via caps (BootInfo, init assigns devices, drivers map MMIO/DMA themselves, IRQ-driven input); drop boot device wiring and info pages; headless display fallback
This commit is contained in:
@@ -15,5 +15,4 @@ libkos = { workspace = true }
|
||||
server-framework = { workspace = true }
|
||||
display-server = { workspace = true }
|
||||
driver-framebuffer-virtio = { workspace = true }
|
||||
driver-framebuffer-mock = { workspace = true }
|
||||
port-framebuffer = { workspace = true }
|
||||
|
||||
@@ -8,12 +8,13 @@ use types::bounded::CapSlot;
|
||||
#[unsafe(no_mangle)]
|
||||
extern "C" fn main() {
|
||||
let ep = CapSlot::const_new(0);
|
||||
|
||||
if let Some(fb) = driver_framebuffer_virtio::VirtioFramebuffer::try_new() {
|
||||
// Init hands over the GPU, or nothing if the machine has none.
|
||||
let dev = libkos::device::receive_device(ep);
|
||||
if let Some(fb) = dev.mmio.and_then(driver_framebuffer_virtio::VirtioFramebuffer::try_new) {
|
||||
run_virtio(fb, ep);
|
||||
} else {
|
||||
run_mock(ep);
|
||||
}
|
||||
libkos::println!("display: no GPU, running headless");
|
||||
run_headless(ep);
|
||||
}
|
||||
|
||||
#[inline(never)]
|
||||
@@ -25,12 +26,33 @@ fn run_virtio(mut fb: driver_framebuffer_virtio::VirtioFramebuffer, ep: CapSlot)
|
||||
server_framework::serve(&mut srv, ep)
|
||||
}
|
||||
|
||||
/// No GPU: clients still get answers (and the dimensions they draw for);
|
||||
/// pixels go nowhere.
|
||||
struct Headless;
|
||||
|
||||
impl port_framebuffer::Framebuffer for Headless {
|
||||
fn width(&self) -> types::display::Dimension {
|
||||
types::display::Dimension::new(640)
|
||||
}
|
||||
fn height(&self) -> types::display::Dimension {
|
||||
types::display::Dimension::new(480)
|
||||
}
|
||||
fn write_pixel(&mut self, _: types::display::ScreenCoord, _: types::display::ScreenCoord, _: types::display::Color) {}
|
||||
fn fill_rect(
|
||||
&mut self,
|
||||
_: types::display::ScreenCoord,
|
||||
_: types::display::ScreenCoord,
|
||||
_: types::display::Dimension,
|
||||
_: types::display::Dimension,
|
||||
_: types::display::Color,
|
||||
) {
|
||||
}
|
||||
fn clear(&mut self, _: types::display::Color) {}
|
||||
fn flush(&mut self) {}
|
||||
}
|
||||
|
||||
#[inline(never)]
|
||||
fn run_mock(ep: CapSlot) -> ! {
|
||||
let fb = driver_framebuffer_mock::MockFramebuffer::new(
|
||||
types::display::Dimension::new(640),
|
||||
types::display::Dimension::new(480),
|
||||
);
|
||||
let mut srv = display_server::server::DisplayServer::new(fb);
|
||||
fn run_headless(ep: CapSlot) -> ! {
|
||||
let mut srv = display_server::server::DisplayServer::new(Headless);
|
||||
server_framework::serve(&mut srv, ep)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user