Macintosh-HW/SCSI2SD
1
0
Fork 0
mirror of https://github.com/fhgwright/SCSI2SD.git synced 2024-06-02 22:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Implement reading spi flash over SCSI

Browse Source
This commit is contained in:
Michael McMaster 2021-01-28 07:20:13 +10:00
parent e4d14f93e3
commit b5cfe91cc5
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
software/SCSI2SD/src/disk.c
View File

@ -161,7 +161,8 @@ static void doWrite(uint32 lba, uint32 blocks)
MEDIA_STATE* mediaState = &(scsiDev.target->device->mediaState); MEDIA_STATE* mediaState = &(scsiDev.target->device->mediaState);
if (unlikely(*mediaState & MEDIA_WP) || if (unlikely(*mediaState & MEDIA_WP) ||
unlikely(scsiDev.target->cfg->deviceType == CONFIG_OPTICAL)) unlikely(scsiDev.target->cfg->deviceType == CONFIG_OPTICAL) ||
(scsiDev.target->cfg->storageDevice != CONFIG_STOREDEVICE_SD))
{ {
scsiDev.status = CHECK_CONDITION; scsiDev.status = CHECK_CONDITION;
@ -245,7 +246,8 @@ static void doRead(uint32 lba, uint32 blocks)
(sdSectors == 1) && (sdSectors == 1) &&
!(scsiDev.boardCfg.flags & CONFIG_ENABLE_CACHE) !(scsiDev.boardCfg.flags & CONFIG_ENABLE_CACHE)
) || ) ||
unlikely(((uint64) lba) + blocks == capacity) unlikely(((uint64) lba) + blocks == capacity) ||
(scsiDev.target->cfg->storageDevice != CONFIG_STOREDEVICE_SD)
) )
{ {
// We get errors on reading the last sector using a multi-sector // We get errors on reading the last sector using a multi-sector
@ -599,16 +601,26 @@ void scsiDiskPoll()
(prep - i < buffers) && (prep - i < buffers) &&
(prep < totalSDSectors)) (prep < totalSDSectors))
{ {
// Start an SD transfer if we have space. if (scsiDev.target->cfg->storageDevice == CONFIG_STOREDEVICE_SD)
if (transfer.multiBlock) {
{ // Start an SD transfer if we have space.
sdReadMultiSectorDMA(&scsiDev.data[SD_SECTOR_SIZE * (prep % buffers)]); if (transfer.multiBlock)
} {
else sdReadMultiSectorDMA(&scsiDev.data[SD_SECTOR_SIZE * (prep % buffers)]);
{ }
sdReadSingleSectorDMA(sdLBA + prep, &scsiDev.data[SD_SECTOR_SIZE * (prep % buffers)]); else
} {
sdActive = 1; sdReadSingleSectorDMA(sdLBA + prep, &scsiDev.data[SD_SECTOR_SIZE * (prep % buffers)]);
}
sdActive = 1;
}
else
{
// Sync Read onboard flash
S2S_Device* device = scsiDev.target->device;
device->read(device, sdLBA + prep, 1, &scsiDev.data[SD_SECTOR_SIZE * (prep % buffers)]);
prep++;
}
} }
if (scsiActive && !scsiBusy && scsiWriteDMAPoll()) if (scsiActive && !scsiBusy && scsiWriteDMAPoll())