diff options
author | 2021-01-01 19:11:47 -0500 | |
---|---|---|
committer | 2021-01-01 19:15:51 -0500 | |
commit | 0a5148e05a5b8de3d806cbb6a63af2121895fa7d (patch) | |
tree | 17f8635fe944bb4215a80d7cc7ab2db4dd490f8a /src/lib/formats/sord_cas.cpp | |
parent | 29bc7e25b71d9af40943c0dc9d24fead65af4ece (diff) |
Cassette image processing cleanup
- Add cassette_image::image_read_byte method for reading one byte at a time
- coco_cas.cpp: Eliminate dependency on emucore.h
- thom_cas.cpp: Declare some temporary variables much closer to where they are used
- tvc_cas.cpp: Read and write entire sectors at a time
Diffstat (limited to 'src/lib/formats/sord_cas.cpp')
-rw-r--r-- | src/lib/formats/sord_cas.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/lib/formats/sord_cas.cpp b/src/lib/formats/sord_cas.cpp index f90daafd248..600751088d0 100644 --- a/src/lib/formats/sord_cas.cpp +++ b/src/lib/formats/sord_cas.cpp @@ -25,13 +25,6 @@ static const cassette_image::Modulation sordm5_cas_modulation = 3150.0 - 600, 3150.0, 3150.0 + 600 }; -static uint8_t cassette_image_read_uint8( cassette_image *cassette, uint64_t offset) -{ - uint8_t data; - cassette->image_read(&data, offset, 1); - return data; -} - static cassette_image::error sordm5_tap_identify( cassette_image *cassette, cassette_image::Options *opts) { return cassette->modulation_identify(sordm5_cas_modulation, opts); @@ -64,10 +57,10 @@ static cassette_image::error sordm5_tap_load( cassette_image *cassette) while (image_pos < image_size) { // read block type - block_type = cassette_image_read_uint8(cassette, image_pos + 0); + block_type = cassette->image_read_byte(image_pos + 0); if ((block_type != 'H') && (block_type != 'D')) return cassette_image::error::INVALID_IMAGE; // read block size - block_size = cassette_image_read_uint8(cassette, image_pos + 1); + block_size = cassette->image_read_byte(image_pos + 1); if (block_size == 0) block_size = 0x100; block_size += 3; // add silence (header block) @@ -86,7 +79,7 @@ static cassette_image::error sordm5_tap_load( cassette_image *cassette) for (i=0;i<block_size;i++) { // read byte - byte = cassette_image_read_uint8(cassette, image_pos + i); + byte = cassette->image_read_byte(image_pos + i); // calc/check checksum #if 0 if (i == block_size) |