diff --git a/src/userland/keyboard/main.c b/src/userland/keyboard/main.c index c72d8e2..4ed3cc5 100644 --- a/src/userland/keyboard/main.c +++ b/src/userland/keyboard/main.c @@ -87,7 +87,6 @@ void initialize() { createFunction("keyDown", (void *)keyDown); createFunction("keyUp", (void *)keyUp); - loadFromInitrd("ps2"); } int32_t main() { @@ -95,6 +94,5 @@ if (!initialized) { initialized = true; initialize(); - printf("keyboard driver set up\n"); } } diff --git a/src/userland/keyboard/main.c b/src/userland/keyboard/main.c index c72d8e2..4ed3cc5 100644 --- a/src/userland/keyboard/main.c +++ b/src/userland/keyboard/main.c @@ -87,7 +87,6 @@ void initialize() { createFunction("keyDown", (void *)keyDown); createFunction("keyUp", (void *)keyUp); - loadFromInitrd("ps2"); } int32_t main() { @@ -95,6 +94,5 @@ if (!initialized) { initialized = true; initialize(); - printf("keyboard driver set up\n"); } } diff --git a/src/userland/loader/main.c b/src/userland/loader/main.c index 3425077..15f9377 100644 --- a/src/userland/loader/main.c +++ b/src/userland/loader/main.c @@ -12,6 +12,7 @@ loadFromInitrd("keyboard"); loadFromInitrd("mouse"); loadFromInitrd("usb"); + loadFromInitrd("ps2"); uint32_t id = loadFromInitrdUninitialized("shell"); requestName("ioManager", "setForeground", id, 0); request(id, 0, 0, 0); diff --git a/src/userland/keyboard/main.c b/src/userland/keyboard/main.c index c72d8e2..4ed3cc5 100644 --- a/src/userland/keyboard/main.c +++ b/src/userland/keyboard/main.c @@ -87,7 +87,6 @@ void initialize() { createFunction("keyDown", (void *)keyDown); createFunction("keyUp", (void *)keyUp); - loadFromInitrd("ps2"); } int32_t main() { @@ -95,6 +94,5 @@ if (!initialized) { initialized = true; initialize(); - printf("keyboard driver set up\n"); } } diff --git a/src/userland/loader/main.c b/src/userland/loader/main.c index 3425077..15f9377 100644 --- a/src/userland/loader/main.c +++ b/src/userland/loader/main.c @@ -12,6 +12,7 @@ loadFromInitrd("keyboard"); loadFromInitrd("mouse"); loadFromInitrd("usb"); + loadFromInitrd("ps2"); uint32_t id = loadFromInitrdUninitialized("shell"); requestName("ioManager", "setForeground", id, 0); request(id, 0, 0, 0); diff --git a/src/userland/ps2/main.c b/src/userland/ps2/main.c index c68ce6a..e46313e 100644 --- a/src/userland/ps2/main.c +++ b/src/userland/ps2/main.c @@ -86,7 +86,7 @@ // disable scanning writeDevice(device, 0xF5); // wait for ACK - while (read(device) != 0xFA); + while (read() != 0xFA); // send identify command writeDevice(device, 0xF2); // wait for ACK @@ -129,7 +129,7 @@ } // send enable command writeController(device == 0 ? 0xAE : 0xA8); - read(); + // maybe there should be a read(); here, but it seems that just times out flushOutputBuffer(); // send reset command to device writeDevice(device, 0xFF); @@ -228,8 +228,6 @@ config.data.firstInterruptEnabled = 1; config.data.secondInterruptEnabled = 1; writeConfiguration(config.byte); - - printf("configuration now: %x", readConfiguration().byte); } int32_t main() {