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

Sync with MESS (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2011-12-25 07:53:06 +00:00
parent 8b958b7b7c
commit 8b883bb7ca
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/formats/ipf_dsk.c
View File

@ -601,15 +601,21 @@ bool ipf_format::generate_gap_from_description(const UINT8 *&data, const UINT8 *
} }
bool ipf_format::generate_block_gap_1(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context) bool ipf_format::generate_block_gap_1(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context)
{ {
spos = 0; if(ipos >= 16 && ipos < gap_cells-16)
spos = ipos;
else
spos = 0;
return generate_gap_from_description(data, dlimit, track, gap_cells, true, context); return generate_gap_from_description(data, dlimit, track, gap_cells, true, context);
} }
bool ipf_format::generate_block_gap_2(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context) bool ipf_format::generate_block_gap_2(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context)
{ {
spos = gap_cells; if(ipos >= 16 && ipos < gap_cells-16)
spos = ipos;
else
spos = gap_cells;
return generate_gap_from_description(data, dlimit, track, gap_cells, false, context); return generate_gap_from_description(data, dlimit, track, gap_cells, false, context);
} }
@ -646,9 +652,9 @@ bool ipf_format::generate_block_gap(UINT32 gap_type, UINT32 gap_cells, UINT8 pat
case 0: case 0:
return generate_block_gap_0(gap_cells, pattern, spos, ipos, track, context); return generate_block_gap_0(gap_cells, pattern, spos, ipos, track, context);
case 1: case 1:
return generate_block_gap_1(gap_cells, spos, data, dlimit, track, context); return generate_block_gap_1(gap_cells, spos, ipos, data, dlimit, track, context);
case 2: case 2:
return generate_block_gap_2(gap_cells, spos, data, dlimit, track, context); return generate_block_gap_2(gap_cells, spos, ipos, data, dlimit, track, context);
case 3: case 3:
return generate_block_gap_3(gap_cells, spos, ipos, data, dlimit, track, context); return generate_block_gap_3(gap_cells, spos, ipos, data, dlimit, track, context);
default: default:

4
src/lib/formats/ipf_dsk.h
View File

@ -63,8 +63,8 @@ private:
bool gap_description_to_reserved_size(const UINT8 *&data, const UINT8 *dlimit, UINT32 &res_size); bool gap_description_to_reserved_size(const UINT8 *&data, const UINT8 *dlimit, UINT32 &res_size);
bool generate_gap_from_description(const UINT8 *&data, const UINT8 *dlimit, UINT32 *track, UINT32 size, bool pre, bool &context); bool generate_gap_from_description(const UINT8 *&data, const UINT8 *dlimit, UINT32 *track, UINT32 size, bool pre, bool &context);
bool generate_block_gap_0(UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, UINT32 *track, bool &context); bool generate_block_gap_0(UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, UINT32 *track, bool &context);
bool generate_block_gap_1(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context); bool generate_block_gap_1(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
bool generate_block_gap_2(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context); bool generate_block_gap_2(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
bool generate_block_gap_3(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context); bool generate_block_gap_3(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
bool generate_block_gap(UINT32 gap_type, UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context); bool generate_block_gap(UINT32 gap_type, UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);