diff options
Diffstat (limited to 'src/devices/machine/idehd.h')
-rw-r--r-- | src/devices/machine/idehd.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/machine/idehd.h b/src/devices/machine/idehd.h index 8acc9e14474..f979d25285b 100644 --- a/src/devices/machine/idehd.h +++ b/src/devices/machine/idehd.h @@ -20,17 +20,17 @@ class ata_mass_storage_device : public ata_hle_device { public: - ata_mass_storage_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); + ata_mass_storage_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); - UINT16 *identify_device_buffer() { return m_identify_buffer; } + uint16_t *identify_device_buffer() { return m_identify_buffer; } - void set_master_password(const UINT8 *password) + void set_master_password(const uint8_t *password) { m_master_password = password; m_master_password_enable = (password != nullptr); } - void set_user_password(const UINT8 *password) + void set_user_password(const uint8_t *password) { m_user_password = password; m_user_password_enable = (password != nullptr); @@ -39,8 +39,8 @@ public: protected: virtual void device_start() override; - virtual int read_sector(UINT32 lba, void *buffer) = 0; - virtual int write_sector(UINT32 lba, const void *buffer) = 0; + virtual int read_sector(uint32_t lba, void *buffer) = 0; + virtual int write_sector(uint32_t lba, const void *buffer) = 0; virtual attotime seek_time(); void ide_build_identify_device(); @@ -56,14 +56,14 @@ protected: virtual void signature() override; int m_can_identify_device; - UINT16 m_num_cylinders; - UINT8 m_num_sectors; - UINT8 m_num_heads; + uint16_t m_num_cylinders; + uint8_t m_num_sectors; + uint8_t m_num_heads; - virtual UINT32 lba_address(); + virtual uint32_t lba_address(); private: - void set_geometry(UINT8 sectors, UINT8 heads) { m_num_sectors = sectors; m_num_heads = heads; } + void set_geometry(uint8_t sectors, uint8_t heads) { m_num_sectors = sectors; m_num_heads = heads; } void finished_read(); void finished_write(); void next_sector(); @@ -71,14 +71,14 @@ private: void read_first_sector(); void soft_reset() override; - UINT32 m_cur_lba; - UINT16 m_block_count; - UINT16 m_sectors_until_int; + uint32_t m_cur_lba; + uint16_t m_block_count; + uint16_t m_sectors_until_int; - UINT8 m_master_password_enable; - UINT8 m_user_password_enable; - const UINT8 * m_master_password; - const UINT8 * m_user_password; + uint8_t m_master_password_enable; + uint8_t m_user_password_enable; + const uint8_t * m_master_password; + const uint8_t * m_user_password; }; // ======================> ide_hdd_device @@ -87,8 +87,8 @@ class ide_hdd_device : public ata_mass_storage_device { public: // construction/destruction - ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - ide_hdd_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); + ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ide_hdd_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); protected: // device-level overrides @@ -98,9 +98,9 @@ protected: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; - virtual int read_sector(UINT32 lba, void *buffer) override { if (m_disk == nullptr) return 0; return hard_disk_read(m_disk, lba, buffer); } - virtual int write_sector(UINT32 lba, const void *buffer) override { if (m_disk == nullptr) return 0; return hard_disk_write(m_disk, lba, buffer); } - virtual UINT8 calculate_status() override; + virtual int read_sector(uint32_t lba, void *buffer) override { if (m_disk == nullptr) return 0; return hard_disk_read(m_disk, lba, buffer); } + virtual int write_sector(uint32_t lba, const void *buffer) override { if (m_disk == nullptr) return 0; return hard_disk_write(m_disk, lba, buffer); } + virtual uint8_t calculate_status() override; chd_file *m_handle; hard_disk_file *m_disk; |