This commit is contained in:
travis-update-bot
2016-01-10 11:54:43 +00:00
parent 90aded2bad
commit 8d00795640
2 changed files with 4 additions and 4 deletions

View File

@@ -326,7 +326,7 @@ use spin::Mutex;
pub static WRITER: Mutex<Writer> = Mutex::new(Writer {
column_position: 0,
color_code: ColorCode::new(Color::LightGreen, Color::Black),
buffer: Unique::new(0xb8000 as *mut _),
buffer: unsafe { Unique::new(0xb8000 as *mut _) },
});
```
[Mutex::new] is a const function, too, so it can be used in statics.

View File

@@ -69,7 +69,7 @@ let boot_info = unsafe{ multiboot2::load(multiboot_information_address) };
let memory_map_tag = boot_info.memory_map_tag().expect("Memory map tag required");
println!("memory areas:");
for area in emory_map_tag.memory_areas() {
for area in memory_map_tag.memory_areas() {
println!(" start: 0x{:x}, length: 0x{:x}", area.base_addr, area.length);
}
```
@@ -361,7 +361,7 @@ let mut frame_allocator = memory::AreaFrameAllocator::new(
Now we can test it by adding some frame allocations:
```rust
println!("{:?}", frame_allocator.allocate_frame())
println!("{:?}", frame_allocator.allocate_frame());
```
You will see that the frame number starts at `0` and increases steadily, but the kernel and Multiboot frames are left out (you need to allocate many frames to see this since the kernel starts at frame 256).