diff options
Diffstat (limited to 'src/lib/formats/p6001_cas.cpp')
-rw-r--r-- | src/lib/formats/p6001_cas.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/lib/formats/p6001_cas.cpp b/src/lib/formats/p6001_cas.cpp index 3319e377b3d..425a4e8dd2c 100644 --- a/src/lib/formats/p6001_cas.cpp +++ b/src/lib/formats/p6001_cas.cpp @@ -4,22 +4,21 @@ * NEC PC-6001 cassette format handling */ -#include <cassert> - #include "p6001_cas.h" +#include <cassert> + #define WAVE_HIGH 0x5a9e #define WAVE_LOW -0x5a9e -static int cas_size; +static int cas_size; // FIXME: global variable prevents multiple instances static int pc6001_fill_wave(int16_t* buffer, uint8_t data, int sample_pos) { - int x; int sample_count = 0; // one byte = 8 samples - for(x=0;x<8;x++) + for(int x=0;x<8;x++) { if(buffer) buffer[sample_pos+x] = ((data >> (7-x)) & 1) ? WAVE_HIGH : WAVE_LOW; @@ -61,7 +60,7 @@ static int pc6001_cas_fill_wave(int16_t *buffer, int sample_count, uint8_t *byte return pc6001_handle_cas(buffer,bytes); } -static const struct CassetteLegacyWaveFiller pc6001_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller pc6001_legacy_fill_wave = { pc6001_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -72,20 +71,20 @@ static const struct CassetteLegacyWaveFiller pc6001_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error pc6001_cas_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error pc6001_cas_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &pc6001_legacy_fill_wave); + return cassette->legacy_identify(opts, &pc6001_legacy_fill_wave); } static cassette_image::error pc6001_cas_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &pc6001_legacy_fill_wave); + return cassette->legacy_construct(&pc6001_legacy_fill_wave); } -static const struct CassetteFormat pc6001_cassette_format = { +static const cassette_image::Format pc6001_cassette_format = { "cas", pc6001_cas_identify, pc6001_cas_load, |