diff options
Diffstat (limited to 'src/mame/drivers/gamecstl.cpp')
-rw-r--r-- | src/mame/drivers/gamecstl.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index 97e2e248323..f08e3836597 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -81,12 +81,12 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } - required_shared_ptr<UINT32> m_cga_ram; + required_shared_ptr<uint32_t> m_cga_ram; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - 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]; DECLARE_WRITE32_MEMBER(pnp_config_w); DECLARE_WRITE32_MEMBER(pnp_data_w); @@ -95,7 +95,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - UINT32 screen_update_gamecstl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_gamecstl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int ch, int att, int x, int y); void intel82439tx_init(); }; @@ -119,17 +119,17 @@ void gamecstl_state::video_start() void gamecstl_state::draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int ch, int att, int x, int y) { int i,j; - const UINT8 *dp; + const uint8_t *dp; int index = 0; dp = gfx->get_data(ch); for (j=y; j < y+8; j++) { - UINT16 *p = &bitmap.pix16(j); + uint16_t *p = &bitmap.pix16(j); for (i=x; i < x+8; i++) { - UINT8 pen = dp[index++]; + uint8_t pen = dp[index++]; if (pen) p[i] = gfx->colorbase() + (att & 0xf); else @@ -138,11 +138,11 @@ void gamecstl_state::draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, } } -UINT32 gamecstl_state::screen_update_gamecstl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t gamecstl_state::screen_update_gamecstl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { int i, j; gfx_element *gfx = m_gfxdecode->gfx(0); - UINT32 *cga = m_cga_ram; + uint32_t *cga = m_cga_ram; int index = 0; bitmap.fill(0, cliprect); @@ -166,14 +166,14 @@ UINT32 gamecstl_state::screen_update_gamecstl(screen_device &screen, bitmap_ind1 // 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) { gamecstl_state *state = busdevice->machine().driver_data<gamecstl_state>(); printf("MTXC: read %d, %02X\n", function, reg); 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) { gamecstl_state *state = busdevice->machine().driver_data<gamecstl_state>(); printf("%s:MTXC: write %d, %02X, %02X\n", busdevice->machine().describe_context(), function, reg, data); @@ -207,9 +207,9 @@ void gamecstl_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 (ACCESSING_BITS_24_31) { r |= mtxc_config_r(busdevice, device, function, reg + 3) << 24; @@ -229,7 +229,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) { @@ -251,23 +251,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) { gamecstl_state *state = busdevice->machine().driver_data<gamecstl_state>(); printf("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) { gamecstl_state *state = busdevice->machine().driver_data<gamecstl_state>(); printf("%s:PIIX4: write %d, %02X, %02X\n", busdevice->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 (ACCESSING_BITS_24_31) { r |= piix4_config_r(busdevice, device, function, reg + 3) << 24; @@ -287,7 +287,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) { @@ -460,7 +460,7 @@ MACHINE_CONFIG_END DRIVER_INIT_MEMBER(gamecstl_state,gamecstl) { - m_bios_ram = std::make_unique<UINT32[]>(0x10000/4); + m_bios_ram = std::make_unique<uint32_t[]>(0x10000/4); intel82439tx_init(); } |