diff options
Diffstat (limited to 'src/lib/formats/d64_dsk.h')
-rw-r--r-- | src/lib/formats/d64_dsk.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/formats/d64_dsk.h b/src/lib/formats/d64_dsk.h index c5bef4b3313..28726332fa3 100644 --- a/src/lib/formats/d64_dsk.h +++ b/src/lib/formats/d64_dsk.h @@ -16,15 +16,15 @@ class d64_format : public floppy_image_format_t { public: struct format { - UINT32 form_factor; // See floppy_image for possible values - UINT32 variant; // See floppy_image for possible values - - UINT16 sector_count; - UINT8 track_count; - UINT8 head_count; - UINT16 sector_base_size; - UINT8 gap_1; - UINT8 gap_2; + uint32_t form_factor; // See floppy_image for possible values + uint32_t variant; // See floppy_image for possible values + + uint16_t sector_count; + uint8_t track_count; + uint8_t head_count; + uint16_t sector_base_size; + uint8_t gap_1; + uint8_t gap_2; }; d64_format(); @@ -34,8 +34,8 @@ public: virtual const char *description() const override; virtual const char *extensions() const override; - virtual int identify(io_generic *io, UINT32 form_factor) override; - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual int identify(io_generic *io, uint32_t form_factor) override; + virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override; virtual bool save(io_generic *io, floppy_image *image) override; virtual bool supports_save() const override { return true; } @@ -58,23 +58,23 @@ protected: const format *formats; - int find_size(io_generic *io, UINT32 form_factor) const; + int find_size(io_generic *io, uint32_t form_factor) const; virtual int get_physical_track(const format &f, int head, int track); - virtual UINT32 get_cell_size(const format &f, int track); + virtual uint32_t get_cell_size(const format &f, int track); virtual int get_sectors_per_track(const format &f, int track); virtual int get_disk_id_offset(const format &f); - void get_disk_id(const format &f, io_generic *io, UINT8 &id1, UINT8 &id2); + void get_disk_id(const format &f, io_generic *io, uint8_t &id1, uint8_t &id2); virtual int get_image_offset(const format &f, int head, int track); int compute_track_size(const format &f, int track); virtual int get_gap2(const format &f, int head, int track) { return f.gap_2; } - virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2); - void build_sector_description(const format &f, UINT8 *sectdata, UINT32 sect_offs, UINT32 error_offs, desc_s *sectors, int sector_count) const; + virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, uint8_t id1, uint8_t id2, int gap_2); + void build_sector_description(const format &f, uint8_t *sectdata, uint32_t sect_offs, uint32_t error_offs, desc_s *sectors, int sector_count) const; virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size); void extract_sectors(floppy_image *image, const format &f, desc_s *sdesc, int track, int head, int sector_count); static const format file_formats[]; - static const UINT32 cell_size[]; + static const uint32_t cell_size[]; static const int sectors_per_track[]; static const int speed_zone[]; }; |