diff options
Diffstat (limited to 'src/lib/formats')
| -rw-r--r-- | src/lib/formats/cassimg.c | 2 | ||||
| -rw-r--r-- | src/lib/formats/ccvf_dsk.c | 8 | ||||
| -rw-r--r-- | src/lib/formats/d64_dsk.c | 2 | ||||
| -rw-r--r-- | src/lib/formats/fmtowns_dsk.c | 2 | ||||
| -rw-r--r-- | src/lib/formats/g64_dsk.c | 12 | ||||
| -rw-r--r-- | src/lib/formats/mbee_cas.h | 1 | ||||
| -rw-r--r-- | src/lib/formats/phc25_cas.c | 4 | ||||
| -rw-r--r-- | src/lib/formats/phc25_cas.h | 1 | ||||
| -rw-r--r-- | src/lib/formats/sol_cas.c | 6 | ||||
| -rw-r--r-- | src/lib/formats/sol_cas.h | 1 | ||||
| -rw-r--r-- | src/lib/formats/sorc_cas.h | 1 | ||||
| -rw-r--r-- | src/lib/formats/spc1000_cas.h | 1 | ||||
| -rw-r--r-- | src/lib/formats/z80ne_dsk.c | 2 |
13 files changed, 19 insertions, 24 deletions
diff --git a/src/lib/formats/cassimg.c b/src/lib/formats/cassimg.c index b7f1ea68ccd..20ccbc99407 100644 --- a/src/lib/formats/cassimg.c +++ b/src/lib/formats/cassimg.c @@ -379,7 +379,7 @@ static casserr_t lookup_sample(cassette_image *cassette, int channel, size_t sam /* is this block beyond the edge of our waveform? */ if (sample_blocknum >= cassette->blocks.count()) cassette->blocks.resize_keep_and_clear_new(sample_blocknum + 1); - + if (cassette->blocks[sample_blocknum] == NULL) cassette->blocks[sample_blocknum] = global_alloc(sample_block); diff --git a/src/lib/formats/ccvf_dsk.c b/src/lib/formats/ccvf_dsk.c index 75a4356c547..d8dc0117bd3 100644 --- a/src/lib/formats/ccvf_dsk.c +++ b/src/lib/formats/ccvf_dsk.c @@ -100,11 +100,11 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) astring line; offs_t byteoffs = 0; char hex[3] = {0}; - + do { end = ccvf.chr(start, 10); line.cpysubstr(ccvf, start, end); - if (line.find(0, "Compucolor Virtual Floppy Disk Image") && line.find(0, "Label") && line.find(0, "Track")) { + if (line.find(0, "Compucolor Virtual Floppy Disk Image") && line.find(0, "Label") && line.find(0, "Track")) { for (int byte = 0; byte < 32; byte++) { if (byteoffs==78720) break; hex[0]=line[byte * 2]; @@ -117,11 +117,11 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) UINT64 pos = 0; int total_size = 200000000/f.cell_size; - + for(int track=0; track < f.track_count; track++) { dynamic_array<UINT32> buffer(total_size); int offset = 0; - + for (int i=0; i<1920 && pos<size; i++, pos++) { for (int bit=0; bit<8; bit++) { bit_w(buffer, offset++, BIT(bytes[pos], bit), f.cell_size); diff --git a/src/lib/formats/d64_dsk.c b/src/lib/formats/d64_dsk.c index 0d6295e2c38..fb985b3ce7b 100644 --- a/src/lib/formats/d64_dsk.c +++ b/src/lib/formats/d64_dsk.c @@ -228,7 +228,7 @@ bool d64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) build_sector_description(f, img, track_offset, error_offset, sectors, sector_count); generate_track(desc, physical_track, head, sectors, sector_count, total_size, image); - + track_offset += track_size; error_offset += sector_count; } diff --git a/src/lib/formats/fmtowns_dsk.c b/src/lib/formats/fmtowns_dsk.c index 9b2bad2170d..71db43650ba 100644 --- a/src/lib/formats/fmtowns_dsk.c +++ b/src/lib/formats/fmtowns_dsk.c @@ -1,7 +1,7 @@ /* * fmtowns_dsk.c * - * FM Towns floppy image format + * FM Towns floppy image format * * Created on: 23/03/2014 */ diff --git a/src/lib/formats/g64_dsk.c b/src/lib/formats/g64_dsk.c index c1c55acc4e8..5beba1ca35f 100644 --- a/src/lib/formats/g64_dsk.c +++ b/src/lib/formats/g64_dsk.c @@ -54,7 +54,7 @@ bool g64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) for (int track = 0; track < track_count; track++) { offs_t track_offset = pick_integer_le(img, TRACK_OFFSET + (track * 4), 4); - + if (!track_offset) continue; @@ -68,7 +68,7 @@ bool g64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) UINT16 track_bytes = pick_integer_le(img, track_offset, 2); int track_size = track_bytes * 8; - + LOG_FORMATS("track %u size %u cell %ld\n", track, track_size, 200000000L/track_size); generate_track_from_bitstream(track, head, &img[track_offset+2], track_size, image); @@ -82,9 +82,9 @@ bool g64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) int g64_format::generate_bitstream(int track, int head, int speed_zone, UINT8 *trackbuf, int &track_size, floppy_image *image) { int cell_size = c1541_cell_size[speed_zone]; - + generate_bitstream_from_track(track, head, cell_size, trackbuf, track_size, image); - + int actual_cell_size = 200000000L/track_size; // allow a tolerance of +- 10 us (3990..4010 -> 4000) @@ -96,7 +96,7 @@ bool g64_format::save(io_generic *io, floppy_image *image) UINT8 header[] = { 'G', 'C', 'R', '-', '1', '5', '4', '1', 0x00, 0x54, TRACK_LENGTH & 0xff, TRACK_LENGTH >> 8 }; io_generic_write(io, header, SIGNATURE, sizeof(header)); - + int head = 0; int tracks_written = 0; @@ -137,7 +137,7 @@ bool g64_format::save(io_generic *io, floppy_image *image) io_generic_write_filler(io, 0xff, dpos, TRACK_LENGTH); io_generic_write(io, track_length, dpos, 2); io_generic_write(io, trackbuf, dpos + 2, track_size); - + tracks_written++; } diff --git a/src/lib/formats/mbee_cas.h b/src/lib/formats/mbee_cas.h index f80d4c15de3..ebca844c7ca 100644 --- a/src/lib/formats/mbee_cas.h +++ b/src/lib/formats/mbee_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(mbee_cassette_formats); - diff --git a/src/lib/formats/phc25_cas.c b/src/lib/formats/phc25_cas.c index 4efa419f3fd..a0d807a335c 100644 --- a/src/lib/formats/phc25_cas.c +++ b/src/lib/formats/phc25_cas.c @@ -97,10 +97,10 @@ static int phc25_handle_cassette(INT16 *buffer, const UINT8 *bytes) UINT32 i; // silence -// sample_count += phc25_put_samples(buffer, 6640, 2, WAVEENTRY_HIGH); +// sample_count += phc25_put_samples(buffer, 6640, 2, WAVEENTRY_HIGH); /* start */ -// for (i=0; i<12155; i++) +// for (i=0; i<12155; i++) for (i=0; i<2155; i++) sample_count += phc25_output_bit(buffer, sample_count, 1); diff --git a/src/lib/formats/phc25_cas.h b/src/lib/formats/phc25_cas.h index e4018911361..82ee5e2f297 100644 --- a/src/lib/formats/phc25_cas.h +++ b/src/lib/formats/phc25_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(phc25_cassette_formats); - diff --git a/src/lib/formats/sol_cas.c b/src/lib/formats/sol_cas.c index 67c7c4ba4dc..e5dc79cd21a 100644 --- a/src/lib/formats/sol_cas.c +++ b/src/lib/formats/sol_cas.c @@ -177,7 +177,7 @@ static int sol20_read_hex(const UINT8 *bytes, UINT8 numdigits) } return data; } - + // Turn digits into decimal static int sol20_read_dec(const UINT8 *bytes) { @@ -191,7 +191,7 @@ static int sol20_read_dec(const UINT8 *bytes) return data; } - + static int sol20_handle_cassette(INT16 *buffer, const UINT8 *bytes) { UINT32 sample_count = 0; @@ -283,7 +283,7 @@ static int sol20_handle_cassette(INT16 *buffer, const UINT8 *bytes) sample_count += sol20_output_byte(buffer, sample_count, sol20_header[i]); // write checksum sample_count += sol20_output_byte(buffer, sample_count, sol20_cksm_byte); - + sol20_cksm_byte = 0; process_d = 1; sol20_scan_to_eol(bytes); diff --git a/src/lib/formats/sol_cas.h b/src/lib/formats/sol_cas.h index 60388e012ab..add6743475d 100644 --- a/src/lib/formats/sol_cas.h +++ b/src/lib/formats/sol_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(sol20_cassette_formats); - diff --git a/src/lib/formats/sorc_cas.h b/src/lib/formats/sorc_cas.h index 1f021464339..b2716458a88 100644 --- a/src/lib/formats/sorc_cas.h +++ b/src/lib/formats/sorc_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(sorcerer_cassette_formats); - diff --git a/src/lib/formats/spc1000_cas.h b/src/lib/formats/spc1000_cas.h index ffdffab3074..b0dbc80f5dd 100644 --- a/src/lib/formats/spc1000_cas.h +++ b/src/lib/formats/spc1000_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(spc1000_cassette_formats); - diff --git a/src/lib/formats/z80ne_dsk.c b/src/lib/formats/z80ne_dsk.c index 4445bcfcacf..6394e177f4f 100644 --- a/src/lib/formats/z80ne_dsk.c +++ b/src/lib/formats/z80ne_dsk.c @@ -208,7 +208,7 @@ static floperr_t z80ne_dmk_format_track(floppy_image_legacy *floppy, int head, i /* set up sector map */ sector_map.resize_and_clear(sectors, 0xFF); - + physical_sector = 0; for (logical_sector = 0; logical_sector < sectors; logical_sector++) { |
