Skip to content

doc: add figures and better discuss chosen design #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[files]
extend-exclude = [
# "uefi/src/table/boot.rs"
"*.drawio.xml"
]

[default.extend-words]
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Please see:

- [multiboot2/CHANGELOG.md](multiboot2/CHANGELOG.md)
- [multiboot2-header/CHANGELOG.md](multiboot2-header/CHANGELOG.md)
- [multiboot2-common/CHANGELOG.md](multiboot2-common/CHANGELOG.md)
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ exclude = [
bitflags = "2.6.0"
derive_more = { version = "~0.99.18", default-features = false, features = ["display"] }
log = { version = "~0.4", default-features = false }
multiboot2 = { version = "0.22.2", default-features = false }
multiboot2-common = { version = "0.1.2", default-features = false }
ptr_meta = { version = "~0.2", default-features = false }

# This way, the corresponding crate dependency can be normalley referenced by
Expand All @@ -21,3 +23,4 @@ ptr_meta = { version = "~0.2", default-features = false }
[patch.crates-io]
multiboot2 = { path = "multiboot2" }
multiboot2-common = { path = "multiboot2-common" }
multiboot2-header = { path = "multiboot2-header" }
3 changes: 0 additions & 3 deletions Changelog.md

This file was deleted.

20 changes: 8 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# Multiboot2: MBI + Header
# Rusty Wrappers for Multiboot2

This repository contains the crates `multiboot2` and `multiboot2-header`.
Please check their individual README-files ([multiboot2](multiboot2/README.md),
[multiboot2-header](multiboot2-header/README.md)).
## Repository Overview

The `multiboot2` crate helps to parse the Multiboot2 information structure
(MBI) and is relevant in kernels, that get booted by a bootloader such as
GRUB, for example. `multiboot2-header` helps you to either build
Multiboot2-headers yourself, or to parse Multiboot2 headers in custom bootloader
or similar applications.
- [`multiboot2`](./multiboot2/README.md)
- [`multiboot2-header`](./multiboot2-header/README.md)
- [`multiboot2-common`](./multiboot2-common/README.md)

## License

Expand All @@ -22,6 +18,6 @@ at your option.

### Contribution

Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the
work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
additional terms or conditions.
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
dual licensed as above, without any additional terms or conditions.
6 changes: 3 additions & 3 deletions integration-test/bins/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions multiboot2-common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Changelog for Crate `multiboot2-common`

## v0.1.2 (2024-08-24)

- Documentation improvements
-

## 0.1.0 / 0.1.1 (2024-08-20)

Initial release.
2 changes: 1 addition & 1 deletion multiboot2-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "multiboot2-common"
description = """
Common helpers for the `multiboot2` and `multiboot2-header` crates.
"""
version = "0.1.1"
version = "0.1.2"
authors = [
"Philipp Schuster <[email protected]>"
]
Expand Down
5 changes: 0 additions & 5 deletions multiboot2-common/Changelog.md

This file was deleted.

17 changes: 17 additions & 0 deletions multiboot2-common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,23 @@

Common helpers for the `multiboot2` and `multiboot2-header` crates.

## Architecture

The following figures, not displayable in `lib.rs` / on `docs.rs` unfortunately,
outline the design of this crate:

![Overview Multiboot2 Structures](./overview-multiboot2-structures.drawio.png "Overview Multiboot2 Structures")

Overview of Multiboot2 structures: Multiboot2 boot information, boot
information tags, Multiboot2 headers, and Multiboot2 header tags all share the
same technical foundation: They have a common header and a possible dynamic
size, depending on the header.

![Crate Architecture Overview](./architecture.drawio.png "Crate Architecture Overview")

Overview of how raw bytes are modelled to be representable by high-level
ABI-compatible rusty types.

## MSRV

The MSRV is 1.70.0 stable.
Expand Down
Binary file added multiboot2-common/architecture.drawio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading