Skip to content

Commit

Permalink
Merge fixes into main
Browse files Browse the repository at this point in the history
  • Loading branch information
adamperkowski committed Oct 12, 2024
1 parent 2171c07 commit 87eebe4
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README-it.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ cd kernel
```
5. Compila il file binario avviabile:
```bash
cargo +nightly bootimage --release
cargo bootimage --release
```
> Questo comando creerà la sottocartella `target/target/release` in cui verrà creato il file binario `bootimage-hlkernel.bin`.
Expand Down
2 changes: 1 addition & 1 deletion README-pl.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ cd kernel
```
5. Zbuduj bootowalny plik binarny :
```bash
cargo +nightly bootimage --release
cargo bootimage --release
```
> Ta komenda stworzy folder `target/target/release` w którym znajdziesz `bootimage-hlkernel.bin`, czyli plik binarny.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ cd kernel
```
5. Build the bootable binary:
```bash
cargo +nightly bootimage --release
cargo bootimage --release
```
> This command will create the `target/target/release` directory in which you'll find the `bootimage-hlkernel.bin` binary file.
Expand Down
1 change: 1 addition & 0 deletions kernel/rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly
2 changes: 2 additions & 0 deletions kernel/src/keyboard_buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pub const BUFFER_SIZE: usize = 256;
pub static mut BUFFER: [char; BUFFER_SIZE] = ['\0'; BUFFER_SIZE];
pub static mut BUFFER_INDEX: usize = 0;

#[allow(static_mut_refs)] // TODO
pub fn read_buffer() -> String {
let mut buffer_content = String::new();

Expand All @@ -16,6 +17,7 @@ pub fn read_buffer() -> String {
buffer_content
}

#[allow(static_mut_refs)] // TODO
pub fn clear_buffer() {
unsafe {
for ref mut i in BUFFER.iter().take(BUFFER_SIZE) {
Expand Down
1 change: 0 additions & 1 deletion kernel/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#![no_std]
#![no_main]
#![feature(abi_x86_interrupt)]
#![feature(const_mut_refs)]

extern crate alloc;

Expand Down

0 comments on commit 87eebe4

Please sign in to comment.