diff options
Diffstat (limited to 'src/devices/imagedev/floppy.h')
-rw-r--r-- | src/devices/imagedev/floppy.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h index 0742649050b..287008fff5b 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -71,10 +71,10 @@ public: typedef delegate<void (floppy_image_device *, int)> wpt_cb; // construction/destruction - floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); virtual ~floppy_image_device(); - virtual void handled_variants(UINT32 *variants, int &var_count) const = 0; + virtual void handled_variants(uint32_t *variants, int &var_count) const = 0; void set_formats(const floppy_format_type *formats); floppy_image_format_t *get_formats() const; @@ -104,7 +104,7 @@ public: void setup_ready_cb(ready_cb cb); void setup_wpt_cb(wpt_cb cb); - std::vector<UINT32> &get_buffer() { return image->get_buffer(cyl, ss, subcyl); } + std::vector<uint32_t> &get_buffer() { return image->get_buffer(cyl, ss, subcyl); } int get_cyl() { return cyl; } void mon_w(int state); @@ -131,8 +131,8 @@ public: void write_flux(const attotime &start, const attotime &end, int transition_count, const attotime *transitions); void set_write_splice(const attotime &when); int get_sides() { return sides; } - UINT32 get_form_factor() const; - UINT32 get_variant() const; + uint32_t get_form_factor() const; + uint32_t get_variant() const; static const floppy_format_type default_floppy_formats[]; @@ -160,7 +160,7 @@ protected: /* Physical characteristics, filled by setup_characteristics */ int tracks; /* addressable tracks */ int sides; /* number of heads */ - UINT32 form_factor; /* 3"5, 5"25, etc */ + uint32_t form_factor; /* 3"5, 5"25, etc */ bool motor_always_on; /* state of input lines */ @@ -182,7 +182,7 @@ protected: int floppy_ratio_1; // rpm/300*1000 attotime revolution_start_time, rev_time; - UINT32 revolution_count; + uint32_t revolution_count; int cyl, subcyl; bool image_dirty; @@ -194,11 +194,11 @@ protected: ready_cb cur_ready_cb; wpt_cb cur_wpt_cb; - UINT32 find_position(attotime &base, const attotime &when); - int find_index(UINT32 position, const std::vector<UINT32> &buf); - void write_zone(UINT32 *buf, int &cells, int &index, UINT32 spos, UINT32 epos, UINT32 mg); + uint32_t find_position(attotime &base, const attotime &when); + int find_index(uint32_t position, const std::vector<uint32_t> &buf); + void write_zone(uint32_t *buf, int &cells, int &index, uint32_t spos, uint32_t epos, uint32_t mg); void commit_image(); - attotime get_next_index_time(std::vector<UINT32> &buf, int index, int delta, attotime base); + attotime get_next_index_time(std::vector<uint32_t> &buf, int index, int delta, attotime base); // Sound bool m_make_sound; @@ -208,9 +208,9 @@ protected: #define DECLARE_FLOPPY_IMAGE_DEVICE(_name, _interface) \ class _name : public floppy_image_device { \ public: \ - _name(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \ + _name(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); \ virtual ~_name(); \ - virtual void handled_variants(UINT32 *variants, int &var_count) const override; \ + virtual void handled_variants(uint32_t *variants, int &var_count) const override; \ virtual const char *image_interface() const override { return _interface; } \ protected: \ virtual void setup_characteristics() override; \ @@ -256,7 +256,7 @@ extern const device_type FLOPPYSOUND; class floppy_sound_device : public samples_device { public: - floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void motor(bool on, bool withdisk); void step(int track); bool samples_loaded() { return m_loaded; } @@ -292,7 +292,7 @@ class floppy_connector: public device_t, public device_slot_interface { public: - floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~floppy_connector(); void set_formats(const floppy_format_type *formats); |