apple_gcr: Refuse 800K images on single-sided drives

This commit is contained in:
Olivier Galibert 2021-03-04 13:48:07 +01:00
parent e3d0004eed
commit 551714138a
2 changed files with 4 additions and 3 deletions

View File

@ -1403,7 +1403,7 @@ bool apple_gcr_format::supports_save() const
int apple_gcr_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
uint64_t size = io_generic_size(io);
if(size == 409600 || size == 819200)
if(size == 409600 || (size == 819200 && (variants.empty() || has_variant(variants, floppy_image::DSDD))))
return 50;
return 0;
@ -1422,9 +1422,10 @@ bool apple_gcr_format::load(io_generic *io, uint32_t form_factor, const std::vec
uint64_t size = io_generic_size(io);
int head_count = size == 409600 ? 1 : size == 819200 ? 2 : 0;
image->set_form_variant(floppy_image::FF_35, head_count == 2 ? floppy_image::DSDD : floppy_image::SSDD);
if(!head_count)
return false;
for(int track=0; track < 80; track++) {
for(int head=0; head < head_count; head++) {
int ns = 12 - (track/16);

View File

@ -751,7 +751,7 @@ public:
//! @param v the variant.
void set_variant(uint32_t v) { variant = v; }
//! @param v the variant.
void set_form_variant(uint32_t f, uint32_t v) { if(form_factor == FF_UNKNOWN) form_factor = f, variant = v; }
void set_form_variant(uint32_t f, uint32_t v) { if(form_factor == FF_UNKNOWN) form_factor = f; variant = v; }
/*!
@param track