mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ps2: mix fixes

Browse Source
This commit is contained in:
Matheus
2023-08-06 00:45:19 -03:00
parent 25828c17c6
commit 5ea1479601
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/arch/x86-64/ps2.c
+9 -7
View File
@@ -7,12 +7,13 @@ static bool reset_selftest(int port) {
bool timeout = false; bool timeout = false;
int attempts = 0; int attempts = 0;
while (r == RESEND && attempts < 10) { while (r == RESEND && attempts < 5) {
device_command(port, DEVICE_CMD_RESETSELFTEST); device_command(port, DEVICE_CMD_RESETSELFTEST);
r = read_data_timeout(5, &timeout); r = read_data_timeout(5, &timeout);
++attempts;
} }
if (attempts == 10) if (attempts == 5)
timeout = true; timeout = true;
if (!timeout) { if (!timeout) {
@@ -43,8 +44,10 @@ void arch_ps2_init() {
write_data(control); write_data(control);
write_command(CTLR_CMD_SELFTEST); write_command(CTLR_CMD_SELFTEST);
if (read_data() != CTLR_SELFTEST_OK) if (read_data() != CTLR_SELFTEST_OK) {
printf("ps2: controller self test failed.\n"); printf("ps2: controller self test failed.\n");
return;
}
write_command(CTLR_CMD_WRITECFG); write_command(CTLR_CMD_WRITECFG);
write_data(control); // restore config if it was reset write_data(control); // restore config if it was reset
@@ -61,7 +64,6 @@ void arch_ps2_init() {
else else
write_command(CTLR_CMD_DISABLEP2); // disable second port again write_command(CTLR_CMD_DISABLEP2); // disable second port again
// self test ports
int workingflag = 0; int workingflag = 0;
write_command(CTLR_CMD_P1SELFTEST); write_command(CTLR_CMD_P1SELFTEST);
@@ -75,7 +77,7 @@ void arch_ps2_init() {
if (read_data() == 0) if (read_data() == 0)
workingflag |= 2; workingflag |= 2;
else else
printf("ps2: econd port self test failed!\n"); printf("ps2: second port self test failed!\n");
} }
if (workingflag == 0) { if (workingflag == 0) {
@@ -105,10 +107,10 @@ void arch_ps2_init() {
int connectedflag = 0; int connectedflag = 0;
if (workingflag & 1 && reset_selftest(1)) if ((workingflag & 1) && reset_selftest(1))
connectedflag |= 1; connectedflag |= 1;
if (workingflag & 2 && reset_selftest(2)) if ((workingflag & 2) && reset_selftest(2))
connectedflag |= 2; connectedflag |= 2;
// XXX should id each one for proper identification // XXX should id each one for proper identification