Merge a84bc11515 into 087a464ed7

Merge pull request #1323 from phil-opp/fix-dead-links
Fix dead links
2025-12-21 00:17:50 +00:00 · 2024-06-08 11:39:42 +03:00 · 2024-05-30 12:19:37 +02:00 · 2024-05-30 11:45:13 +02:00 · 2024-05-30 11:44:47 +02:00 · 2024-05-30 11:25:31 +02:00
37 changed files with 2185 additions and 95 deletions
--- a/blog/content/edition-2/extra/building-on-android/index.md
+++ b/blog/content/edition-2/extra/building-on-android/index.md
@@ -8,6 +8,12 @@ I finally managed to get `blog_os` building on my Android phone using [termux](h

 <!-- more -->

+<div class = "warning">
+
+This post is outdated and the instructions provided here might not work anymore.
+
+</div>
+
 <img src="building-on-android.png" alt="Screenshot of the compilation output from android" style="height: 50rem;" >


@@ -29,7 +35,7 @@ First, install [termux](https://termux.com/) from the [Google Play Store](https:
    pkg install wget tar
    ```

- Add the [community repository by its-pointless](https://wiki.termux.com/wiki/Package_Management#By_its-pointless):
+- Add the [community repository by its-pointless](https://wiki.termux.com/wiki/Package_Management):
    ```
    wget https://its-pointless.github.io/setup-pointless-repo.sh
    bash setup-pointless-repo.sh
--- a/blog/content/edition-2/posts/01-freestanding-rust-binary/index.fa.md
+++ b/blog/content/edition-2/posts/01-freestanding-rust-binary/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/freestanding-rust-binary"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "80136cc0474ae8d2da04f391b5281cfcda068c1a"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/01-freestanding-rust-binary/index.fr.md
+++ b/blog/content/edition-2/posts/01-freestanding-rust-binary/index.fr.md
@@ -5,7 +5,6 @@ path = "fr/freestanding-rust-binary"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "3e87916b6c2ed792d1bdb8c0947906aef9013ac1"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/01-freestanding-rust-binary/index.ja.md
+++ b/blog/content/edition-2/posts/01-freestanding-rust-binary/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/freestanding-rust-binary"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "6f1f87215892c2be12c6973a6f753c9a25c34b7e"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/01-freestanding-rust-binary/index.ko.md
+++ b/blog/content/edition-2/posts/01-freestanding-rust-binary/index.ko.md
@@ -5,7 +5,6 @@ path = "ko/freestanding-rust-binary"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "c1af4e31b14e562826029999b9ab1dce86396b93"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/01-freestanding-rust-binary/index.ru.md
+++ b/blog/content/edition-2/posts/01-freestanding-rust-binary/index.ru.md
@@ -5,7 +5,6 @@ path = "ru/freestanding-rust-binary"
 date = 2018-02-10

 [extra]
-chapter = "С нуля"
 translators = ["MrZloHex"]
 +++

--- a/blog/content/edition-2/posts/02-minimal-rust-kernel/index.fa.md
+++ b/blog/content/edition-2/posts/02-minimal-rust-kernel/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/minimal-rust-kernel"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "7212ffaa8383122b1eb07fe1854814f99d2e1af4"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/02-minimal-rust-kernel/index.fr.md
+++ b/blog/content/edition-2/posts/02-minimal-rust-kernel/index.fr.md
@@ -5,7 +5,6 @@ path = "fr/minimal-rust-kernel"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "c689ecf810f8e93f6b2fb3c4e1e8b89b8a0998eb"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/02-minimal-rust-kernel/index.ja.md
+++ b/blog/content/edition-2/posts/02-minimal-rust-kernel/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/minimal-rust-kernel"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "7212ffaa8383122b1eb07fe1854814f99d2e1af4"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/02-minimal-rust-kernel/index.ko.md
+++ b/blog/content/edition-2/posts/02-minimal-rust-kernel/index.ko.md
@@ -5,7 +5,6 @@ path = "ko/minimal-rust-kernel"
 date = 2018-02-10

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "c1af4e31b14e562826029999b9ab1dce86396b93"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/02-minimal-rust-kernel/index.ru.md
+++ b/blog/content/edition-2/posts/02-minimal-rust-kernel/index.ru.md
@@ -5,7 +5,6 @@ path = "ru/minimal-rust-kernel"
 date = 2018-02-10

 [extra]
-chapter = "С нуля"
 translators = ["MrZloHex"]
 +++

--- a/blog/content/edition-2/posts/03-vga-text-buffer/index.fa.md
+++ b/blog/content/edition-2/posts/03-vga-text-buffer/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/vga-text-mode"
 date  = 2018-02-26

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "fb8b03e82d9805473fed16e8795a78a020a6b537"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/03-vga-text-buffer/index.ja.md
+++ b/blog/content/edition-2/posts/03-vga-text-buffer/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/vga-text-mode"
 date  = 2018-02-26

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "bd6fbcb1c36705b2c474d7fcee387bfea1210851"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/03-vga-text-buffer/index.ko.md
+++ b/blog/content/edition-2/posts/03-vga-text-buffer/index.ko.md
@@ -5,7 +5,6 @@ path = "ko/vga-text-mode"
 date  = 2018-02-26

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "1c9b5edd6a5a667e282ca56d6103d3ff1fd7cfcb"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/04-testing/index.fa.md
+++ b/blog/content/edition-2/posts/04-testing/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/testing"
 date = 2019-04-27

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "d007af4811469b974f7abb988dd9c9d1373b55f0"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/04-testing/index.ja.md
+++ b/blog/content/edition-2/posts/04-testing/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/testing"
 date = 2019-04-27

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "dce5c9825bd4e7ea6c9530e999c9d58f80c585cc"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/04-testing/index.ko.md
+++ b/blog/content/edition-2/posts/04-testing/index.ko.md
@@ -5,7 +5,6 @@ path = "ko/testing"
 date = 2019-04-27

 [extra]
-chapter = "Bare Bones"
 # Please update this when updating the translation
 translation_based_on_commit = "1c9b5edd6a5a667e282ca56d6103d3ff1fd7cfcb"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/05-cpu-exceptions/index.fa.md
+++ b/blog/content/edition-2/posts/05-cpu-exceptions/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/cpu-exceptions"
 date  = 2018-06-17

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "a081faf3cced9aeb0521052ba91b74a1c408dcff"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/05-cpu-exceptions/index.ja.md
+++ b/blog/content/edition-2/posts/05-cpu-exceptions/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/cpu-exceptions"
 date  = 2018-06-17

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "a8a6b725cff2e485bed76ff52ac1f18cec08cc7b"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/05-cpu-exceptions/index.ko.md
+++ b/blog/content/edition-2/posts/05-cpu-exceptions/index.ko.md
@@ -5,7 +5,6 @@ path = "ko/cpu-exceptions"
 date  = 2018-06-17

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "1c9b5edd6a5a667e282ca56d6103d3ff1fd7cfcb"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/06-double-faults/index.fa.md
+++ b/blog/content/edition-2/posts/06-double-faults/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/double-fault-exceptions"
 date  = 2018-06-18

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "3ac829171218156c07ce9a27186fee58e3a5521e"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/06-double-faults/index.ja.md
+++ b/blog/content/edition-2/posts/06-double-faults/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/double-fault-exceptions"
 date  = 2018-06-18

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "27ac0e1acc36f640d7045b427da2ed65b945756b"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/06-double-faults/index.ko.md
+++ b/blog/content/edition-2/posts/06-double-faults/index.ko.md
@@ -5,7 +5,6 @@ path = "ko/double-fault-exceptions"
 date  = 2018-06-18

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "a108367d712ef97c28e8e4c1a22da4697ba6e6cd"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/07-hardware-interrupts/index.fa.md
+++ b/blog/content/edition-2/posts/07-hardware-interrupts/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/hardware-interrupts"
 date = 2018-10-22

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "b6ff79ac3290ea92c86763d49cc6c0ff4fb0ea30"
 # GitHub usernames of the people that translated this post
@@ -654,13 +653,13 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 ترجمه کلیدهای دیگر نیز به همین روش کار می کند. خوشبختانه کرت ای با نام [`pc-keyboard`] برای ترجمه اسکن‌کد مجموعه های اسکن‌کد 1 و 2 وجود دارد ، بنابراین لازم نیست که خودمان این را پیاده سازی کنیم. برای استفاده از کرت ، آن را به `Cargo.toml` اضافه کرده و در`lib.rs` خود وارد می کنیم:

-[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/
+[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/

 ```toml
 # in Cargo.toml

 [dependencies]
-pc-keyboard = "0.5.0"
+pc-keyboard = "0.7.0"
 ```

 اکنون میتوانیم از این کرت برای باز نویسی `keyboard_interrupt_handler` استفاده کنیم:
@@ -677,8 +676,8 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

    lazy_static! {
        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
-            Mutex::new(Keyboard::new(layouts::Us104Key, ScancodeSet1,
-                HandleControl::Ignore)
+            Mutex::new(Keyboard::new(ScancodeSet1::new(),
+                layouts::Us104Key, HandleControl::Ignore)
            );
    }

@@ -704,17 +703,17 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 ما از ماکرو `lazy_static` برای ایجاد یک شی ثابت [`Keyboard`] محافظت شده توسط Mutex استفاده می کنیم. `Keyboard` را با طرح صفحه کلید ایالات متحده و مجموعه اسکن کد 1 مقداردهی می کنیم. پارامتر [`HandleControl`] اجازه می دهد تا `ctrl+[a-z]` را به کاراکتر های `U+0001` تا `U+001A` نگاشت کنیم. ما نمی خواهیم چنین کاری انجام دهیم ، بنابراین از گزینه `Ignore` برای برخورد با `ctrl` مانند کلیدهای عادی استفاده می کنیم.

-[`HandleControl`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/enum.HandleControl.html
+[`HandleControl`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/enum.HandleControl.html

 در هر وقفه ، Mutex را قفل می کنیم ، اسکن کد را از کنترل کننده صفحه کلید می خوانیم و آن را به متد [`add_byte`] منتقل می کنیم ، که اسکن کد را به یک `<Option<KeyEvent` ترجمه می کند. [`KeyEvent`] حاوی كلیدی است كه باعث رویداد شده و آیا این یک رویداد فشردن یا رها کردن بوده است.

-[`Keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html
-[`add_byte`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.add_byte
-[`KeyEvent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.KeyEvent.html
+[`Keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html
+[`add_byte`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.add_byte
+[`KeyEvent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.KeyEvent.html

 برای تفسیر این رویداد کلید ، آن را به متد [`process_keyevent`] منتقل می کنیم ، که در صورت امکان رویداد کلید را به یک کاراکتر ترجمه می کند. به عنوان مثال ، بسته به فشردن کلید shift ، یک رویداد فشردن کلید `A` را به یک حرف کوچک `a` یا یک حرف بزرگ `A` ترجمه می کند.

-[`process_keyevent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent
+[`process_keyevent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent

 با استفاده از این کنترل کننده وقفه اصلاح شده اکنون می توانیم متن بنویسیم:

--- a/blog/content/edition-2/posts/07-hardware-interrupts/index.ja.md
+++ b/blog/content/edition-2/posts/07-hardware-interrupts/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/hardware-interrupts"
 date = 2018-10-22

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "81d4f49f153eb5f390681f5c13018dd2aa6be0b1"
 # GitHub usernames of the people that translated this post
@@ -655,13 +654,13 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 他の文字も同じように変換することができます。幸運なことに、スキャンコードセットの1と2のスキャンコードを変換するための [`pc-keyboard`] というクレートがありますので、これを自分で実装する必要はありません。このクレートを使うために `Cargo.toml` に以下を追加し、`lib.rs` でインポートしましょう:

-[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/
+[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/

 ```toml
 # in Cargo.toml

 [dependencies]
-pc-keyboard = "0.5.0"
+pc-keyboard = "0.7.0"
 ```

 これでこのクレートを使って `keyboard_interrupt_handler` を書き直すことができます:
@@ -678,8 +677,8 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

    lazy_static! {
        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
-            Mutex::new(Keyboard::new(layouts::Us104Key, ScancodeSet1,
-                HandleControl::Ignore)
+            Mutex::new(Keyboard::new(ScancodeSet1::new(),
+                layouts::Us104Key, HandleControl::Ignore)
            );
    }

@@ -705,17 +704,17 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 ミューテックスで保護された静的な [`Keyboard`] オブジェクトを作るために `lazy_static` マクロを使います。`Keyboard` は、レイアウトを US キーボードに、スキャンコードセットは1として初期化を行います。[`HandleControl`] パラメタは、`ctrl+[a-z]` を Unicode 文字の `U+0001` から `U+001A` にマッピングさせることができます。この機能は使いたくないので、`Ignore` オプションを使い `ctrl` キーを通常のキーと同様に扱います。

-[`HandleControl`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/enum.HandleControl.html
+[`HandleControl`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/enum.HandleControl.html

 各割り込みでは、ミューテックスをロックし、キーボードコントローラからスキャンコードを読み取り、それを読み取ったスキャンコードを `Option<KeyEvent>` に変換する [`add_byte`] メソッドに渡します。[`KeyEvent`] は、そのイベントを起こしたキーと、それが押されたのか離されたのかの情報を含んでいます。

-[`Keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html
-[`add_byte`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.add_byte
-[`KeyEvent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.KeyEvent.html
+[`Keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html
+[`add_byte`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.add_byte
+[`KeyEvent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.KeyEvent.html

 このキーイベントを解釈するために、変換可能であればキーイベントを文字に変換する [`process_keyevent`] メソッドにキーイベントを渡します。例えば `A` キーの押下イベントを、シフトキーが押されていたかによって小文字の `a` か大文字の `A` に変換します。

-[`process_keyevent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent
+[`process_keyevent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent

 修正した割り込みハンドラで、テキストが入力できるようになります:

--- a/blog/content/edition-2/posts/07-hardware-interrupts/index.ko.md
+++ b/blog/content/edition-2/posts/07-hardware-interrupts/index.ko.md
@@ -5,7 +5,6 @@ path = "ko/hardware-interrupts"
 date = 2018-10-22

 [extra]
-chapter = "Interrupts"
 # Please update this when updating the translation
 translation_based_on_commit = "a108367d712ef97c28e8e4c1a22da4697ba6e6cd"
 # GitHub usernames of the people that translated this post
@@ -655,13 +654,13 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 나머지 키를 인식하는 것도 위와 마찬가지 방법으로 진행하면 됩니다. 다행히도, [`pc-keyboard`] 크레이트가 1번/2번 스캔코드 셋을 해석하는 기능을 제공합니다. `Cargo.toml`에 이 크레이트를 추가하고 `lib.rs`에서 불러와 사용합니다.

-[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/
+[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/

 ```toml
 # in Cargo.toml

 [dependencies]
-pc-keyboard = "0.5.0"
+pc-keyboard = "0.7.0"
 ```

 `pc-keyboard` 크레이트를 사용해 `keyboard_interrupt_handler` 함수를 새로 작성합니다.
@@ -678,8 +677,8 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

    lazy_static! {
        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
-            Mutex::new(Keyboard::new(layouts::Us104Key, ScancodeSet1,
-                HandleControl::Ignore)
+            Mutex::new(Keyboard::new(ScancodeSet1::new(),
+                layouts::Us104Key, HandleControl::Ignore)
            );
    }

@@ -705,17 +704,17 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 `lazy_static` 매크로를 사용해 Mutex로 감싼 [`Keyboard`] 타입의 static 오브젝트를 얻습니다. `Keyboard`가 미국 키보드 레이아웃과 1번 스캔코드 셋을 사용하도록 초기화합니다. [`HandleControl`] 매개변수를 사용하면 `ctrl+[a-z]` 키 입력을 유니코드 `U+0001`에서 `U+001A`까지 값에 대응시킬 수 있습니다. 우리는 그렇게 하지 않기 위해 해당 매개변수에 `Ignore` 옵션을 주고 `ctrl` 키를 일반 키로서 취급합니다.

-[`HandleControl`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/enum.HandleControl.html
+[`HandleControl`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/enum.HandleControl.html

 인터럽트마다 우리는 Mutex를 잠그고 키보드 컨트롤러로부터 스캔 코드를 읽어온 후, 그 스캔 코드를 [`add_byte`] 함수에 전달합니다. 이 함수는 스캔 코드를 `Option<KeyEvent>`으로 변환합니다. [`KeyEvent`] 타입은 입력된 키의 정보와 키의 누름/뗌 정보를 저장합니다.

-[`Keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html
-[`add_byte`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.add_byte
-[`KeyEvent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.KeyEvent.html
+[`Keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html
+[`add_byte`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.add_byte
+[`KeyEvent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.KeyEvent.html

 [`process_keyevent`] 함수가 인자로 받은 `KeyEvent`를 변환하여 입력된 키의 문자를 반환합니다 (변환 불가한 경우 `None` 반환). 예를 들어, `A`키 입력 시 shift키 입력 여부에 따라 소문자 `a` 또는 대문자 `A`를 얻습니다.

-[`process_keyevent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent
+[`process_keyevent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent

 수정한 인터럽트 처리 함수를 통해 텍스트를 입력한 대로 화면에 출력할 수 있습니다.

--- a/blog/content/edition-2/posts/07-hardware-interrupts/index.md
+++ b/blog/content/edition-2/posts/07-hardware-interrupts/index.md
@@ -649,13 +649,13 @@ Now we can write numbers:

 Translating the other keys works in the same way. Fortunately, there is a crate named [`pc-keyboard`] for translating scancodes of scancode sets 1 and 2, so we don't have to implement this ourselves. To use the crate, we add it to our `Cargo.toml` and import it in our `lib.rs`:

-[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/
+[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/

 ```toml
 # in Cargo.toml

 [dependencies]
-pc-keyboard = "0.5.0"
+pc-keyboard = "0.7.0"
 ```

 Now we can use this crate to rewrite our `keyboard_interrupt_handler`:
@@ -672,8 +672,8 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

    lazy_static! {
        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
-            Mutex::new(Keyboard::new(layouts::Us104Key, ScancodeSet1,
-                HandleControl::Ignore)
+            Mutex::new(Keyboard::new(ScancodeSet1::new(),
+                layouts::Us104Key, HandleControl::Ignore)
            );
    }

@@ -699,17 +699,17 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 We use the `lazy_static` macro to create a static [`Keyboard`] object protected by a Mutex. We initialize the `Keyboard` with a US keyboard layout and the scancode set 1. The [`HandleControl`] parameter allows to map `ctrl+[a-z]` to the Unicode characters `U+0001` through `U+001A`. We don't want to do that, so we use the `Ignore` option to handle the `ctrl` like normal keys.

-[`HandleControl`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/enum.HandleControl.html
+[`HandleControl`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/enum.HandleControl.html

 On each interrupt, we lock the Mutex, read the scancode from the keyboard controller, and pass it to the [`add_byte`] method, which translates the scancode into an `Option<KeyEvent>`. The [`KeyEvent`] contains the key which caused the event and whether it was a press or release event.

-[`Keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html
-[`add_byte`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.add_byte
-[`KeyEvent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.KeyEvent.html
+[`Keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html
+[`add_byte`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.add_byte
+[`KeyEvent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.KeyEvent.html

 To interpret this key event, we pass it to the [`process_keyevent`] method, which translates the key event to a character, if possible. For example, it translates a press event of the `A` key to either a lowercase `a` character or an uppercase `A` character, depending on whether the shift key was pressed.

-[`process_keyevent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent
+[`process_keyevent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent

 With this modified interrupt handler, we can now write text:

--- a/blog/content/edition-2/posts/07-hardware-interrupts/index.zh-CN.md
+++ b/blog/content/edition-2/posts/07-hardware-interrupts/index.zh-CN.md
@@ -655,13 +655,13 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 其他扫描码也可以通过同样的手段进行译码，不过真的很麻烦，好在 [`pc-keyboard`] crate 已经帮助我们实现了Set-1和Set-2的译码工作，所以无需自己去实现。所以我们只需要将下述内容添加到 `Cargo.toml`，并在 `lib.rs` 里进行引用：

-[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/
+[`pc-keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/

 ```toml
 # in Cargo.toml

 [dependencies]
-pc-keyboard = "0.5.0"
+pc-keyboard = "0.7.0"
 ```

 现在我们可以使用新的crate对 `keyboard_interrupt_handler` 进行改写：
@@ -678,8 +678,8 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

    lazy_static! {
        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
-            Mutex::new(Keyboard::new(layouts::Us104Key, ScancodeSet1,
-                HandleControl::Ignore)
+            Mutex::new(Keyboard::new(ScancodeSet1::new(),
+                layouts::Us104Key, HandleControl::Ignore)
            );
    }

@@ -705,17 +705,17 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(

 首先我们使用 `lazy_static` 宏创建一个受到Mutex同步锁保护的 [`Keyboard`] 对象，初始化参数为美式键盘布局以及Set-1。至于 [`HandleControl`]，它可以设定为将 `ctrl+[a-z]` 映射为Unicode字符 `U+0001` 至 `U+001A`，但我们不想这样，所以使用了 `Ignore` 选项让 `ctrl` 仅仅表现为一个正常键位。

-[`HandleControl`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/enum.HandleControl.html
+[`HandleControl`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/enum.HandleControl.html

 对于每一个中断，我们都会为 KEYBOARD 加锁，从键盘控制器获取扫描码并将其传入 [`add_byte`] 函数，并将其转化为 `Option<KeyEvent>` 结构。[`KeyEvent`] 包括了触发本次中断的按键信息，以及子动作是按下还是释放。

-[`Keyboard`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html
-[`add_byte`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.add_byte
-[`KeyEvent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.KeyEvent.html
+[`Keyboard`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html
+[`add_byte`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.add_byte
+[`KeyEvent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.KeyEvent.html

 要处理KeyEvent，我们还需要将其传入 [`process_keyevent`] 函数，将其转换为人类可读的字符，若果有必要，也会对字符进行一些处理。典型例子就是，要判断 `A` 键按下后输入的是小写 `a` 还是大写 `A`，这要取决于shift键是否同时被按下。

-[`process_keyevent`]: https://docs.rs/pc-keyboard/0.5.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent
+[`process_keyevent`]: https://docs.rs/pc-keyboard/0.7.0/pc_keyboard/struct.Keyboard.html#method.process_keyevent

 进行这些修改之后，我们就可以正常输入英文了：

--- a/blog/content/edition-2/posts/08-paging-introduction/index.fa.md
+++ b/blog/content/edition-2/posts/08-paging-introduction/index.fa.md
@@ -5,7 +5,6 @@ path = "fa/paging-introduction"
 date = 2019-01-14

 [extra]
-chapter = "Memory Management"
 # Please update this when updating the translation
 translation_based_on_commit = "f692c5b377460e872bca2d3fcec787f4a0d1ec9b"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/08-paging-introduction/index.ja.md
+++ b/blog/content/edition-2/posts/08-paging-introduction/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/paging-introduction"
 date = 2019-01-14

 [extra]
-chapter = "Memory Management"
 # Please update this when updating the translation
 translation_based_on_commit = "3315bfe2f63571f5e6e924d58ed32afd8f39f892"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/09-paging-implementation/index.ja.md
+++ b/blog/content/edition-2/posts/09-paging-implementation/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/paging-implementation"
 date = 2019-03-14

 [extra]
-chapter = "Memory Management"
 translation_based_on_commit = "27ab4518acbb132e327ed4f4f0508393e9d4d684"
 translators = ["swnakamura", "garasubo"]
 +++
--- a/blog/content/edition-2/posts/10-heap-allocation/index.ja.md
+++ b/blog/content/edition-2/posts/10-heap-allocation/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/heap-allocation"
 date = 2019-06-26

 [extra]
-chapter = "Memory Management"
 # Please update this when updating the translation
 translation_based_on_commit = "afeed7477bb19a29d94a96b8b0620fd241b0d55f"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/11-allocator-designs/index.ja.md
+++ b/blog/content/edition-2/posts/11-allocator-designs/index.ja.md
@@ -5,7 +5,6 @@ path = "allocator-designs/ja"
 date = 2020-01-20

 [extra]
-chapter = "Memory Management"
 # Please update this when updating the translation
 translation_based_on_commit = "2e3230eca2275226ec33c2dfe7f98f2f4b9a48b4"
 # GitHub usernames of the people that translated this post
--- a/blog/content/edition-2/posts/12-async-await/index.ja.md
+++ b/blog/content/edition-2/posts/12-async-await/index.ja.md
@@ -5,7 +5,6 @@ path = "ja/async-await"
 date = 2020-03-27

 [extra]
-chapter = "Multitasking"
 # Please update this when updating the translation
 translation_based_on_commit = "bf4f88107966c7ab1327c3cdc0ebfbd76bad5c5f"
 # GitHub usernames of the authors of this translation
@@ -1363,8 +1362,8 @@ use crate::print;

 pub async fn print_keypresses() {
    let mut scancodes = ScancodeStream::new();
-    let mut keyboard = Keyboard::new(layouts::Us104Key, ScancodeSet1,
-        HandleControl::Ignore);
+    let mut keyboard = Keyboard::new(ScancodeSet1::new(),
+        layouts::Us104Key, HandleControl::Ignore);

    while let Some(scancode) = scancodes.next().await {
        if let Ok(Some(key_event)) = keyboard.add_byte(scancode) {
--- a/blog/content/edition-2/posts/12-async-await/index.md
+++ b/blog/content/edition-2/posts/12-async-await/index.md
@@ -1055,7 +1055,7 @@ To use the type, we need to add a dependency on the `crossbeam-queue` crate:
 # in Cargo.toml

 [dependencies.crossbeam-queue]
-version = "0.2.1"
+version = "0.3.11"
 default-features = false
 features = ["alloc"]
 ```
@@ -1233,8 +1233,8 @@ impl Stream for ScancodeStream {
    fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<u8>> {
        let queue = SCANCODE_QUEUE.try_get().expect("not initialized");
        match queue.pop() {
-            Ok(scancode) => Poll::Ready(Some(scancode)),
-            Err(crossbeam_queue::PopError) => Poll::Pending,
+            Some(scancode) => Poll::Ready(Some(scancode)),
+            None => Poll::Pending,
        }
    }
 }
@@ -1284,17 +1284,17 @@ impl Stream for ScancodeStream {
            .expect("scancode queue not initialized");

        // fast path
-        if let Ok(scancode) = queue.pop() {
+        if let Some(scancode) = queue.pop() {
            return Poll::Ready(Some(scancode));
        }

        WAKER.register(&cx.waker());
        match queue.pop() {
-            Ok(scancode) => {
+            Some(scancode) => {
                WAKER.take();
                Poll::Ready(Some(scancode))
            }
-            Err(crossbeam_queue::PopError) => Poll::Pending,
+            None => Poll::Pending,
        }
    }
 }
@@ -1350,8 +1350,8 @@ use crate::print;

 pub async fn print_keypresses() {
    let mut scancodes = ScancodeStream::new();
-    let mut keyboard = Keyboard::new(layouts::Us104Key, ScancodeSet1,
-        HandleControl::Ignore);
+    let mut keyboard = Keyboard::new(ScancodeSet1::new(),
+        layouts::Us104Key, HandleControl::Ignore);

    while let Some(scancode) = scancodes.next().await {
        if let Ok(Some(key_event)) = keyboard.add_byte(scancode) {
@@ -1546,7 +1546,7 @@ impl Executor {
            waker_cache,
        } = self;

-        while let Ok(task_id) = task_queue.pop() {
+        while let Some(task_id) = task_queue.pop() {
            let task = match tasks.get_mut(&task_id) {
                Some(task) => task,
                None => continue, // task no longer exists
--- a/blog/content/edition-2/posts/12-async-await/index.zh-TW.md
+++ b/blog/content/edition-2/posts/12-async-await/index.zh-TW.md
--- a/blog/content/edition-2/posts/deprecated/10-advanced-paging/index.md
+++ b/blog/content/edition-2/posts/deprecated/10-advanced-paging/index.md
@@ -562,9 +562,8 @@ pub extern "C" fn _start(boot_info: &'static BootInfo) -> ! { // new argument
 }
 ```

-The [`BootInfo`] struct is still in an early stage, so expect some breakage when updating to future [semver-incompatible] bootloader versions. It currently has the three fields `p4_table_addr`, `memory_map`, and `package`:
+The `BootInfo` struct is still in an early stage, so expect some breakage when updating to future [semver-incompatible] bootloader versions. It currently has the three fields `p4_table_addr`, `memory_map`, and `package`:

-[`BootInfo`]: https://docs.rs/bootloader/0.3.11/bootloader/bootinfo/struct.BootInfo.html
 [semver-incompatible]: https://doc.rust-lang.org/stable/cargo/reference/specifying-dependencies.html#caret-requirements

 - The `p4_table_addr` field contains the recursive virtual address of the level 4 page table. By using this field we can avoid hardcoding the address `0o_177777_777_777_777_777_0000`.
@@ -577,9 +576,7 @@ Before we use the `memory_map` field to create a proper `FrameAllocator`, we wan

 Since our `_start` function is called externally from the bootloader, no checking of our function signature occurs. This means that we could let it take arbitrary arguments without any compilation errors, but it would fail or cause undefined behavior at runtime.

-To make sure that the entry point function has always the correct signature that the bootloader expects, the `bootloader` crate provides an [`entry_point`] macro that provides a type-checked way to define a Rust function as the entry point. Let's rewrite our entry point function to use this macro:
-
-[`entry_point`]: https://docs.rs/bootloader/0.3.12/bootloader/macro.entry_point.html
+To make sure that the entry point function has always the correct signature that the bootloader expects, the `bootloader` crate provides an `entry_point` macro that provides a type-checked way to define a Rust function as the entry point. Let's rewrite our entry point function to use this macro:

 ```rust
 // in src/main.rs
@@ -662,12 +659,11 @@ pub fn init_frame_allocator(

 This function uses iterator combinator methods to transform the initial `MemoryMap` into an iterator of usable physical frames:

- First, we call the `iter` method to convert the memory map to an iterator of [`MemoryRegion`]s. Then we use the [`filter`] method to skip any reserved or otherwise unavailable regions. The bootloader updates the memory map for all the mappings it creates, so frames that are used by our kernel (code, data or stack) or to store the boot information are already marked as `InUse` or similar. Thus we can be sure that `Usable` frames are not used somewhere else.
+- First, we call the `iter` method to convert the memory map to an iterator of `MemoryRegion`s. Then we use the [`filter`] method to skip any reserved or otherwise unavailable regions. The bootloader updates the memory map for all the mappings it creates, so frames that are used by our kernel (code, data or stack) or to store the boot information are already marked as `InUse` or similar. Thus we can be sure that `Usable` frames are not used somewhere else.
 - In the second step, we use the [`map`] combinator and Rust's [range syntax] to transform our iterator of memory regions to an iterator of address ranges.
 - The third step is the most complicated: We convert each range to an iterator through the `into_iter` method and then choose every 4096th address using [`step_by`]. Since 4096 bytes (= 4 KiB) is the page size, we get the start address of each frame. The bootloader page aligns all usable memory areas so that we don't need any alignment or rounding code here. By using [`flat_map`] instead of `map`, we get an `Iterator<Item = u64>` instead of an `Iterator<Item = Iterator<Item = u64>>`.
 - In the final step, we convert the start addresses to `PhysFrame` types to construct the desired `Iterator<Item = PhysFrame>`. We then use this iterator to create and return a new `BootInfoFrameAllocator`.

-[`MemoryRegion`]: https://docs.rs/bootloader/0.3.12/bootloader/bootinfo/struct.MemoryRegion.html
 [`filter`]: https://doc.rust-lang.org/core/iter/trait.Iterator.html#method.filter
 [`map`]: https://doc.rust-lang.org/core/iter/trait.Iterator.html#method.map
 [range syntax]: https://doc.rust-lang.org/core/ops/struct.Range.html
Author	SHA1	Message	Date
Jihyeon Gim	0e7f3296fd	Merge `a84bc11515` into `087a464ed7`	2024-06-08 11:39:42 +03:00
Philipp Oppermann	087a464ed7	Merge pull request #1323 from phil-opp/fix-dead-links Fix dead links	2024-05-30 12:19:37 +02:00
Philipp Oppermann	96dc9ed668	Remove dead docs.rs links from deprecated 'advanced-paging' post	2024-05-30 11:45:13 +02:00
Philipp Oppermann	e6486aad6d	Remove dead link in 'building on Android' post and add deprecation notice	2024-05-30 11:44:47 +02:00
Philipp Oppermann	f578336cd7	Merge pull request #1322 from phil-opp/translation-improvements Various translation improvements	2024-05-30 11:25:31 +02:00
Philipp Oppermann	1ba8a4b012	Remove chapter config from translated posts (they are not considered) We only consider the chapter definitions on the original posts when generating the site.	2024-05-30 11:22:59 +02:00
Philipp Oppermann	69a0f31747	Move translation note behind `<!--- more -->` marker	2024-05-30 11:12:23 +02:00
Philipp Oppermann	e4c25a3612	Add translator for post-12-zh-TW	2024-05-30 11:10:43 +02:00
Philipp Oppermann	978fc6b174	Merge pull request #1291 from ssrlive/main Translate Multitasking post to Chinese	2024-05-30 11:09:08 +02:00
Philipp Oppermann	f192d8ae4e	Merge pull request #1321 from ds797/patch-1 Update crossbeam and pc_keyboard	2024-05-30 11:04:06 +02:00
ds797	1e108fba64	Update pc_keyboard Updated pc_keyboard to 0.7.0 and fixed breaking changes.	2024-05-23 01:12:15 +00:00
ds797	9c05cc9bd5	Update crossbeam Updated crossbeam to 0.3.11 and fixed breaking changes.	2024-05-22 17:48:43 -07:00
ssrlive	88e473433b	Merge branch 'phil-opp:main' into main	2024-02-16 22:12:18 +08:00
ssrlive	1a0254b977	minor changes	2024-02-15 00:35:51 +08:00
ssrlive	05dadc1302	minor changes	2024-02-15 00:28:49 +08:00
ssrlive	6041d119db	Merge branch 'phil-opp:main' into main	2024-02-15 00:15:31 +08:00
ssrlive	258426b787	minor changes	2024-02-15 00:14:14 +08:00