summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/isa/omti8621.h
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/devices/bus/isa/omti8621.h
parent333bff8de64dfaeb98134000412796b4fdef970b (diff)
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/devices/bus/isa/omti8621.h')
-rw-r--r--src/devices/bus/isa/omti8621.h74
1 files changed, 37 insertions, 37 deletions
diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h
index 7a81751bbe7..10f3bb6588b 100644
--- a/src/devices/bus/isa/omti8621.h
+++ b/src/devices/bus/isa/omti8621.h
@@ -33,7 +33,7 @@ class omti_disk_image_device;
class omti8621_device : public device_t, public device_isa16_card_interface
{
public:
- omti8621_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
~omti8621_device() {}
DECLARE_READ16_MEMBER(read);
@@ -59,8 +59,8 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line, UINT8 data) override;
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line, uint8_t data) override;
virtual void eop_w(int state) override;
void set_interrupt(enum line_state line_state);
@@ -68,62 +68,62 @@ protected:
omti_disk_image_device *our_disks[OMTI_MAX_LUN+1];
private:
- UINT16 jumper;
+ uint16_t jumper;
- UINT8 omti_state;
+ uint8_t omti_state;
- UINT8 status_port;
- UINT8 config_port;
- UINT8 mask_port;
+ uint8_t status_port;
+ uint8_t config_port;
+ uint8_t mask_port;
// command descriptor block
- UINT8 command_buffer[CDB_SIZE];
+ uint8_t command_buffer[CDB_SIZE];
int command_length;
int command_index;
int command_status;
// data buffer
- std::vector<UINT8> sector_buffer;
- UINT8 *data_buffer;
+ std::vector<uint8_t> sector_buffer;
+ uint8_t *data_buffer;
int data_length;
int data_index;
// sense data
- UINT8 sense_data[4];
+ uint8_t sense_data[4];
// these are used only to satisfy dex
- UINT32 diskaddr_ecc_error;
- UINT32 diskaddr_format_bad_track;
- UINT8 alternate_track_buffer[4];
- UINT32 alternate_track_address[2];
+ uint32_t diskaddr_ecc_error;
+ uint32_t diskaddr_format_bad_track;
+ uint8_t alternate_track_buffer[4];
+ uint32_t alternate_track_address[2];
emu_timer *m_timer;
bool m_installed;
void clear_sense_data();
- void set_sense_data(UINT8 code, const UINT8 * cdb);
- void set_configuration_data(UINT8 lun);
- UINT8 get_lun(const UINT8 * cdb);
- UINT8 check_disk_address(const UINT8 *cdb);
- UINT32 get_disk_track(const UINT8 * cdb);
- UINT32 get_disk_address(const UINT8 * cdb);
- void set_data_transfer(UINT8 *data, UINT16 length);
- void read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8 lun);
- void write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 lun);
- void copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count, UINT8 lun);
- void format_track(const UINT8 * cdb);
- void set_esdi_defect_list(UINT8 lun, UINT8 head);
+ void set_sense_data(uint8_t code, const uint8_t * cdb);
+ void set_configuration_data(uint8_t lun);
+ uint8_t get_lun(const uint8_t * cdb);
+ uint8_t check_disk_address(const uint8_t *cdb);
+ uint32_t get_disk_track(const uint8_t * cdb);
+ uint32_t get_disk_address(const uint8_t * cdb);
+ void set_data_transfer(uint8_t *data, uint16_t length);
+ void read_sectors_from_disk(int32_t diskaddr, uint8_t count, uint8_t lun);
+ void write_sectors_to_disk(int32_t diskaddr, uint8_t count, uint8_t lun);
+ void copy_sectors(int32_t dst_addr, int32_t src_addr, uint8_t count, uint8_t lun);
+ void format_track(const uint8_t * cdb);
+ void set_esdi_defect_list(uint8_t lun, uint8_t head);
template <typename Format, typename... Params> void logerror(Format &&fmt, Params &&... args) const;
- void log_command(const UINT8 cdb[], const UINT16 cdb_length);
+ void log_command(const uint8_t cdb[], const uint16_t cdb_length);
void log_data();
- void do_command(const UINT8 cdb[], const UINT16 cdb_length);
- UINT8 get_command_length(UINT8 command_byte);
- UINT16 get_data();
- void set_data(UINT16 data);
- void set_jumper(UINT16 disk_type);
+ void do_command(const uint8_t cdb[], const uint16_t cdb_length);
+ uint8_t get_command_length(uint8_t command_byte);
+ uint16_t get_data();
+ void set_data(uint16_t data);
+ void set_jumper(uint16_t disk_type);
DECLARE_READ8_MEMBER(read8);
DECLARE_WRITE8_MEMBER(write8);
};
@@ -133,7 +133,7 @@ private:
class omti8621_pc_device : public omti8621_device
{
public:
- omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
extern const device_type ISA16_OMTI8621;
@@ -143,10 +143,10 @@ extern const device_type ISA16_OMTI8621;
class omti8621_apollo_device : public omti8621_device
{
public:
- omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// get sector diskaddr of logical unit lun into data_buffer
- UINT32 get_sector(INT32 diskaddr, UINT8 *data_buffer, UINT32 length, UINT8 lun);
+ uint32_t get_sector(int32_t diskaddr, uint8_t *data_buffer, uint32_t length, uint8_t lun);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
};