Skip to content

Commit

Permalink
Merge pull request #462 from Thog/feature/keyboard-sysmodule
Browse files Browse the repository at this point in the history
Move keyboard handling to it own process
  • Loading branch information
Thomas Guillemard authored Sep 18, 2019
2 parents 9885101 + 001d361 commit f2deeb3
Show file tree
Hide file tree
Showing 15 changed files with 1,325 additions and 453 deletions.
14 changes: 14 additions & 0 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["kernel", "bootstrap", "shell", "time", "libuser", "wall-clock", "sm", "vi", "ahci", "fs", "libutils", "libkern", "swipc-gen", "swipc-parser", "docs", "libtimezone", "disk-initializer", "loader"]
members = ["kernel", "bootstrap", "shell", "time", "libuser", "wall-clock", "sm", "vi", "ahci", "fs", "libutils", "libkern", "swipc-gen", "swipc-parser", "docs", "libtimezone", "disk-initializer", "loader", "keyboard"]

[profile.release]
debug = true
Expand Down
11 changes: 9 additions & 2 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,15 @@ dependencies = ["install-xargo"]
command = "xargo"
args = ["build", "--target=i386-unknown-sunrise-user", "--package=sunrise-loader", "@@split(COMPILER_FLAGS, )"]

[tasks.keyboard]
description = "Compiles sunrise-keyboard"
dependencies = ["install-xargo"]
command = "xargo"
args = ["build", "--target=i386-unknown-sunrise-user", "--package=sunrise-keyboard", "@@split(COMPILER_FLAGS, )"]

[tasks.userspace]
description = "Compiles userspace apps"
dependencies = ["shell", "wall-clock", "sm", "vi", "ahci", "time", "fs", "loader"]
dependencies = ["shell", "wall-clock", "sm", "vi", "ahci", "time", "fs", "loader", "keyboard"]

[tasks.iso]
description = "Creates a bootable ISO containing the kernel and grub."
Expand All @@ -155,6 +161,7 @@ cp target/i386-unknown-sunrise-user/$PROFILE_NAME/sunrise-vi isofile
cp target/i386-unknown-sunrise-user/$PROFILE_NAME/sunrise-ahci isofiles/boot/
cp target/i386-unknown-sunrise-user/$PROFILE_NAME/sunrise-fs isofiles/boot/
cp target/i386-unknown-sunrise-user/$PROFILE_NAME/sunrise-loader isofiles/boot/
cp target/i386-unknown-sunrise-user/$PROFILE_NAME/sunrise-keyboard isofiles/boot/
mkisofs-rs external/grub/isofiles isofiles -o os.iso -b boot/grub/i386-pc/eltorito.img --no-emul-boot --boot-info-table --embedded-boot external/grub/embedded.img
'''
]
Expand Down Expand Up @@ -223,7 +230,7 @@ args = ["-c", "kernel/src/main.rs", "bootstrap/src/main.rs",
"sm/src/main.rs", "vi/src/main.rs", "ahci/src/main.rs",
"libutils/src/lib.rs", "libkern/src/lib.rs", "swipc-gen/src/lib.rs",
"swipc-parser/src/lib.rs", "time/src/main.rs", "libtimezone/src/lib.rs",
"loader/src/main.rs"
"loader/src/main.rs", "keyboard/src/main.rs"
]

[tasks.clippy-sunrise-kernel-target]
Expand Down
Loading

0 comments on commit f2deeb3

Please sign in to comment.