From 62c181fb6ae0a2a0bdca169cb86b115b64cdda60 Mon Sep 17 00:00:00 2001 From: Able Date: Fri, 14 Jun 2024 11:48:53 -0500 Subject: [PATCH] checkpoint --- kernel/Cargo.toml | 26 +++++++++++----------- sysdata/programs/diskio_driver/meta.toml | 2 +- sysdata/programs/diskio_driver/spec.md | 0 sysdata/programs/diskio_driver/src/main.hb | 2 ++ sysdata/programs/fb_driver/src/main.hb | 19 ++++++++++++++-- sysdata/programs/tests/src/main.hb | 1 + sysdata/system_config.toml | 5 +++++ 7 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 sysdata/programs/diskio_driver/spec.md diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 2765f2d2..d1beff86 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -5,29 +5,29 @@ version = "0.2.0" [dependencies] -embedded-graphics = "0.7" -hbvm.git = "https://git.ablecorp.us/ableos/holey-bytes" -log = "0.4" -spin = "0.9" -uart_16550 = "0.2" -slab = { version = "0.4", default-features = false } -xml.git = "https://git.ablecorp.us/ableos/ableos_userland" -versioning.git = "https://git.ablecorp.us/ableos/ableos_userland" +embedded-graphics = "0.7" +hbvm.git = "https://git.ablecorp.us/ableos/holey-bytes" +log = "0.4" +spin = "0.9" +uart_16550 = "0.2" +slab = { version = "0.4", default-features = false } +xml.git = "https://git.ablecorp.us/ableos/ableos_userland" +versioning.git = "https://git.ablecorp.us/ableos/ableos_userland" able_graphics_library.git = "https://git.ablecorp.us/ableos/ableos_userland" -hashbrown = "*" +hashbrown = "*" kiam = "0.1.1" [dependencies.limine] version = "0.1" -git = "https://github.com/limine-bootloader/limine-rs" +git = "https://github.com/limine-bootloader/limine-rs" [dependencies.crossbeam-queue] -version = "0.3" +version = "0.3" default-features = false -features = ["alloc"] +features = ["alloc"] [dependencies.clparse] -git = "https://git.ablecorp.us/ableos/ableos_userland" +git = "https://git.ablecorp.us/ableos/ableos_userland" default-features = false [dependencies.derive_more] diff --git a/sysdata/programs/diskio_driver/meta.toml b/sysdata/programs/diskio_driver/meta.toml index dc316524..f68631f5 100644 --- a/sysdata/programs/diskio_driver/meta.toml +++ b/sysdata/programs/diskio_driver/meta.toml @@ -8,4 +8,4 @@ authors = ["able"] hblang.version = "1.0.0" [build] -command = "hblang libraries/stn/src/lib.hb src/main.hb" +command = "hblang src/main.hb" diff --git a/sysdata/programs/diskio_driver/spec.md b/sysdata/programs/diskio_driver/spec.md new file mode 100644 index 00000000..e69de29b diff --git a/sysdata/programs/diskio_driver/src/main.hb b/sysdata/programs/diskio_driver/src/main.hb index cd84536e..7493b263 100644 --- a/sysdata/programs/diskio_driver/src/main.hb +++ b/sysdata/programs/diskio_driver/src/main.hb @@ -1,3 +1,5 @@ main := fn(): int { + @eca(i32, 1, 1, 1); + return 0; } \ No newline at end of file diff --git a/sysdata/programs/fb_driver/src/main.hb b/sysdata/programs/fb_driver/src/main.hb index 3b846351..2caf07ae 100644 --- a/sysdata/programs/fb_driver/src/main.hb +++ b/sysdata/programs/fb_driver/src/main.hb @@ -1,7 +1,22 @@ +buffer := 18446603339442421960; + +send_msg := fn(): int { + msg := 10; + @eca(i32, 3, 1, 2, 1); + return 0; +} + +modify := fn(a: ^int): void { + *a = 4294967295; + return; +} main := fn(): int { - loop { - + @eca(i32, 1, 1, 1); + loop{ + @eca(i32, 1, 1, 1); + modify(&buffer); } return 0; } + diff --git a/sysdata/programs/tests/src/main.hb b/sysdata/programs/tests/src/main.hb index cd84536e..9e3c01e7 100644 --- a/sysdata/programs/tests/src/main.hb +++ b/sysdata/programs/tests/src/main.hb @@ -1,3 +1,4 @@ main := fn(): int { + return 0; } \ No newline at end of file diff --git a/sysdata/system_config.toml b/sysdata/system_config.toml index e6e738c0..14907dfe 100644 --- a/sysdata/system_config.toml +++ b/sysdata/system_config.toml @@ -17,7 +17,12 @@ resolution = "1024x768x24" [boot.limine.ableos.modules] + [boot.limine.ableos.modules.tests] path = "boot:///tests.hbf" + [boot.limine.ableos.modules.diskio_driver] path = "boot:///diskio_driver.hbf" + +[boot.limine.ableos.modules.fat32_filesystem_driver] +path = "boot:///fat32_filesystem_driver.hbf"