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 DVDImageRead.

Browse source 
Implement functions for AHCI ATAPI Seek and Start/Stop.
This commit is contained in:
TomAwezome 2021-06-16 20:47:21 -04:00
parent 2bf3d229bc
commit 138e503ccd
4 changed files with 96 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Zenith-latest-2021-06-15-21_35_43.iso → Zenith-latest-2021-06-16-20_14_58.iso
View file

Binary file not shown.

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

@ -168,6 +168,90 @@ I64 AHCIAtapiCapacityGet(CBlkDev *bd)
return EndianU32(buf[0]);
}
Bool AHCIAtapiSeek(CBlkDev *bd, I64 blk)
{
CPortCmdTable *cmd_table;
CFisH2D *cmd_fis;
CAHCIPort *port = bd->ahci_port;
I64 cmd_slot = AHCIPortCmdSlotGet(bd->port_num);
CPortCmdHeader *cmd_header = AHCIPortActiveHeaderGet(bd->port_num, cmd_slot);
if (port->signature != AHCI_PxSIG_ATAPI)
{
ZenithErr("AHCI: Drive is not an ATAPI drive!\n");
throw('AHCI');
}
Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
cmd_table = cmd_header->cmd_table_base;
MemSet(cmd_table, 0, sizeof(CPortCmdTable));
cmd_fis = &cmd_table->cmd_fis;
cmd_fis->type = FISt_H2D;
Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
cmd_fis->command = ATA_PACKET;
cmd_table->acmd[0] = ATAPI_SEEK >> 8;
cmd_table->acmd[2] = blk.u8[4];
cmd_table->acmd[3] = blk.u8[3];
cmd_table->acmd[4] = blk.u8[2];
cmd_table->acmd[5] = blk.u8[1];
AHCIPortWait(bd->port_num, tS + 2);
Bts(&port->cmd_issue, cmd_slot); //Issue the command.
try
AHCIPortCmdWait(bd->port_num, cmd_slot);
catch
{
Fs->catch_except = TRUE;
return FALSE;
}
return TRUE;
}
Bool AHCIAtapiStartStop(CBlkDev *bd, Bool start)
{
CPortCmdTable *cmd_table;
CFisH2D *cmd_fis;
CAHCIPort *port = bd->ahci_port;
I64 cmd_slot = AHCIPortCmdSlotGet(bd->port_num);
CPortCmdHeader *cmd_header = AHCIPortActiveHeaderGet(bd->port_num, cmd_slot);
if (port->signature != AHCI_PxSIG_ATAPI)
{
ZenithErr("AHCI: Drive is not an ATAPI drive!\n");
throw('AHCI');
}
Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
cmd_table = cmd_header->cmd_table_base;
MemSet(cmd_table, 0, sizeof(CPortCmdTable));
cmd_fis = &cmd_table->cmd_fis;
cmd_fis->type = FISt_H2D;
Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
cmd_fis->command = ATA_PACKET;
cmd_table->acmd[0] = ATAPI_START_STOP_UNIT >> 8;
cmd_table->acmd[4] = start;
AHCIPortWait(bd->port_num, tS + 2);
Bts(&port->cmd_issue, cmd_slot); //Issue the command.
try
AHCIPortCmdWait(bd->port_num, cmd_slot);
catch
{
Fs->catch_except = TRUE;
return FALSE;
}
return TRUE;
}
U0 AHCIPortIdentify(CBlkDev *bd)
{//Perform ATA_IDENTIFY command on ATA/ATAPI drive and store capacity and id record.

6
src/Kernel/BlkDev/DiskCDDVD.CC
View file

@ -101,12 +101,14 @@ U0 DVDImageRead(U8 dvd_drive_let, U8 *out_name)
retry = 4;
while (--retry)
if (IDEATAPIReadBlks2(bd, tS + 7.0 + 0.004 * n / spc, buf, blk / spc, n / spc, TRUE))
// if (IDEATAPIReadBlks2(bd, tS + 7.0 + 0.004 * n / spc, buf, blk / spc, n / spc, TRUE))
if (AHCIAtapiBlksRead(bd, buf, blk / spc, n / spc)) // ahci
//n is 0x800 if max_reads. Up to 8 additional seconds
break;
if (!retry)
IDEATAPIReadBlks2(bd, 0, buf, blk / spc, n / spc, TRUE);
// IDEATAPIReadBlks2(bd, 0, buf, blk / spc, n / spc, TRUE);
AHCIAtapiBlksRead(bd, buf, blk / spc, n / spc); // ahci
FBlkWrite(f, buf, blk, n);
count -= n;

12
src/Kernel/KernelC.HH
View file

@ -362,10 +362,14 @@ public extern I64 MountIDEAuto();
extern U0 AHCIHbaReset();
extern U0 AHCIPortReset(I64 port_num);
extern U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num);
extern I64 AHCIAtaBlksRW( CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write);
extern I64 AHCIAtaBlksRead( CBlkDev *bd, U8 *buf, I64 blk, I64 count);
extern I64 AHCIAtaBlksWrite( CBlkDev *bd, U8 *buf, I64 blk, I64 count);
extern I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count);
extern I64 AHCIAtaBlksRW( CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write);
extern I64 AHCIAtaBlksRead( CBlkDev *bd, U8 *buf, I64 blk, I64 count);
extern I64 AHCIAtaBlksWrite( CBlkDev *bd, U8 *buf, I64 blk, I64 count);
extern I64 AHCIAtapiBlksRead( CBlkDev *bd, U8 *buf, I64 blk, I64 count);
extern Bool AHCIAtapiSeek( CBlkDev *bd, I64 blk);
extern Bool AHCIAtapiStartStop(CBlkDev *bd, Bool start);
public extern CBlkDevGlobals blkdev;
#help_index "Graphics/Color"