diff options
Diffstat (limited to 'Private/Drivers')
| -rw-r--r-- | Private/Drivers/AHCI/Defines.hxx | 8 | ||||
| -rw-r--r-- | Private/Drivers/PS2/PS2KernelMouse.hxx | 23 |
2 files changed, 15 insertions, 16 deletions
diff --git a/Private/Drivers/AHCI/Defines.hxx b/Private/Drivers/AHCI/Defines.hxx index f3b93660..c1d3c063 100644 --- a/Private/Drivers/AHCI/Defines.hxx +++ b/Private/Drivers/AHCI/Defines.hxx @@ -313,10 +313,4 @@ typedef struct HbaCmdTbl final { HbaPrdtEntry prdtEntries[1]; // Physical region descriptor table entries, 0 ~ 65535 } HbaCmdTbl; -/* - * - * - * - * - * - */ +/* EOF */ diff --git a/Private/Drivers/PS2/PS2KernelMouse.hxx b/Private/Drivers/PS2/PS2KernelMouse.hxx index ecfc0459..e78bd97f 100644 --- a/Private/Drivers/PS2/PS2KernelMouse.hxx +++ b/Private/Drivers/PS2/PS2KernelMouse.hxx @@ -32,25 +32,30 @@ class PS2KernelMouse final { this->Write(0xFF); + HAL::Out8(0x64, 0xA8); + this->Wait(); HAL::Out8(0x64, 0x20); - this->Wait(); + this->WaitInput(); - auto status = HAL::In8(0x60); + UInt8 dataStatus = HAL::In8(0x60); - status |= 0x12; + dataStatus |= 0b10; this->Wait(); - - HAL::Out8(0x64, 0x60); - this->Wait(); - - HAL::Out8(0x60, status); + HAL::Out8(0x60, dataStatus); + + this->Write(0xF6); + auto f6Dat = this->Read(); + + this->Write(0xF4); + auto f4Dat = this->Read(); - HCore::kcout << "HCoreKrnl.exe: PS/2 mouse is OK.\r\n"; + HCore::kcout << "HCoreKrnl.exe: PS/2 mouse is OK: " << hex_number(f6Dat); + HCore::kcout << ", " << hex_number(f4Dat) << end_line(); } private: |