summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/imd_dsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/imd_dsk.cpp')
-rw-r--r--src/lib/formats/imd_dsk.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/lib/formats/imd_dsk.cpp b/src/lib/formats/imd_dsk.cpp
index 13f155b638a..8f3626aedbb 100644
--- a/src/lib/formats/imd_dsk.cpp
+++ b/src/lib/formats/imd_dsk.cpp
@@ -17,7 +17,7 @@ struct imddsk_tag
int heads;
int tracks;
int sector_size;
- UINT64 track_offsets[84*2]; /* offset within data for each track */
+ uint64_t track_offsets[84*2]; /* offset within data for each track */
};
@@ -32,7 +32,7 @@ static struct imddsk_tag *get_tag(floppy_image_legacy *floppy)
FLOPPY_IDENTIFY( imd_dsk_identify )
{
- UINT8 header[3];
+ uint8_t header[3];
floppy_image_read(floppy, header, 0, 3);
if (header[0]=='I' && header[1]=='M' && header[2]=='D') {
@@ -53,16 +53,16 @@ static int imd_get_tracks_per_disk(floppy_image_legacy *floppy)
return get_tag(floppy)->tracks;
}
-static UINT64 imd_get_track_offset(floppy_image_legacy *floppy, int head, int track)
+static uint64_t imd_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 offs = 0;
- UINT8 header[5];
- UINT8 sector_num;
+ uint64_t offs = 0;
+ uint8_t header[5];
+ uint8_t sector_num;
int i;
@@ -98,9 +98,9 @@ static floperr_t get_offset(floppy_image_legacy *floppy, int head, int track, in
static floperr_t internal_imd_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;
- UINT8 header[1];
+ uint8_t header[1];
// take sector offset
err = get_offset(floppy, head, track, sector, sector_is_index, &offset);
@@ -137,25 +137,25 @@ static floperr_t imd_read_indexed_sector(floppy_image_legacy *floppy, int head,
return internal_imd_read_sector(floppy, head, track, sector, TRUE, buffer, buflen);
}
-static floperr_t imd_expand_file(floppy_image_legacy *floppy , UINT64 offset , size_t amount)
+static floperr_t imd_expand_file(floppy_image_legacy *floppy , uint64_t offset , size_t amount)
{
if (amount == 0) {
return FLOPPY_ERROR_SUCCESS;
}
- UINT64 file_size = floppy_image_size(floppy);
+ uint64_t file_size = floppy_image_size(floppy);
if (offset > file_size) {
return FLOPPY_ERROR_INTERNAL;
}
- UINT64 size_after_off = file_size - offset;
+ uint64_t size_after_off = file_size - offset;
if (size_after_off == 0) {
return FLOPPY_ERROR_SUCCESS;
}
- auto buffer = global_alloc_array(UINT8 , size_after_off);
+ auto buffer = global_alloc_array(uint8_t , size_after_off);
// Read the part of file after offset
floppy_image_read(floppy , buffer , offset , size_after_off);
@@ -172,7 +172,7 @@ static floperr_t imd_expand_file(floppy_image_legacy *floppy , UINT64 offset , s
struct imddsk_tag *tag = get_tag(floppy);
for (int track = 0; track < tag->tracks; track++) {
for (int head = 0; head < tag->heads; head++) {
- UINT64 *track_off = &(tag->track_offsets[ (track << 1) + head ]);
+ uint64_t *track_off = &(tag->track_offsets[ (track << 1) + head ]);
if (*track_off >= offset) {
*track_off += amount;
}
@@ -184,9 +184,9 @@ static floperr_t imd_expand_file(floppy_image_legacy *floppy , UINT64 offset , s
static floperr_t imd_write_indexed_sector(floppy_image_legacy *floppy, int head, int track, int sector_index, const void *buffer, size_t buflen, int ddam)
{
- UINT64 offset;
+ uint64_t offset;
floperr_t err;
- UINT8 header[1];
+ uint8_t header[1];
// take sector offset
err = get_offset(floppy, head, track, sector_index, TRUE, &offset);
@@ -222,7 +222,7 @@ static floperr_t imd_write_indexed_sector(floppy_image_legacy *floppy, int head,
return FLOPPY_ERROR_SUCCESS;
}
-static floperr_t imd_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length)
+static floperr_t imd_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);
@@ -235,14 +235,14 @@ static floperr_t imd_get_sector_length(floppy_image_legacy *floppy, int head, in
return FLOPPY_ERROR_SUCCESS;
}
-static floperr_t imd_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 imd_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)
{
- UINT64 offset;
- UINT8 header[5];
- UINT8 hd;
- UINT8 tr;
- UINT32 sector_size;
- UINT8 sector_num;
+ uint64_t offset;
+ uint8_t header[5];
+ uint8_t hd;
+ uint8_t tr;
+ uint32_t sector_size;
+ uint8_t sector_num;
offset = imd_get_track_offset(floppy,head,track);
floppy_image_read(floppy, header, offset, 5);
@@ -279,7 +279,7 @@ static floperr_t imd_get_indexed_sector_info(floppy_image_legacy *floppy, int he
*sector_length = sector_size;
}
if (flags) {
- UINT8 skip;
+ uint8_t skip;
if (head & 0x40) {
if (head & 0x80) {
skip = 3;
@@ -302,8 +302,8 @@ FLOPPY_CONSTRUCT( imd_dsk_construct )
{
struct FloppyCallbacks *callbacks;
struct imddsk_tag *tag;
- UINT8 header[0x100];
- UINT64 pos = 0;
+ uint8_t header[0x100];
+ uint64_t pos = 0;
int sector_size = 0;
int sector_num;
int i;
@@ -409,7 +409,7 @@ void imd_format::fixnum(char *start, char *end) const
};
}
-int imd_format::identify(io_generic *io, UINT32 form_factor)
+int imd_format::identify(io_generic *io, uint32_t form_factor)
{
char h[4];
@@ -420,13 +420,13 @@ int imd_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
-bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool imd_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
{
- UINT64 size = io_generic_size(io);
- std::vector<UINT8> img(size);
+ uint64_t size = io_generic_size(io);
+ std::vector<uint8_t> img(size);
io_generic_read(io, &img[0], 0, size);
- UINT64 pos;
+ uint64_t pos;
for(pos=0; pos < size && img[pos] != 0x1a; pos++) {};
pos++;
@@ -434,16 +434,16 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
return false;
while(pos < size) {
- UINT8 mode = img[pos++];
- UINT8 track = img[pos++];
- UINT8 head = img[pos++];
- UINT8 sector_count = img[pos++];
- UINT8 ssize = img[pos++];
+ uint8_t mode = img[pos++];
+ uint8_t track = img[pos++];
+ uint8_t head = img[pos++];
+ uint8_t sector_count = img[pos++];
+ uint8_t ssize = img[pos++];
if(ssize == 0xff)
throw emu_fatalerror("imd_format: Unsupported variable sector size on track %d head %d", track, head);
- UINT32 actual_size = ssize < 7 ? 128 << ssize : 8192;
+ uint32_t actual_size = ssize < 7 ? 128 << ssize : 8192;
static const int rates[3] = { 500000, 300000, 250000 };
bool fm = mode < 3;
@@ -451,12 +451,12 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
int rpm = form_factor == floppy_image::FF_8 || (form_factor == floppy_image::FF_525 && rate >= 300000) ? 360 : 300;
int cell_count = (fm ? 1 : 2)*rate*60/rpm;
- const UINT8 *snum = &img[pos];
+ const uint8_t *snum = &img[pos];
pos += sector_count;
- const UINT8 *tnum = head & 0x80 ? &img[pos] : nullptr;
+ const uint8_t *tnum = head & 0x80 ? &img[pos] : nullptr;
if(tnum)
pos += sector_count;
- const UINT8 *hnum = head & 0x40 ? &img[pos] : nullptr;
+ const uint8_t *hnum = head & 0x40 ? &img[pos] : nullptr;
if(hnum)
pos += sector_count;
@@ -467,7 +467,7 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
desc_pc_sector sects[256];
for(int i=0; i<sector_count; i++) {
- UINT8 stype = img[pos++];
+ uint8_t stype = img[pos++];
sects[i].track = tnum ? tnum[i] : track;
sects[i].head = hnum ? hnum[i] : head;
sects[i].sector = snum[i];
@@ -482,7 +482,7 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
sects[i].bad_crc = stype == 5 || stype == 6 || stype == 7 || stype == 8;
if(stype == 2 || stype == 4 || stype == 6 || stype == 8) {
- sects[i].data = global_alloc_array(UINT8, actual_size);
+ sects[i].data = global_alloc_array(uint8_t, actual_size);
memset(sects[i].data, img[pos++], actual_size);
} else {