td0_dsk: cleanup (nw)

This commit is contained in:
cracyc 2014-04-09 13:46:04 +00:00
parent af7aba4e19
commit 2130b87ae0

View File

@ -823,8 +823,6 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
dynamic_buffer imagebuf(max_size);
UINT8 header[12];
try
{
io_generic_read(io, header, 0, 12);
head_count = header[9];
@ -845,7 +843,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
track_spt = imagebuf[offset];
if(track_spt == 255) // Empty file?
throw false;
return false;
switch(header[6])
{
@ -855,7 +853,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
if(head_count == 2)
image->set_variant(floppy_image::DSHD);
else
throw false; // single side hd?
return false; // single side hd?
break;
}
/* no break; could be qd, won't know until tracks are counted */
@ -871,7 +869,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
if(head_count == 2)
image->set_variant(floppy_image::DSHD);
else
throw false; // single side 3.5?
return false; // single side 3.5?
break;
}
/* no break */
@ -888,7 +886,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
if(form_factor == floppy_image::FF_525)
image->set_variant(floppy_image::SSQD);
else
throw false; // single side 3.5?
return false; // single side 3.5?
}
break;
}
@ -930,7 +928,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
switch(hs[8])
{
default:
throw false;
return false;
case 0:
memcpy(&sect_data[sdatapos], &imagebuf[offset], size);
offset += size;
@ -1001,13 +999,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
else if(image->get_variant() == floppy_image::SSDD)
image->set_variant(floppy_image::SSQD);
}
throw true;
}
catch(bool ret)
{
return ret;
}
return false;
return true;
}