Magic strings, just say no (nw)

This commit is contained in:
Alex W. Jackson 2014-09-18 04:30:33 +00:00
parent 66e0b0128b
commit b888f5e86e
7 changed files with 26 additions and 16 deletions

View File

@ -72,7 +72,7 @@ const device_type M37710S4 = &device_creator<m37710s4_device>;
DEVICE_ADDRESS_MAP_START( map, 16, m37702m2_device )
AM_RANGE(0x000000, 0x00007f) AM_READWRITE(m37710_internal_word_r, m37710_internal_word_w)
AM_RANGE(0x000080, 0x00027f) AM_RAM
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("internal", 0)
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION(M37710_INTERNAL_ROM_REGION, 0)
ADDRESS_MAP_END

View File

@ -84,6 +84,10 @@ enum
};
// internal ROM region
#define M37710_INTERNAL_ROM_REGION "internal"
#define M37710_INTERNAL_ROM(_tag) (_tag ":" M33710_INTERNAL_ROM_REGION)
class m37710_cpu_device : public cpu_device
{
public:

View File

@ -473,7 +473,7 @@ static ADDRESS_MAP_START( m50740_map, AS_PROGRAM, 8, m50740_device )
AM_RANGE(0x0000, 0x005f) AM_RAM
AM_RANGE(0x00e0, 0x00e9) AM_READWRITE(ports_r, ports_w)
AM_RANGE(0x00f9, 0x00ff) AM_READWRITE(tmrirq_r, tmrirq_w)
AM_RANGE(0x1400, 0x1fff) AM_ROM AM_REGION("internal", 0)
AM_RANGE(0x1400, 0x1fff) AM_ROM AM_REGION(M5074X_INTERNAL_ROM_REGION, 0)
ADDRESS_MAP_END
m50740_device::m50740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :

View File

@ -5,6 +5,14 @@
#include "m740.h"
//**************************************************************************
// CONSTANTS
//**************************************************************************
// internal ROM region
#define M5074X_INTERNAL_ROM_REGION "internal"
#define M5074X_INTERNAL_ROM(_tag) (_tag ":" M5074X_INTERNAL_ROM_REGION)
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
//**************************************************************************

View File

@ -22,31 +22,31 @@ const device_type NAMCO_C76 = &device_creator<namco_c76_device>;
ROM_START( c69 )
ROM_REGION16_LE( 0x4000, "internal", 0 )
ROM_REGION16_LE( 0x4000, M37710_INTERNAL_ROM_REGION, 0 )
ROM_LOAD( "c69.bin", 0, 0x4000, CRC(349134d9) SHA1(61a4981fc2716c228b6121fedcbf1ed6f34dc2de) )
ROM_END
ROM_START( c70 )
ROM_REGION16_LE( 0x4000, "internal", 0 )
ROM_REGION16_LE( 0x4000, M37710_INTERNAL_ROM_REGION, 0 )
ROM_LOAD( "c70.bin", 0, 0x4000, CRC(b4015f23) SHA1(7ce91eda76e86b5cab625e2b67c463b7d143832e) )
ROM_END
ROM_START( c74 )
ROM_REGION16_LE( 0x4000, "internal", 0 )
ROM_REGION16_LE( 0x4000, M37710_INTERNAL_ROM_REGION, 0 )
ROM_LOAD( "c74.bin", 0, 0x4000, CRC(a3dce360) SHA1(8f3248b1890abb2e649927240ae46f73bb171e3b) )
ROM_END
ROM_START( c75 )
ROM_REGION16_LE( 0x4000, "internal", 0 )
ROM_REGION16_LE( 0x4000, M37710_INTERNAL_ROM_REGION, 0 )
ROM_LOAD( "c75.bin", 0, 0x4000, CRC(42f539a5) SHA1(3103e5a0a2867620309fd4fe478a2be0effbeff8) )
ROM_END
ROM_START( c76 )
ROM_REGION16_LE( 0x4000, "internal", 0 )
ROM_REGION16_LE( 0x4000, M37710_INTERNAL_ROM_REGION, 0 )
ROM_LOAD( "c76.bin", 0, 0x4000, CRC(399faac7) SHA1(ceb184ef0486caf715dd997101999785f67a40b8) )
ROM_END

View File

@ -427,7 +427,7 @@ MACHINE_CONFIG_END
ROM_START(apple2gs)
// M50740/50741 ADB MCU inside the IIgs system unit
ROM_REGION(0x1000,ADBMICRO_TAG":internal",0)
ROM_REGION(0x1000,M5074X_INTERNAL_ROM(ADBMICRO_TAG),0)
ROM_LOAD( "341s0632-2.bin", 0x000000, 0x001000, CRC(e1c11fb0) SHA1(141d18c36a617ab9dce668445440d34354be0672) )
// i8048 microcontroller inside the IIgs ADB Standard Keyboard
@ -454,7 +454,7 @@ ROM_START(apple2gs)
ROM_END
ROM_START(apple2gsr3p)
ROM_REGION(0x1000,ADBMICRO_TAG":internal",0)
ROM_REGION(0x1000,M5074X_INTERNAL_ROM(ADBMICRO_TAG),0)
ROM_LOAD( "341s0632-2.bin", 0x000000, 0x001000, CRC(e1c11fb0) SHA1(141d18c36a617ab9dce668445440d34354be0672) )
ROM_REGION(0x400, "kmcu", 0)
@ -476,7 +476,7 @@ ROM_START(apple2gsr3p)
ROM_END
ROM_START(apple2gsr3lp)
ROM_REGION(0x1000,ADBMICRO_TAG":internal",0)
ROM_REGION(0x1000,M5074X_INTERNAL_ROM(ADBMICRO_TAG),0)
ROM_LOAD( "341s0632-2.bin", 0x000000, 0x001000, CRC(e1c11fb0) SHA1(141d18c36a617ab9dce668445440d34354be0672) )
ROM_REGION(0x400, "kmcu", 0)
@ -498,7 +498,7 @@ ROM_START(apple2gsr3lp)
ROM_END
ROM_START(apple2gsr1)
ROM_REGION(0xc00,ADBMICRO_TAG":internal",0)
ROM_REGION(0xc00,M5074X_INTERNAL_ROM(ADBMICRO_TAG),0)
ROM_LOAD( "341s0345.bin", 0x000000, 0x000c00, CRC(48cd5779) SHA1(97e421f5247c00a0ca34cd08b6209df573101480) )
ROM_REGION(0x400, "kmcu", 0)
@ -519,7 +519,7 @@ ROM_START(apple2gsr1)
ROM_END
ROM_START(apple2gsr0)
ROM_REGION(0xc00,ADBMICRO_TAG":internal",0)
ROM_REGION(0xc00,M5074X_INTERNAL_ROM(ADBMICRO_TAG),0)
ROM_LOAD( "341s0345.bin", 0x000000, 0x000c00, CRC(48cd5779) SHA1(97e421f5247c00a0ca34cd08b6209df573101480) )
ROM_REGION(0x400, "kmcu", 0)
@ -544,7 +544,7 @@ ROM_START(apple2gsr0)
ROM_END
ROM_START(apple2gsr0p) // 6/19/1986 Cortland prototype
ROM_REGION(0xc00,ADBMICRO_TAG":internal",0)
ROM_REGION(0xc00,M5074X_INTERNAL_ROM(ADBMICRO_TAG),0)
ROM_LOAD( "341s0345.bin", 0x000000, 0x000c00, CRC(48cd5779) SHA1(97e421f5247c00a0ca34cd08b6209df573101480) )
ROM_REGION(0x400, "kmcu", 0)
@ -565,7 +565,7 @@ ROM_START(apple2gsr0p) // 6/19/1986 Cortland prototype
ROM_END
ROM_START(apple2gsr0p2) // 3/10/1986 Cortland prototype, boots as "Apple //'ing - Alpha 2.0"
ROM_REGION(0xc00,ADBMICRO_TAG":internal",0)
ROM_REGION(0xc00,M5074X_INTERNAL_ROM(ADBMICRO_TAG),0)
ROM_LOAD( "341s0345.bin", 0x000000, 0x000c00, CRC(48cd5779) SHA1(97e421f5247c00a0ca34cd08b6209df573101480) )
ROM_REGION(0x400, "kmcu", 0)

View File

@ -15,9 +15,7 @@
#include "sound/es5503.h"
#include "machine/nvram.h"
#include "cpu/g65816/g65816.h"
#if RUN_ADB_MICRO
#include "cpu/m6502/m5074x.h"
#endif
#define ADBMICRO_TAG "adbmicro"