From 90a97cd16000899b015a6af03111927c128498be Mon Sep 17 00:00:00 2001 From: peony Date: Sun, 17 Nov 2024 19:11:13 +0100 Subject: [PATCH] more work --- Cargo.lock | 6 +++--- sysdata/programs/ps2_driver/src/controller.hb | 6 +++--- sysdata/programs/ps2_driver/src/main.hb | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a336be8..1eaf3cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -213,12 +213,12 @@ dependencies = [ [[package]] name = "hbbytecode" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#397b2a4b1b7c088f379f32d846e235c1286e17e0" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#fe5a8631f66e7acde8707a68ad25074ab5b1f408" [[package]] name = "hblang" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#397b2a4b1b7c088f379f32d846e235c1286e17e0" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#fe5a8631f66e7acde8707a68ad25074ab5b1f408" dependencies = [ "hashbrown", "hbbytecode", @@ -229,7 +229,7 @@ dependencies = [ [[package]] name = "hbvm" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#397b2a4b1b7c088f379f32d846e235c1286e17e0" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#fe5a8631f66e7acde8707a68ad25074ab5b1f408" dependencies = [ "hbbytecode", ] diff --git a/sysdata/programs/ps2_driver/src/controller.hb b/sysdata/programs/ps2_driver/src/controller.hb index 2c6af89..38863b1 100644 --- a/sysdata/programs/ps2_driver/src/controller.hb +++ b/sysdata/programs/ps2_driver/src/controller.hb @@ -2,6 +2,9 @@ .{bit0, bit1, bit5, bit6, bit7} := @use("bits.hb"); .{Port, port_at_startup} := @use("port.hb") +port1 := port_at_startup +port2 := port_at_startup + $disable_port1 := fn(): void memory.outb(0x64, 0xAD) $enable_port1 := fn(): void memory.outb(0x64, 0xAE) $disable_port2 := fn(): void memory.outb(0x64, 0xA7) @@ -58,9 +61,6 @@ flush_input := fn(): void { loop if has_input(get_info()) == false break else get_info() } -port1 := port_at_startup -port2 := port_at_startup - init := fn(): void { disable_port1() disable_port2() diff --git a/sysdata/programs/ps2_driver/src/main.hb b/sysdata/programs/ps2_driver/src/main.hb index ce6bd6b..362c101 100644 --- a/sysdata/programs/ps2_driver/src/main.hb +++ b/sysdata/programs/ps2_driver/src/main.hb @@ -5,7 +5,8 @@ format_page := memory.dangling(u8) info := controller.Info.(0) -process := fn(port: ^controller.Port): bool { +process := fn(port: ^controller.Port): void { + } check_complete := fn(port: ^controller.Port): bool {