tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 15:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix AHCI initialization on bare-metal.

Browse source
This commit is contained in:
TomAwezome 2021-06-15 01:09:35 -04:00
parent baa862b268
commit 674ef844b8
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Zenith-latest-2021-06-06-00_00_16.iso → Zenith-latest-2021-06-15-01_00_18.iso
View file

Binary file not shown.

4
src/HomeSys.CC
View file

@ -21,8 +21,8 @@ U0 ServerStartUp()
U0 StartUpTasks()
{
if (sys_boot_src.u16[0] != BOOT_SRC_RAM)
PopUpRunFile("::/Zenith/ZSplash.CC");
// if (sys_boot_src.u16[0] != BOOT_SRC_RAM)
// PopUpRunFile("::/Zenith/ZSplash.CC");
CTask *user = User;
WinToTop(user);
WinTileVert;

21
src/Kernel/BlkDev/DiskAHCI.CC
View file

@ -550,13 +550,18 @@ U0 AHCIInit()
hba = dev.uncached_alias + PCIReadU32(bdf.u8[2], bdf.u8[1], bdf.u8[0], PCIR_BASE5) & ~0x1F; //Last 4 bits not part of address.
blkdev.ahci_hba = hba;
AHCIHbaReset;
"AHCI: HBA reset\n";
Bts(&blkdev.ahci_hba->ghc, AHCI_GHCf_AHCI_ENABLE);
"AHCI: GHC.AE\n";
// AHCIHbaReset;
// "AHCI: HBA reset\n";
//Transferring ownership from BIOS if supported.
if (Bt(&hba->caps_ext, AHCI_CAPSEXTf_BOH))
{
Bt(&hba->bohc, AHCI_BOHCf_OOS);
"AHCI: Transferring ownership from BIOS\n";
while (Bt(&hba->bohc, AHCI_BOHCf_BOS));
@ -573,11 +578,17 @@ U0 AHCIInit()
if (Bt(&hba->ports_implemented, i))
{//$BK,1$Make ports idle?$BK,0$
port = &hba->ports[i];
"AHCI: port on %d, signature 0x%0X\n", i, port->signature;
if (port->signature == AHCI_PxSIG_ATA || port->signature == AHCI_PxSIG_ATAPI)
{
"AHCI: port on %d\n", i;
if (port->signature == AHCI_PxSIG_ATAPI)
{
Bts(&port->command, AHCI_PxCMDf_ATAPI);
" ATAPI drive\n";
}
else
" ATAPI drive\n";
if (!AHCIPortIsIdle(i))
{
"AHCI: Port not idle\n";
@ -600,8 +611,12 @@ Bool AHCIBootDVDProbeAll(CBlkDev *bd)
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
"AHCI: BootDVDProbeAll: Saw port at %d with signature 0x%0X\n", i, port->signature;
if (port->signature == AHCI_PxSIG_ATAPI)
{
"AHCI: Probing ATAPI drive at port %d\n", i;
AHCIPortInit(bd, port, i);
AHCIAtapiBlksRead(bd, buf, sys_boot_blk, 1);