diff options
Diffstat (limited to 'src/lib/formats/zx81_p.cpp')
-rw-r--r-- | src/lib/formats/zx81_p.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/lib/formats/zx81_p.cpp b/src/lib/formats/zx81_p.cpp index 9fa5814385f..515f5b78581 100644 --- a/src/lib/formats/zx81_p.cpp +++ b/src/lib/formats/zx81_p.cpp @@ -31,8 +31,6 @@ medium transfer rate is approx. 307 bps (38 bytes/sec) for files that contain *****************************************************************************/ -#include <assert.h> - #include "zx81_p.h" #include "tzx_cas.h" @@ -56,7 +54,7 @@ medium transfer rate is approx. 307 bps (38 bytes/sec) for files that contain #define ZX81_DATA_LENGTH_OFFSET 0x0b #define ZX80_DATA_LENGTH_OFFSET 0x04 -static uint8_t zx_file_name[128]; +static uint8_t zx_file_name[128]; // FIXME: global variables prevent multiple instances static uint16_t real_data_length = 0; static uint8_t zx_file_name_length = 0; @@ -64,9 +62,7 @@ static uint8_t zx_file_name_length = 0; static int16_t *zx81_emit_level(int16_t *p, int count, int level) { - int i; - - for (i=0; i<count; i++) *(p++) = level; + for (int i=0; i<count; i++) *(p++) = level; return p; } @@ -177,7 +173,7 @@ static int zx81_cassette_calculate_size_in_samples(const uint8_t *bytes, int len return (number_of_0_data+number_of_0_name)*ZX81_LOW_BIT_LENGTH + (number_of_1_data+number_of_1_name)*ZX81_HIGH_BIT_LENGTH + ZX81_PILOT_LENGTH; } -static int zx81_cassette_fill_wave(int16_t *buffer, int length, uint8_t *bytes) +static int zx81_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int) { int16_t * p = buffer; int i; @@ -196,7 +192,7 @@ static int zx81_cassette_fill_wave(int16_t *buffer, int length, uint8_t *bytes) return p - buffer; } -static const struct CassetteLegacyWaveFiller zx81_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller zx81_legacy_fill_wave = { zx81_cassette_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -207,9 +203,9 @@ static const struct CassetteLegacyWaveFiller zx81_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error zx81_p_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error zx81_p_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &zx81_legacy_fill_wave); + return cassette->legacy_identify(opts, &zx81_legacy_fill_wave); } static cassette_image::error zx81_p_load(cassette_image *cassette) @@ -219,10 +215,10 @@ static cassette_image::error zx81_p_load(cassette_image *cassette) Hardcoding this to "cassette". */ zx81_fill_file_name ("cassette" /*image_basename_noext(device_list_find_by_tag( Machine->config->m_devicelist, CASSETTE, "cassette" ))*/ ); - return cassette_legacy_construct(cassette, &zx81_legacy_fill_wave); + return cassette->legacy_construct(&zx81_legacy_fill_wave); } -static const struct CassetteFormat zx81_p_image_format = +static const cassette_image::Format zx81_p_image_format = { "p,81", zx81_p_identify, @@ -254,7 +250,7 @@ static int zx80_cassette_calculate_size_in_samples(const uint8_t *bytes, int len return number_of_0_data*ZX81_LOW_BIT_LENGTH + number_of_1_data*ZX81_HIGH_BIT_LENGTH + ZX81_PILOT_LENGTH; } -static int zx80_cassette_fill_wave(int16_t *buffer, int length, uint8_t *bytes) +static int zx80_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int) { int16_t * p = buffer; int i; @@ -269,7 +265,7 @@ static int zx80_cassette_fill_wave(int16_t *buffer, int length, uint8_t *bytes) return p - buffer; } -static const struct CassetteLegacyWaveFiller zx80_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller zx80_legacy_fill_wave = { zx80_cassette_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -280,17 +276,17 @@ static const struct CassetteLegacyWaveFiller zx80_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error zx80_o_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error zx80_o_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &zx80_legacy_fill_wave); + return cassette->legacy_identify(opts, &zx80_legacy_fill_wave); } static cassette_image::error zx80_o_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &zx80_legacy_fill_wave); + return cassette->legacy_construct(&zx80_legacy_fill_wave); } -static const struct CassetteFormat zx80_o_image_format = +static const cassette_image::Format zx80_o_image_format = { "o,80", zx80_o_identify, |