From ddb290d5f615019c33c42b8d94e5a5254cabcf33 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 22 Oct 2016 13:13:17 +0200 Subject: NOTICE (TYPE NAME CONSOLIDATION) Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8 --- src/lib/formats/ccvf_dsk.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/lib/formats/ccvf_dsk.cpp') diff --git a/src/lib/formats/ccvf_dsk.cpp b/src/lib/formats/ccvf_dsk.cpp index abce7fb55da..12acbeea37a 100644 --- a/src/lib/formats/ccvf_dsk.cpp +++ b/src/lib/formats/ccvf_dsk.cpp @@ -44,7 +44,7 @@ const ccvf_format::format ccvf_format::file_formats[] = { {} }; -int ccvf_format::identify(io_generic *io, UINT32 form_factor) +int ccvf_format::identify(io_generic *io, uint32_t form_factor) { char h[36]; @@ -85,20 +85,20 @@ floppy_image_format_t::desc_e* ccvf_format::get_desc_8n1(const format &f, int &c return desc; } -bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) +bool ccvf_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) { const format &f = formats[0]; - UINT64 size = io_generic_size(io); - std::vector img(size); + uint64_t size = io_generic_size(io); + std::vector img(size); io_generic_read(io, &img[0], 0, size); std::string ccvf = std::string((const char *)&img[0], size); - std::vector bytes(78720); + std::vector bytes(78720); int start = 0, end = 0; std::string line; - UINT32 byteoffs = 0; + uint32_t byteoffs = 0; char hex[3] = {0}; do { @@ -115,11 +115,11 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) start = end + 1; } while (start > 0 && end != -1); - UINT64 pos = 0; + uint64_t pos = 0; int total_size = 200000000/f.cell_size; for(int track=0; track < f.track_count; track++) { - std::vector buffer; + std::vector buffer; int offset = 0; for (int i=0; i<1920 && pos