summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/voyager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/voyager.cpp')
-rw-r--r--src/mame/drivers/voyager.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp
index 7afe5159636..1ffb2a7f987 100644
--- a/src/mame/drivers/voyager.cpp
+++ b/src/mame/drivers/voyager.cpp
@@ -31,11 +31,11 @@ public:
{
}
- std::unique_ptr<UINT32[]> m_bios_ram;
- UINT8 m_mtxc_config_reg[256];
- UINT8 m_piix4_config_reg[4][256];
+ std::unique_ptr<uint32_t[]> m_bios_ram;
+ uint8_t m_mtxc_config_reg[256];
+ uint8_t m_piix4_config_reg[4][256];
- UINT32 m_idle_skip_ram;
+ uint32_t m_idle_skip_ram;
DECLARE_WRITE32_MEMBER(bios_ram_w);
DECLARE_DRIVER_INIT(voyager);
virtual void machine_start() override;
@@ -46,7 +46,7 @@ public:
// Intel 82439TX System Controller (MTXC)
-static UINT8 mtxc_config_r(device_t *busdevice, device_t *device, int function, int reg)
+static uint8_t mtxc_config_r(device_t *busdevice, device_t *device, int function, int reg)
{
voyager_state *state = busdevice->machine().driver_data<voyager_state>();
// osd_printf_debug("MTXC: read %d, %02X\n", function, reg);
@@ -54,7 +54,7 @@ static UINT8 mtxc_config_r(device_t *busdevice, device_t *device, int function,
return state->m_mtxc_config_reg[reg];
}
-static void mtxc_config_w(device_t *busdevice, device_t *device, int function, int reg, UINT8 data)
+static void mtxc_config_w(device_t *busdevice, device_t *device, int function, int reg, uint8_t data)
{
voyager_state *state = busdevice->machine().driver_data<voyager_state>();
// osd_printf_debug("%s:MTXC: write %d, %02X, %02X\n", machine.describe_context(), function, reg, data);
@@ -100,9 +100,9 @@ void voyager_state::intel82439tx_init()
m_mtxc_config_reg[0x65] = 0x02;
}
-static UINT32 intel82439tx_pci_r(device_t *busdevice, device_t *device, int function, int reg, UINT32 mem_mask)
+static uint32_t intel82439tx_pci_r(device_t *busdevice, device_t *device, int function, int reg, uint32_t mem_mask)
{
- UINT32 r = 0;
+ uint32_t r = 0;
if(reg == 0)
return 0x05851106; // VT82C585VPX, VIA
@@ -126,7 +126,7 @@ static UINT32 intel82439tx_pci_r(device_t *busdevice, device_t *device, int func
return r;
}
-static void intel82439tx_pci_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask)
+static void intel82439tx_pci_w(device_t *busdevice, device_t *device, int function, int reg, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_24_31)
{
@@ -148,23 +148,23 @@ static void intel82439tx_pci_w(device_t *busdevice, device_t *device, int functi
// Intel 82371AB PCI-to-ISA / IDE bridge (PIIX4)
-static UINT8 piix4_config_r(device_t *busdevice, device_t *device, int function, int reg)
+static uint8_t piix4_config_r(device_t *busdevice, device_t *device, int function, int reg)
{
voyager_state *state = busdevice->machine().driver_data<voyager_state>();
// osd_printf_debug("PIIX4: read %d, %02X\n", function, reg);
return state->m_piix4_config_reg[function][reg];
}
-static void piix4_config_w(device_t *busdevice, device_t *device, int function, int reg, UINT8 data)
+static void piix4_config_w(device_t *busdevice, device_t *device, int function, int reg, uint8_t data)
{
voyager_state *state = busdevice->machine().driver_data<voyager_state>();
// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine.describe_context(), function, reg, data);
state->m_piix4_config_reg[function][reg] = data;
}
-static UINT32 intel82371ab_pci_r(device_t *busdevice, device_t *device, int function, int reg, UINT32 mem_mask)
+static uint32_t intel82371ab_pci_r(device_t *busdevice, device_t *device, int function, int reg, uint32_t mem_mask)
{
- UINT32 r = 0;
+ uint32_t r = 0;
if(reg == 0)
return 0x30401106; // VT82C586B, VIA
@@ -188,7 +188,7 @@ static UINT32 intel82371ab_pci_r(device_t *busdevice, device_t *device, int func
return r;
}
-static void intel82371ab_pci_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask)
+static void intel82371ab_pci_w(device_t *busdevice, device_t *device, int function, int reg, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_24_31)
{
@@ -499,7 +499,7 @@ MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(voyager_state,voyager)
{
- m_bios_ram = std::make_unique<UINT32[]>(0x20000/4);
+ m_bios_ram = std::make_unique<uint32_t[]>(0x20000/4);
intel82439tx_init();
}