From 30b0fe7561562c3fc9f6791fa0609d18a123b5e4 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Tue, 19 Dec 2006 22:19:55 +0000 Subject: [PATCH] This fixes bug #951 It's not required to enable the AUX ports after enabling active multiplexing, because the default according to specification is already enabled. In fact, Sony VGN-FS115M laptop even has a bug when processing the enable. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19566 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/ps2/ps2_common.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_common.c b/src/add-ons/kernel/bus_managers/ps2/ps2_common.c index 3536ec6a29..3b0104f1bb 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_common.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_common.c @@ -170,15 +170,6 @@ ps2_setup_active_multiplexing(bool *enabled) } dprintf("ps2: active multiplexing v%d.%d enabled\n", (in >> 4), in & 0xf); - ps2_command(0xa8, NULL, 0, NULL, 0); - ps2_command(0x90, NULL, 0, NULL, 0); - ps2_command(0xa8, NULL, 0, NULL, 0); - ps2_command(0x91, NULL, 0, NULL, 0); - ps2_command(0xa8, NULL, 0, NULL, 0); - ps2_command(0x92, NULL, 0, NULL, 0); - ps2_command(0xa8, NULL, 0, NULL, 0); - ps2_command(0x93, NULL, 0, NULL, 0); - ps2_command(0xa8, NULL, 0, NULL, 0); *enabled = true; return B_OK; @@ -194,7 +185,7 @@ fail: // just in case it has switched to multiplexed mode res = ps2_command(PS2_CTRL_SELF_TEST, NULL, 0, &out, 1); if (res != B_OK || out != 0x55) { - dprintf("ps2: controller self test failed, status 0x%08x, data 0x%02x\n", res, out); + dprintf("ps2: controller self test failed, status 0x%08lx, data 0x%02x\n", res, out); return B_ERROR; } return B_OK;