tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-03-15 04:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace AHCIPortInit CPortCmdHeader pointer cast(s) with declared variable.

Browse source
This commit is contained in:
TomAwezome 2022-09-13 01:45:25 -04:00
parent 95ee43d4a1
commit 8c132e2536
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Kernel/BlkDev/DiskAHCI.ZC
View file

@ -961,8 +961,9 @@ I64 AHCIAtapiBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num) U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num)
{//Initialize base addresses for command list and FIS receive area and start command execution on port. {//Initialize base addresses for command list and FIS receive area and start command execution on port.
CPortCmdHeader *cmd_header; CPortCmdHeader *cmd_header,
I64 i; *cmd_header_base;
I64 i;
if (!(port->signature == AHCI_PxSIG_ATAPI || port->signature == AHCI_PxSIG_ATA)) if (!(port->signature == AHCI_PxSIG_ATAPI || port->signature == AHCI_PxSIG_ATA))
Debug("AHCI Port/BlkDev error: Invalid Port Signature"); Debug("AHCI Port/BlkDev error: Invalid Port Signature");
@ -993,8 +994,9 @@ U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num)
port->fis_base_upper = 0; port->fis_base_upper = 0;
cmd_header_base = port->cmd_list_base;
if (sys_boot_src.u16[0] == BOOT_SRC_DVD) if (sys_boot_src.u16[0] == BOOT_SRC_DVD)
{ {
"AHCI: DEBUG: AHCIPortInit variable check\n"; "AHCI: DEBUG: AHCIPortInit variable check\n";
"___________\n"; "___________\n";
"port (addr): 0x%016X\n", port; "port (addr): 0x%016X\n", port;
@ -1002,17 +1004,13 @@ U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num)
"&port->fis_base: 0x%016X\n", &port->fis_base; "&port->fis_base: 0x%016X\n", &port->fis_base;
"port->cmd_list_base: 0x%016X\n", port->cmd_list_base; "port->cmd_list_base: 0x%016X\n", port->cmd_list_base;
"&port->cmd_list_base: 0x%016X\n", &port->cmd_list_base; "&port->cmd_list_base: 0x%016X\n", &port->cmd_list_base;
"port->cmd_list_base(CPortCmdHeader *): 0x%016X\n", port->cmd_list_base(CPortCmdHeader *); "cmd_header_base: 0x%016X\n", cmd_header_base;
"&port->cmd_list_base(CPortCmdHeader *): 0x%016X\n", &port->cmd_list_base(CPortCmdHeader *); "&cmd_header_base[0]: 0x%016X\n", &cmd_header_base[0];
"&port->cmd_list_base(CPortCmdHeader *)[0]: 0x%016X\n", &port->cmd_list_base(CPortCmdHeader *)[0]; "___________\n";
"blkdev.cmd_slot_count: %d\n", blkdev.cmd_slot_count; }
"___________\nAHCI: DEBUG: Halting...";
while(TRUE){HLT};
}
for (i = 0; i < blkdev.cmd_slot_count; i++) for (i = 0; i < blkdev.cmd_slot_count; i++)
{ {
cmd_header = &port->cmd_list_base(CPortCmdHeader *)[i]; cmd_header = &cmd_header_base[i];
//Write Command FIS Length (CFL, a fixed size) in bits 4:0 of the desc. Takes size in U32s. //Write Command FIS Length (CFL, a fixed size) in bits 4:0 of the desc. Takes size in U32s.
cmd_header->desc = sizeof(CFisH2D) / sizeof(U32); cmd_header->desc = sizeof(CFisH2D) / sizeof(U32);