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.

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

Add .DO support. Look inside .DSK files to detect sector order. #679

Merged

Conversation

mike-wiese
Copy link
Contributor

For issue #616

  • add support for DOS order .DO disk images
  • look for ProDOS volume header info inside .DSK image files to detect if they are in DOS order or ProDOS order

Copy link
Collaborator

@tschak909 tschak909 left a comment

Choose a reason for hiding this comment

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

Thank you!

@tschak909 tschak909 merged commit 9b60b41 into FujiNetWIFI:master Oct 22, 2023
@@ -535,8 +551,6 @@ mediatype_t iwmDisk::mount(FILE *f, const char *filename, uint32_t disksize, med
readonly = false;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is the section above not duplicated to MEDIATYPE_DO?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

high_score_enabled is only ever set to true for .2MG files in MediaTypePO::mount

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. Thanks for the quick and helpful answer :-)

Another question I couldn't find an answer for easily: Does the new code make sure that Disk II mounting of PO media is only an option for 140kB files?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I admit I don't really understand the high score code. I don't recall anything like that for other floppy emulators, so I assume it is a FujiNet thing?

The new code is not checking for 140kB files. I was thinking to allow up to 160kB, or anywhere between 35-40 whole tracks, since WOZ format supports up to 40. Not common but pretty easy. I could pass back MEDIATYPE_UNKNOWN from the ::mount calls if the size isn't supported.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure how to interpret your answer. Do you say that there's already code in place that checks for some size or do you say that you plan to add such code?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The new code calls through to the old DSK code … as far as I can tell the DSK code does not check the size.

I am proposing to add file size checks, and support up to 40 tracks while I'm in the code.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the explanation :-)

@tschak909
Copy link
Collaborator

tschak909 commented Oct 23, 2023 via email

@tschak909
Copy link
Collaborator

tschak909 commented Oct 24, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants