diff options
Diffstat (limited to 'src/lib/formats')
-rw-r--r-- | src/lib/formats/atom_dsk.cpp | 2 | ||||
-rw-r--r-- | src/lib/formats/atom_dsk.h | 2 | ||||
-rw-r--r-- | src/lib/formats/cbm_crt.cpp | 28 | ||||
-rw-r--r-- | src/lib/formats/cbm_crt.h | 6 | ||||
-rw-r--r-- | src/lib/formats/ioprocs.cpp | 21 |
5 files changed, 31 insertions, 28 deletions
diff --git a/src/lib/formats/atom_dsk.cpp b/src/lib/formats/atom_dsk.cpp index 6a5294a8fb8..36e4eeab69a 100644 --- a/src/lib/formats/atom_dsk.cpp +++ b/src/lib/formats/atom_dsk.cpp @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Carl #include "atom_dsk.h" atom_format::atom_format() : wd177x_format(formats) diff --git a/src/lib/formats/atom_dsk.h b/src/lib/formats/atom_dsk.h index 7f64810e87c..03a4a0688f3 100644 --- a/src/lib/formats/atom_dsk.h +++ b/src/lib/formats/atom_dsk.h @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Carl #ifndef __ATOM_DSK_H__ #define __ATOM_DSK_H__ diff --git a/src/lib/formats/cbm_crt.cpp b/src/lib/formats/cbm_crt.cpp index 6484dbf108c..43e440e725c 100644 --- a/src/lib/formats/cbm_crt.cpp +++ b/src/lib/formats/cbm_crt.cpp @@ -122,11 +122,11 @@ static const char * CRT_C64_SLOT_NAMES[_CRT_C64_COUNT] = // cbm_crt_get_card - get slot interface card //------------------------------------------------- -std::string cbm_crt_get_card(core_file *file) +std::string cbm_crt_get_card(util::core_file &file) { // read the header cbm_crt_header header; - core_fread(file, &header, CRT_HEADER_LENGTH); + file.read(&header, CRT_HEADER_LENGTH); if (memcmp(header.signature, CRT_SIGNATURE, 16) == 0) { @@ -143,11 +143,11 @@ std::string cbm_crt_get_card(core_file *file) // cbm_crt_read_header - read cartridge header //------------------------------------------------- -bool cbm_crt_read_header(core_file* file, size_t *roml_size, size_t *romh_size, int *exrom, int *game) +bool cbm_crt_read_header(util::core_file &file, size_t *roml_size, size_t *romh_size, int *exrom, int *game) { // read the header cbm_crt_header header; - core_fread(file, &header, CRT_HEADER_LENGTH); + file.read(&header, CRT_HEADER_LENGTH); if (memcmp(header.signature, CRT_SIGNATURE, 16) != 0) return false; @@ -166,10 +166,10 @@ bool cbm_crt_read_header(core_file* file, size_t *roml_size, size_t *romh_size, } // determine ROM region lengths - while (!core_feof(file)) + while (!file.eof()) { cbm_crt_chip chip; - core_fread(file, &chip, CRT_CHIP_LENGTH); + file.read(&chip, CRT_CHIP_LENGTH); UINT16 address = pick_integer_be(chip.start_address, 0, 2); UINT16 size = pick_integer_be(chip.image_size, 0, 2); @@ -190,7 +190,7 @@ bool cbm_crt_read_header(core_file* file, size_t *roml_size, size_t *romh_size, default: osd_printf_verbose("Invalid CHIP loading address!\n"); break; } - core_fseek(file, size, SEEK_CUR); + file.seek(size, SEEK_CUR); } return true; @@ -201,26 +201,26 @@ bool cbm_crt_read_header(core_file* file, size_t *roml_size, size_t *romh_size, // cbm_crt_read_data - read cartridge data //------------------------------------------------- -bool cbm_crt_read_data(core_file* file, UINT8 *roml, UINT8 *romh) +bool cbm_crt_read_data(util::core_file &file, UINT8 *roml, UINT8 *romh) { UINT32 roml_offset = 0; UINT32 romh_offset = 0; - core_fseek(file, CRT_HEADER_LENGTH, SEEK_SET); + file.seek(CRT_HEADER_LENGTH, SEEK_SET); - while (!core_feof(file)) + while (!file.eof()) { cbm_crt_chip chip; - core_fread(file, &chip, CRT_CHIP_LENGTH); + file.read(&chip, CRT_CHIP_LENGTH); UINT16 address = pick_integer_be(chip.start_address, 0, 2); UINT16 size = pick_integer_be(chip.image_size, 0, 2); switch (address) { - case 0x8000: core_fread(file, roml + roml_offset, size); roml_offset += size; break; - case 0xa000: core_fread(file, romh + romh_offset, size); romh_offset += size; break; - case 0xe000: core_fread(file, romh + romh_offset, size); romh_offset += size; break; + case 0x8000: file.read(roml + roml_offset, size); roml_offset += size; break; + case 0xa000: file.read(romh + romh_offset, size); romh_offset += size; break; + case 0xe000: file.read(romh + romh_offset, size); romh_offset += size; break; } } diff --git a/src/lib/formats/cbm_crt.h b/src/lib/formats/cbm_crt.h index f3cfb6bb164..96d04cea2f6 100644 --- a/src/lib/formats/cbm_crt.h +++ b/src/lib/formats/cbm_crt.h @@ -135,9 +135,9 @@ struct cbm_crt_chip // FUNCTION PROTOTYPES //************************************************************************** -std::string cbm_crt_get_card(core_file *file); -bool cbm_crt_read_header(core_file* file, size_t *roml_size, size_t *romh_size, int *exrom, int *game); -bool cbm_crt_read_data(core_file* file, UINT8 *roml, UINT8 *romh); +std::string cbm_crt_get_card(util::core_file &file); +bool cbm_crt_read_header(util::core_file &file, size_t *roml_size, size_t *romh_size, int *exrom, int *game); +bool cbm_crt_read_data(util::core_file &file, UINT8 *roml, UINT8 *romh); #endif diff --git a/src/lib/formats/ioprocs.cpp b/src/lib/formats/ioprocs.cpp index 24f92060a82..9f00e3bb9d5 100644 --- a/src/lib/formats/ioprocs.cpp +++ b/src/lib/formats/ioprocs.cpp @@ -68,34 +68,33 @@ const struct io_procs stdio_ioprocs_noclose = static void corefile_closeproc(void *file) { - core_fclose((core_file*)file); + delete (util::core_file*)file; } static int corefile_seekproc(void *file, INT64 offset, int whence) { - return core_fseek((core_file*)file, (long) offset, whence); + return ((util::core_file*)file)->seek(offset, whence); } static size_t corefile_readproc(void *file, void *buffer, size_t length) { - return core_fread((core_file*)file, buffer, length); + return ((util::core_file*)file)->read(buffer, length); } static size_t corefile_writeproc(void *file, const void *buffer, size_t length) { - return core_fwrite((core_file*)file, buffer, length); + return ((util::core_file*)file)->write(buffer, length); } static UINT64 corefile_filesizeproc(void *file) { - long l, sz; - l = core_ftell((core_file*)file); - if (core_fseek((core_file*)file, 0, SEEK_END)) - return (size_t) -1; - sz = core_ftell((core_file*)file); - if (core_fseek((core_file*)file, l, SEEK_SET)) + const auto l = ((util::core_file*)file)->tell(); + if (((util::core_file*)file)->seek(0, SEEK_END)) return (size_t) -1; - return (size_t) sz; + const auto sz = ((util::core_file*)file)->tell(); + if (((util::core_file*)file)->seek(l, SEEK_SET)) + return UINT64(-1); + return UINT64(sz); } const struct io_procs corefile_ioprocs = |