Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 23:12:11 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ap_dsk35: updates [R. Belmont]

Browse Source 
- Set form factor for 2mg and dc42 disks so the SuperDrive can handle them
- Accept ProDOS-format dc42 3.5" disks
This commit is contained in:
arbee 2021-03-06 13:14:56 -05:00
parent d608ebfa41
commit 444470572b
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/formats/ap_dsk35.cpp
View File

@ -1257,11 +1257,35 @@ bool dc42_format::load(io_generic *io, uint32_t form_factor, const std::vector<u
uint8_t encoding = h[0x50];
uint8_t format = h[0x51];
if((encoding != 0x00 || format != 0x02) && (encoding != 0x01 || format != 0x22)) {
if((encoding != 0x00 || format != 0x02) && (encoding != 0x01 || (format != 0x22 && format != 0x24))) {
osd_printf_error("dc42: Unsupported encoding/format combination %02x/%02x\n", encoding, format);
return false;
}
switch (dsize)
{
case 409600: // Mac 400K
image->set_form_variant(floppy_image::FF_35, floppy_image::SSDD);
break;
case 737280: // PC 720K
case 819200: // Mac/A2 800K
image->set_form_variant(floppy_image::FF_35, floppy_image::DSDD);
break;
case 1474560: // PC or Mac 1.44M
image->set_form_variant(floppy_image::FF_35, floppy_image::DSHD);
break;
case 871424: // Apple Twiggy 851KiB
image->set_form_variant(floppy_image::FF_525, floppy_image::DSHD);
break;
default:
osd_printf_error("dc42: dsize is %d, unknown form factor\n");
break;
}
uint8_t sector_data[(512+12)*12];
memset(sector_data, 0, sizeof(sector_data));
@ -1525,6 +1549,8 @@ bool apple_2mg_format::load(io_generic *io, uint32_t form_factor, const std::vec
if(blocks != 1600 && blocks != 16390)
return false;
image->set_form_variant(floppy_image::FF_35, (blocks > 800) ? floppy_image::DSDD : floppy_image::SSDD);
for(int track=0; track < 80; track++) {
for(int head=0; head < 2; head++) {
int ns = 12 - (track/16);