summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/dmk_dsk.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/lib/formats/dmk_dsk.cpp
parent333bff8de64dfaeb98134000412796b4fdef970b (diff)
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
Diffstat (limited to 'src/lib/formats/dmk_dsk.cpp')
-rw-r--r--src/lib/formats/dmk_dsk.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/formats/dmk_dsk.cpp b/src/lib/formats/dmk_dsk.cpp
index aa37206f736..5ca0a3b8781 100644
--- a/src/lib/formats/dmk_dsk.cpp
+++ b/src/lib/formats/dmk_dsk.cpp
@@ -41,12 +41,12 @@ const char *dmk_format::extensions() const
}
-int dmk_format::identify(io_generic *io, UINT32 form_factor)
+int dmk_format::identify(io_generic *io, uint32_t form_factor)
{
const int header_size = 16;
- UINT8 header[header_size];
+ uint8_t header[header_size];
- UINT64 size = io_generic_size(io);
+ uint64_t size = io_generic_size(io);
io_generic_read(io, header, 0, header_size);
@@ -81,10 +81,10 @@ int dmk_format::identify(io_generic *io, UINT32 form_factor)
}
-bool dmk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool dmk_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
{
const int header_size = 16;
- UINT8 header[header_size];
+ uint8_t header[header_size];
io_generic_read(io, header, 0, header_size);
@@ -121,8 +121,8 @@ bool dmk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
for (int head = 0; head < heads; head++)
{
- std::vector<UINT8> track_data(track_size);
- std::vector<UINT32> raw_track_data;
+ std::vector<uint8_t> track_data(track_size);
+ std::vector<uint32_t> raw_track_data;
int iam_location = -1;
int idam_location[64];
int dam_location[64];
@@ -137,8 +137,8 @@ bool dmk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
}
// Find IDAM locations
- UINT16 track_header_offset = 0;
- UINT16 track_offset = ( ( track_data[track_header_offset + 1] << 8 ) | track_data[track_header_offset] ) & 0x3fff;
+ uint16_t track_header_offset = 0;
+ uint16_t track_offset = ( ( track_data[track_header_offset + 1] << 8 ) | track_data[track_header_offset] ) & 0x3fff;
track_header_offset += 2;
while ( track_offset != 0 && track_offset >= 0x83 && track_offset < track_size && track_header_offset < 0x80 )