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

Merge pull request #230 from phil-opp/multiboot2-crates.io

Browse Source 
Use crates.io version of multiboot2
This commit is contained in:
Philipp Oppermann
2016-09-27 13:49:36 +02:00
committed by GitHub
parent 05c537d1e7 2b07d88b62
commit 51e19d104b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@@ -6,6 +6,7 @@ version = "0.1.0"
[dependencies] [dependencies]
bit_field = "0.5.0" bit_field = "0.5.0"
bitflags = "0.7.0" bitflags = "0.7.0"
multiboot2 = "0.1.0"
once = "0.3.2" once = "0.3.2"
rlibc = "0.1.4" rlibc = "0.1.4"
spin = "0.3.4" spin = "0.3.4"
@@ -17,9 +18,6 @@ path = "libs/hole_list_allocator"
features = ["spin_no_std"] features = ["spin_no_std"]
version = "0.2.1" version = "0.2.1"
[dependencies.multiboot2]
git = "https://github.com/phil-opp/multiboot2-elf64"
[dependencies.x86] [dependencies.x86]
default-features = false default-features = false
version = "0.7.1" version = "0.7.1"

10
blog/post/05-allocating-frames.md
View File

@@ -44,17 +44,17 @@ Now we can add the argument to our `rust_main`:
pub extern fn rust_main(multiboot_information_address: usize) { ... } pub extern fn rust_main(multiboot_information_address: usize) { ... }
``` ```
Instead of writing an own Multiboot module, we use the [multiboot2-elf64] crate. It gives us some basic information about mapped kernel sections and available memory. I just wrote it for this blog post since I could not find any other Multiboot 2 crate. It's really ugly and incomplete, but it does its job[^fn-multiboot-crate]. Instead of writing an own Multiboot module, we use the [multiboot2] crate. It gives us some basic information about mapped kernel sections and available memory. I just wrote it for this blog post since I could not find any other Multiboot 2 crate. It's still incomplete, but it does its job.
[multiboot2-elf64]: https://github.com/phil-opp/multiboot2-elf64 [multiboot2]: https://docs.rs/multiboot2
[^fn-multiboot-crate]: All contributions are welcome! If you want to maintain it, please contact me!
So let's add a dependency on the git repository: So let's add a dependency on the git repository:
```toml ```toml
# in Cargo.toml # in Cargo.toml
[dependencies.multiboot2] [dependencies]
git = "https://github.com/phil-opp/multiboot2-elf64" ...
multiboot2 = "0.1.0"
``` ```
```rust ```rust