summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/ami_dsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/ami_dsk.cpp')
-rw-r--r--src/lib/formats/ami_dsk.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/formats/ami_dsk.cpp b/src/lib/formats/ami_dsk.cpp
index a222208d46d..8a757e6a4c9 100644
--- a/src/lib/formats/ami_dsk.cpp
+++ b/src/lib/formats/ami_dsk.cpp
@@ -36,9 +36,9 @@ bool adf_format::supports_save() const
return true;
}
-int adf_format::identify(io_generic *io, UINT32 form_factor)
+int adf_format::identify(io_generic *io, uint32_t form_factor)
{
- UINT64 size = io_generic_size(io);
+ uint64_t size = io_generic_size(io);
if ((size == 901120) || (size == 912384) || (size == 1802240))
{
return 50;
@@ -46,10 +46,10 @@ int adf_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
-bool adf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool adf_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
{
desc_s sectors[22];
- UINT8 sectdata[512*22];
+ uint8_t sectdata[512*22];
bool is_hd = false;
int tracks = 80;
@@ -59,7 +59,7 @@ bool adf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
sectors[i].sector_id = i;
}
- UINT64 size = io_generic_size(io);
+ uint64_t size = io_generic_size(io);
if(size == 901120)
{
is_hd = false;
@@ -97,7 +97,7 @@ bool adf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
return true;
}
-UINT32 adf_format::g32(const UINT8 *trackbuf, int track_size, int pos)
+uint32_t adf_format::g32(const uint8_t *trackbuf, int track_size, int pos)
{
if(pos >= 0 && track_size-pos >= 40) {
int pp = pos >> 3;
@@ -109,7 +109,7 @@ UINT32 adf_format::g32(const UINT8 *trackbuf, int track_size, int pos)
(trackbuf[pp+3] << dp) |
(trackbuf[pp+4] >> (8-dp));
} else {
- UINT32 res = 0;
+ uint32_t res = 0;
for(int i=0; i<32; i++) {
int pp = (pos+i) % track_size;
if(trackbuf[pp>>3] & (0x80 >> (pp & 7)))
@@ -119,9 +119,9 @@ UINT32 adf_format::g32(const UINT8 *trackbuf, int track_size, int pos)
}
}
-UINT32 adf_format::checksum(const UINT8 *trackbuf, int track_size, int pos, int long_count)
+uint32_t adf_format::checksum(const uint8_t *trackbuf, int track_size, int pos, int long_count)
{
- UINT32 check = 0;
+ uint32_t check = 0;
for(int i=0; i<long_count; i++)
check ^= g32(trackbuf, track_size, pos+32*i);
return check & 0x55555555;
@@ -129,8 +129,8 @@ UINT32 adf_format::checksum(const UINT8 *trackbuf, int track_size, int pos, int
bool adf_format::save(io_generic *io, floppy_image *image)
{
- UINT8 sectdata[512*22];
- UINT8 trackbuf[300000/8];
+ uint8_t sectdata[512*22];
+ uint8_t trackbuf[300000/8];
bool hd = image->get_variant() == floppy_image::DSHD;
@@ -145,14 +145,14 @@ bool adf_format::save(io_generic *io, floppy_image *image)
if(g32(trackbuf, track_size, i) == 0x44894489 &&
(g32(trackbuf, track_size, i+384) & 0x55555555) == checksum(trackbuf, track_size, i+32, 10) &&
(g32(trackbuf, track_size, i+448) & 0x55555555) == checksum(trackbuf, track_size, i+480, 256)) {
- UINT32 head = ((g32(trackbuf, track_size, i+32) & 0x55555555) << 1) | (g32(trackbuf, track_size, i+64) & 0x55555555);
+ uint32_t head = ((g32(trackbuf, track_size, i+32) & 0x55555555) << 1) | (g32(trackbuf, track_size, i+64) & 0x55555555);
int sect = (head >> 8) & 0xff;
if(sect > (hd ? 22 : 11))
continue;
- UINT8 *dest = sectdata + 512*sect;
+ uint8_t *dest = sectdata + 512*sect;
for(int j=0; j<128; j++) {
- UINT32 val = ((g32(trackbuf, track_size, i+480+32*j) & 0x55555555) << 1) | (g32(trackbuf, track_size, i+4576+32*j) & 0x55555555);
+ uint32_t val = ((g32(trackbuf, track_size, i+480+32*j) & 0x55555555) << 1) | (g32(trackbuf, track_size, i+4576+32*j) & 0x55555555);
*dest++ = val >> 24;
*dest++ = val >> 16;
*dest++ = val >> 8;