summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/cpu/cpu.mak16
-rw-r--r--src/emu/cpu/mcs48/mcs48.c28
-rw-r--r--src/ldplayer/ldplayer.mak2
-rw-r--r--src/mame/mame.mak12
4 files changed, 5 insertions, 53 deletions
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index dfeeaad8e6d..645c0617fb0 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -658,19 +658,9 @@ $(CPUOBJ)/i8085/i8085.o: $(CPUSRC)/i8085/i8085.c \
# Intel MCS-48 (8039 and derivatives)
#-------------------------------------------------
-CPUDEFS += -DHAS_I8035=$(if $(filter I8035,$(CPUS)),1,0)
-CPUDEFS += -DHAS_I8048=$(if $(filter I8048,$(CPUS)),1,0)
-CPUDEFS += -DHAS_I8648=$(if $(filter I8648,$(CPUS)),1,0)
-CPUDEFS += -DHAS_I8748=$(if $(filter I8748,$(CPUS)),1,0)
-CPUDEFS += -DHAS_MB8884=$(if $(filter MB8884,$(CPUS)),1,0)
-
-CPUDEFS += -DHAS_I8039=$(if $(filter I8039,$(CPUS)),1,0)
-CPUDEFS += -DHAS_I8049=$(if $(filter I8049,$(CPUS)),1,0)
-CPUDEFS += -DHAS_I8749=$(if $(filter I8749,$(CPUS)),1,0)
-CPUDEFS += -DHAS_N7751=$(if $(filter N7751,$(CPUS)),1,0)
-CPUDEFS += -DHAS_M58715=$(if $(filter M58715,$(CPUS)),1,0)
-
-ifneq ($(filter I8035 I8048 I8648 I8748 MB8884 I8039 I8049 I8749 N7751 M58715,$(CPUS)),)
+CPUDEFS += -DHAS_MCS48=$(if $(filter MCS48,$(CPUS)),1,0)
+
+ifneq ($(filter MCS48,$(CPUS)),)
OBJDIRS += $(CPUOBJ)/mcs48
CPUOBJS += $(CPUOBJ)/mcs48/mcs48.o
DBGOBJS += $(CPUOBJ)/mcs48/mcs48dsm.o
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c
index 11e6cc018c8..8d17f249887 100644
--- a/src/emu/cpu/mcs48/mcs48.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -744,12 +744,10 @@ static void mcs48_init(const device_config *device, cpu_irq_callback irqcallback
RAM
-------------------------------------------------*/
-#if (HAS_I8035 || HAS_MB8884)
static CPU_INIT( i8035 )
{
mcs48_init(device, irqcallback, 0x0);
}
-#endif
/*-------------------------------------------------
@@ -758,12 +756,10 @@ static CPU_INIT( i8035 )
RAM
-------------------------------------------------*/
-#if (HAS_I8048 || HAS_I8648 || HAS_I8748 || HAS_N7751)
static CPU_INIT( i8048 )
{
mcs48_init(device, irqcallback, 0x400);
}
-#endif
/*-------------------------------------------------
@@ -772,12 +768,10 @@ static CPU_INIT( i8048 )
RAM
-------------------------------------------------*/
-#if (HAS_I8039)
static CPU_INIT( i8039 )
{
mcs48_init(device, irqcallback, 0x0);
}
-#endif
/*-------------------------------------------------
@@ -786,12 +780,10 @@ static CPU_INIT( i8039 )
RAM
-------------------------------------------------*/
-#if (HAS_I8049 || HAS_I8749 || HAS_M58715)
static CPU_INIT( i8049 )
{
mcs48_init(device, irqcallback, 0x800);
}
-#endif
/*-------------------------------------------------
@@ -1132,7 +1124,6 @@ static CPU_GET_INFO( mcs48 )
CPU-SPECIFIC CONTEXT ACCESS
***************************************************************************/
-#if (HAS_I8035)
CPU_GET_INFO( i8035 )
{
switch (state)
@@ -1144,9 +1135,7 @@ CPU_GET_INFO( i8035 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_I8048)
CPU_GET_INFO( i8048 )
{
switch (state)
@@ -1159,9 +1148,7 @@ CPU_GET_INFO( i8048 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_I8648)
CPU_GET_INFO( i8648 )
{
switch (state)
@@ -1174,9 +1161,7 @@ CPU_GET_INFO( i8648 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_I8748)
CPU_GET_INFO( i8748 )
{
switch (state)
@@ -1189,9 +1174,7 @@ CPU_GET_INFO( i8748 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_MB8884)
CPU_GET_INFO( mb8884 )
{
switch (state)
@@ -1203,9 +1186,7 @@ CPU_GET_INFO( mb8884 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_N7751)
CPU_GET_INFO( n7751 )
{
switch (state)
@@ -1218,11 +1199,9 @@ CPU_GET_INFO( n7751 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_I8039)
CPU_GET_INFO( i8039 )
{
switch (state)
@@ -1234,9 +1213,7 @@ CPU_GET_INFO( i8039 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_I8049)
CPU_GET_INFO( i8049 )
{
switch (state)
@@ -1249,9 +1226,7 @@ CPU_GET_INFO( i8049 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_I8749)
CPU_GET_INFO( i8749 )
{
switch (state)
@@ -1264,9 +1239,7 @@ CPU_GET_INFO( i8749 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
-#if (HAS_M58715)
CPU_GET_INFO( m58715 )
{
switch (state)
@@ -1279,4 +1252,3 @@ CPU_GET_INFO( m58715 )
default: CPU_GET_INFO_CALL(mcs48); break;
}
}
-#endif
diff --git a/src/ldplayer/ldplayer.mak b/src/ldplayer/ldplayer.mak
index fd707a7d9a2..2c67ba4c6dd 100644
--- a/src/ldplayer/ldplayer.mak
+++ b/src/ldplayer/ldplayer.mak
@@ -25,7 +25,7 @@ OBJDIRS += \
# specify required CPU cores (none)
#-------------------------------------------------
-CPUS += I8049
+CPUS += MCS48
CPUS += Z80
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 5d5b7881424..f605670355b 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -66,17 +66,7 @@ CPUS += V33
CPUS += V35
CPUS += V60
CPUS += V70
-CPUS += I8035
-CPUS += I8041
-CPUS += I8048
-CPUS += I8648
-CPUS += I8748
-CPUS += MB8884
-CPUS += I8039
-CPUS += I8049
-CPUS += I8749
-CPUS += N7751
-CPUS += M58715
+CPUS += MCS48
CPUS += I8041
CPUS += I8741
CPUS += I8042