From 80283db9f3ce4be3fd829121480846a726b6c11e Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Thu, 29 Nov 2012 02:30:44 +0000 Subject: [PATCH] Added preliminary artwork LEDs for Commodore Amiga (open to suggestions), nw --- .gitattributes | 1 + src/emu/machine/amigafdc.c | 1 + src/mess/drivers/amiga.c | 8 +++++++- src/mess/layout/amiga.lay | 32 ++++++++++++++++++++++++++++++++ src/mess/mess.mak | 1 + 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 src/mess/layout/amiga.lay diff --git a/.gitattributes b/.gitattributes index 64ab2631504..364d34a5a1f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6419,6 +6419,7 @@ src/mess/layout/acrnsys1.lay svneol=native#text/plain src/mess/layout/aim65.lay svneol=native#text/plain src/mess/layout/aim65_40.lay svneol=native#text/plain src/mess/layout/amico2k.lay svneol=native#text/plain +src/mess/layout/amiga.lay svneol=native#text/plain src/mess/layout/apollo.lay svneol=native#text/plain src/mess/layout/apollo_15i.lay svneol=native#text/plain src/mess/layout/apollo_dsp.lay svneol=native#text/plain diff --git a/src/emu/machine/amigafdc.c b/src/emu/machine/amigafdc.c index ca49aecd122..f973c6c1859 100644 --- a/src/emu/machine/amigafdc.c +++ b/src/emu/machine/amigafdc.c @@ -406,6 +406,7 @@ WRITE8_MEMBER( amiga_fdc::ciaaprb_w ) floppy->dir_w((data >> 1) & 1); floppy->stp_w(data & 1); floppy->mon_w((data >> 7) & 1); + output_set_value("fdc_led",data & 0x80); // LED directly connected to FDC motor } if(floppy) { diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 0611c554f20..6fe13750021 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -60,6 +60,7 @@ would commence ($C00000). #include "machine/nvram.h" #include "sound/cdda.h" #include "machine/i2cmem.h" +#include "amiga.lh" /* Devices */ #include "imagedev/chd_cd.h" @@ -390,7 +391,7 @@ WRITE8_MEMBER(a1200_state::ami1200_cia_0_porta_w) device_t *device = machine().device("cia_0"); /* bit 2 = Power Led on Amiga */ - set_led_status(machine(), 0, !BIT(data, 1)); + output_set_value("audio_led", !BIT(data, 1)); handle_cd32_joystick_cia(this, data, mos6526_r(device, space, 2)); } @@ -636,6 +637,8 @@ static MACHINE_CONFIG_START( ntsc, amiga_state ) MCFG_MACHINE_RESET_OVERRIDE(amiga_state, amiga ) + MCFG_DEFAULT_LAYOUT(layout_amiga) + /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_SIZE(228*4, 262) @@ -827,6 +830,7 @@ static MACHINE_CONFIG_START( a1200n, a1200_state ) MCFG_VIDEO_START_OVERRIDE(a1200_state,amiga_aga) + MCFG_DEFAULT_LAYOUT(layout_amiga) MCFG_PALETTE_LENGTH(4096) MCFG_PALETTE_INIT_OVERRIDE(amiga_state, amiga ) @@ -914,6 +918,8 @@ static MACHINE_CONFIG_START( a3000n, amiga_state ) MCFG_MACHINE_RESET_OVERRIDE(amiga_state, amiga ) + MCFG_DEFAULT_LAYOUT(layout_amiga) + /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_SIZE(228*4, 262) diff --git a/src/mess/layout/amiga.lay b/src/mess/layout/amiga.lay new file mode 100644 index 00000000000..44428fa3392 --- /dev/null +++ b/src/mess/layout/amiga.lay @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 68c40d20020..00ddf85eac8 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -2147,6 +2147,7 @@ $(MESS_DRIVERS)/aim65.o: $(MESS_LAYOUT)/aim65.lh $(MESS_DRIVERS)/aim65_40.o: $(MESS_LAYOUT)/aim65_40.lh $(MESS_DRIVERS)/alesis.o: $(MESS_LAYOUT)/sr16.lh $(MESS_DRIVERS)/amico2k.o: $(MESS_LAYOUT)/amico2k.lh +$(MESS_DRIVERS)/amiga.o: $(MESS_LAYOUT)/amiga.lh $(MESS_VIDEO)/apollo.o: $(MESS_LAYOUT)/apollo.lh $(MESS_VIDEO)/apollo.o: $(MESS_LAYOUT)/apollo_15i.lh $(MESS_DRIVERS)/apollo.o: $(MESS_LAYOUT)/apollo_dsp.lh