Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 17:56:43 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fdc37c93x.cpp: use enum constants and not explicit values (nw)

Browse Source
This commit is contained in:
yz70s 2019-11-29 17:57:59 +01:00
parent cbd1c11a3f
commit c63e41ff66
2 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/devices/machine/fdc37c93x.cpp
View File

@ -21,7 +21,7 @@ fdc37c93x_device::fdc37c93x_device(const machine_config &mconfig, const char *ta
, mode(OperatingMode::Run) , mode(OperatingMode::Run)
, config_key_step(0) , config_key_step(0)
, config_index(0) , config_index(0)
, logical_device(0) , logical_device(LogicalDevice::FDC)
, last_dma_line(-1) , last_dma_line(-1)
, m_gp20_reset_callback(*this) , m_gp20_reset_callback(*this)
, m_gp25_gatea20_callback(*this) , m_gp25_gatea20_callback(*this)
@ -48,22 +48,22 @@ fdc37c93x_device::fdc37c93x_device(const machine_config &mconfig, const char *ta
global_configuration_registers[0x21] = 1; global_configuration_registers[0x21] = 1;
global_configuration_registers[0x24] = 4; global_configuration_registers[0x24] = 4;
memset(configuration_registers, 0, sizeof(configuration_registers)); memset(configuration_registers, 0, sizeof(configuration_registers));
configuration_registers[0][0x60] = 3; configuration_registers[LogicalDevice::FDC][0x60] = 3;
configuration_registers[0][0x61] = 0xf0; configuration_registers[LogicalDevice::FDC][0x61] = 0xf0;
configuration_registers[0][0x70] = 6; configuration_registers[LogicalDevice::FDC][0x70] = 6;
configuration_registers[0][0x74] = 2; configuration_registers[LogicalDevice::FDC][0x74] = 2;
configuration_registers[0][0xf0] = 0xe; configuration_registers[LogicalDevice::FDC][0xf0] = 0xe;
configuration_registers[0][0xf2] = 0xff; configuration_registers[LogicalDevice::FDC][0xf2] = 0xff;
configuration_registers[1][0x60] = 1; configuration_registers[LogicalDevice::IDE1][0x60] = 1;
configuration_registers[1][0x61] = 0xf0; configuration_registers[LogicalDevice::IDE1][0x61] = 0xf0;
configuration_registers[1][0x62] = 3; configuration_registers[LogicalDevice::IDE1][0x62] = 3;
configuration_registers[1][0x63] = 0xf6; configuration_registers[LogicalDevice::IDE1][0x63] = 0xf6;
configuration_registers[1][0x70] = 0xe; configuration_registers[LogicalDevice::IDE1][0x70] = 0xe;
configuration_registers[3][0x74] = 4; configuration_registers[LogicalDevice::Parallel][0x74] = 4;
configuration_registers[3][0xf0] = 0x3c; configuration_registers[LogicalDevice::Parallel][0xf0] = 0x3c;
configuration_registers[6][0xf4] = 3; configuration_registers[LogicalDevice::RTC][0xf4] = 3;
for (int n = 0xe0; n <= 0xed; n++) for (int n = 0xe0; n <= 0xed; n++)
configuration_registers[8][n] = 1; configuration_registers[LogicalDevice::AuxIO][n] = 1;
for (int n = 0; n <= 8; n++) for (int n = 0; n <= 8; n++)
enabled_logical[n] = false; enabled_logical[n] = false;
for (int n = 0; n < 4; n++) for (int n = 0; n < 4; n++)
@ -248,6 +248,7 @@ void fdc37c93x_device::device_add_mconfig(machine_config &config)
fdcdev.drq_wr_callback().set(FUNC(fdc37c93x_device::drq_floppy_w)); fdcdev.drq_wr_callback().set(FUNC(fdc37c93x_device::drq_floppy_w));
FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", fdc37c93x_device::floppy_formats); FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", fdc37c93x_device::floppy_formats);
FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", fdc37c93x_device::floppy_formats); FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", fdc37c93x_device::floppy_formats);
// parallel port // parallel port
PC_LPT(config, pc_lpt_lptdev); PC_LPT(config, pc_lpt_lptdev);
pc_lpt_lptdev->irq_handler().set(FUNC(fdc37c93x_device::irq_parallel_w)); pc_lpt_lptdev->irq_handler().set(FUNC(fdc37c93x_device::irq_parallel_w));
@ -759,31 +760,31 @@ void fdc37c93x_device::write_logical_configuration_register(int index, int data)
configuration_registers[logical_device][index] = data; configuration_registers[logical_device][index] = data;
switch (logical_device) switch (logical_device)
{ {
case 0: case LogicalDevice::FDC:
write_fdd_configuration_register(index, data); write_fdd_configuration_register(index, data);
break; break;
case 1: case LogicalDevice::IDE1:
write_ide1_configuration_register(index, data); write_ide1_configuration_register(index, data);
break; break;
case 2: case LogicalDevice::IDE2:
write_ide2_configuration_register(index, data); write_ide2_configuration_register(index, data);
break; break;
case 3: case LogicalDevice::Parallel:
write_parallel_configuration_register(index, data); write_parallel_configuration_register(index, data);
break; break;
case 4: case LogicalDevice::Serial1:
write_serial1_configuration_register(index, data); write_serial1_configuration_register(index, data);
break; break;
case 5: case LogicalDevice::Serial2:
write_serial2_configuration_register(index, data); write_serial2_configuration_register(index, data);
break; break;
case 6: case LogicalDevice::RTC:
write_rtc_configuration_register(index, data); write_rtc_configuration_register(index, data);
break; break;
case 7: case LogicalDevice::Keyboard:
write_keyboard_configuration_register(index, data); write_keyboard_configuration_register(index, data);
break; break;
case 8: case LogicalDevice::AuxIO:
write_auxio_configuration_register(index, data); write_auxio_configuration_register(index, data);
break; break;
} }
@ -957,31 +958,31 @@ uint16_t fdc37c93x_device::read_logical_configuration_register(int index)
switch (logical_device) switch (logical_device)
{ {
case 0: case LogicalDevice::FDC:
ret = read_fdd_configuration_register(index); ret = read_fdd_configuration_register(index);
break; break;
case 1: case LogicalDevice::IDE1:
ret = read_ide1_configuration_register(index); ret = read_ide1_configuration_register(index);
break; break;
case 2: case LogicalDevice::IDE2:
ret = read_ide2_configuration_register(index); ret = read_ide2_configuration_register(index);
break; break;
case 3: case LogicalDevice::Parallel:
ret = read_parallel_configuration_register(index); ret = read_parallel_configuration_register(index);
break; break;
case 4: case LogicalDevice::Serial1:
ret = read_serial1_configuration_register(index); ret = read_serial1_configuration_register(index);
break; break;
case 5: case LogicalDevice::Serial2:
ret = read_serial2_configuration_register(index); ret = read_serial2_configuration_register(index);
break; break;
case 6: case LogicalDevice::RTC:
ret = read_rtc_configuration_register(index); ret = read_rtc_configuration_register(index);
break; break;
case 7: case LogicalDevice::Keyboard:
ret = read_keyboard_configuration_register(index); ret = read_keyboard_configuration_register(index);
break; break;
case 8: case LogicalDevice::AuxIO:
ret = read_auxio_configuration_register(index); ret = read_auxio_configuration_register(index);
break; break;
} }
@ -991,17 +992,17 @@ uint16_t fdc37c93x_device::read_logical_configuration_register(int index)
uint16_t fdc37c93x_device::read_rtc_configuration_register(int index) uint16_t fdc37c93x_device::read_rtc_configuration_register(int index)
{ {
return configuration_registers[6][index]; return configuration_registers[LogicalDevice::RTC][index];
} }
uint16_t fdc37c93x_device::read_keyboard_configuration_register(int index) uint16_t fdc37c93x_device::read_keyboard_configuration_register(int index)
{ {
return configuration_registers[7][index]; return configuration_registers[LogicalDevice::Keyboard][index];
} }
uint16_t fdc37c93x_device::read_auxio_configuration_register(int index) uint16_t fdc37c93x_device::read_auxio_configuration_register(int index)
{ {
return configuration_registers[8][index]; return configuration_registers[LogicalDevice::AuxIO][index];
} }
/* Device management */ /* Device management */

6
src/devices/machine/fdc37c93x.h
View File

@ -50,9 +50,6 @@ public:
void remap(int space_id, offs_t start, offs_t end) override; void remap(int space_id, offs_t start, offs_t end) override;
// to access io ports
DECLARE_READ8_MEMBER(read_fdc37c93x);
DECLARE_WRITE8_MEMBER(write_fdc37c93x);
// for the internal floppy controller // for the internal floppy controller
DECLARE_WRITE_LINE_MEMBER(irq_floppy_w); DECLARE_WRITE_LINE_MEMBER(irq_floppy_w);
DECLARE_WRITE_LINE_MEMBER(drq_floppy_w); DECLARE_WRITE_LINE_MEMBER(drq_floppy_w);
@ -93,6 +90,9 @@ public:
void map_keyboard(address_map &map); void map_keyboard(address_map &map);
void unmap_keyboard(address_map &map); void unmap_keyboard(address_map &map);
// to access io ports
DECLARE_READ8_MEMBER(read_fdc37c93x);
DECLARE_WRITE8_MEMBER(write_fdc37c93x);
DECLARE_READ8_MEMBER(disabled_read); DECLARE_READ8_MEMBER(disabled_read);
DECLARE_WRITE8_MEMBER(disabled_write); DECLARE_WRITE8_MEMBER(disabled_write);
DECLARE_READ8_MEMBER(lpt_read); DECLARE_READ8_MEMBER(lpt_read);