diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index 01a713e2d6f..f80be9338af 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -494,12 +494,12 @@ $(CPUOBJ)/h83002/h8periph.o: $(CPUSRC)/h83002/h8periph.c \ #------------------------------------------------- -# Hitachi H8/3344 (8/16-bit H8/3xx series) +# Hitachi H8/3334 (8/16-bit H8/3xx series) #------------------------------------------------- -CPUDEFS += -DHAS_H83344=$(if $(filter H83344,$(CPUS)),1,0) +CPUDEFS += -DHAS_H83334=$(if $(filter H83334,$(CPUS)),1,0) -ifneq ($(filter H83344,$(CPUS)),) +ifneq ($(filter H83334,$(CPUS)),) OBJDIRS += $(CPUOBJ)/h83002 CPUOBJS += $(CPUOBJ)/h83002/h8_8.o $(CPUOBJ)/h83002/h8periph.o DBGOBJS += $(CPUOBJ)/h83002/h8disasm.o diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c index ad0d8c3391b..f3db1c3542b 100644 --- a/src/emu/cpu/h83002/h8_8.c +++ b/src/emu/cpu/h83002/h8_8.c @@ -518,13 +518,13 @@ static WRITE8_HANDLER( h8330_itu_w ) h8->per_regs[reg] = data; } -static ADDRESS_MAP_START( h8_3344_internal_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( h8_3334_internal_map, ADDRESS_SPACE_PROGRAM, 8 ) // 512B RAM AM_RANGE(0xfb80, 0xff7f) AM_RAM AM_RANGE(0xff88, 0xffff) AM_READWRITE( h8330_itu_r, h8330_itu_w ) ADDRESS_MAP_END -CPU_GET_INFO( h8_3344 ) +CPU_GET_INFO( h8_3334 ) { h83xx_state *h8 = (device != NULL) ? device->token : NULL; @@ -556,12 +556,12 @@ CPU_GET_INFO( h8_3344 ) case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break; // Internal maps - case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_h8_3344_internal_map; break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_h8_3334_internal_map; break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = NULL; break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map16 = NULL; break; // CPU misc parameters - case CPUINFO_STR_NAME: strcpy(info->s, "H8/3344"); break; + case CPUINFO_STR_NAME: strcpy(info->s, "H8/3334"); break; case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; case CPUINFO_STR_FLAGS: strcpy(info->s, h8_get_ccr_str(h8)); break; case CPUINFO_INT_ENDIANNESS: info->i = CPU_IS_BE; break; diff --git a/src/emu/cpuintrf.c b/src/emu/cpuintrf.c index 0cc73d0bb11..b587e73b22a 100644 --- a/src/emu/cpuintrf.c +++ b/src/emu/cpuintrf.c @@ -209,7 +209,7 @@ CPU_GET_INFO( i960 ); CPU_GET_INFO( h8_3002 ); CPU_GET_INFO( h8_3007 ); CPU_GET_INFO( h8_3044 ); -CPU_GET_INFO( h8_3344 ); +CPU_GET_INFO( h8_3334 ); CPU_GET_INFO( v810 ); CPU_GET_INFO( m37702 ); CPU_GET_INFO( m37710 ); @@ -746,8 +746,8 @@ static const struct #if (HAS_I960) { CPU_I960, CPU_GET_INFO_NAME(i960) }, #endif -#if (HAS_H83344) - { CPU_H83344, CPU_GET_INFO_NAME(h8_3344) }, +#if (HAS_H83334) + { CPU_H83334, CPU_GET_INFO_NAME(h8_3334) }, #endif #if (HAS_H83002) { CPU_H83002, CPU_GET_INFO_NAME(h8_3002) }, diff --git a/src/emu/cpuintrf.h b/src/emu/cpuintrf.h index b8f6fe224b3..b3a3d1326de 100644 --- a/src/emu/cpuintrf.h +++ b/src/emu/cpuintrf.h @@ -375,7 +375,7 @@ enum _cpu_type CPU_H83002, CPU_H83007, CPU_H83044, - CPU_H83344, + CPU_H83334, CPU_V810, CPU_M37702, CPU_M37710, diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index b5fa4c53d66..1b5dff76206 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -49,14 +49,14 @@ Note! This document is a Work-In-Progress and will be updated from time to time This document covers all the known Namco System 23 / Super System 23 games, including.... *Angler King Namco, 1999 System 23 -*Final Furlong Namco, 1997 System 23 +*Final Furlong Namco, 1997 System 22.5/Gorgon Gunmen Wars Namco, 1998 System 23 [not dumped, but have] Motocross Go! Namco, 1997 System 23 *Panic Park Namco, 1998 System 23 Rapid River Namco, 1997 System 22.5/Gorgon Time Crisis II Namco, 1997 System 23 *Underground King Namco, 1998 System 23 -*Downhill Bikers Namco, 199? System 23 +Downhill Bikers Namco, 199? System 23 [not dumped, but have] 500 GP Namco, 1999 Super System 23 Crisis Zone Namco, 2000 Super System 23 Evolution 2 [not dumped, but have] Final Furlong 2 Namco, 1999 Super System 23 @@ -1339,7 +1339,7 @@ static MACHINE_DRIVER_START( s23 ) MDRV_CPU_IO_MAP( s23h8iomap, 0 ) MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) - MDRV_CPU_ADD("ioboard", H83344, 14745600 ) + MDRV_CPU_ADD("ioboard", H83334, 14745600 ) MDRV_CPU_PROGRAM_MAP( s23iobrdmap, 0 ) MDRV_CPU_IO_MAP( s23iobrdiomap, 0 ) MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) @@ -1477,7 +1477,7 @@ ROM_START( motoxgo ) ROM_REGION( 0x80000, "audio", 0 ) /* Hitachi H8/3002 MCU code */ ROM_LOAD16_WORD_SWAP( "mg3vera.ic3", 0x000000, 0x080000, CRC(9e3d46a8) SHA1(9ffa5b91ea51cc0fb97def25ce47efa3441f3c6f) ) - ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3344 MCU code */ + ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code */ ROM_LOAD( "asca-3a.ic14", 0x000000, 0x040000, CRC(8e9266e5) SHA1(ffa8782ca641d71d57df23ed1c5911db05d3df97) ) ROM_REGION( 0x20000, "exioboard", 0 ) /* "extra" I/O board (uses Fujitsu MB90611A MCU) */ @@ -1524,7 +1524,7 @@ ROM_START( timecrs2 ) ROM_REGION( 0x80000, "audio", 0 ) /* Hitachi H8/3002 MCU code */ ROM_LOAD16_WORD_SWAP( "tss3verb.3", 0x000000, 0x080000, CRC(41e41994) SHA1(eabc1a307c329070bfc6486cb68169c94ff8a162) ) - ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3344 MCU code */ + ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code */ ROM_LOAD( "tssioprog.ic3", 0x000000, 0x040000, CRC(edad4538) SHA1(1330189184a636328d956c0e435f8d9ad2e96a80) ) ROM_REGION( 0x2000000, "sprite", 0 ) /* sprite? tilemap? tiles */ @@ -1564,7 +1564,7 @@ ROM_START( timcrs2b ) ROM_REGION( 0x80000, "audio", 0 ) /* Hitachi H8/3002 MCU code */ ROM_LOAD16_WORD_SWAP( "tss3verb.3", 0x000000, 0x080000, CRC(41e41994) SHA1(eabc1a307c329070bfc6486cb68169c94ff8a162) ) - ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3344 MCU code */ + ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code */ ROM_LOAD( "tssioprog.ic3", 0x000000, 0x040000, CRC(edad4538) SHA1(1330189184a636328d956c0e435f8d9ad2e96a80) ) ROM_REGION( 0x2000000, "sprite", 0 ) /* sprite? tilemap? tiles */ diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 3dd863a426d..aeeaab48754 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -184,7 +184,7 @@ CPUS += GMS30C2216 CPUS += GMS30C2232 CPUS += I960 CPUS += H83002 -CPUS += H83344 +CPUS += H83334 CPUS += V810 CPUS += M37702 CPUS += M37710