From 0a5148e05a5b8de3d806cbb6a63af2121895fa7d Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 1 Jan 2021 19:11:47 -0500 Subject: 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 --- src/lib/formats/atom_tap.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/lib/formats/atom_tap.cpp') diff --git a/src/lib/formats/atom_tap.cpp b/src/lib/formats/atom_tap.cpp index cfe83bc1bae..02a2416f856 100644 --- a/src/lib/formats/atom_tap.cpp +++ b/src/lib/formats/atom_tap.cpp @@ -67,17 +67,6 @@ static const cassette_image::Modulation atom_tap_modulation = 2400.0 - 600, 2400.0, 2400.0 + 600 }; -/*------------------------------------------------- - cassette_image_read_uint8 - read tape data --------------------------------------------------*/ - -static uint8_t cassette_image_read_uint8(cassette_image *cassette, uint64_t offset) -{ - uint8_t data; - cassette->image_read(&data, offset, 1); - return data; -} - /*------------------------------------------------- atom_tap_identify - identify cassette -------------------------------------------------*/ @@ -104,13 +93,12 @@ static cassette_image::error atom_tap_load(cassette_image *cassette) { cassette_image::error err; uint64_t image_size = cassette->image_size(); - uint64_t image_pos = 0; double time_index = 0.0; double time_displacement; - while (image_pos < image_size) + for (uint64_t image_pos = 0; image_pos < image_size; image_pos++) { - uint8_t data = cassette_image_read_uint8(cassette, image_pos); + uint8_t data = cassette->image_read_byte(image_pos); /* start bit */ MODULATE(0); @@ -124,8 +112,6 @@ static cassette_image::error atom_tap_load(cassette_image *cassette) /* stop bits */ MODULATE(1); MODULATE(1); - - image_pos++; } return cassette_image::error::SUCCESS; -- cgit v1.2.3-70-g09d2