From 5a528f750821ea0cef518bc550ea90557b0c117d Mon Sep 17 00:00:00 2001 From: Guillaume DIDIER Date: Sun, 6 Oct 2019 17:16:19 +0200 Subject: [PATCH] Proper VGA driver, just missing print! / println! support. --- .cargo/config | 4 +- .gitignore | 3 + .idea/DendrobatesTinctoriusAzureus.iml | 18 +- .idea/workspace.xml | 94 +- Cargo.lock | 86 +- Cargo.toml | 25 +- kernel/src/main.rs | 28 - scripts/bochs.sh | 7 + scripts/bochsrc | 1263 +++++++++++++++++ scripts/gdb.sh | 7 + scripts/syms.sh | 1 + src/main.rs | 86 ++ {kernel => vga_buffer}/Cargo.toml | 10 +- vga_buffer/src/lib.rs | 274 ++++ ...us.json => x86_64-D.TinctoriusAzureus.json | 0 15 files changed, 1858 insertions(+), 48 deletions(-) delete mode 100644 kernel/src/main.rs create mode 100755 scripts/bochs.sh create mode 100644 scripts/bochsrc create mode 100644 scripts/gdb.sh create mode 100755 scripts/syms.sh create mode 100644 src/main.rs rename {kernel => vga_buffer}/Cargo.toml (65%) create mode 100644 vga_buffer/src/lib.rs rename x86_64-D.TinctoriusAzureaus.json => x86_64-D.TinctoriusAzureus.json (100%) diff --git a/.cargo/config b/.cargo/config index f34b2b0..24306fc 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,5 +1,5 @@ [build] -target = "x86_64-D.TinctoriusAzureaus.json" +target = "x86_64-D.TinctoriusAzureus.json" [target.'cfg(target_os = "none")'] -runner = "bootimage runner" \ No newline at end of file +runner = "bootimage runner" diff --git a/.gitignore b/.gitignore index 0d43938..6c31f01 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ #Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk +bootimage-kernel.iso +kernel.sym +bochsout.txt \ No newline at end of file diff --git a/.idea/DendrobatesTinctoriusAzureus.iml b/.idea/DendrobatesTinctoriusAzureus.iml index bc2cd87..ba79a76 100644 --- a/.idea/DendrobatesTinctoriusAzureus.iml +++ b/.idea/DendrobatesTinctoriusAzureus.iml @@ -1,7 +1,23 @@ - + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a12ddeb..579062f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,17 +10,23 @@ + - - - + + + + + + + - - + + + + + - + + + + + + - + + + + @@ -116,6 +181,7 @@ @@ -128,6 +194,10 @@