summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/apridisk.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/apridisk.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/apridisk.cpp')
-rw-r--r--src/lib/formats/apridisk.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/formats/apridisk.cpp b/src/lib/formats/apridisk.cpp
index a004d54ccd0..a42aa9fa4d4 100644
--- a/src/lib/formats/apridisk.cpp
+++ b/src/lib/formats/apridisk.cpp
@@ -31,9 +31,9 @@ const char *apridisk_format::extensions() const
return "dsk";
}
-int apridisk_format::identify(io_generic *io, UINT32 form_factor)
+int apridisk_format::identify(io_generic *io, uint32_t form_factor)
{
- UINT8 header[APR_HEADER_SIZE];
+ uint8_t header[APR_HEADER_SIZE];
io_generic_read(io, header, 0, APR_HEADER_SIZE);
const char magic[] = "ACT Apricot disk image\x1a\x04";
@@ -44,35 +44,35 @@ int apridisk_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
-bool apridisk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool apridisk_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
{
desc_pc_sector sectors[80][2][18];
- UINT8 sector_data[MAX_SECTORS * SECTOR_SIZE];
- UINT8 *data_ptr = sector_data;
+ uint8_t sector_data[MAX_SECTORS * SECTOR_SIZE];
+ uint8_t *data_ptr = sector_data;
int track_count = 0, head_count = 0, sector_count = 0;
- UINT64 file_size = io_generic_size(io);
- UINT64 file_offset = APR_HEADER_SIZE;
+ uint64_t file_size = io_generic_size(io);
+ uint64_t file_offset = APR_HEADER_SIZE;
while (file_offset < file_size)
{
// read sector header
- UINT8 sector_header[16];
+ uint8_t sector_header[16];
io_generic_read(io, sector_header, file_offset, 16);
- UINT32 type = pick_integer_le(&sector_header, 0, 4);
- UINT16 compression = pick_integer_le(&sector_header, 4, 2);
- UINT16 header_size = pick_integer_le(&sector_header, 6, 2);
- UINT32 data_size = pick_integer_le(&sector_header, 8, 4);
+ uint32_t type = pick_integer_le(&sector_header, 0, 4);
+ uint16_t compression = pick_integer_le(&sector_header, 4, 2);
+ uint16_t header_size = pick_integer_le(&sector_header, 6, 2);
+ uint32_t data_size = pick_integer_le(&sector_header, 8, 4);
file_offset += header_size;
switch (type)
{
case APR_SECTOR:
- UINT8 head = pick_integer_le(&sector_header, 12, 1);
- UINT8 sector = pick_integer_le(&sector_header, 13, 1);
- UINT8 track = (UINT8) pick_integer_le(&sector_header, 14, 2);
+ uint8_t head = pick_integer_le(&sector_header, 12, 1);
+ uint8_t sector = pick_integer_le(&sector_header, 13, 1);
+ uint8_t track = (uint8_t) pick_integer_le(&sector_header, 14, 2);
track_count = std::max(track_count, int(unsigned(track)));
head_count = std::max(head_count, int(unsigned(head)));
@@ -92,9 +92,9 @@ bool apridisk_format::load(io_generic *io, UINT32 form_factor, floppy_image *ima
{
case APR_COMPRESSED:
{
- UINT8 comp[3];
+ uint8_t comp[3];
io_generic_read(io, comp, file_offset, 3);
- UINT16 length = pick_integer_le(comp, 0, 2);
+ uint16_t length = pick_integer_le(comp, 0, 2);
if (length != SECTOR_SIZE)
fatalerror("apridisk_format: Invalid compression length %04x\n", length);