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/st_dsk.cpp | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'src/lib/formats/st_dsk.cpp') diff --git a/src/lib/formats/st_dsk.cpp b/src/lib/formats/st_dsk.cpp index a30165993ea..9808dc56ff9 100644 --- a/src/lib/formats/st_dsk.cpp +++ b/src/lib/formats/st_dsk.cpp @@ -36,20 +36,20 @@ bool st_format::supports_save() const return true; } -void st_format::find_size(io_generic *io, UINT8 &track_count, UINT8 &head_count, UINT8 §or_count) +void st_format::find_size(io_generic *io, uint8_t &track_count, uint8_t &head_count, uint8_t §or_count) { - UINT64 size = io_generic_size(io); + uint64_t size = io_generic_size(io); for(track_count=80; track_count <= 82; track_count++) for(head_count=1; head_count <= 2; head_count++) for(sector_count=9; sector_count <= 11; sector_count++) - if(size == (UINT32)512*track_count*head_count*sector_count) + if(size == (uint32_t)512*track_count*head_count*sector_count) return; track_count = head_count = sector_count = 0; } -int st_format::identify(io_generic *io, UINT32 form_factor) +int st_format::identify(io_generic *io, uint32_t form_factor) { - UINT8 track_count, head_count, sector_count; + uint8_t track_count, head_count, sector_count; find_size(io, track_count, head_count, sector_count); if(track_count) @@ -57,12 +57,12 @@ int st_format::identify(io_generic *io, UINT32 form_factor) return 0; } -bool st_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) +bool st_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) { - UINT8 track_count, head_count, sector_count; + uint8_t track_count, head_count, sector_count; find_size(io, track_count, head_count, sector_count); - UINT8 sectdata[11*512]; + uint8_t sectdata[11*512]; desc_s sectors[11]; for(int i=0; i> 8; th[1] = csize; io_generic_write(io, th, pos, 2); io_generic_write(io, compdata, pos+2, csize); pos += 2+csize; } else { - UINT8 th[2]; + uint8_t th[2]; th[0] = track_size >> 8; th[1] = track_size; io_generic_write(io, th, pos, 2); -- cgit v1.2.3-70-g09d2