forked from AbleOS/ableos
h
This commit is contained in:
parent
6adc312213
commit
5ced36a916
|
@ -9,5 +9,6 @@ build-std = ["core","alloc", "compiler_builtins"]
|
||||||
[target.'cfg(target_arch = "x86_64")']
|
[target.'cfg(target_arch = "x86_64")']
|
||||||
# --quiet suppresses warning messages from the bootimage crate
|
# --quiet suppresses warning messages from the bootimage crate
|
||||||
runner = "bootimage runner --quiet"
|
runner = "bootimage runner --quiet"
|
||||||
|
|
||||||
[target.riscv64gc-unknown-none-elf]
|
[target.riscv64gc-unknown-none-elf]
|
||||||
rustflags = "-C link-arg=-T../ableos/src/arch/riscv/virt.lds"
|
rustflags = "-C link-arg=-T../ableos/src/arch/riscv/virt.lds"
|
||||||
|
|
|
@ -1,39 +1,38 @@
|
||||||
//! hi
|
//! hi
|
||||||
|
|
||||||
#![no_std]
|
#![no_std]
|
||||||
// #![deny(warnings)]
|
#![feature(
|
||||||
#![feature(asm)]
|
abi_x86_interrupt,
|
||||||
#![feature(global_asm)]
|
asm,
|
||||||
#![feature(abi_x86_interrupt)]
|
core_intrinsics,
|
||||||
#![feature(core_intrinsics, lang_items, llvm_asm)]
|
global_asm,
|
||||||
// #![feature(alloc_error_handler)] // at the top of the file
|
lang_items,
|
||||||
#![reexport_test_harness_main = "test_main"]
|
llvm_asm,
|
||||||
#![feature(custom_test_frameworks)]
|
naked_functions
|
||||||
#![test_runner(crate::arch::test_runner)]
|
)]
|
||||||
#![feature(naked_functions)]
|
|
||||||
#[cfg(target_arch = "arm")]
|
|
||||||
#[path = "arch/aarch32/mod.rs"]
|
|
||||||
mod arch;
|
|
||||||
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
#[cfg(target_arch = "aarch64")]
|
||||||
#[path = "arch/aarch64/mod.rs"]
|
#[path = "arch/aarch64/mod.rs"]
|
||||||
mod arch;
|
pub mod arch;
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
#[path = "arch/x86_64/mod.rs"]
|
#[path = "arch/x86_64/mod.rs"]
|
||||||
mod arch;
|
pub mod arch;
|
||||||
|
|
||||||
#[cfg(target_arch = "riscv64")]
|
#[cfg(target_arch = "riscv64")]
|
||||||
#[path = "arch/riscv/mod.rs"]
|
#[path = "arch/riscv/mod.rs"]
|
||||||
mod arch;
|
pub mod arch;
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
pub mod print;
|
pub mod print;
|
||||||
|
|
||||||
use arch::drivers::serial;
|
use arch::drivers::serial;
|
||||||
|
|
||||||
mod driver_traits;
|
pub mod driver_traits;
|
||||||
mod experiments;
|
pub mod experiments;
|
||||||
mod kmain;
|
|
||||||
mod panic;
|
|
||||||
pub use experiments::server;
|
|
||||||
pub mod keyboard;
|
pub mod keyboard;
|
||||||
|
pub mod kmain;
|
||||||
|
pub mod panic;
|
||||||
pub mod relib;
|
pub mod relib;
|
||||||
|
|
||||||
|
use experiments::server;
|
||||||
|
|
Loading…
Reference in a new issue