refactor fb & console mod structure

wangrunji0408 · wangrunji0408 · commit 50d833e42076 · 2019-09-11T23:58:52.000+08:00
- move both modules to crate::drivers
- no longer need `probe_fb_info` for each board
diff --git a/kernel/src/arch/aarch64/board/raspi3/mod.rs b/kernel/src/arch/aarch64/board/raspi3/mod.rs
@@ -3,14 +3,12 @@
 use bcm2837::{addr::bus_to_phys, atags::Atags};
 
 pub mod emmc;
-#[path = "../../../../drivers/gpu/fb.rs"]
-pub mod fb;
 pub mod irq;
 pub mod mailbox;
 pub mod serial;
 pub mod timer;
 
-use fb::{ColorDepth, ColorFormat, FramebufferInfo, FramebufferResult};
+use crate::drivers::gpu::fb::{self, ColorDepth, ColorFormat, FramebufferInfo, FramebufferResult};
 
 /// Initialize serial port before other initializations.
 pub fn init_serial_early() {
@@ -20,8 +18,9 @@ pub fn init_serial_early() {
 
 /// Initialize raspi3 drivers
 pub fn init_driver() {
-    #[cfg(not(feature = "nographic"))]
-    fb::init();
+    if let Ok(fb_info) = probe_fb_info(0, 0, 0) {
+        fb::init(fb_info);
+    }
     timer::init();
     emmc::init();
 }
@@ -40,7 +39,7 @@ pub fn probe_memory() -> Option<(usize, usize)> {
     None
 }
 
-pub fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult {
+fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult {
     let (width, height) = if width == 0 || height == 0 {
         mailbox::framebuffer_get_physical_size()?
     } else {
diff --git a/kernel/src/arch/aarch64/driver/mod.rs b/kernel/src/arch/aarch64/driver/mod.rs
@@ -1,14 +1,10 @@
 //! ARM64 drivers
 
-use super::board;
-
-pub use self::board::fb;
 pub use self::board::serial;
-#[path = "../../../drivers/console/mod.rs"]
-pub mod console;
+use super::board;
 
 /// Initialize ARM64 common drivers
 pub fn init() {
     board::init_driver();
-    console::init();
+    crate::drivers::console::init();
 }
diff --git a/kernel/src/arch/aarch64/io.rs b/kernel/src/arch/aarch64/io.rs
@@ -1,7 +1,7 @@
 //! Input/output for aarch64.
 
-use super::driver::console::CONSOLE;
 use super::driver::serial::*;
+use crate::drivers::console::CONSOLE;
 use core::fmt::{Arguments, Write};
 
 pub fn getchar() -> char {
diff --git a/kernel/src/arch/mipsel/board/malta/mod.rs b/kernel/src/arch/mipsel/board/malta/mod.rs
@@ -1,19 +1,14 @@
 use crate::drivers::bus::pci;
+use crate::drivers::gpu::fb::{self, FramebufferInfo};
 use alloc::string::String;
 use mips::registers::cp0;
 
-#[path = "../../../../drivers/console/mod.rs"]
-pub mod console;
 pub mod consts;
-#[path = "../../../../drivers/gpu/fb.rs"]
-pub mod fb;
 #[path = "../../../../drivers/serial/ti_16c550c.rs"]
 pub mod serial;
 #[path = "../../../../drivers/gpu/qemu_stdvga.rs"]
 pub mod vga;
 
-use fb::FramebufferInfo;
-
 /// Device tree bytes
 pub static DTB: &'static [u8] = include_bytes!("device.dtb");
 
@@ -33,11 +28,8 @@ pub fn init_driver() {
     // TODO: add possibly more drivers
     vga::init(0xbbe00000, 0xb2050000, 800, 600);
     pci::init();
-    fb::init();
-}
 
-pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferResult {
-    Ok(FramebufferInfo {
+    let fb_info = FramebufferInfo {
         xres: 800,
         yres: 600,
         xres_virtual: 800,
@@ -49,5 +41,6 @@ pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferR
         paddr: 0xb0000000,
         vaddr: 0xb0000000,
         screen_size: 800 * 600,
-    })
+    };
+    fb::init(fb_info);
 }
diff --git a/kernel/src/arch/mipsel/board/mipssim/mod.rs b/kernel/src/arch/mipsel/board/mipssim/mod.rs
@@ -1,10 +1,4 @@
-use alloc::string::String;
-
-#[path = "../../../../drivers/console/mod.rs"]
-pub mod console;
 pub mod consts;
-#[path = "../../../../drivers/gpu/fb.rs"]
-pub mod fb;
 #[path = "../../../../drivers/serial/16550_reg.rs"]
 pub mod serial;
 
@@ -22,7 +16,3 @@ pub fn init_driver() {
     // TODO: add possibly more drivers
     // timer::init();
 }
-
-pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferResult {
-    Err(String::from("Framebuffer not usable on mipssim board"))
-}
diff --git a/kernel/src/arch/mipsel/board/thinpad/mod.rs b/kernel/src/arch/mipsel/board/thinpad/mod.rs
@@ -1,16 +1,9 @@
-use alloc::string::String;
+use crate::drivers::gpu::fb::{self, FramebufferInfo};
 
-#[path = "../../../../drivers/console/mod.rs"]
-pub mod console;
 pub mod consts;
-#[path = "../../../../drivers/gpu/fb.rs"]
-pub mod fb;
 #[path = "../../../../drivers/serial/simple_uart.rs"]
 pub mod serial;
 
-use fb::FramebufferInfo;
-use fb::FramebufferResult;
-
 /// Device tree bytes
 pub static DTB: &'static [u8] = include_bytes!("device.dtb");
 
@@ -24,11 +17,8 @@ pub fn init_serial_early() {
 pub fn init_driver() {
     // TODO: add possibly more drivers
     // timer::init();
-    fb::init();
-}
 
-pub fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult {
-    Ok(FramebufferInfo {
+    let fb_info = FramebufferInfo {
         xres: 800,
         yres: 600,
         xres_virtual: 800,
@@ -40,5 +30,6 @@ pub fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult {
         paddr: 0xa2000000,
         vaddr: 0xa2000000,
         screen_size: 800 * 600,
-    })
+    };
+    fb::init(fb_info);
 }
diff --git a/kernel/src/arch/mipsel/driver/mod.rs b/kernel/src/arch/mipsel/driver/mod.rs
@@ -2,16 +2,10 @@
 
 use super::board;
 
-pub use self::board::fb;
 pub use self::board::serial;
-#[path = "../../../drivers/console/mod.rs"]
-pub mod console;
 
 /// Initialize common drivers
 pub fn init() {
     board::init_driver();
-    console::init();
-    if let Some(con) = console::CONSOLE.lock().as_mut() {
-        con.clear();
-    }
+    crate::drivers::console::init();
 }
diff --git a/kernel/src/arch/mipsel/io.rs b/kernel/src/arch/mipsel/io.rs
@@ -1,7 +1,7 @@
 //! Input/output for mipsel.
 
-use super::driver::console::CONSOLE;
 use super::driver::serial::*;
+use crate::drivers::console::CONSOLE;
 use core::fmt::{Arguments, Write};
 
 pub fn getchar() -> char {
diff --git a/kernel/src/arch/riscv32/board/u540/mod.rs b/kernel/src/arch/riscv32/board/u540/mod.rs
@@ -1,6 +1,3 @@
-#[path = "../../../../drivers/gpu/fb.rs"]
-pub mod fb;
-
 use super::consts::KERNEL_OFFSET;
 use crate::memory::phys_to_virt;
 
@@ -27,7 +24,3 @@ pub unsafe fn enable_serial_interrupt() {
     const UART_RXWM: u8 = 0x2;
     SERIAL_BASE.add(UART_REG_IE).write_volatile(UART_RXWM);
 }
-
-pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferResult {
-    unimplemented!()
-}
diff --git a/kernel/src/arch/riscv32/board/virt/mod.rs b/kernel/src/arch/riscv32/board/virt/mod.rs
@@ -1,6 +1,3 @@
-#[path = "../../../../drivers/gpu/fb.rs"]
-pub mod fb;
-
 use crate::memory::phys_to_virt;
 
 /// Mask all external interrupt except serial.
@@ -19,7 +16,3 @@ pub unsafe fn enable_serial_interrupt() {
     UART16550.add(4).write_volatile(0x0B);
     UART16550.add(1).write_volatile(0x01);
 }
-
-pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferResult {
-    unimplemented!()
-}
diff --git a/kernel/src/arch/x86_64/board/mod.rs b/kernel/src/arch/x86_64/board/mod.rs
@@ -1,38 +1,26 @@
-#[path = "../../../drivers/gpu/fb.rs"]
-pub mod fb;
-
 use crate::consts::KERNEL_OFFSET;
+use crate::drivers::gpu::fb::{self, ColorDepth, ColorFormat, FramebufferInfo};
 use crate::memory::phys_to_virt;
 use core::mem::zeroed;
-use fb::{ColorDepth, ColorFormat, FramebufferInfo, FramebufferResult, FRAME_BUFFER};
-use rboot::{BootInfo, GraphicInfo};
-
-static mut GRAPHIC_INFO: Option<GraphicInfo> = None;
+use rboot::BootInfo;
 
 pub fn init_driver(boot_info: &BootInfo) {
-    unsafe {
-        GRAPHIC_INFO = Some(boot_info.graphic_info);
-    }
-    #[cfg(not(feature = "nographic"))]
-    fb::init();
-}
-
-pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> FramebufferResult {
-    let info = unsafe { GRAPHIC_INFO.as_ref().unwrap() };
+    let info = &boot_info.graphic_info;
     let width = info.mode.resolution().0 as u32;
     let height = info.mode.resolution().1 as u32;
-    let format = fb::ColorFormat::RGBA8888;
-    Ok(FramebufferInfo {
+
+    let fb_info = FramebufferInfo {
         xres: width,
         yres: height,
         xres_virtual: width,
         yres_virtual: height,
         xoffset: 0,
         yoffset: 0,
         depth: ColorDepth::ColorDepth32,
-        format: format,
+        format: fb::ColorFormat::RGBA8888,
         paddr: info.fb_addr as usize,
         vaddr: phys_to_virt(info.fb_addr as usize),
         screen_size: info.fb_size as usize,
-    })
+    };
+    fb::init(fb_info);
 }
diff --git a/kernel/src/arch/x86_64/driver/mod.rs b/kernel/src/arch/x86_64/driver/mod.rs
@@ -5,11 +5,7 @@ pub mod pit;
 pub mod rtc_cmos;
 pub mod serial;
 
-use super::{board, BootInfo};
-
-pub use self::board::fb;
-#[path = "../../../drivers/console/mod.rs"]
-pub mod console;
+use super::BootInfo;
 
 pub fn init(boot_info: &BootInfo) {
     // Use IOAPIC instead of PIC
@@ -34,9 +30,6 @@ pub fn init(boot_info: &BootInfo) {
     enable_irq(consts::PIRQG);
     enable_irq(consts::PIRQH);
     */
-    board::init_driver(boot_info);
-    console::init();
-    //if let Some(con) = console::CONSOLE.lock().as_mut() {
-    //con.clear();
-    //}
+    super::board::init_driver(boot_info);
+    crate::drivers::console::init();
 }
diff --git a/kernel/src/arch/x86_64/io.rs b/kernel/src/arch/x86_64/io.rs
@@ -1,5 +1,5 @@
-use super::driver::console::CONSOLE;
 use super::driver::serial::*;
+use crate::drivers::console::CONSOLE;
 use core::fmt::{Arguments, Write};
 
 pub fn getchar() -> char {
@@ -10,7 +10,7 @@ pub fn getchar() -> char {
 }
 
 pub fn putfmt(fmt: Arguments) {
-    // print to console
+    // output to serial
     unsafe {
         COM1.force_unlock();
     }
diff --git a/kernel/src/drivers/console/mod.rs b/kernel/src/drivers/console/mod.rs
@@ -1,6 +1,6 @@
 //! Framebuffer console display driver
 
-use super::fb::{Framebuffer, FRAME_BUFFER};
+use super::gpu::fb::{Framebuffer, FRAME_BUFFER};
 use rcore_console::{Console, ConsoleOnGraphic};
 use spin::Mutex;
 
diff --git a/kernel/src/drivers/gpu/fb.rs b/kernel/src/drivers/gpu/fb.rs
@@ -152,12 +152,11 @@ pub struct Framebuffer {
 }
 
 impl Framebuffer {
-    fn new(width: u32, height: u32, depth: u32) -> Result<Framebuffer, String> {
-        let info = super::probe_fb_info(width, height, depth)?;
-        Ok(Framebuffer {
+    fn new(info: FramebufferInfo) -> Framebuffer {
+        Framebuffer {
             buf: ColorBuffer::new(info.depth, info.vaddr, info.screen_size),
             fb_info: info,
-        })
+        }
     }
 
     #[inline]
@@ -301,12 +300,10 @@ lazy_static! {
 }
 
 /// Initialize framebuffer
-pub fn init() {
-    match Framebuffer::new(0, 0, 0) {
-        Ok(fb) => {
-            info!("framebuffer: init end\n{:#x?}", fb);
-            *FRAME_BUFFER.lock() = Some(fb);
-        }
-        Err(err) => warn!("framebuffer init failed: {}", err),
-    }
+///
+/// Called in arch mod if the board have a framebuffer
+pub fn init(info: FramebufferInfo) {
+    let fb = Framebuffer::new(info);
+    info!("framebuffer: init end\n{:#x?}", fb);
+    *FRAME_BUFFER.lock() = Some(fb);
 }
diff --git a/kernel/src/drivers/gpu/mod.rs b/kernel/src/drivers/gpu/mod.rs
@@ -1,2 +1,3 @@
+pub mod fb;
 mod test;
 pub mod virtio_gpu;
diff --git a/kernel/src/drivers/mod.rs b/kernel/src/drivers/mod.rs
@@ -13,9 +13,10 @@ use rcore_fs::dev::{self, BlockDevice, DevError};
 pub mod block;
 #[allow(dead_code)]
 pub mod bus;
+pub mod console;
 mod device_tree;
 #[allow(dead_code)]
-mod gpu;
+pub mod gpu;
 #[allow(dead_code)]
 mod input;
 pub mod irq;
diff --git a/kernel/src/fs/vga.rs b/kernel/src/fs/vga.rs
@@ -1,6 +1,6 @@
 use rcore_fs::vfs::*;
 
-use crate::arch::board::fb::FRAME_BUFFER;
+use crate::drivers::gpu::fb::FRAME_BUFFER;
 use crate::memory::phys_to_virt;
 use alloc::{string::String, sync::Arc, vec::Vec};
 use core::any::Any;
diff --git a/kernel/src/syscall/mem.rs b/kernel/src/syscall/mem.rs
@@ -55,7 +55,7 @@ impl Syscall<'_> {
             info!("mmap path is {} ", &*file.path);
             match &*file.path {
                 "/dev/fb0" => {
-                    use crate::arch::board::fb::FRAME_BUFFER;
+                    use crate::drivers::gpu::fb::FRAME_BUFFER;
                     let attr = prot.to_attr();
                     #[cfg(feature = "board_raspi3")]
                     let attr = attr.mmio(crate::arch::paging::MMIOType::NormalNonCacheable as u8);
