michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-02' into post-03

Browse Source
This commit is contained in:
Philipp Oppermann
2020-10-02 23:15:32 +02:00
parent 1afa3af79d 4e38e7ddf8
commit ea5aad0e0c
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.cargo/config.toml
View File

@@ -1,5 +1,6 @@
[unstable] [unstable]
build-std = ["core", "compiler_builtins"] build-std = ["core", "compiler_builtins"]
build-std-features = ["compiler-builtins-mem"]
[build] [build]
target = "x86_64-blog_os.json" target = "x86_64-blog_os.json"

7
Cargo.lock generated
View File

@@ -6,7 +6,6 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bootloader", "bootloader",
"lazy_static", "lazy_static",
"rlibc",
"spin", "spin",
"volatile", "volatile",
] ]
@@ -26,12 +25,6 @@ dependencies = [
"spin", "spin",
] ]
[[package]]
name = "rlibc"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
[[package]] [[package]]
name = "spin" name = "spin"
version = "0.5.2" version = "0.5.2"

1
Cargo.toml
View File

@@ -6,7 +6,6 @@ edition = "2018"
[dependencies] [dependencies]
bootloader = "0.9.8" bootloader = "0.9.8"
rlibc = "1.0.0"
volatile = "0.2.6" volatile = "0.2.6"
spin = "0.5.2" spin = "0.5.2"

2
src/main.rs
View File

@@ -1,8 +1,6 @@
#![no_std] #![no_std]
#![no_main] #![no_main]
extern crate rlibc;
use core::panic::PanicInfo; use core::panic::PanicInfo;
mod vga_buffer; mod vga_buffer;