diff options
Diffstat (limited to 'src/lib/formats/rk_cas.cpp')
-rw-r--r-- | src/lib/formats/rk_cas.cpp | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/src/lib/formats/rk_cas.cpp b/src/lib/formats/rk_cas.cpp index 18504fcb130..25bbb79eea3 100644 --- a/src/lib/formats/rk_cas.cpp +++ b/src/lib/formats/rk_cas.cpp @@ -5,7 +5,6 @@ Tape support for RK format */ -#include <assert.h> #include "rk_cas.h" @@ -20,13 +19,12 @@ #define RK_SIZE_22 22 #define RK_SIZE_60 60 -static int data_size; +static int data_size; // FIXME: global variable prevents multiple instances static int16_t *rk_emit_level(int16_t *p, int count, int level) { - int i; - for (i=0; i<count; i++) + for (int i=0; i<count; i++) { *(p++) = level; } @@ -79,7 +77,7 @@ static int gam_cas_to_wav_size( const uint8_t *casdata, int caslen ) { return (RK_HEADER_LEN * 8 * 2 + caslen * 8 * 2) * RK_SIZE_20; } -static int rk20_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { +static int rk20_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) { int i; int16_t * p = buffer; @@ -95,7 +93,7 @@ static int rk20_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { return p - buffer; } -static int rk22_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { +static int rk22_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) { int i; int16_t * p = buffer; @@ -111,7 +109,7 @@ static int rk22_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { return p - buffer; } -static int rk60_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { +static int rk60_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) { int i; int16_t * p = buffer; @@ -127,7 +125,7 @@ static int rk60_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { return p - buffer; } -static int gam_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { +static int gam_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) { int i; int16_t * p = buffer; @@ -141,7 +139,7 @@ static int gam_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { return p - buffer; } -static const struct CassetteLegacyWaveFiller rk20_legacy_fill_wave = { +static const cassette_image::LegacyWaveFiller rk20_legacy_fill_wave = { rk20_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ 0, /* chunk_samples */ @@ -151,15 +149,15 @@ static const struct CassetteLegacyWaveFiller rk20_legacy_fill_wave = { 0 /* trailer_samples */ }; -static cassette_image::error rk20_cassette_identify( cassette_image *cassette, struct CassetteOptions *opts ) { - return cassette_legacy_identify( cassette, opts, &rk20_legacy_fill_wave ); +static cassette_image::error rk20_cassette_identify( cassette_image *cassette, cassette_image::Options *opts ) { + return cassette->legacy_identify( opts, &rk20_legacy_fill_wave ); } static cassette_image::error rk20_cassette_load( cassette_image *cassette ) { - return cassette_legacy_construct( cassette, &rk20_legacy_fill_wave ); + return cassette->legacy_construct( &rk20_legacy_fill_wave ); } -static const struct CassetteLegacyWaveFiller rk22_legacy_fill_wave = { +static const cassette_image::LegacyWaveFiller rk22_legacy_fill_wave = { rk22_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ 0, /* chunk_samples */ @@ -169,15 +167,15 @@ static const struct CassetteLegacyWaveFiller rk22_legacy_fill_wave = { 0 /* trailer_samples */ }; -static cassette_image::error rk22_cassette_identify( cassette_image *cassette, struct CassetteOptions *opts ) { - return cassette_legacy_identify( cassette, opts, &rk22_legacy_fill_wave ); +static cassette_image::error rk22_cassette_identify( cassette_image *cassette, cassette_image::Options *opts ) { + return cassette->legacy_identify( opts, &rk22_legacy_fill_wave ); } static cassette_image::error rk22_cassette_load( cassette_image *cassette ) { - return cassette_legacy_construct( cassette, &rk22_legacy_fill_wave ); + return cassette->legacy_construct( &rk22_legacy_fill_wave ); } -static const struct CassetteLegacyWaveFiller gam_legacy_fill_wave = { +static const cassette_image::LegacyWaveFiller gam_legacy_fill_wave = { gam_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ 0, /* chunk_samples */ @@ -187,15 +185,15 @@ static const struct CassetteLegacyWaveFiller gam_legacy_fill_wave = { 0 /* trailer_samples */ }; -static cassette_image::error gam_cassette_identify( cassette_image *cassette, struct CassetteOptions *opts ) { - return cassette_legacy_identify( cassette, opts, &gam_legacy_fill_wave ); +static cassette_image::error gam_cassette_identify( cassette_image *cassette, cassette_image::Options *opts ) { + return cassette->legacy_identify( opts, &gam_legacy_fill_wave ); } static cassette_image::error gam_cassette_load( cassette_image *cassette ) { - return cassette_legacy_construct( cassette, &gam_legacy_fill_wave ); + return cassette->legacy_construct( &gam_legacy_fill_wave ); } -static const struct CassetteLegacyWaveFiller rk60_legacy_fill_wave = { +static const cassette_image::LegacyWaveFiller rk60_legacy_fill_wave = { rk60_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ 0, /* chunk_samples */ @@ -205,71 +203,71 @@ static const struct CassetteLegacyWaveFiller rk60_legacy_fill_wave = { 0 /* trailer_samples */ }; -static cassette_image::error rk60_cassette_identify( cassette_image *cassette, struct CassetteOptions *opts ) { - return cassette_legacy_identify( cassette, opts, &rk60_legacy_fill_wave ); +static cassette_image::error rk60_cassette_identify( cassette_image *cassette, cassette_image::Options *opts ) { + return cassette->legacy_identify( opts, &rk60_legacy_fill_wave ); } static cassette_image::error rk60_cassette_load( cassette_image *cassette ) { - return cassette_legacy_construct( cassette, &rk60_legacy_fill_wave ); + return cassette->legacy_construct( &rk60_legacy_fill_wave ); } -static const struct CassetteFormat rku_cassette_format = { +static const cassette_image::Format rku_cassette_format = { "rku", rk20_cassette_identify, rk20_cassette_load, nullptr }; -static const struct CassetteFormat rk8_cassette_format = { +static const cassette_image::Format rk8_cassette_format = { "rk8", rk60_cassette_identify, rk60_cassette_load, nullptr }; -static const struct CassetteFormat rks_cassette_format = { +static const cassette_image::Format rks_cassette_format = { "rks", rk20_cassette_identify, rk20_cassette_load, nullptr }; -static const struct CassetteFormat rko_cassette_format = { +static const cassette_image::Format rko_cassette_format = { "rko", rk20_cassette_identify, rk20_cassette_load, nullptr }; -static const struct CassetteFormat rkr_cassette_format = { +static const cassette_image::Format rkr_cassette_format = { "rk,rkr", rk20_cassette_identify, rk20_cassette_load, nullptr }; -static const struct CassetteFormat rka_cassette_format = { +static const cassette_image::Format rka_cassette_format = { "rka", rk20_cassette_identify, rk20_cassette_load, nullptr }; -static const struct CassetteFormat rkm_cassette_format = { +static const cassette_image::Format rkm_cassette_format = { "rkm", rk22_cassette_identify, rk22_cassette_load, nullptr }; -static const struct CassetteFormat rkp_cassette_format = { +static const cassette_image::Format rkp_cassette_format = { "rkp", rk20_cassette_identify, rk20_cassette_load, nullptr }; -static const struct CassetteFormat gam_cassette_format = { +static const cassette_image::Format gam_cassette_format = { "gam,g16,pki", gam_cassette_identify, gam_cassette_load, |