summaryrefslogtreecommitdiffstats
path: root/src/lib/formats/dsk_dsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/dsk_dsk.cpp')
-rw-r--r--src/lib/formats/dsk_dsk.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/lib/formats/dsk_dsk.cpp b/src/lib/formats/dsk_dsk.cpp
index 528f30c24be..a4b498f47b2 100644
--- a/src/lib/formats/dsk_dsk.cpp
+++ b/src/lib/formats/dsk_dsk.cpp
@@ -23,7 +23,7 @@ struct dskdsk_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 */
};
@@ -39,7 +39,7 @@ static struct dskdsk_tag *get_tag(floppy_image_legacy *floppy)
FLOPPY_IDENTIFY( dsk_dsk_identify )
{
- UINT8 header[8];
+ uint8_t header[8];
floppy_image_read(floppy, header, 0, 8);
if ( memcmp( header, MV_CPC, 8 ) ==0) {
@@ -63,17 +63,17 @@ static int dsk_get_tracks_per_disk(floppy_image_legacy *floppy)
return get_tag(floppy)->tracks;
}
-static UINT64 dsk_get_track_offset(floppy_image_legacy *floppy, int head, int track)
+static uint64_t dsk_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;
- UINT64 track_offset;
- UINT8 track_info[0x100];
- UINT8 sectors_per_track;
+ uint64_t offs;
+ uint64_t track_offset;
+ uint8_t track_info[0x100];
+ uint8_t sectors_per_track;
int i;
/* translate the sector to a raw sector */
@@ -113,7 +113,7 @@ static floperr_t get_offset(floppy_image_legacy *floppy, int head, int track, in
static floperr_t internal_dsk_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;
err = get_offset(floppy, head, track, sector, sector_is_index, &offset);
if (err)
@@ -126,7 +126,7 @@ static floperr_t internal_dsk_read_sector(floppy_image_legacy *floppy, int head,
static floperr_t internal_dsk_write_sector(floppy_image_legacy *floppy, int head, int track, int sector, int sector_is_index, const void *buffer, size_t buflen, int ddam)
{
- UINT64 offset;
+ uint64_t offset;
floperr_t err;
err = get_offset(floppy, head, track, sector, sector_is_index, &offset);
@@ -159,7 +159,7 @@ static floperr_t dsk_write_indexed_sector(floppy_image_legacy *floppy, int head,
return internal_dsk_write_sector(floppy, head, track, sector, TRUE, buffer, buflen, ddam);
}
-static floperr_t dsk_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length)
+static floperr_t dsk_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);
@@ -172,11 +172,11 @@ static floperr_t dsk_get_sector_length(floppy_image_legacy *floppy, int head, in
return FLOPPY_ERROR_SUCCESS;
}
-static floperr_t dsk_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 dsk_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)
{
floperr_t retVal;
- UINT64 offset;
- UINT8 sector_info[0x100];
+ uint64_t offset;
+ uint8_t sector_info[0x100];
int pos;
retVal = get_offset(floppy, head, track, sector_index, FALSE, nullptr);
@@ -202,8 +202,8 @@ FLOPPY_CONSTRUCT( dsk_dsk_construct )
{
struct FloppyCallbacks *callbacks;
struct dskdsk_tag *tag;
- UINT8 header[0x100];
- UINT64 tmp = 0;
+ uint8_t header[0x100];
+ uint64_t tmp = 0;
int i;
int skip,cnt;
@@ -216,8 +216,8 @@ FLOPPY_CONSTRUCT( dsk_dsk_construct )
floppy_image_read(floppy, header, 0, 0x100);
#ifdef SPOT_DUPLICATES
// this allow to spot .dsk files with same data and different headers, making easier to debug softlists.
- UINT32 temp_size = floppy_image_size(floppy);
- UINT8 tmp_copy[temp_size - 0x100];
+ uint32_t temp_size = floppy_image_size(floppy);
+ uint8_t tmp_copy[temp_size - 0x100];
floppy_image_read(floppy,tmp_copy,0x100,temp_size - 0x100);
printf("CRC16: %d\n", ccitt_crc16(0xffff, tmp_copy, temp_size - 0x100));
#endif
@@ -295,9 +295,9 @@ bool dsk_format::supports_save() const
return false;
}
-int dsk_format::identify(io_generic *io, UINT32 form_factor)
+int dsk_format::identify(io_generic *io, uint32_t form_factor)
{
- UINT8 header[16];
+ uint8_t header[16];
io_generic_read(io, &header, 0, sizeof(header));
if ( memcmp( header, DSK_FORMAT_HEADER, 8 ) ==0) {
@@ -314,38 +314,38 @@ int dsk_format::identify(io_generic *io, UINT32 form_factor)
struct track_header
{
- UINT8 headertag[13];
- UINT16 unused1;
- UINT8 unused1b;
- UINT8 track_number;
- UINT8 side_number;
- UINT8 datarate;
- UINT8 rec_mode;
- UINT8 sector_size_code;
- UINT8 number_of_sector;
- UINT8 gap3_length;
- UINT8 filler_byte;
+ uint8_t headertag[13];
+ uint16_t unused1;
+ uint8_t unused1b;
+ uint8_t track_number;
+ uint8_t side_number;
+ uint8_t datarate;
+ uint8_t rec_mode;
+ uint8_t sector_size_code;
+ uint8_t number_of_sector;
+ uint8_t gap3_length;
+ uint8_t filler_byte;
};
struct sector_header
{
- UINT8 track;
- UINT8 side;
- UINT8 sector_id;
- UINT8 sector_size_code;
- UINT8 fdc_status_reg1;
- UINT8 fdc_status_reg2;
- UINT16 data_length;
+ uint8_t track;
+ uint8_t side;
+ uint8_t sector_id;
+ uint8_t sector_size_code;
+ uint8_t fdc_status_reg1;
+ uint8_t fdc_status_reg2;
+ uint16_t data_length;
};
#pragma pack()
-bool dsk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool dsk_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
{
- UINT8 header[0x100];
+ uint8_t header[0x100];
bool extendformat = false;
- UINT64 image_size = io_generic_size(io);
+ uint64_t image_size = io_generic_size(io);
io_generic_read(io, &header, 0, sizeof(header));
if ( memcmp( header, EXT_FORMAT_HEADER, 16 ) ==0) {
@@ -358,7 +358,7 @@ bool dsk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
skip = 2;
}
int tracks = header[0x30];
- UINT64 track_offsets[84*2];
+ uint64_t track_offsets[84*2];
int cnt =0;
if (!extendformat) {
int tmp = 0x100;
@@ -395,7 +395,7 @@ bool dsk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
track_header tr;
io_generic_read(io, &tr,track_offsets[(track<<1)+side],sizeof(tr));
desc_pc_sector sects[256];
- UINT8 sect_data[65536];
+ uint8_t sect_data[65536];
int sdatapos = 0;
int pos = track_offsets[(track<<1)+side] + 0x100;
for(int j=0;j<tr.number_of_sector;j++) {