diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/lib/formats/cqm_dsk.cpp | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (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/cqm_dsk.cpp')
-rw-r--r-- | src/lib/formats/cqm_dsk.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/formats/cqm_dsk.cpp b/src/lib/formats/cqm_dsk.cpp index 94ba350c2a4..3c13f3d44b4 100644 --- a/src/lib/formats/cqm_dsk.cpp +++ b/src/lib/formats/cqm_dsk.cpp @@ -24,8 +24,8 @@ struct cqmdsk_tag int interleave; int skew; - UINT8* buf; - UINT64 track_offsets[84*2]; /* offset within data for each track */ + uint8_t* buf; + uint64_t track_offsets[84*2]; /* offset within data for each track */ }; @@ -40,7 +40,7 @@ static struct cqmdsk_tag *get_tag(floppy_image_legacy *floppy) FLOPPY_IDENTIFY( cqm_dsk_identify ) { - UINT8 header[2]; + uint8_t header[2]; floppy_image_read(floppy, header, 0, 2); if (header[0]=='C' && header[1]=='Q') { @@ -61,16 +61,16 @@ static int cqm_get_tracks_per_disk(floppy_image_legacy *floppy) return get_tag(floppy)->tracks; } -static UINT64 cqm_get_track_offset(floppy_image_legacy *floppy, int head, int track) +static uint64_t cqm_get_track_offset(floppy_image_legacy *floppy, int head, int track) { return get_tag(floppy)->track_offsets[(track<<1) + head]; } -static floperr_t get_offset(floppy_image_legacy *floppy, int head, int track, int sector, int sector_is_index, UINT64 *offset) +static floperr_t get_offset(floppy_image_legacy *floppy, int head, int track, int sector, int sector_is_index, uint64_t *offset) { - UINT64 pos = 0; - UINT8 data; - INT16 len; + uint64_t pos = 0; + uint8_t data; + int16_t len; int s; if ((head < 0) || (head >= get_tag(floppy)->heads) || (track < 0) || (track >= get_tag(floppy)->tracks) @@ -103,7 +103,7 @@ static floperr_t get_offset(floppy_image_legacy *floppy, int head, int track, in static floperr_t internal_cqm_read_sector(floppy_image_legacy *floppy, int head, int track, int sector, int sector_is_index, void *buffer, size_t buflen) { - UINT64 offset; + uint64_t offset; floperr_t err; // take sector offset @@ -125,7 +125,7 @@ static floperr_t cqm_read_indexed_sector(floppy_image_legacy *floppy, int head, return internal_cqm_read_sector(floppy, head, track, sector, TRUE, buffer, buflen); } -static floperr_t cqm_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length) +static floperr_t cqm_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, uint32_t *sector_length) { floperr_t err; err = get_offset(floppy, head, track, sector, FALSE, nullptr); @@ -138,7 +138,7 @@ static floperr_t cqm_get_sector_length(floppy_image_legacy *floppy, int head, in return FLOPPY_ERROR_SUCCESS; } -static floperr_t cqm_get_indexed_sector_info(floppy_image_legacy *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags) +static floperr_t cqm_get_indexed_sector_info(floppy_image_legacy *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, uint32_t *sector_length, unsigned long *flags) { if (sector_index >= get_tag(floppy)->sector_per_track) return FLOPPY_ERROR_SEEKERROR; @@ -163,9 +163,9 @@ FLOPPY_CONSTRUCT( cqm_dsk_construct ) { struct FloppyCallbacks *callbacks; struct cqmdsk_tag *tag; - UINT8 header[CQM_HEADER_SIZE]; - UINT64 pos = 0; - INT16 len; + uint8_t header[CQM_HEADER_SIZE]; + uint64_t pos = 0; + int16_t len; int head; int track; int s; @@ -194,7 +194,7 @@ FLOPPY_CONSTRUCT( cqm_dsk_construct ) pos = CQM_HEADER_SIZE + (header[0x70] << 8) + header[0x6f]; track = 0; head = 0; - tag->buf = (UINT8*)malloc(tag->sector_size*tag->sector_per_track); + tag->buf = (uint8_t*)malloc(tag->sector_size*tag->sector_per_track); do { tag->track_offsets[(track<<1) + head] = pos; s = 0; @@ -261,9 +261,9 @@ const char *cqm_format::extensions() const return "cqm,cqi,dsk"; } -int cqm_format::identify(io_generic *io, UINT32 form_factor) +int cqm_format::identify(io_generic *io, uint32_t form_factor) { - UINT8 h[3]; + uint8_t h[3]; io_generic_read(io, h, 0, 3); if (h[0] == 'C' && h[1] == 'Q' && h[2] == 0x14) @@ -272,11 +272,11 @@ int cqm_format::identify(io_generic *io, UINT32 form_factor) return 0; } -bool cqm_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) +bool cqm_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) { const int max_size = 4*1024*1024; // 4MB ought to be large enough for any floppy - std::vector<UINT8> imagebuf(max_size); - UINT8 header[CQM_HEADER_SIZE]; + std::vector<uint8_t> imagebuf(max_size); + uint8_t header[CQM_HEADER_SIZE]; io_generic_read(io, header, 0, CQM_HEADER_SIZE); int sector_size = (header[0x04] << 8) | header[0x03]; @@ -318,13 +318,13 @@ bool cqm_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) int base_cell_count = rate*60/rpm; int cqm_size = io_generic_size(io); - std::vector<UINT8> cqmbuf(cqm_size); + std::vector<uint8_t> cqmbuf(cqm_size); io_generic_read(io, &cqmbuf[0], 0, cqm_size); // decode the RLE data for (int s = 0, pos = CQM_HEADER_SIZE + comment_size; pos < cqm_size; ) { - INT16 len = (cqmbuf[pos + 1] << 8) | cqmbuf[pos]; + int16_t len = (cqmbuf[pos + 1] << 8) | cqmbuf[pos]; pos += 2; if(len < 0) { |