diff options
Diffstat (limited to 'src/mame/drivers/cxhumax.cpp')
-rw-r--r-- | src/mame/drivers/cxhumax.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp index cd3ad8feaa8..3f990dd8a32 100644 --- a/src/mame/drivers/cxhumax.cpp +++ b/src/mame/drivers/cxhumax.cpp @@ -120,9 +120,9 @@ WRITE32_MEMBER ( cxhumax_state::flash_w ) { offset *= 2; if(ACCESSING_BITS_0_15) - m_flash->write(space, offset, data); + m_flash->write(offset, data); if(ACCESSING_BITS_16_31) - m_flash->write(space, offset+1, data >> 16); + m_flash->write(offset+1, data >> 16); verboselog(*this, 9, "(FLASH) %08X <- %08X\n", 0xF0000000 + (offset << 2), data); } @@ -131,9 +131,9 @@ READ32_MEMBER ( cxhumax_state::flash_r ) uint32_t res = 0; offset *= 2; if(ACCESSING_BITS_0_15) - res |= m_flash->read(space, offset); + res |= m_flash->read(offset); if(ACCESSING_BITS_16_31) - res |= m_flash->read(space, offset+1) << 16; + res |= m_flash->read(offset+1) << 16; //if(m_flash->m_flash_mode!=FM_NORMAL) verboselog(*this, 9, "(FLASH) %08X -> %08X\n", 0xF0000000 + (offset << 2), res); return res; } @@ -167,7 +167,7 @@ READ32_MEMBER( cxhumax_state::cx_scratch_r ) int i = 0; while ((temp=program.read_byte(m_maincpu->state_int(ARM7_R0)+i))) { buf[i++]=temp; - //m_terminal->write(space, 0, temp); + //m_terminal->write(temp); } osd_printf_debug("%s", buf); verboselog(*this, 9, "(DEBUG) %s", buf); @@ -412,7 +412,7 @@ WRITE32_MEMBER( cxhumax_state::cx_uart2_w ) case UART_FIFO_REG: if(!(m_uart2_regs[UART_FRMC_REG]&UART_FRMC_BDS_BIT)) { /* Sending byte... add logging */ - m_terminal->write(space, 0, data); + m_terminal->write(data); /* Transmitter Idle Interrupt Enable */ if(m_uart2_regs[UART_IRQE_REG]&UART_IRQE_TIDE_BIT) { @@ -1055,26 +1055,27 @@ void cxhumax_state::machine_reset() memset(m_gxa_cmd_regs,0,sizeof(m_gxa_cmd_regs)); } -MACHINE_CONFIG_START(cxhumax_state::cxhumax) - MCFG_DEVICE_ADD("maincpu", ARM920T, 180000000) // CX24175 (RevC up?) - MCFG_DEVICE_PROGRAM_MAP(cxhumax_map) +void cxhumax_state::cxhumax(machine_config &config) +{ + ARM920T(config, m_maincpu, 180000000); // CX24175 (RevC up?) + m_maincpu->set_addrmap(AS_PROGRAM, &cxhumax_state::cxhumax_map); INTEL_28F320J3D(config, "flash"); I2CMEM(config, "eeprom", 0).set_data_size(0x2000); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(50) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ - MCFG_SCREEN_SIZE(1920, 1080) - MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 1080-1) - MCFG_SCREEN_UPDATE_DRIVER(cxhumax_state, screen_update_cxhumax) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(50); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ + screen.set_size(1920, 1080); + screen.set_visarea_full(); + screen.set_screen_update(FUNC(cxhumax_state::screen_update_cxhumax)); PALETTE(config, "palette", palette_device::MONOCHROME); GENERIC_TERMINAL(config, m_terminal, 0); -MACHINE_CONFIG_END +} ROM_START( hxhdci2k ) ROM_REGION( 0x400000, "flash", 0 ) |