Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Adding audio mode to initiator mode #157

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[WIP] Adding audio mode to initiator mode #157

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0e37c3
Added Debug Function from DatExtract
andrewocyeah Jun 28, 2024
fe37d29
Enables Audio Mode
andrewocyeah Jun 28, 2024
0c9f54b
Fixing the Read command to work with Audio Mode
andrewocyeah Jun 28, 2024
a052d25
Tracking Interpolation Frames
andrewocyeah Jun 28, 2024
2c3c6f4
Added Comments and cleaned code
andrewocyeah Jul 15, 2024
bfdbfc1
Added Comment
andrewocyeah Jul 16, 2024
0b73c39
Added a End Check + Removed interpolation rereading
andrewocyeah Jul 29, 2024
805d0f8
Added Timecode
andrewocyeah Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 56 additions & 2 deletions src/BlueSCSI_initiator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ static struct {
uint32_t sectors_done;
uint32_t max_sector_per_transfer;
uint32_t badSectorCount;
uint32_t interpolationLeft;
uint32_t interpolationRight;
uint32_t interpolationBoth;
uint32_t goodFrames;
uint32_t allFrames;
uint32_t nullFrames;
uint32_t nullFramesMax;
uint8_t ansiVersion;
uint8_t maxRetryCount;
uint8_t deviceType;
Expand Down Expand Up @@ -109,6 +116,7 @@ void scsiInitiatorInit()
g_initiator_state.badSectorCount = 0;
g_initiator_state.deviceType = DEVICE_TYPE_DIRECT_ACCESS;
g_initiator_state.ejectWhenDone = false;
g_initiator_state.nullFramesMax = ini_getl("SCSI", "InitiatorMaxNullTrys", 10, CONFIGFILE);
}

// Update progress bar LED during transfers
Expand Down Expand Up @@ -336,6 +344,10 @@ void scsiInitiatorMainLoop()
log_f("NOTE: There were %d bad sectors that could not be read off this drive.", g_initiator_state.badSectorCount);
}

if(g_initiator_state.interpolationLeft)log_f("There are %d left interpolations",g_initiator_state.interpolationLeft);
if(g_initiator_state.interpolationRight)log_f("There are %d right interpolations",g_initiator_state.interpolationRight);
if(g_initiator_state.interpolationBoth)log_f("There are %d both interpolations",g_initiator_state.interpolationBoth);

if(!g_initiator_state.ejectWhenDone)
{
log("Marking this ID as imaged, wont ask it again.");
Expand Down Expand Up @@ -399,9 +411,12 @@ void scsiInitiatorMainLoop()
g_initiator_state.target_file.flush();

int speed_kbps = numtoread * g_initiator_state.sectorsize / (millis() - time_start);
log_f("SCSI read succeeded, sectors done: %d / %d speed %d kB/s - %.2f%%",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @erichelgeson @andrewocyeah, I was looking at this commit and see that this SCSI log line is changed. In the new version it is specific to the details of audio_mode tape transfers. I suggest this should be a conditional, so if audio_mode then use the new log line, else stay with the original.

log_f("SCSI read succeeded, sectors done: %d / %d speed %d kB/s - %.2f%%, [left: %d, right: %d, both: %d]",
g_initiator_state.sectors_done, g_initiator_state.sectorcount, speed_kbps,
(float)(((float)g_initiator_state.sectors_done / (float)g_initiator_state.sectorcount) * 100.0));
(float)(((float)g_initiator_state.sectors_done / (float)g_initiator_state.sectorcount) * 100.0),
g_initiator_state.interpolationLeft,
g_initiator_state.interpolationRight,
g_initiator_state.interpolationBoth);
}
}
}
Expand Down Expand Up @@ -848,6 +863,45 @@ bool scsiInitiatorReadDataToFile(int target_id, uint32_t start_sector, uint32_t
log("SCSI read from sector ", (int)start_sector, " was incomplete: expected ",
(int)g_initiator_transfer.bytes_scsi, " got ", (int)g_initiator_transfer.bytes_sd, " bytes");
g_initiator_transfer.all_ok = false;
}else{

if(scsiDev.data[0x16BB] & 0b00000010){
g_initiator_state.interpolationLeft++;
g_initiator_transfer.all_ok = false;

}
if(scsiDev.data[0x16BB] & 0b00000001){
g_initiator_state.interpolationRight++;
g_initiator_transfer.all_ok = false;
}

if(scsiDev.data[0x16BB] & 0b00000001 && scsiDev.data[0x16BB] & 0b00000010){
g_initiator_state.interpolationBoth++;
g_initiator_transfer.all_ok = false;
}

if(!(scsiDev.data[0x16BB] & 0b00000001 || scsiDev.data[0x16BB] & 0b00000010)){
g_initiator_state.goodFrames++;
}

g_initiator_state.allFrames++;

bool NullFrame = true;
for(int i = 0x1680; i < 0x17BC; i++){
if(scsiDev.data[i]){
NullFrame = false;
break;
}
}
if(NullFrame){
g_initiator_state.nullFrames++;
log("NULL FRAME!!!!");
if(g_initiator_state.nullFrames > g_initiator_state.nullFramesMax){
//Quit somehow!
}
}else{
g_initiator_state.nullFrames = 0;
}
}

while ((phase = (SCSI_PHASE)scsiHostPhyGetPhase()) != BUS_FREE)
Expand Down