Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 01:48:29 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

ti99: Fix a problem with formatted disk images that do not match the expected file size

Browse Source
This commit is contained in:
Michael Zapf 2016-08-24 14:22:21 +02:00
parent cf67d5cfd7
commit 19a2c632ae
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/formats/ti99_dsk.cpp
View File

@ -47,7 +47,7 @@
#define SECTOR_SIZE 256 #define SECTOR_SIZE 256
// Debugging // Debugging
#define TRACE 0 #define TRACE 1
// ==================================================== // ====================================================
// Common methods for both formats. // Common methods for both formats.
@ -99,7 +99,8 @@ bool ti99_floppy_format::load(io_generic *io, UINT32 form_factor, floppy_image *
int cell_size = 0; int cell_size = 0;
int sector_count = 0; int sector_count = 0;
int heads = 0; int heads = 0;
determine_sizes(io, cell_size, sector_count, heads); int tracks = 0;
determine_sizes(io, cell_size, sector_count, heads, tracks);
if (cell_size == 0) return false; if (cell_size == 0) return false;
@ -111,7 +112,8 @@ bool ti99_floppy_format::load(io_generic *io, UINT32 form_factor, floppy_image *
int file_size = io_generic_size(io); int file_size = io_generic_size(io);
int track_size = get_track_size(cell_size, sector_count); int track_size = get_track_size(cell_size, sector_count);
int track_count = file_size / (track_size*heads); int track_count = tracks;
if (tracks==0) track_count = file_size / (track_size*heads);
if (TRACE) osd_printf_info("ti99_dsk: track count = %d\n", track_count); if (TRACE) osd_printf_info("ti99_dsk: track count = %d\n", track_count);
@ -785,7 +787,7 @@ int ti99_sdf_format::identify(io_generic *io, UINT32 form_factor)
return vote; return vote;
} }
void ti99_sdf_format::determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) void ti99_sdf_format::determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads, int& tracks)
{ {
UINT64 file_size = io_generic_size(io); UINT64 file_size = io_generic_size(io);
ti99vib vib; ti99vib vib;
@ -819,10 +821,11 @@ void ti99_sdf_format::determine_sizes(io_generic *io, int& cell_size, int& secto
} }
if (TRACE) osd_printf_info("ti99_dsk: VIB says that this disk is %s density with %d sectors per track, %d tracks, and %d heads\n", (cell_size==4000)? "single": ((cell_size==2000)? "double" : "high"), sector_count, vib.tracksperside, heads); if (TRACE) osd_printf_info("ti99_dsk: VIB says that this disk is %s density with %d sectors per track, %d tracks, and %d heads\n", (cell_size==4000)? "single": ((cell_size==2000)? "double" : "high"), sector_count, vib.tracksperside, heads);
have_vib = true; have_vib = true;
tracks = vib.tracksperside;
} }
// Do we have a broken VIB? The Pascal disks are known to have such incomplete VIBs // Do we have a broken VIB? The Pascal disks are known to have such incomplete VIBs
if (heads == 0 || sector_count == 0) have_vib = false; if (tracks == 0 || heads == 0 || sector_count == 0) have_vib = false;
// We're also checking the size of the image // We're also checking the size of the image
int cell_size1 = 0; int cell_size1 = 0;
@ -1095,7 +1098,7 @@ int ti99_tdf_format::identify(io_generic *io, UINT32 form_factor)
Find the proper format for a given image file. We determine the cell size, Find the proper format for a given image file. We determine the cell size,
but we do not care about the sector size (only needed by the SDF converter). but we do not care about the sector size (only needed by the SDF converter).
*/ */
void ti99_tdf_format::determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) void ti99_tdf_format::determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads, int& tracks)
{ {
UINT64 file_size = io_generic_size(io); UINT64 file_size = io_generic_size(io);
heads = 2; // TDF only supports two-sided recordings heads = 2; // TDF only supports two-sided recordings

6
src/lib/formats/ti99_dsk.h
View File

@ -29,7 +29,7 @@ protected:
virtual int min_heads() =0; virtual int min_heads() =0;
virtual void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) =0; virtual void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads, int& tracks) =0;
virtual int get_track_size(int cell_size, int sector_count) =0; virtual int get_track_size(int cell_size, int sector_count) =0;
virtual void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) =0; virtual void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) =0;
virtual void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) =0; virtual void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) =0;
@ -57,7 +57,7 @@ public:
const char *extensions() const override; const char *extensions() const override;
private: private:
void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) override; void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads, int& tracks) override;
int get_track_size(int cell_size, int sector_count) override; int get_track_size(int cell_size, int sector_count) override;
void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override; void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override;
void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override; void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override;
@ -96,7 +96,7 @@ public:
const char *extensions() const override; const char *extensions() const override;
private: private:
void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) override; void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads, int& tracks) override;
void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override; void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override;
void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override; void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override;
int get_track_size(int cell_size, int sector_count) override; int get_track_size(int cell_size, int sector_count) override;