Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Marcus Overhagen 2006-12-19 22:19:55 +00:00
parent c46eb09e8f
commit 30b0fe7561
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/add-ons/kernel/bus_managers/ps2/ps2_common.c
View File

@ -170,15 +170,6 @@ ps2_setup_active_multiplexing(bool *enabled)
} }
dprintf("ps2: active multiplexing v%d.%d enabled\n", (in >> 4), in & 0xf); 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; *enabled = true;
return B_OK; return B_OK;
@ -194,7 +185,7 @@ fail:
// just in case it has switched to multiplexed mode // just in case it has switched to multiplexed mode
res = ps2_command(PS2_CTRL_SELF_TEST, NULL, 0, &out, 1); res = ps2_command(PS2_CTRL_SELF_TEST, NULL, 0, &out, 1);
if (res != B_OK || out != 0x55) { 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_ERROR;
} }
return B_OK; return B_OK;