x86_64: fix for real hardware. remove legacy drivers.

Author: wangrunji0408

kernel/Cargo.lock

@@ -58,10 +58,10 @@ buddy_system_allocator = "0.3"
 pci = { git = "https://github.com/rcore-os/pci-rs" }
 device_tree = { git = "https://github.com/rcore-os/device_tree-rs" }
 isomorphic_drivers = { git = "https://github.com/rcore-os/isomorphic_drivers", features = ["log"] }
-lazy_static = { version = "1.3", features = ["spin_no_std"] }
+lazy_static = { version = "1.4", features = ["spin_no_std"] }
 smoltcp = { git = "https://github.com/rcore-os/smoltcp", default-features = false, features = ["alloc", "log", "proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
 bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator" }
-rcore-console = { git = "https://github.com/rcore-os/rcore-console", rev = "323c176", default-features = false }
+rcore-console = { git = "https://github.com/rcore-os/rcore-console", rev = "b7bacf9", default-features = false }
 rcore-memory = { path = "../crate/memory" }
 rcore-thread = { git = "https://github.com/rcore-os/rcore-thread" }
 rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "33f86c47" }
@@ -76,7 +76,7 @@ compression = { version = "0.1.4", default-features = false, features = ["gzip"]
 rboot = { path = "../rboot" }
 apic = { git = "https://github.com/rcore-os/apic-rs" }
 x86_64 = "0.7"
-raw-cpuid = "6.0"
+raw-cpuid = "7.0"
 uart_16550 = "0.2"
 pc-keyboard = "0.5"
 acpi = "0.4"
@@ -94,10 +94,5 @@ bcm2837 = { git = "https://github.com/rcore-os/bcm2837", version = "2.1.0", opti
 mips = "^0.2.0"
 paste = "0.1"
 
-[package.metadata.bootimage]
-default-target = "targets/x86_64.json"
-output = "target/x86_64/bootimage.bin"
-minimum-image-size = 0      # The minimum output file size (in MiB)
-
 [build-dependencies]
 cc = "1.0"

kernel/Cargo.toml

@@ -1,19 +1,11 @@
 pub mod ide;
 pub mod keyboard;
-pub mod pic;
-pub mod pit;
 pub mod rtc_cmos;
 pub mod serial;
 
 use super::BootInfo;
 
 pub fn init(boot_info: &BootInfo) {
-    // Use IOAPIC instead of PIC
-    pic::disable();
-
-    // Use APIC Timer instead of PIT
-    // pit::init();
-
     serial::init();
     keyboard::init();
 
@@ -30,6 +22,9 @@ pub fn init(boot_info: &BootInfo) {
     enable_irq(consts::PIRQG);
     enable_irq(consts::PIRQH);
     */
+}
+
+pub fn init_graphic(boot_info: &BootInfo) {
     super::board::init_driver(boot_info);
     crate::drivers::console::init();
 }

kernel/src/arch/x86_64/driver/mod.rs

@@ -11,10 +11,13 @@ pub fn getchar() -> char {
 
 pub fn putfmt(fmt: Arguments) {
     // output to serial
-    unsafe {
-        COM1.force_unlock();
+    #[cfg(not(feature = "board_pc"))]
+    {
+        unsafe {
+            COM1.force_unlock();
+        }
+        COM1.lock().write_fmt(fmt).unwrap();
     }
-    COM1.lock().write_fmt(fmt).unwrap();
 
     // print to graphic
     #[cfg(feature = "consolegraphic")]

kernel/src/arch/x86_64/driver/pic.rs

@@ -1,13 +1,12 @@
 use super::paging::PageTableImpl;
-use crate::memory::{init_heap, FRAME_ALLOCATOR};
+use crate::memory::FRAME_ALLOCATOR;
 use bitmap_allocator::BitAlloc;
 use rboot::{BootInfo, MemoryType};
 use rcore_memory::paging::*;
 use rcore_memory::PAGE_SIZE;
 
 pub fn init(boot_info: &BootInfo) {
     init_frame_allocator(boot_info);
-    init_heap();
     info!("memory: init end");
 }
 

kernel/src/arch/x86_64/driver/pit.rs

@@ -22,7 +22,7 @@ static AP_CAN_INIT: AtomicBool = AtomicBool::new(false);
 
 /// The entry point of kernel
 #[no_mangle] // don't mangle the name of this function
-pub extern "C" fn _start(boot_info: *const BootInfo) -> ! {
+pub extern "C" fn _start(boot_info: &'static BootInfo) -> ! {
     let cpu_id = cpu::id();
     println!("Hello world! from CPU {}!", cpu_id);
 
@@ -33,11 +33,12 @@ pub extern "C" fn _start(boot_info: *const BootInfo) -> ! {
         other_start();
     }
 
-    // First init log mod, so that we can print log info.
+    // init log, heap and graphic output
     crate::logging::init();
+    crate::memory::init_heap();
+    driver::init_graphic(boot_info);
 
     // check BootInfo from bootloader
-    let boot_info = unsafe { &*boot_info };
     info!("{:#x?}", boot_info);
     assert_eq!(
         boot_info.physical_memory_offset as usize,
@@ -47,11 +48,9 @@ pub extern "C" fn _start(boot_info: *const BootInfo) -> ! {
     // setup fast syscall in x86_64
     interrupt::fast_syscall::init();
 
-    // Init physical memory management and heap.
+    // Init physical memory management
     memory::init(boot_info);
 
-    // Now heap is available
-
     // Init GDT
     gdt::init();
     // Init trap handling

kernel/src/arch/x86_64/io.rs

@@ -260,9 +260,9 @@ impl Drawing<Rgb888> for Framebuffer {
     where
         T: IntoIterator<Item = Pixel<Rgb888>>,
     {
-        for Pixel(coord, color) in item {
+        for Pixel(point, color) in item {
             let pixel = color.pack32(self.fb_info.format);
-            self.write(coord[0], coord[1], pixel);
+            self.write(point[0] as u32, point[1] as u32, pixel);
         }
     }
 }