LIV2/lide.device
1
0
Fork 0
mirror of https://github.com/LIV2/lide.device.git synced 2025-12-06 00:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ata.c:

Browse Source 
* optimize status_reg_delay
* write_taskfile_lba/chs - write head register after waiting for BSY to clear, not before
This commit is contained in:
Matt Harlum 2023-12-06 21:55:37 +00:00 committed by Matt Harlum
parent 6f0e0b4acc
commit 0beac9f71e
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ata.c
View File

@ -35,14 +35,13 @@ static BYTE write_taskfile_chs(struct IDEUnit *unit, UBYTE command, ULONG lba, U
* @param unit Pointer to an IDEUnit struct * @param unit Pointer to an IDEUnit struct
*/ */
static void __attribute__((always_inline)) ata_status_reg_delay(struct IDEUnit *unit) { static void __attribute__((always_inline)) ata_status_reg_delay(struct IDEUnit *unit) {
BYTE status;
asm volatile ( asm volatile (
".rep 6 \n\t" ".rep 4 \n\t"
"move.b (%1),%0 \n\t" "tst.l (%0) \n\t" // Use tst.l so we don't need to save/restore some other register
".endr \n\t" ".endr \n\t"
: "=&d" (status) :
: "a" (unit->drive->status_command) : "a" (unit->drive->status_command)
: "d0" :
); );
} }
@ -173,7 +172,7 @@ bool ata_select(struct IDEUnit *unit, UBYTE select, bool wait)
*unit->drive->devHead = select; *unit->drive->devHead = select;
if (changed && wait) { if (changed && wait) {
wait_us(unit->itask->tr,5); wait_us(unit->itask->tr,5); // Could possibly be replaced with call to ata_status_reg_delay
ata_wait_not_busy(unit,ATA_BSY_WAIT_COUNT); ata_wait_not_busy(unit,ATA_BSY_WAIT_COUNT);
} }
@ -642,13 +641,14 @@ static BYTE write_taskfile_chs(struct IDEUnit *unit, UBYTE command, ULONG lba, U
UBYTE head = ((lba / unit->sectorsPerTrack) % unit->heads) & 0xF; UBYTE head = ((lba / unit->sectorsPerTrack) % unit->heads) & 0xF;
UBYTE sector = (lba % unit->sectorsPerTrack) + 1; UBYTE sector = (lba % unit->sectorsPerTrack) + 1;
BYTE drvSelHead = ((unit->primary) ? 0xA0 : 0xB0) | (head & 0x0F); BYTE devHead;
ata_select(unit,drvSelHead,false); *unit->shadowDevHead = devHead = ((unit->primary) ? 0xA0 : 0xB0) | (head & 0x0F);
if (!ata_wait_ready(unit,ATA_RDY_WAIT_COUNT)) if (!ata_wait_ready(unit,ATA_RDY_WAIT_COUNT))
return HFERR_SelTimeout; return HFERR_SelTimeout;
*unit->drive->devHead = devHead;
*unit->drive->sectorCount = sectorCount; // Count value of 0 indicates to transfer 256 sectors *unit->drive->sectorCount = sectorCount; // Count value of 0 indicates to transfer 256 sectors
*unit->drive->lbaLow = (UBYTE)(sector); *unit->drive->lbaLow = (UBYTE)(sector);
*unit->drive->lbaMid = (UBYTE)(cylinder); *unit->drive->lbaMid = (UBYTE)(cylinder);
@ -665,12 +665,13 @@ static BYTE write_taskfile_chs(struct IDEUnit *unit, UBYTE command, ULONG lba, U
* @param lba Pointer to the LBA variable * @param lba Pointer to the LBA variable
*/ */
static BYTE write_taskfile_lba(struct IDEUnit *unit, UBYTE command, ULONG lba, UBYTE sectorCount) { static BYTE write_taskfile_lba(struct IDEUnit *unit, UBYTE command, ULONG lba, UBYTE sectorCount) {
BYTE drvSelHead = ((unit->primary) ? 0xE0 : 0xF0) | ((lba >> 24) & 0x0F); BYTE devHead;
*unit->shadowDevHead = devHead = ((unit->primary) ? 0xE0 : 0xF0) | ((lba >> 24) & 0x0F);
ata_select(unit,drvSelHead,false);
if (!ata_wait_ready(unit,ATA_RDY_WAIT_COUNT)) if (!ata_wait_ready(unit,ATA_RDY_WAIT_COUNT))
return HFERR_SelTimeout; return HFERR_SelTimeout;
*unit->drive->devHead = devHead;
*unit->drive->sectorCount = sectorCount; // Count value of 0 indicates to transfer 256 sectors *unit->drive->sectorCount = sectorCount; // Count value of 0 indicates to transfer 256 sectors
*unit->drive->lbaLow = (UBYTE)(lba); *unit->drive->lbaLow = (UBYTE)(lba);
*unit->drive->lbaMid = (UBYTE)(lba >> 8); *unit->drive->lbaMid = (UBYTE)(lba >> 8);