From 18ddb0bac3a1e0a86f6bfc7a48fd6929e3f9f7aa Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 24 Sep 2012 07:54:59 +0000 Subject: [PATCH] Removed AS_DATA on all variants and AS_IO on CPU variants not having IO lines (no whatsnew) --- src/emu/cpu/m6800/m6800.c | 26 +++++++++++++------------- src/mess/drivers/hx20.c | 5 ++++- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index 2c8b6086482..b5286ccf3f6 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -1048,8 +1048,8 @@ static CPU_INIT( m6800 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); - cpustate->io = &device->space(AS_IO); + //cpustate->data = &device->space(AS_DATA); + //cpustate->io = &device->space(AS_IO); // cpustate->subtype = SUBTYPE_M6800; cpustate->insn = m6800_insn; @@ -1201,7 +1201,7 @@ static CPU_INIT( m6801 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); + //cpustate->data = &device->space(AS_DATA); cpustate->io = &device->space(AS_IO); cpustate->clock = device->clock() / 4; @@ -1236,8 +1236,8 @@ static CPU_INIT( m6802 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); - cpustate->io = &device->space(AS_IO); + //cpustate->data = &device->space(AS_DATA); + //cpustate->io = &device->space(AS_IO); state_register(cpustate, "m6802"); } @@ -1256,7 +1256,7 @@ static CPU_INIT( m6803 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); + //cpustate->data = &device->space(AS_DATA); cpustate->io = &device->space(AS_IO); cpustate->clock = device->clock() / 4; @@ -1298,8 +1298,8 @@ static CPU_INIT( m6808 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); - cpustate->io = &device->space(AS_IO); + //cpustate->data = &device->space(AS_DATA); + //cpustate->io = &device->space(AS_IO); state_register(cpustate, "m6808"); } @@ -1319,7 +1319,7 @@ static CPU_INIT( hd6301 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); + //cpustate->data = &device->space(AS_DATA); cpustate->io = &device->space(AS_IO); cpustate->clock = device->clock() / 4; @@ -1344,7 +1344,7 @@ static CPU_INIT( hd63701 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); + //cpustate->data = &device->space(AS_DATA); cpustate->io = &device->space(AS_IO); cpustate->clock = device->clock() / 4; @@ -1379,8 +1379,8 @@ static CPU_INIT( nsc8105 ) cpustate->program = &device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - cpustate->data = &device->space(AS_DATA); - cpustate->io = &device->space(AS_IO); + //cpustate->data = &device->space(AS_DATA); + //cpustate->io = &device->space(AS_IO); cpustate->insn = nsc8105_insn; cpustate->cycles = cycles_nsc8105; @@ -1893,7 +1893,7 @@ CPU_GET_INFO( m6800 ) case CPUINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; case CPUINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; case CPUINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break; - case CPUINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 9; break; + case CPUINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break; case CPUINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break; case CPUINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break; diff --git a/src/mess/drivers/hx20.c b/src/mess/drivers/hx20.c index 75b12ef5f07..9ed646c8957 100644 --- a/src/mess/drivers/hx20.c +++ b/src/mess/drivers/hx20.c @@ -27,6 +27,9 @@ static ADDRESS_MAP_START(ehx20_mem, AS_PROGRAM, 8, hx20_state) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END +static ADDRESS_MAP_START(ehx20_io, AS_IO, 8, hx20_state) +ADDRESS_MAP_END + /* Input ports */ static INPUT_PORTS_START( ehx20 ) INPUT_PORTS_END @@ -95,7 +98,7 @@ static MACHINE_CONFIG_START( ehx20, hx20_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",HD63701, 614000) // HD6301 MCFG_CPU_PROGRAM_MAP(ehx20_mem) - + MCFG_CPU_IO_MAP(ehx20_io) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER)