Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-27 14:49:11 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
couriersud 2015-01-28 19:37:34 +01:00
commit 48a36e5241
268 changed files with 4039 additions and 5864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -931,7 +931,7 @@ $(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOP
$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
@echo Linking $@...
ifeq ($(TARGETOS),emscripten)
# Emscripten's linker seems to be stricter about the ordering of .a files
# Emscripten's linker seems to be stricter about the ordering of .a files
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) -Wl,--start-group $^ -Wl,--end-group $(LIBS) -o $@
else
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@

1
src/emu/bus/a8sio/a8sio.c
View File

@ -217,4 +217,3 @@ WRITE_LINE_MEMBER( device_a8sio_card_interface::motor_w )
SLOT_INTERFACE_START(a8sio_cards)
SLOT_INTERFACE("cassette", A8SIO_CASSETTE)
SLOT_INTERFACE_END

1
src/emu/bus/a8sio/cassette.c
View File

@ -115,4 +115,3 @@ void a8sio_cassette_device::device_timer(emu_timer &timer, device_timer_id id, i
break;
}
}

1
src/emu/bus/nes_ctrl/joypad.c
View File

@ -314,4 +314,3 @@ void nes_arcstick_device::write(UINT8 data)
m_latch = m_joypad->read();
}

14
src/emu/bus/nes_ctrl/miracle.c
View File

@ -2,8 +2,7 @@
Nintendo Entertainment System - Miracle Piano Keyboard
TODO: basically everything, this is just a skeleton with no
real MIDI handling at the moment.
TODO: MIDI input, output is now working.
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@ -44,6 +43,10 @@ void nes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int
{
m_strobe_clock++;
}
else
{
device_serial_interface::device_timer(timer, id, param, ptr);
}
}
//**************************************************************************
@ -204,7 +207,6 @@ void nes_miracle_device::rcv_complete() // Rx completed receiving byte
void nes_miracle_device::tra_complete() // Tx completed sending byte
{
// printf("Tx complete\n");
// is there more waiting to send?
if (m_xmit_read != m_xmit_write)
{
@ -222,14 +224,14 @@ void nes_miracle_device::tra_complete() // Tx completed sending byte
void nes_miracle_device::tra_callback() // Tx send bit
{
UINT8 bit = transmit_register_get_data_bit();
// send this to midi out
m_midiout->write_txd(transmit_register_get_data_bit());
m_midiout->write_txd(bit);
}
void nes_miracle_device::xmit_char(UINT8 data)
{
// printf("xmit %02x\n", data);
// if tx is busy it'll pick this up automatically when it completes
// if not, send now!
if (!m_tx_busy)

2
src/emu/bus/nes_ctrl/miracle.h
View File

@ -28,7 +28,7 @@ class nes_miracle_device : public device_t,
public device_nes_control_port_interface
{
public:
static const int XMIT_RING_SIZE = 16;
static const int XMIT_RING_SIZE = 64;
// construction/destruction
nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);

1
src/emu/cliopts.c
View File

@ -62,4 +62,3 @@ cli_options::cli_options()
{
add_entries(cli_options::s_option_entries);
}

6
src/emu/cpu/h8/h8.c
View File

@ -114,8 +114,14 @@ void h8_device::device_start()
save_item(NAME(EXR));
save_item(NAME(CCR));
save_item(NAME(TMP1));
save_item(NAME(TMP2));
save_item(NAME(inst_state));
save_item(NAME(inst_substate));
save_item(NAME(irq_vector));
save_item(NAME(taken_irq_vector));
save_item(NAME(irq_level));
save_item(NAME(taken_irq_level));
save_item(NAME(irq_nmi));
m_icountptr = &icount;

4
src/emu/cpu/m6502/m4510.c
View File

@ -75,8 +75,8 @@ void m4510_device::device_reset()
nomap = true;
// Wild guess, this setting makes the cpu start executing some code in the c65 driver
map_offset[1] = 0x30000;
map_enable = 0x80;
//map_offset[1] = 0x2e000;
//map_enable = 0x80;
m65ce02_device::device_reset();
}

2
src/emu/cpu/m6502/m6502.c
View File

@ -579,7 +579,7 @@ offs_t m6502_device::disassemble_generic(char *buffer, offs_t pc, const UINT8 *o
break;
case DASM_rw2:
sprintf(buffer, " $%04x", (pc & 0xf0000) | UINT16(pc + 3 + INT16((opram[2] << 8) | opram[1])));
sprintf(buffer, " $%04x", (pc & 0xf0000) | UINT16(pc + 2 + INT16((opram[2] << 8) | opram[1])));
flags |= 3;
break;

4
src/emu/cpu/m6502/m6502.h
View File

@ -220,8 +220,8 @@ protected:
// inline helpers
static inline bool page_changing(UINT16 base, int delta) { return ((base + delta) ^ base) & 0xff00; }
static inline UINT16 set_l(UINT16 base, UINT8 val) { return (base & 0xff00) | val; }
static inline UINT16 set_h(UINT16 base, UINT8 val) { return (base & 0x00ff) | (val << 8); }
static inline UINT16 set_l(UINT16 base, UINT16 val) { return (base & 0xff00) | val; }
static inline UINT16 set_h(UINT16 base, UINT16 val) { return (base & 0x00ff) | (val << 8); }
inline void dec_SP() { SP = set_l(SP, SP-1); }
inline void inc_SP() { SP = set_l(SP, SP+1); }

9
src/emu/cpu/m6502/om4510.lst
View File

@ -9,4 +9,13 @@ map_imp
map_offset[0] = (A<<8) | ((X & 0xf) << 16);
map_offset[1] = (Y<<8) | ((Z & 0xf) << 16);
map_enable = ((X & 0xf0) >> 4) | (Z & 0xf0);
logerror("MAP execute\n");
logerror("0x0000 - 0x1fff = %08x\n",map_enable & 1 ? map_offset[0]+0x0000 : 0x0000);
logerror("0x2000 - 0x3fff = %08x\n",map_enable & 2 ? map_offset[0]+0x2000 : 0x2000);
logerror("0x4000 - 0x5fff = %08x\n",map_enable & 4 ? map_offset[0]+0x4000 : 0x4000);
logerror("0x6000 - 0x7fff = %08x\n",map_enable & 8 ? map_offset[0]+0x6000 : 0x6000);
logerror("0x8000 - 0x9fff = %08x\n",map_enable & 16 ? map_offset[1]+0x8000 : 0x8000);
logerror("0xa000 - 0xbfff = %08x\n",map_enable & 32 ? map_offset[1]+0xa000 : 0xa000);
logerror("0xc000 - 0xdfff = %08x\n",map_enable & 64 ? map_offset[1]+0xc000 : 0xc000);
logerror("0xe000 - 0xffff = %08x\n",map_enable & 128 ? map_offset[1]+0xe000 : 0xe000);
prefetch();

21
src/emu/cpu/m6502/om65ce02.lst
View File

@ -245,7 +245,7 @@ bcc_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(!(P & F_C))
PC += TMP;
PC += TMP-1;
prefetch();
bcs_ce_rel
@ -258,7 +258,7 @@ bcs_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(P & F_C)
PC += TMP;
PC += TMP-1;
prefetch();
beq_ce_rel
@ -271,7 +271,7 @@ beq_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(P & F_Z)
PC += TMP;
PC += TMP-1;
prefetch();
bit_ce_abx
@ -307,7 +307,7 @@ bmi_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(P & F_N)
PC += TMP;
PC += TMP-1;
prefetch();
bne_ce_rel
@ -320,7 +320,7 @@ bne_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(!(P & F_Z))
PC += TMP;
PC += TMP-1;
prefetch();
bpl_ce_rel
@ -333,7 +333,7 @@ bpl_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(!(P & F_N))
PC += TMP;
PC += TMP-1;
prefetch();
bra_ce_rel
@ -344,7 +344,7 @@ bra_ce_rel
bra_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
PC += TMP;
PC += TMP - 1;
prefetch();
brk_ce_imp
@ -379,7 +379,7 @@ bsr_rw2
write(SP, PC);
dec_SP_ce();
TMP = set_h(TMP, read_pc());
PC += TMP;
PC += TMP-1;
prefetch();
bvc_ce_rel
@ -392,7 +392,7 @@ bvc_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(!(P & F_V))
PC += TMP;
PC += TMP-1;
prefetch();
bvs_ce_rel
@ -405,7 +405,7 @@ bvs_rw2
TMP = read_pc();
TMP = set_h(TMP, read_pc());
if(P & F_V)
PC += TMP;
PC += TMP-1;
prefetch();
clc_ce_imp
@ -419,6 +419,7 @@ cld_ce_imp
cle_imp
read_pc_noinc();
P &= ~F_E;
logerror("CLE\n");
prefetch();
cli_ce_imp

1
src/emu/cpu/m68000/m68kfpu.inc
View File

@ -2194,4 +2194,3 @@ void m68881_ftrap(m68000_base_device *m68k)
}
}
}

1
src/emu/drivers/xtal.h
View File

@ -57,6 +57,7 @@ enum
XTAL_2_5MHz = 2500000, /* Janken Man units */
XTAL_3MHz = 3000000, /* Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */
XTAL_3_12MHz = 3120000, /* SP0250 clock on Gottlieb games */
XTAL_3_5MHz = 3500000, /* Reported by Commodore 65 document, true xtal unchecked on PCB */
XTAL_3_52128MHz = 3521280, /* RCA COSMAC VIP */
XTAL_3_579545MHz = 3579545, /* NTSC color subcarrier, extremely common, used on 100's of PCBs (Keytronic custom part #48-300-010 is equivalent) */
XTAL_3_6864MHz = 3686400, /* CPS3 */

21
src/emu/machine/jvshost.c
View File

@ -49,16 +49,12 @@ void jvs_host::commit_raw()
// - have at least one command byte
if(send_size < 3 || send_buffer[0] == 0x00 || send_buffer[1] != send_size-1) {
logerror("JVS checksum error\n");
} /*
Naomi suchie3 have bad working controls with this
// "This message is crap" doesn't exist so call it checksum error
recv_buffer[0] = 0x00;
recv_buffer[1] = 0x02;
recv_buffer[2] = 0x03;
recv_size = 3;
} else */ {
} else {
if(first_device) {
first_device->message(send_buffer[0], send_buffer+2, send_size-2, recv_buffer+2, recv_size);
recv_is_encoded = false;
@ -120,10 +116,13 @@ void jvs_host::encode(UINT8 *buffer, UINT32 &size)
if(!size)
return;
UINT32 add = 1;
UINT8 sum = 0;
for(UINT32 i=0; i<size; i++)
sum += buffer[i];
buffer[size++] = sum;
for(UINT32 i=0; i<size; i++)
if(buffer[i] == 0xd0 || buffer[i] == 0xe0)
add++;
UINT32 nsize = size+add;
for(UINT32 i=size; i; i--) {
UINT8 t = buffer[i-1];
if(t == 0xd0 || t == 0xe0) {
@ -134,11 +133,7 @@ void jvs_host::encode(UINT8 *buffer, UINT32 &size)
buffer[i+add-1] = t;
}
buffer[0] = 0xe0;
UINT8 sum = 0;
for(UINT32 i=1; i<nsize; i++)
sum += buffer[i];
buffer[nsize++] = sum;
size = nsize;
size += add;
}
void jvs_host::decode(UINT8 *buffer, UINT32 &size)
@ -146,7 +141,7 @@ void jvs_host::decode(UINT8 *buffer, UINT32 &size)
if(!size)
return;
UINT32 pos = 0;
for(UINT32 i=0; i<size-1; i++) {
for(UINT32 i=0; i<size; i++) {
UINT8 t = buffer[i];
if(!i && t == 0xe0)
continue;
@ -156,5 +151,5 @@ void jvs_host::decode(UINT8 *buffer, UINT32 &size)
}
buffer[pos++] = t;
}
size = pos;
size = pos ? pos - 1 : 0;
}

1
src/emu/netlist/devices/net_lib.c
View File

@ -148,4 +148,3 @@ void nl_initialize_factory(netlist_factory_t &factory)
ENTRY(SN74LS629_dip, SN74LS629_DIP, "1.CAP1,2.CAP2")
ENTRY(NE555_dip, NE555_DIP, "-")
}

3
src/emu/netlist/devices/nld_system.h
View File

@ -42,8 +42,7 @@
#define FRONTIER(_name, _IN, _OUT) \
NET_REGISTER_DEV(frontier, _name) \
NET_C(_IN, _name.I) \
NET_C(_OUT, _name.Q) \
NET_C(_OUT, _name.Q)
// -----------------------------------------------------------------------------
// mainclock
// -----------------------------------------------------------------------------

1
src/emu/netlist/nl_base.c
View File

@ -1001,4 +1001,3 @@ NETLIB_UPDATE(mainclock)
net.toggle_new_Q();
net.set_time(netlist().time() + m_inc);
}

1
src/emu/parameters.c
View File

@ -24,4 +24,3 @@ void parameters_manager::add(astring tag, astring value)
{
m_parameters.add(tag, value);
}

12
src/mame/audio/seibu.c
View File

@ -229,21 +229,11 @@ WRITE8_MEMBER( seibu_sound_device::rst18_ack_w )
update_irq_lines(RST18_CLEAR);
}
void seibu_sound_device::ym3812_irqhandler(int linestate)
{
update_irq_lines(linestate ? RST10_ASSERT : RST10_CLEAR);
}
WRITE_LINE_MEMBER( seibu_sound_device::ym2151_irqhandler )
WRITE_LINE_MEMBER( seibu_sound_device::fm_irqhandler )
{
update_irq_lines(state ? RST10_ASSERT : RST10_CLEAR);
}
void seibu_sound_device::ym2203_irqhandler(int linestate)
{
update_irq_lines(linestate ? RST10_ASSERT : RST10_CLEAR);
}
WRITE8_MEMBER( seibu_sound_device::bank_w )
{
space.machine().root_device().membank("bank1")->set_entry(data & 1);

20
src/mame/audio/seibu.h
View File

@ -45,17 +45,13 @@ public:
DECLARE_READ16_MEMBER( main_word_r );
DECLARE_WRITE16_MEMBER( main_word_w );
DECLARE_WRITE16_MEMBER( main_mustb_w );
DECLARE_WRITE8_MEMBER( irq_clear_w );
DECLARE_WRITE8_MEMBER( rst10_ack_w );
DECLARE_WRITE8_MEMBER( rst18_ack_w );
DECLARE_WRITE8_MEMBER( bank_w );
DECLARE_WRITE8_MEMBER( coin_w );
void ym3812_irqhandler(int linestate);
WRITE_LINE_MEMBER(ym2151_irqhandler);
void ym2203_irqhandler(int linestate);
WRITE_LINE_MEMBER( fm_irqhandler );
DECLARE_READ8_MEMBER( soundlatch_r );
DECLARE_READ8_MEMBER( main_data_pending_r );
DECLARE_WRITE8_MEMBER( main_data_w );
@ -194,7 +190,7 @@ extern const device_type SEIBU_ADPCM;
MCFG_SPEAKER_STANDARD_MONO("mono") \
\
MCFG_SOUND_ADD("ymsnd", YM3812, freq1) \
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym3812_irqhandler)) \
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
@ -204,7 +200,7 @@ extern const device_type SEIBU_ADPCM;
MCFG_SPEAKER_STANDARD_MONO("mono") \
\
MCFG_SOUND_ADD("ymsnd", YM3812, freq1) \
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym3812_irqhandler)) \
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH) \
@ -214,7 +210,7 @@ extern const device_type SEIBU_ADPCM;
MCFG_SPEAKER_STANDARD_MONO("mono") \
\
MCFG_YM2151_ADD("ymsnd", freq1) \
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler)) \
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
MCFG_SOUND_ROUTE(0, "mono", 0.50) \
MCFG_SOUND_ROUTE(1, "mono", 0.50) \
\
@ -225,15 +221,15 @@ extern const device_type SEIBU_ADPCM;
MCFG_SPEAKER_STANDARD_MONO("mono") \
\
MCFG_YM2151_ADD("ymsnd", freq1) \
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler)) \
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
MCFG_SOUND_ROUTE(0, "mono", 0.50) \
MCFG_SOUND_ROUTE(1, "mono", 0.50)
#define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb) \
#define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1, freq2, regiona, regionb) \
MCFG_SPEAKER_STANDARD_MONO("mono") \
\
MCFG_YM2151_ADD("ymsnd", freq1) \
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler)) \
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
MCFG_SOUND_ROUTE(0, "mono", 0.50) \
MCFG_SOUND_ROUTE(1, "mono", 0.50) \
\
@ -247,7 +243,7 @@ extern const device_type SEIBU_ADPCM;
MCFG_SPEAKER_STANDARD_MONO("mono") \
\
MCFG_SOUND_ADD("ym1", YM2203, freq) \
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2203_irqhandler)) \
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
\
MCFG_SOUND_ADD("ym2", YM2203, freq) \

7
src/mame/drivers/backfire.c
View File

@ -106,7 +106,6 @@ public:
required_ioport m_io_in3;
required_device<palette_device> m_palette;
required_shared_ptr<UINT32> m_generic_paletteram_32;
DECLARE_WRITE_LINE_MEMBER(sound_irq_gen);
};
//UINT32 *backfire_180010, *backfire_188010;
@ -439,11 +438,6 @@ static GFXDECODE_START( backfire )
GFXDECODE_END
WRITE_LINE_MEMBER(backfire_state::sound_irq_gen)
{
logerror("sound irq\n");
}
INTERRUPT_GEN_MEMBER(backfire_state::deco32_vbl_interrupt)
{
device.execute().set_input_line(ARM_IRQ_LINE, HOLD_LINE);
@ -559,7 +553,6 @@ static MACHINE_CONFIG_START( backfire, backfire_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(backfire_state, sound_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END

8
src/mame/drivers/bfm_sc4h.c
View File

@ -610,13 +610,6 @@ MACHINE_START_MEMBER(sc4_state,sc4)
}
WRITE_LINE_MEMBER(sc4_state::bfm_sc4_irqhandler)
{
logerror("YMZ280 is generating an interrupt. State=%08x\n",state);
}
WRITE_LINE_MEMBER(sc4_state::bfm_sc4_duart_irq_handler)
{
// triggers after reel tests on luckb, at the start on dnd...
@ -709,7 +702,6 @@ MACHINE_CONFIG_FRAGMENT( sc4_common )
// MCFG_DEFAULT_LAYOUT(layout_bfm_sc4)
MCFG_SOUND_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(sc4_state, bfm_sc4_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

9
src/mame/drivers/bfm_sc5.c
View File

@ -186,14 +186,6 @@ WRITE8_MEMBER( bfm_sc5_state::sc5_10202F0_w )
}
WRITE_LINE_MEMBER(bfm_sc5_state::bfm_sc5_ym_irqhandler)
{
logerror("YMZ280 is generating an interrupt. State=%08x\n",state);
}
WRITE_LINE_MEMBER(bfm_sc5_state::bfm_sc5_duart_irq_handler)
{
printf("bfm_sc5_duart_irq_handler\n");
@ -235,6 +227,5 @@ MACHINE_CONFIG_START( bfm_sc5, bfm_sc5_state )
MCFG_DEFAULT_LAYOUT(layout_bfm_sc5)
MCFG_SOUND_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(bfm_sc5_state, bfm_sc5_ym_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

8
src/mame/drivers/bfm_swp.c
View File

@ -122,7 +122,6 @@ public:
{
return 0;
}
DECLARE_WRITE_LINE_MEMBER(irqhandler);
protected:
@ -132,12 +131,6 @@ protected:
virtual void machine_start();
};
WRITE_LINE_MEMBER(bfm_swp_state::irqhandler)
{
}
READ32_MEMBER(bfm_swp_state::bfm_swp_mem_r)
{
int pc = space.device().safe_pc();
@ -218,7 +211,6 @@ static MACHINE_CONFIG_START( bfm_swp, bfm_swp_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymz", YMZ280B, 10000000 )
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(bfm_swp_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

8
src/mame/drivers/bishi.c
View File

@ -357,12 +357,6 @@ static INPUT_PORTS_START( bishi2p )
INPUT_PORTS_END
WRITE_LINE_MEMBER(bishi_state::sound_irq_gen)
{
m_maincpu->set_input_line(M68K_IRQ_1, (state) ? ASSERT_LINE : CLEAR_LINE);
}
void bishi_state::machine_start()
{
save_item(NAME(m_cur_control));
@ -413,7 +407,7 @@ static MACHINE_CONFIG_START( bishi, bishi_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymz", YMZ280B, SOUND_CLOCK) /* 16.9344MHz */
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(bishi_state, sound_irq_gen))
MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_1))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END

2
src/mame/drivers/cabal.c
View File

@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( cabal, cabal_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler))
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) /* it should use the msm5205 */

7
src/mame/drivers/deco156.c
View File

@ -66,7 +66,6 @@ public:
UINT32 screen_update_wcvol95(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(deco32_vbl_interrupt);
void descramble_sound( const char *tag );
DECLARE_WRITE_LINE_MEMBER(sound_irq_gen);
DECO16IC_BANK_CB_MEMBER(bank_callback);
DECOSPR_PRIORITY_CB_MEMBER(pri_callback);
};
@ -315,11 +314,6 @@ GFXDECODE_END
/**********************************************************************************/
WRITE_LINE_MEMBER(deco156_state::sound_irq_gen)
{
logerror("sound irq\n");
}
INTERRUPT_GEN_MEMBER(deco156_state::deco32_vbl_interrupt)
{
device.execute().set_input_line(ARM_IRQ_LINE, HOLD_LINE);
@ -441,7 +435,6 @@ static MACHINE_CONFIG_START( wcvol95, deco156_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(deco156_state, sound_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END

12
src/mame/drivers/gunpey.c
View File

@ -263,8 +263,6 @@ public:
int write_dest_byte(UINT8 usedata);
//UINT16 main_m_vram[0x800][0x800];
DECLARE_WRITE_LINE_MEMBER(sound_irq_gen);
};
@ -1314,15 +1312,6 @@ static ADDRESS_MAP_START( io_map, AS_IO, 16, gunpey_state )
ADDRESS_MAP_END
/***************************************************************************************/
WRITE_LINE_MEMBER(gunpey_state::sound_irq_gen)
{
logerror("sound irq\n");
}
/***************************************************************************************/
static INPUT_PORTS_START( gunpey )
@ -1467,7 +1456,6 @@ static MACHINE_CONFIG_START( gunpey, gunpey_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(gunpey_state, sound_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
MACHINE_CONFIG_END

7
src/mame/drivers/maygayep.c
View File

@ -50,7 +50,6 @@ protected:
required_device<cpu_device> m_maincpu;
public:
DECLARE_DRIVER_INIT(maygayep);
DECLARE_WRITE_LINE_MEMBER(irqhandler);
};
// bp 29e58 in ep_simp reads the 'INITIALISE . . .' string
@ -101,11 +100,6 @@ DRIVER_INIT_MEMBER(maygayep_state,maygayep)
}
WRITE_LINE_MEMBER(maygayep_state::irqhandler)
{
}
static MACHINE_CONFIG_START( maygayep, maygayep_state )
MCFG_CPU_ADD("maincpu", H83002, 16000000 )
MCFG_CPU_PROGRAM_MAP( maygayep_map )
@ -113,7 +107,6 @@ static MACHINE_CONFIG_START( maygayep, maygayep_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymz", YMZ280B, 10000000 )
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(maygayep_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

12
src/mame/drivers/midas.c
View File

@ -85,7 +85,6 @@ public:
UINT32 screen_update_midas(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(livequiz_irqhandler);
required_device<cpu_device> m_maincpu;
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_device<gfxdecode_device> m_gfxdecode;
@ -607,15 +606,6 @@ void midas_state::machine_reset()
{
}
WRITE_LINE_MEMBER(midas_state::livequiz_irqhandler)
{
logerror("YMZ280 is generating an interrupt. State=%08x\n",state);
}
void midas_state::screen_eof_midas(screen_device &screen, bool state)
{
if (state) m_sprgen->buffer_vram();
@ -647,7 +637,6 @@ static MACHINE_CONFIG_START( livequiz, midas_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(midas_state, livequiz_irqhandler))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
@ -681,7 +670,6 @@ static MACHINE_CONFIG_START( hammer, midas_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(midas_state, livequiz_irqhandler))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END

1
src/mame/drivers/model3.c
View File

@ -5846,7 +5846,6 @@ DRIVER_INIT_MEMBER(model3_state,srally2)
DRIVER_INIT_MEMBER(model3_state,swtrilgy)
{
UINT32 *rom = (UINT32*)memregion("user1")->base();
DRIVER_INIT_CALL(model3_20);

16
src/mame/drivers/nmk16.c
View File

@ -3780,12 +3780,6 @@ static GFXDECODE_START( atombjt )
GFXDECODE_END
WRITE_LINE_MEMBER(nmk16_state::ym2203_irqhandler)
{
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
/*
----
@ -3894,7 +3888,7 @@ static MACHINE_CONFIG_START( tharrier, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4421,7 +4415,7 @@ static MACHINE_CONFIG_START( macross2, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4464,7 +4458,7 @@ static MACHINE_CONFIG_START( tdragon2, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4506,7 +4500,7 @@ static MACHINE_CONFIG_START( raphero, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4636,7 +4630,7 @@ static MACHINE_CONFIG_START( manybloc, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)

1
src/mame/drivers/psychic5.c
View File

@ -947,4 +947,3 @@ ROM_END
GAME( 1987, psychic5, 0, psychic5, psychic5, driver_device, 0, ROT270, "Jaleco / NMK", "Psychic 5 (World)", 0 ) // "Oversea's version V2.00 CHANGED BY TAMIO NAKASATO" text present in ROM, various modifications (English names, more complete attract demo etc.)
GAME( 1987, psychic5j, psychic5, psychic5, psychic5, driver_device, 0, ROT270, "Jaleco / NMK", "Psychic 5 (Japan)", 0 )
GAME( 1988, bombsa, 0, bombsa, bombsa, driver_device, 0, ROT270, "Jaleco", "Bombs Away", GAME_NOT_WORKING )

2
src/mame/drivers/shanghai.c
View File

@ -514,7 +514,7 @@ static MACHINE_CONFIG_START( kothello, shanghai_state )
/* same as standard seibu ym2203, but "ym1" also reads "DSW" */
MCFG_SOUND_ADD("ym1", YM2203, XTAL_16MHz/4)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2203_irqhandler))
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)

4
src/mame/drivers/silkroad.c
View File

@ -388,5 +388,5 @@ ROM_START( silkroada )
ROM_END
GAME( 1999, silkroad, 0, silkroad, silkroad, driver_device, 0, ROT0, "Unico", "The Legend of Silkroad", 0 )
GAME( 1999, silkroada, silkroad, silkroad, silkroad, driver_device, 0, ROT0, "Unico", "The Legend of Silkroad (larger ROMs)", 0 ) // same content but fewer GFX roms of a larger size
GAME( 1999, silkroad, 0, silkroad, silkroad, driver_device, 0, ROT0, "Unico", "The Legend of Silkroad", GAME_SUPPORTS_SAVE )
GAME( 1999, silkroada, silkroad, silkroad, silkroad, driver_device, 0, ROT0, "Unico", "The Legend of Silkroad (larger ROMs)", GAME_SUPPORTS_SAVE ) // same content but fewer GFX roms of a larger size

9
src/mame/drivers/toaplan2.c
View File

@ -3049,13 +3049,6 @@ static GFXDECODE_START( fixeightbl )
GFXDECODE_END
WRITE_LINE_MEMBER(toaplan2_state::bbakraid_irqhandler)
{
// Not used ??? Connected to a test pin (TP082)
logerror("YMZ280 is generating an interrupt. State=%08x\n",state);
}
static MACHINE_CONFIG_START( tekipaki, toaplan2_state )
/* basic machine hardware */
@ -4003,7 +3996,7 @@ static MACHINE_CONFIG_START( bbakraid, toaplan2_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(toaplan2_state, bbakraid_irqhandler))
// IRQ not used ??? Connected to a test pin (TP082)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

42
src/mame/drivers/tx1.c
View File

@ -795,17 +795,17 @@ ROM_START( tx1 )
ROM_REGION( 0x10000, "audio_cpu", 0 )
ROM_LOAD( "8411-136027-157.11", 0x00000, 0x2000, CRC(10ae3075) SHA1(69c5f62f2473aba848383eed3cecf15e273d86ca) )
ROM_REGION( 0x20000, "char_tiles", 0 )
ROM_REGION( 0x8000, "char_tiles", 0 )
ROM_LOAD( "8411-136027-156.204", 0x0000, 0x4000, CRC(60f3c616) SHA1(59c4361891e4274e27e6279c919e8fd6803af7cf) )
ROM_LOAD( "8411-136027-155.174", 0x4000, 0x4000, CRC(e59a6b72) SHA1(c10efa77ab421ac60b97227a8d547f50f8415670) )
ROM_REGION( 0x40000, "obj_tiles", 0 )
ROM_REGION( 0x10000, "obj_tiles", 0 )
ROM_LOAD( "8411-136027-114.203", 0x0000, 0x4000, CRC(fc91328b) SHA1(e57fd2056b65d37cf2e1f0af56616c6555df3006) )
ROM_LOAD( "8411-136027-116.258", 0x4000, 0x4000, CRC(5745f671) SHA1(6e471633cd6de9926b3361a84430c088e1f6a097) )
ROM_LOAD( "8411-136027-115.173", 0x8000, 0x4000, CRC(720e5873) SHA1(151d9063c35b26f5876cf94bdf0c2665ec701bbd) )
ROM_LOAD( "8411-136027-117.232", 0xc000, 0x4000, CRC(3c68d0bc) SHA1(2dbaf2a268b90214fd61c016ac945d4371057826) )
ROM_REGION( 0x40000, "gfx3", 0 )
ROM_REGION( 0x6000, "road", 0 )
ROM_LOAD( "8411-136027-146.56", 0x0000, 0x2000, CRC(5635b8c1) SHA1(5cc9437a2ff0843f1917f2451852d4561c240b24) )
ROM_LOAD( "8411-136027-147.66", 0x2000, 0x2000, CRC(03d83cf8) SHA1(5c0cfc6bf02ad2b3f37e1ceb493f69eb9829ab1e) )
ROM_LOAD( "8411-136027-148.76", 0x4000, 0x2000, CRC(ad56013a) SHA1(ae3a91f58f30daff334754476db33ad1d12569fc) )
@ -816,11 +816,11 @@ ROM_START( tx1 )
ROM_LOAD16_BYTE( "136027-143.ic223", 0x8000, 0x0200, CRC(22c77af6) SHA1(1be8585b95316b4fc5712cdaef699e676320cd4d) )
ROM_LOAD16_BYTE( "136027-142.ic213", 0x8001, 0x0200, CRC(f6b8b70b) SHA1(b79374acf11d71db1e4ad3c494ac5f500a52677b) )
ROM_REGION( 0x50000, "obj_map", 0 )
ROM_REGION( 0x8000, "obj_map", 0 )
ROM_LOAD( "8411-136027-119.106", 0x0000, 0x4000, CRC(88eec0fb) SHA1(81d7a69dc1a4b3b81d7f28d97a3f80697cdcc6eb) )
ROM_LOAD( "8411-136027-120.73", 0x4000, 0x4000, CRC(407cbe65) SHA1(e1c11b65f3c6abde6d55afeaffdb39cdd6d66377) )
ROM_REGION( 0x50000, "user3", 0 )
ROM_REGION( 0x6000, "obj_luts", 0 )
ROM_LOAD( "8411-136027-113.48", 0x0000, 0x2000, CRC(4b3d7956) SHA1(fc2432dd69f3be7007d4fd6f7c86c7c19453b1ba) )
ROM_LOAD( "8411-136027-118.281", 0x2000, 0x4000, CRC(de418dc7) SHA1(1233e2f7499ec5a73a40ee336d3fe26c06187784) )
@ -882,17 +882,17 @@ ROM_START( tx1jb )
ROM_REGION( 0x10000, "audio_cpu", 0 )
ROM_LOAD( "tx1_22h.ic9", 0x00000, 0x2000, CRC(66376232) SHA1(b8a026dae47173e7760eea4f52e67e525ad1b70b) )
ROM_REGION( 0x20000, "char_tiles", 0 )
ROM_REGION( 0x8000, "char_tiles", 0 )
ROM_LOAD( "tx1_21a.ic204", 0x0000, 0x4000, CRC(cd3441ad) SHA1(8e6597b3177b8aaa34ed3373d85fc4b6231e1333) )
ROM_LOAD( "tx1_20a.ic174", 0x4000, 0x4000, CRC(dbe595fc) SHA1(1ed2f775f0a1b46a2ffbc056eb4ef732ed546d3c) )
ROM_REGION( 0x40000, "obj_tiles", 0 )
ROM_REGION( 0x10000, "obj_tiles", 0 )
ROM_LOAD( "tx1_16b.ic203", 0x0000, 0x4000, CRC(1141c965) SHA1(4b90c1428bcbd72d0449c064856a5596269b3fc6) )
ROM_LOAD( "tx1_18b.ic258", 0x4000, 0x4000, CRC(0ad36d68) SHA1(fd5a65c56557c1bc9c0f3916f15f62500b52bfe0) )
ROM_LOAD( "tx1_15b.ic173", 0x8000, 0x4000, CRC(30d1a8d5) SHA1(b4c585b7b8a8920bb3949d643e9e10c17d4009a0) )
ROM_LOAD( "tx1_17b.ic232", 0xc000, 0x4000, CRC(364bb354) SHA1(a26581ca1088b979285471e2c6595048df84d75e) )
ROM_REGION( 0x40000, "gfx3", 0 )
ROM_REGION( 0x6000, "road", 0 )
ROM_LOAD( "tx1_5a.ic56", 0x0000, 0x2000, CRC(5635b8c1) SHA1(5cc9437a2ff0843f1917f2451852d4561c240b24) )
ROM_LOAD( "tx1_6a.ic66", 0x2000, 0x2000, CRC(03d83cf8) SHA1(5c0cfc6bf02ad2b3f37e1ceb493f69eb9829ab1e) )
ROM_LOAD( "tx1_7a.ic76", 0x4000, 0x2000, CRC(ad56013a) SHA1(ae3a91f58f30daff334754476db33ad1d12569fc) )
@ -903,11 +903,11 @@ ROM_START( tx1jb )
ROM_LOAD16_BYTE( "xb02b.ic223", 0x8000, 0x0200, CRC(22c77af6) SHA1(1be8585b95316b4fc5712cdaef699e676320cd4d) )
ROM_LOAD16_BYTE( "xb01b.ic213", 0x8001, 0x0200, CRC(f6b8b70b) SHA1(b79374acf11d71db1e4ad3c494ac5f500a52677b) )
ROM_REGION( 0x50000, "obj_map", 0 )
ROM_REGION( 0x8000, "obj_map", 0 )
ROM_LOAD( "tx1_14b.ic106", 0x0000, 0x4000, CRC(68c63d6e) SHA1(110e02b99c44d31041be588bd14642e26890ecbd) )
ROM_LOAD( "tx1_13b.ic73", 0x4000, 0x4000, CRC(b0c581b2) SHA1(20926bc15e7c97045b219b828acfcdd99b8712a6) )
ROM_REGION( 0x50000, "user3", 0 )
ROM_REGION( 0x6000, "obj_luts", 0 )
ROM_LOAD( "tx1_12b.ic48", 0x0000, 0x2000, CRC(4b3d7956) SHA1(fc2432dd69f3be7007d4fd6f7c86c7c19453b1ba) )
ROM_LOAD( "tx1_19b.ic281", 0x2000, 0x4000, CRC(cb250de6) SHA1(4bf3006986fb8cbb3dd4fa988e6471633614e4bb) )
@ -963,17 +963,17 @@ ROM_START( tx1jc )
ROM_REGION( 0x10000, "audio_cpu", 0 ) /* Label was missing */
ROM_LOAD( "8411-136027-157.11", 0x00000, 0x2000, CRC(10ae3075) SHA1(69c5f62f2473aba848383eed3cecf15e273d86ca) ) /* Unconfirmed TC013A or the later TC013B */
ROM_REGION( 0x20000, "char_tiles", 0 )
ROM_REGION( 0x8000, "char_tiles", 0 )
ROM_LOAD( "tx1_21a.ic204", 0x0000, 0x4000, CRC(cd3441ad) SHA1(8e6597b3177b8aaa34ed3373d85fc4b6231e1333) )
ROM_LOAD( "tx1_20a.ic174", 0x4000, 0x4000, CRC(dbe595fc) SHA1(1ed2f775f0a1b46a2ffbc056eb4ef732ed546d3c) )
ROM_REGION( 0x40000, "obj_tiles", 0 )
ROM_REGION( 0x10000, "obj_tiles", 0 )
ROM_LOAD( "tx1_16b.ic203", 0x0000, 0x4000, CRC(1141c965) SHA1(4b90c1428bcbd72d0449c064856a5596269b3fc6) )
ROM_LOAD( "tx1_18b.ic258", 0x4000, 0x4000, CRC(0ad36d68) SHA1(fd5a65c56557c1bc9c0f3916f15f62500b52bfe0) )
ROM_LOAD( "tx1_15b.ic173", 0x8000, 0x4000, CRC(30d1a8d5) SHA1(b4c585b7b8a8920bb3949d643e9e10c17d4009a0) )
ROM_LOAD( "tx1_17b.ic232", 0xc000, 0x4000, CRC(364bb354) SHA1(a26581ca1088b979285471e2c6595048df84d75e) )
ROM_REGION( 0x40000, "gfx3", 0 )
ROM_REGION( 0x6000, "road", 0 )
ROM_LOAD( "tx1_5a.ic56", 0x0000, 0x2000, CRC(5635b8c1) SHA1(5cc9437a2ff0843f1917f2451852d4561c240b24) )
ROM_LOAD( "tx1_6a.ic66", 0x2000, 0x2000, CRC(03d83cf8) SHA1(5c0cfc6bf02ad2b3f37e1ceb493f69eb9829ab1e) )
ROM_LOAD( "tx1_7a.ic76", 0x4000, 0x2000, CRC(ad56013a) SHA1(ae3a91f58f30daff334754476db33ad1d12569fc) )
@ -984,11 +984,11 @@ ROM_START( tx1jc )
ROM_LOAD16_BYTE( "xb02b.ic223", 0x8000, 0x0200, CRC(22c77af6) SHA1(1be8585b95316b4fc5712cdaef699e676320cd4d) )
ROM_LOAD16_BYTE( "xb01b.ic213", 0x8001, 0x0200, CRC(f6b8b70b) SHA1(b79374acf11d71db1e4ad3c494ac5f500a52677b) )
ROM_REGION( 0x50000, "obj_map", 0 )
ROM_REGION( 0x8000, "obj_map", 0 )
ROM_LOAD( "tx1_14b.ic106", 0x0000, 0x4000, CRC(68c63d6e) SHA1(110e02b99c44d31041be588bd14642e26890ecbd) )
ROM_LOAD( "tx1_13b.ic73", 0x4000, 0x4000, CRC(b0c581b2) SHA1(20926bc15e7c97045b219b828acfcdd99b8712a6) )
ROM_REGION( 0x50000, "user3", 0 )
ROM_REGION( 0x6000, "obj_luts", 0 )
ROM_LOAD( "tx1_12b.ic48", 0x0000, 0x2000, CRC(4b3d7956) SHA1(fc2432dd69f3be7007d4fd6f7c86c7c19453b1ba) )
ROM_LOAD( "tx1_19b.ic281", 0x2000, 0x4000, CRC(cb250de6) SHA1(4bf3006986fb8cbb3dd4fa988e6471633614e4bb) )
@ -1072,7 +1072,7 @@ ROM_START( buggyboy )
ROM_LOAD( "bug25.157", 0x2c000, 0x4000, CRC(80c4e045) SHA1(be3b537d3ed3ee74fc51059aa744dca4d63431f6) )
ROM_RELOAD( 0x38000, 0x4000 )
ROM_REGION( 0x40000, "road", 0 )
ROM_REGION( 0x8000, "road", 0 )
ROM_LOAD( "bug12.58", 0x0000, 0x2000, CRC(bd34d55c) SHA1(05a719a6eff5af3aaaa1e0ee783b18597582ed64) )
ROM_LOAD( "bug11.57", 0x2000, 0x2000, CRC(a44d43eb) SHA1(c4d68c7e123506acaa6adc353579cac19ecb3a9d) )
ROM_LOAD( "bb3.137", 0x4000, 0x0200, CRC(ad76f3fb) SHA1(bf96f903b32e009a2592df0f28cc3e20b039f4d4) )
@ -1086,13 +1086,13 @@ ROM_START( buggyboy )
ROM_LOAD16_BYTE( "bb1.245", 0x8000, 0x0200, CRC(0ddbd36d) SHA1(7a08901a350c315d46ab8d0aa881db384b9f37d2) )
ROM_LOAD16_BYTE( "bb2.220", 0x8001, 0x0200, CRC(71d47de1) SHA1(2da9aeb3f2ebb1114631c8042a37c4f4c18e741b) )
ROM_REGION( 0x100000, "obj_map", 0 )
ROM_REGION( 0x10000, "obj_map", 0 )
ROM_LOAD( "bug16.210", 0x0000, 0x4000, CRC(8b64409e) SHA1(1fb4c6923e6a9e1f2a63a2c335b63e2bdc44b61f) )
ROM_LOAD( "bug14.209", 0x4000, 0x4000, CRC(4e765282) SHA1(f7d69d39823a8b33bd0e5b1bd78a5d68a293e221) )
ROM_LOAD( "bug17.182", 0x8000, 0x4000, CRC(a5d84df6) SHA1(4e33ef0bee383e0d47b0c679cd2a54edb7ca0e3e) )
ROM_LOAD( "bug15.181", 0xc000, 0x4000, CRC(d519de10) SHA1(535d05e11af65be65f3d9924b0c48faf8dcfd1bf) )
ROM_REGION( 0x10000, "obj_luts", 0 )
ROM_REGION( 0x6000, "obj_luts", 0 )
ROM_LOAD( "bug13.124", 0x0000, 0x2000, CRC(53604d7a) SHA1(bfa304cd885162ece7a5f54988d9880fc541eb3a) )
ROM_LOAD( "bug18.156", 0x2000, 0x4000, CRC(e58321a6) SHA1(81be87d3c6046bb375c74362dc940f0269b39d1d) )
@ -1161,7 +1161,7 @@ ROM_START( buggyboyjr )
ROM_LOAD( "bug30s.145", 0x20000, 0x8000, CRC(11d8e2a8) SHA1(9bf198229a12d331e8e7352b7ee3f39f6891f517) )
ROM_LOAD( "bug23s.142", 0x28000, 0x8000, CRC(015db5d8) SHA1(39ef8b44f2eb9399fb1555cffa6763e06d59c181) )
ROM_REGION( 0x40000, "road", 0 )
ROM_REGION( 0x8000, "road", 0 )
ROM_LOAD( "bug11s.225",0x0000, 0x4000, CRC(771af4e1) SHA1(a42b164dd0567c78c0d308ee48d63e5a284897bb) )
ROM_LOAD( "bb3s.195", 0x4000, 0x0200, CRC(2ab3d5ff) SHA1(9f8359cb4ba2e7d15dbb9dc21cd71c0902cd2153) )
ROM_LOAD( "bb4s.193", 0x4200, 0x0200, CRC(630f68a4) SHA1(d730f050353c688f81d090e33e00cd35e7b7b6fa) )
@ -1174,11 +1174,11 @@ ROM_START( buggyboyjr )
ROM_LOAD16_BYTE( "bb1.163", 0x8000, 0x0200, CRC(0ddbd36d) SHA1(7a08901a350c315d46ab8d0aa881db384b9f37d2) )
ROM_LOAD16_BYTE( "bb2.162", 0x8001, 0x0200, CRC(71d47de1) SHA1(2da9aeb3f2ebb1114631c8042a37c4f4c18e741b) )
ROM_REGION( 0x100000, "obj_map", 0 )
ROM_REGION( 0x10000, "obj_map", 0 )
ROM_LOAD( "bug16s.139", 0x0000, 0x8000, CRC(1903a9ad) SHA1(526c404c15e3f04b4afb27dee66e9deb0a6b9704) )
ROM_LOAD( "bug17s.140", 0x8000, 0x8000, CRC(82cabdd4) SHA1(94324fcf83c373621fc40553473ae3cb552ab704) )
ROM_REGION( 0x10000, "obj_luts", 0 )
ROM_REGION( 0x6000, "obj_luts", 0 )
ROM_LOAD( "bug13.32", 0x0000, 0x2000, CRC(53604d7a) SHA1(bfa304cd885162ece7a5f54988d9880fc541eb3a) )
ROM_LOAD( "bug18s.141", 0x2000, 0x4000, CRC(67786327) SHA1(32cc1f5bc654497c968ddcd4af29720c6d659482) )

1
src/mame/drivers/vicdual.c
View File

@ -3535,4 +3535,3 @@ GAME( 1980, digger, 0, digger, digger, driver_device, 0, ROT270
GAME( 1981, pulsar, 0, pulsar, pulsar, driver_device, 0, ROT270, "Sega", "Pulsar", GAME_IMPERFECT_SOUND )
GAME( 1979, heiankyo, 0, heiankyo, heiankyo, driver_device, 0, ROT270, "Denki Onkyo", "Heiankyo Alien", GAME_NO_SOUND )
GAME( 19??, alphaho, 0, alphaho, alphaho, driver_device, 0, ROT270, "Data East Corporation", "Alpha Fighter / Head On", GAME_WRONG_COLORS | GAME_NO_SOUND )

8
src/mame/drivers/zn.c
View File

@ -90,7 +90,6 @@ public:
DECLARE_WRITE8_MEMBER(coh1001l_bank_w);
DECLARE_WRITE16_MEMBER(coh1001l_latch_w);
DECLARE_WRITE16_MEMBER(coh1001l_sound_unk_w);
DECLARE_WRITE_LINE_MEMBER(coh1001l_ymz_irq);
DECLARE_WRITE8_MEMBER(coh1002v_bank_w);
DECLARE_WRITE8_MEMBER(coh1002m_bank_w);
DECLARE_READ8_MEMBER(cbaj_sound_main_status_r);
@ -2273,11 +2272,6 @@ Notes:
VSync - 60Hz
*/
WRITE_LINE_MEMBER(zn_state::coh1001l_ymz_irq)
{
m_audiocpu->set_input_line(2, state ? ASSERT_LINE : CLEAR_LINE);
}
WRITE16_MEMBER(zn_state::coh1001l_sound_unk_w)
{
// irq ack maybe?
@ -2326,7 +2320,7 @@ static MACHINE_CONFIG_DERIVED(coh1001l, zn1_2mb_vram)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1001l)
MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(zn_state, coh1001l_ymz_irq))
MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE("audiocpu", 2))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
MACHINE_CONFIG_END

1
src/mame/includes/bfm_sc45.h
View File

@ -592,7 +592,6 @@ public:
DECLARE_MACHINE_START(sc4);
DECLARE_MACHINE_RESET(sc4);
DECLARE_WRITE_LINE_MEMBER(bfm_sc4_irqhandler);
void bfm_sc4_68307_porta_w(address_space &space, bool dedicated, UINT8 data, UINT8 line_mask);
DECLARE_WRITE8_MEMBER( bfm_sc4_reel3_w );

1
src/mame/includes/bfm_sc5.h
View File

@ -16,7 +16,6 @@ public:
required_device<m68000_base_device> m_maincpu;
DECLARE_DRIVER_INIT(sc5);
DECLARE_WRITE_LINE_MEMBER(bfm_sc5_ym_irqhandler);
DECLARE_READ8_MEMBER( sc5_10202F0_r );
DECLARE_WRITE8_MEMBER( sc5_10202F0_w );
DECLARE_WRITE16_MEMBER( sc5_duart_w );

1
src/mame/includes/bishi.h
View File

@ -55,6 +55,5 @@ public:
virtual void video_start();
UINT32 screen_update_bishi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(bishi_scanline);
DECLARE_WRITE_LINE_MEMBER(sound_irq_gen);
K056832_CB_MEMBER(tile_callback);
};

2
src/mame/includes/cave.h
View File

@ -37,7 +37,6 @@ public:
m_paletteram(*this, "paletteram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_nmk112(*this, "nmk112"),
m_oki(*this, "oki"),
m_int_timer(*this, "int_timer"),
m_int_timer_left(*this, "int_timer_left"),
@ -122,7 +121,6 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
optional_device<nmk112_device> m_nmk112;
optional_device<okim6295_device> m_oki;
required_device<timer_device> m_int_timer;
optional_device<timer_device> m_int_timer_left;

4
src/mame/includes/nmk16.h
View File

@ -11,7 +11,6 @@ public:
m_audiocpu(*this, "audiocpu"),
m_oki1(*this, "oki1"),
m_oki2(*this, "oki2"),
m_nmk112(*this, "nmk112"),
m_nmk_bgvideoram0(*this, "nmk_bgvideoram0"),
m_nmk_txvideoram(*this, "nmk_txvideoram"),
m_mainram(*this, "mainram"),
@ -34,7 +33,6 @@ public:
optional_device<cpu_device> m_audiocpu;
optional_device<okim6295_device> m_oki1;
optional_device<okim6295_device> m_oki2;
optional_device<nmk112_device> m_nmk112;
required_shared_ptr<UINT16> m_nmk_bgvideoram0;
optional_shared_ptr<UINT16> m_nmk_txvideoram;
required_shared_ptr<UINT16> m_mainram;
@ -196,6 +194,4 @@ public:
void decode_gfx();
void decode_tdragonb();
void decode_ssmissin();
DECLARE_WRITE_LINE_MEMBER(ym2203_irqhandler);
};

1
src/mame/includes/pastelg.h
View File

@ -61,4 +61,3 @@ public:
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};

2
src/mame/includes/powerins.h
View File

@ -7,7 +7,6 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"),
m_nmk112(*this, "nmk112"),
m_vctrl_0(*this, "vctrl_0"),
m_vram_0(*this, "vram_0"),
m_vram_1(*this, "vram_1"),
@ -20,7 +19,6 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_soundcpu;
optional_device<nmk112_device> m_nmk112;
required_shared_ptr<UINT16> m_vctrl_0;
required_shared_ptr<UINT16> m_vram_0;
required_shared_ptr<UINT16> m_vram_1;

2
src/mame/includes/quizpani.h
View File

@ -6,14 +6,12 @@ public:
quizpani_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_nmk112(*this, "nmk112"),
m_scrollreg(*this, "scrollreg"),
m_bg_videoram(*this, "bg_videoram"),
m_txt_videoram(*this, "txt_videoram"),
m_gfxdecode(*this, "gfxdecode") { }
required_device<cpu_device> m_maincpu;
required_device<nmk112_device> m_nmk112;
required_shared_ptr<UINT16> m_scrollreg;
required_shared_ptr<UINT16> m_bg_videoram;
required_shared_ptr<UINT16> m_txt_videoram;

28
src/mame/includes/silkroad.h
View File

@ -5,40 +5,46 @@ class silkroad_state : public driver_device
public:
silkroad_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_vidram(*this, "vidram"),
m_vidram2(*this, "vidram2"),
m_vidram3(*this, "vidram3"),
m_sprram(*this, "sprram"),
m_regs(*this, "regs"),
m_maincpu(*this, "maincpu"),
m_oki1(*this, "oki1"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_generic_paletteram_32(*this, "paletteram") { }
m_generic_paletteram_32(*this, "paletteram"),
m_vidram(*this, "vidram"),
m_vidram2(*this, "vidram2"),
m_vidram3(*this, "vidram3"),
m_sprram(*this, "sprram"),
m_regs(*this, "regs") { }
required_device<cpu_device> m_maincpu;
required_device<okim6295_device> m_oki1;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_shared_ptr<UINT32> m_generic_paletteram_32;
required_shared_ptr<UINT32> m_vidram;
required_shared_ptr<UINT32> m_vidram2;
required_shared_ptr<UINT32> m_vidram3;
required_shared_ptr<UINT32> m_sprram;
required_shared_ptr<UINT32> m_regs;
tilemap_t *m_fg_tilemap;
tilemap_t *m_fg2_tilemap;
tilemap_t *m_fg3_tilemap;
DECLARE_WRITE32_MEMBER(paletteram32_xRRRRRGGGGGBBBBB_dword_w);
DECLARE_WRITE32_MEMBER(silk_coin_counter_w);
DECLARE_WRITE32_MEMBER(silkroad_fgram_w);
DECLARE_WRITE32_MEMBER(silkroad_fgram2_w);
DECLARE_WRITE32_MEMBER(silkroad_fgram3_w);
DECLARE_WRITE32_MEMBER(silk_6295_bank_w);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_fg2_tile_info);
TILE_GET_INFO_MEMBER(get_fg3_tile_info);
virtual void video_start();
UINT32 screen_update_silkroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<okim6295_device> m_oki1;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_shared_ptr<UINT32> m_generic_paletteram_32;
};

1
src/mame/includes/toaplan2.h
View File

@ -153,7 +153,6 @@ public:
void truxton2_postload();
void create_tx_tilemap(int dx = 0, int dx_flipped = 0);
void toaplan2_vblank_irq(int irq_line);
DECLARE_WRITE_LINE_MEMBER(bbakraid_irqhandler);
UINT8 m_pwrkick_hopper;
DECLARE_CUSTOM_INPUT_MEMBER(pwrkick_hopper_status_r);

14
src/mame/includes/tx1.h
View File

@ -107,6 +107,12 @@ public:
m_objram(*this, "objram"),
m_rcram(*this, "rcram"),
m_z80_ram(*this, "z80_ram"),
m_char_tiles(*this, "char_tiles"),
m_obj_tiles(*this, "obj_tiles"),
m_road_rom(*this, "road"),
m_obj_map(*this, "obj_map"),
m_obj_luts(*this, "obj_luts"),
m_proms(*this, "proms"),
m_screen(*this, "screen") { }
required_device<cpu_device> m_maincpu;
@ -117,6 +123,14 @@ public:
required_shared_ptr<UINT16> m_objram;
required_shared_ptr<UINT16> m_rcram;
required_shared_ptr<UINT8> m_z80_ram;
required_region_ptr<UINT8> m_char_tiles;
required_region_ptr<UINT8> m_obj_tiles;
required_region_ptr<UINT8> m_road_rom;
required_region_ptr<UINT8> m_obj_map;
required_region_ptr<UINT8> m_obj_luts;
required_region_ptr<UINT8> m_proms;
required_device<screen_device> m_screen;
emu_timer *m_interrupt_timer;

16
src/mame/machine/mie.c
View File

@ -33,8 +33,9 @@ static ADDRESS_MAP_START( mie_port, AS_IO, 8, mie_device)
AM_RANGE(0x00, 0x07) AM_READWRITE(gpio_r, gpio_w)
AM_RANGE(0x08, 0x08) AM_READWRITE(gpiodir_r, gpiodir_w)
AM_RANGE(0x0f, 0x0f) AM_READWRITE(adc_r, adc_w)
AM_RANGE(0x10, 0x10) AM_READWRITE(jvs_r, jvs_w)
AM_RANGE(0x10, 0x10) AM_READWRITE(jvs_r, jvs_w) // ports 1x and 2x is standard UARTs, TODO handle it properly
AM_RANGE(0x12, 0x12) AM_WRITE(jvs_dest_w)
AM_RANGE(0x13, 0x13) AM_WRITE(jvs_lcr_w)
AM_RANGE(0x15, 0x15) AM_READ(jvs_status_r)
AM_RANGE(0x30, 0x30) AM_READWRITE(irq_enable_r, irq_enable_w)
AM_RANGE(0x50, 0x50) AM_READWRITE(maple_irqlevel_r, maple_irqlevel_w)
@ -319,6 +320,9 @@ WRITE8_MEMBER(mie_device::lreg_w)
READ8_MEMBER(mie_device::jvs_r)
{
if (jvs_lcr & 0x80)
return 0;
const UINT8 *buf;
UINT32 size;
jvs->get_encoded_reply(buf, size);
@ -329,8 +333,9 @@ READ8_MEMBER(mie_device::jvs_r)
WRITE8_MEMBER(mie_device::jvs_w)
{
// Hack until the ports are better understood
if(jvs_dest == 2)
if (jvs_lcr & 0x80)
return;
jvs->push(data);
}
@ -359,6 +364,11 @@ WRITE8_MEMBER(mie_device::jvs_control_w)
jvs_control = data;
}
WRITE8_MEMBER(mie_device::jvs_lcr_w)
{
jvs_lcr = data;
}
READ8_MEMBER(mie_device::jvs_sense_r)
{
return 0x8c | (jvs->get_address_set_line() ? 2 : 0) | (jvs->get_presence_line() ? 0 : 1);

2
src/mame/machine/mie.h
View File

@ -61,6 +61,7 @@ public:
DECLARE_READ8_MEMBER(jvs_status_r);
DECLARE_WRITE8_MEMBER(jvs_control_w);
DECLARE_READ8_MEMBER(jvs_sense_r);
DECLARE_WRITE8_MEMBER(jvs_lcr_w);
DECLARE_READ8_MEMBER(read_ff);
DECLARE_READ8_MEMBER(read_00);
@ -106,6 +107,7 @@ private:
UINT8 gpiodir, gpio_val[8];
UINT8 irq_enable, irq_pending, maple_irqlevel;
UINT8 jvs_control, jvs_dest;
UINT8 jvs_lcr;
void raise_irq(int level);
void recalc_irq();

85
src/mame/video/tx1.c
View File

@ -113,7 +113,7 @@ enum
PALETTE_INIT_MEMBER(tx1_state,tx1)
{
const UINT8 *color_prom = memregion("proms")->base();
const UINT8 *const color_prom = &m_proms[0];
int i;
static const res_net_info tx1_net_info =
@ -233,11 +233,10 @@ void tx1_state::tx1_draw_char(UINT8 *bitmap)
UINT16 *tx1_vram = m_vram;
INT32 x, y;
UINT32 scroll_x;
UINT8 *chars, *gfx2;
/* 2bpp characters */
chars = memregion("char_tiles")->base();
gfx2 = chars + 0x4000;
const UINT8 *const chars = &m_char_tiles[0];
const UINT8 *const gfx2 = &m_char_tiles[0x4000];
/* X scroll value is the last word in char RAM */
scroll_x = tx1_vram[0xfff] & 0x3ff;
@ -414,17 +413,15 @@ void tx1_state::tx1_draw_road(UINT8 *bitmap)
UINT8 pix[2][4][3];
/* Road slice map ROMs */
const UINT8 *const gfx3 = memregion("gfx3")->base();
const UINT8 *const rom_a = gfx3;
const UINT8 *const rom_b = gfx3 + 0x2000;
const UINT8 *const rom_c = gfx3 + 0x4000;
const UINT8 *const rom_a = &m_road_rom[0];
const UINT8 *const rom_b = &m_road_rom[0x2000];
const UINT8 *const rom_c = &m_road_rom[0x4000];
/* Pixel data */
const UINT8 *const proms = memregion("proms")->base();
const UINT8 *const prom_a = proms + 0x1100;
const UINT8 *const prom_b = proms + 0x1300;
const UINT8 *const prom_c = proms + 0x1500;
const UINT8 *const vprom = proms + 0x1700;
const UINT8 *const prom_a = &m_proms[0x1100];
const UINT8 *const prom_b = &m_proms[0x1300];
const UINT8 *const prom_c = &m_proms[0x1500];
const UINT8 *const vprom = &m_proms[0x1700];
rva9_8 = (tx1_vregs.flags & 3) << 8;
rva7 = !BIT(tx1_vregs.flags, TX1_RDFLAG_RVA7) << 7;
@ -855,18 +852,17 @@ void tx1_state::tx1_draw_objects(UINT8 *bitmap)
UINT32 offs;
/* The many lookup table ROMs */
const UINT8 *const ic48 = memregion("user3")->base();
const UINT8 *const ic281 = ic48 + 0x2000;
const UINT8 *const ic48 = &m_obj_luts[0];
const UINT8 *const ic281 = &m_obj_luts[0x2000];
const UINT8 *const proms = memregion("proms")->base();
const UINT8 *const ic190 = proms + 0xc00;
const UINT8 *const ic162 = proms + 0xe00;
const UINT8 *const ic25 = proms + 0x1000;
const UINT8 *const ic190 = &m_proms[0xc00];
const UINT8 *const ic162 = &m_proms[0xe00];
const UINT8 *const ic25 = &m_proms[0x1000];
const UINT8 *const ic106 = memregion("obj_map")->base();
const UINT8 *const ic73 = ic106 + 0x4000;
const UINT8 *const ic106 = &m_obj_map[0];
const UINT8 *const ic73 = &m_obj_map[0x4000];
const UINT8 *const pixdata_rgn = memregion("obj_tiles")->base();
const UINT8 *const pixdata_rgn = &m_obj_tiles[0];
for (offs = 0x0; offs <= 0x300; offs += 8)
{
@ -995,7 +991,7 @@ void tx1_state::tx1_draw_objects(UINT8 *bitmap)
dataend |= ic106_data & 0x40;
/* Retrieve data for an 8x8 tile */
ic73_data = ic73[rom_addr2];
ic73_data = ic73[rom_addr2 & 0x3fff];
/* This is the data from the LUT pair */
lut_data = (ic106_data << 8) | ic73_data;
@ -1130,7 +1126,7 @@ void tx1_state::screen_eof_tx1(screen_device &screen, bool state)
void tx1_state::tx1_combine_layers(bitmap_ind16 &bitmap, int screen)
{
int x, y;
UINT8 *chr_pal = memregion("proms")->base() + 0x900;
UINT8 *chr_pal = &m_proms[0x900];
int x_offset = screen * 256;
@ -1256,7 +1252,7 @@ UINT32 tx1_state::screen_update_tx1_right(screen_device &screen, bitmap_ind16 &b
PALETTE_INIT_MEMBER(tx1_state,buggyboy)
{
const UINT8 *color_prom = memregion("proms")->base();
const UINT8 *const color_prom = &m_proms[0];
int i;
for (i = 0; i < 0x100; i++)
@ -1301,13 +1297,12 @@ void tx1_state::buggyboy_draw_char(UINT8 *bitmap, bool wide)
UINT16 *buggyboy_vram = m_vram;
INT32 x, y;
UINT32 scroll_x, scroll_y;
UINT8 *chars, *gfx2;
UINT32 total_width;
UINT32 x_mask;
/* 2bpp characters */
chars = memregion("char_tiles")->base();
gfx2 = memregion("char_tiles")->base() + 0x4000;
const UINT8 *const chars = &m_char_tiles[0];
const UINT8 *const gfx2 = &m_char_tiles[0x4000];
/* X/Y scroll values are the last word in char RAM */
if (wide)
@ -1449,10 +1444,10 @@ void tx1_state::buggyboy_get_roadpix(int screen, int ls161, UINT8 rva0_6, UINT8
UINT8 d1 = 0;
/* ROM/PROM lookup tables */
const UINT8 *rom = memregion("road")->base();
const UINT8 *prom0 = rom + 0x4000;
const UINT8 *prom1 = rom + 0x4200;
const UINT8 *prom2 = rom + 0x4400;
const UINT8 *const rom = &m_road_rom[0];
const UINT8 *const prom0 = &m_road_rom[0x4000];
const UINT8 *const prom1 = &m_road_rom[0x4200];
const UINT8 *const prom2 = &m_road_rom[0x4400];
/* Latch road reverse bit */
*_rorev = !( (rom_en && rom_flip) || (!rom_en && (ls161 & 0x4000)) );
@ -1543,8 +1538,8 @@ void tx1_state::buggyboy_draw_road(UINT8 *bitmap)
UINT32 rva20_6;
/* ROM/PROM lookup tables */
const UINT8 *rcols = (UINT8*)(memregion("proms")->base() + 0x1500);
const UINT8 *vprom = memregion("road")->base() + 0x4600;
const UINT8 *const rcols = &m_proms[0x1500];
const UINT8 *const vprom = &m_road_rom[0x4600];
/* Extract constant values */
tcmd = ((vregs.scol & 0xc000) >> 12) | ((vregs.scol & 0x00c0) >> 6);
@ -2170,8 +2165,8 @@ void tx1_state::buggybjr_draw_road(UINT8 *bitmap)
UINT32 rva20_6;
/* ROM/PROM lookup tables */
const UINT8 *rcols = (UINT8*)(memregion("proms")->base() + 0x1500);
const UINT8 *vprom = memregion("road")->base() + 0x4600;
const UINT8 *const rcols = &m_proms[0x1500];
const UINT8 *const vprom = &m_road_rom[0x4600];
/* Extract constant values */
tcmd = ((vregs.scol & 0xc000) >> 12) | ((vregs.scol & 0x00c0) >> 6);
@ -2577,17 +2572,17 @@ void tx1_state::buggyboy_draw_objs(UINT8 *bitmap, bool wide)
UINT32 x_stride;
/* The many lookup table ROMs */
const UINT8 *const bug13 = (UINT8*)memregion("obj_luts")->base();
const UINT8 *const bug18s = bug13 + 0x2000;
const UINT8 *const bb8 = (UINT8*)memregion("proms")->base() + 0x1600;
const UINT8 *const bug13 = &m_obj_luts[0];
const UINT8 *const bug18s = &m_obj_luts[0x2000];
const UINT8 *const bb8 = &m_proms[0x1600];
const UINT8 *const bug16s = (UINT8*)memregion("obj_map")->base();
const UINT8 *const bug17s = bug16s + 0x8000;
const UINT8 *const bug16s = &m_obj_map[0];
const UINT8 *const bug17s = &m_obj_map[0x8000];
const UINT8 *const bb9o = (UINT8*)memregion("proms")->base() + 0x500;
const UINT8 *const bb9e = bb9o + 0x800;
const UINT8 *const bb9o = &m_proms[0x500];
const UINT8 *const bb9e = &m_proms[0xd00];
const UINT8 *const pixdata_rgn = (UINT8*)memregion("obj_tiles")->base();
const UINT8 *const pixdata_rgn = &m_obj_tiles[0];
if (wide)
{
@ -2927,7 +2922,7 @@ WRITE16_MEMBER(tx1_state::buggyboy_scolst_w)
void tx1_state::bb_combine_layers(bitmap_ind16 &bitmap, int screen)
{
UINT8 *chr_pal = memregion("proms")->base() + 0x400;
UINT8 *chr_pal = &m_proms[0x400];
UINT32 bmp_stride;
UINT32 x_offset;
UINT32 y;

998
src/mess/drivers/c65.c
View File

File diff suppressed because it is too large Load Diff

3
src/mess/drivers/gamate.c
View File

@ -105,7 +105,6 @@ WRITE8_MEMBER( gamate_state::gamate_cart_protection_w )
}
READ8_MEMBER( gamate_state::gamate_cart_protection_r )
{
UINT8 ret=1;
if (card_protection.bit_shifter==7 && card_protection.unprotected) {
ret=m_cart_ptr[bank_multi*0x4000];
@ -416,5 +415,3 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
CONS( 19??, gamate, 0, 0, gamate, gamate, gamate_state, gamate, "Bit Corp", "Gamate", GAME_NO_SOUND)

194
src/mess/includes/c65.h
View File

@ -1,195 +1 @@
/*****************************************************************************
*
* includes/c65.h
*
****************************************************************************/
#ifndef C65_H_
#define C65_H_
#include "machine/mos6526.h"
#include "bus/cbmiec/cbmiec.h"
#include "imagedev/snapquik.h"
#include "machine/ram.h"
#include "sound/mos6581.h"
#include "video/vic4567.h"
#define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'.
struct C64_ROM {
int addr, size, index, start;
};
struct c64_cart_t {
C64_ROM bank[C64_MAX_ROMBANK];
INT8 game;
INT8 exrom;
UINT8 mapper;
UINT8 n_banks;
};
struct dma_t
{
int version;
UINT8 data[4];
};
struct fdc_t
{
int state;
UINT8 reg[0x0f];
UINT8 buffer[0x200];
int cpu_pos;
int fdc_pos;
UINT16 status;
attotime time;
int head,track,sector;
};
struct expansion_ram_t
{
UINT8 reg;
};
class c65_state : public driver_device
{
public:
c65_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_cia0(*this, "cia_0"),
m_cia1(*this, "cia_1"),
m_sid_r(*this, "sid_r"),
m_vic(*this, "vic3"),
m_iec(*this, CBM_IEC_TAG),
m_colorram(*this, "colorram"),
m_basic(*this, "basic"),
m_chargen(*this, "chargen"),
m_kernal(*this, "kernal"),
m_c65_chargen(*this, "c65_chargen"),
m_interface(*this, "interface"),
m_roml_writable(0),
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
required_device<mos6526_device> m_cia0;
required_device<mos6526_device> m_cia1;
required_device<mos6581_device> m_sid_r;
required_device<vic3_device> m_vic;
optional_device<cbm_iec_device> m_iec;
required_shared_ptr<UINT8> m_colorram;
required_shared_ptr<UINT8> m_basic;
required_shared_ptr<UINT8> m_chargen;
required_shared_ptr<UINT8> m_kernal;
required_shared_ptr<UINT8> m_c65_chargen;
required_shared_ptr<UINT8> m_interface;
int m_old_level;
int m_old_data;
int m_old_exrom;
int m_old_game;
UINT8 m_vicirq;
emu_timer *m_datasette_timer;
emu_timer *m_cartridge_timer;
UINT8 *m_memory;
int m_pal;
int m_tape_on;
UINT8 *m_c64_roml;
UINT8 *m_c64_romh;
UINT8 *m_vicaddr;
UINT8 *m_c128_vicaddr;
UINT8 m_game;
UINT8 m_exrom;
UINT8 *m_io_mirror;
UINT8 m_port_data;
UINT8 *m_roml;
UINT8 *m_romh;
int m_roml_writable;
int m_ultimax;
int m_cia1_on;
int m_io_enabled;
int m_is_sx64;
UINT8 *m_io_ram_w_ptr;
UINT8 *m_io_ram_r_ptr;
c64_cart_t m_cart;
int m_nmilevel; int m_charset_select;
int m_c64mode;
UINT8 m_6511_port;
UINT8 m_keyline;
int m_old_value;
dma_t m_dma;
int m_dump_dma;
fdc_t m_fdc;
expansion_ram_t m_expansion_ram;
int m_io_on;
int m_io_dc00_on;
int m_cia0_irq, m_cia1_irq;
DECLARE_DRIVER_INIT(c65);
DECLARE_DRIVER_INIT(c65pal);
DECLARE_READ8_MEMBER( c64_lightpen_x_cb );
DECLARE_READ8_MEMBER( c64_lightpen_y_cb );
DECLARE_READ8_MEMBER( c64_lightpen_button_cb );
DECLARE_READ8_MEMBER( c64_dma_read );
DECLARE_READ8_MEMBER( c64_dma_read_ultimax );
DECLARE_READ8_MEMBER( c64_dma_read_color );
DECLARE_WRITE_LINE_MEMBER( c64_vic_interrupt );
DECLARE_READ8_MEMBER( c64_rdy_cb );
DECLARE_READ8_MEMBER( sid_potx_r );
DECLARE_READ8_MEMBER( sid_poty_r );
DECLARE_MACHINE_START(c65);
UINT32 screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vic3_raster_irq);
INTERRUPT_GEN_MEMBER(c65_frame_interrupt);
DECLARE_READ8_MEMBER(c65_cia0_port_a_r);
DECLARE_READ8_MEMBER(c65_cia0_port_b_r);
DECLARE_WRITE8_MEMBER(c65_cia0_port_b_w);
DECLARE_READ8_MEMBER(c65_cia1_port_a_r);
DECLARE_WRITE8_MEMBER(c65_cia1_port_a_w);
DECLARE_WRITE_LINE_MEMBER(c65_cia1_interrupt);
void c64_legacy_driver_init();
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( c64_cart );
DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( c64_cart );
DECLARE_WRITE_LINE_MEMBER(c65_cia0_interrupt);
DECLARE_READ8_MEMBER(c65_lightpen_x_cb);
DECLARE_READ8_MEMBER(c65_lightpen_y_cb);
DECLARE_READ8_MEMBER(c65_lightpen_button_cb);
DECLARE_READ8_MEMBER(c65_c64_mem_r);
DECLARE_READ8_MEMBER(c65_dma_read);
DECLARE_READ8_MEMBER(c65_dma_read_color);
DECLARE_WRITE_LINE_MEMBER(c65_vic_interrupt);
DECLARE_WRITE8_MEMBER(c65_bankswitch_interface);
DECLARE_READ8_MEMBER( c65_read_mem );
DECLARE_WRITE8_MEMBER( c65_write_mem );
DECLARE_READ8_MEMBER( c65_ram_expansion_r );
DECLARE_WRITE8_MEMBER( c65_ram_expansion_w );
DECLARE_WRITE8_MEMBER( c65_write_io );
DECLARE_WRITE8_MEMBER( c65_write_io_dc00 );
DECLARE_READ8_MEMBER( c65_read_io );
DECLARE_READ8_MEMBER( c65_read_io_dc00 );
DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_c65 );
int c64_paddle_read( device_t *device, address_space &space, int which );
void c65_nmi( );
void c65_irq( int level );
void c65_dma_port_w( int offset, int value );
int c65_dma_port_r( int offset );
void c65_6511_port_w( int offset, int value );
int c65_6511_port_r( int offset );
void c65_fdc_state(void);
void c65_fdc_w( int offset, int data );
int c65_fdc_r( int offset );
void c65_bankswitch( );
void c65_colorram_write( int offset, int value );
void c65_common_driver_init( );
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
MACHINE_CONFIG_EXTERN( c64_cartslot );
#endif /* C65_H_ */

1337
src/mess/machine/c65.c
View File

File diff suppressed because it is too large Load Diff

2
src/mess/mess.mak
View File

@ -1088,7 +1088,7 @@ $(MESSOBJ)/cbm.a: \
$(MESS_DRIVERS)/c128.o \
$(MESS_DRIVERS)/c64.o \
$(MESS_DRIVERS)/c64dtv.o \
$(MESS_DRIVERS)/c65.o $(MESS_MACHINE)/c65.o \
$(MESS_DRIVERS)/c65.o \
$(MESS_DRIVERS)/c900.o \
$(MESS_DRIVERS)/cbm2.o \
$(MESS_DRIVERS)/clcd.o \

1
src/osd/modules/font/font_none.c
View File

@ -64,4 +64,3 @@ public:
};
MODULE_DEFINITION(FONT_NONE, font_none)

2
src/osd/modules/font/font_sdl.c
View File

@ -358,5 +358,3 @@ public:
#endif
MODULE_DEFINITION(FONT_SDL, font_sdl)

1
src/osd/modules/lib/osdlib_os2.c
View File

@ -288,4 +288,3 @@ void osd_sleep(osd_ticks_t duration)
usleep(msec*1000);
}
}

3
src/osd/modules/lib/osdobj_common.c
View File

@ -110,7 +110,6 @@ osd_common_t::osd_common_t(osd_options &options)
void osd_common_t::register_options()
{
REGISTER_MODULE(m_mod_man, FONT_OSX);
REGISTER_MODULE(m_mod_man, FONT_WINDOWS);
REGISTER_MODULE(m_mod_man, FONT_SDL);
@ -545,5 +544,3 @@ void osd_common_t::midi_exit()
{
osd_midi_exit();
}

2
src/osd/modules/osdmodule.c
View File

@ -112,5 +112,3 @@ void osd_module_manager::get_module_names(const char *type, const int max, int *
}
}

2
src/osd/modules/sound/sdl_sound.c
View File

@ -12,7 +12,7 @@
#include "sound_module.h"
#include "modules/osdmodule.h"
#if (!defined(SDLMAME_EMSCRIPTEN)) && (!defined(OSD_WINDOWS))
#if (!defined(OSD_WINDOWS))
// standard sdl header
#include "../../sdl/sdlinc.h"

1
src/osd/modules/sync/sync_mini.c
View File

@ -160,4 +160,3 @@ int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask)
void osd_thread_wait_free(osd_thread *thread)
{
}

1
src/osd/modules/sync/sync_ntc.c
View File

@ -531,4 +531,3 @@ void osd_thread_wait_free(osd_thread *thread)
pthread_join(thread->thread, NULL);
free(thread);
}

1
src/osd/modules/sync/sync_sdl.c
View File

@ -366,4 +366,3 @@ void osd_thread_wait_free(osd_thread *thread)
SDL_WaitThread(thread->thread, &status);
free(thread);
}

1
src/osd/modules/sync/sync_tc.c
View File

@ -389,4 +389,3 @@ void osd_thread_wait_free(osd_thread *thread)
pthread_join(thread->thread, NULL);
free(thread);
}

1
src/osd/osdcore.c
View File

@ -166,4 +166,3 @@ void CLIB_DECL osd_printf_log(const char *format, ...)
va_end(argptr);
}
#endif

1
src/osd/osdmini/minimisc.c
View File

@ -81,4 +81,3 @@ char *osd_get_clipboard_text(void)
// can't support clipboards generically
return NULL;
}

1
src/osd/sdl/draw13.c
View File

@ -937,7 +937,6 @@ bool texture_info::matches(const render_primitive &prim, const quad_setup_data &
texture_info::texture_info(SDL_Renderer *renderer, const render_texinfo &texsource, const quad_setup_data &setup, UINT32 flags)
{
// fill in the core data
m_renderer = renderer;
m_hash = texture_compute_hash(texsource, flags);

1
src/osd/sdl/sdldir.c
View File

@ -152,7 +152,6 @@ osd_directory *osd_opendir(const char *dirname)
if (tmpstr[0] == '$')
{
envstr = (char *) osd_malloc_array(strlen(tmpstr)+1);
strcpy(envstr, tmpstr);

2
src/osd/sdl/sdlmain.c
View File

@ -688,5 +688,3 @@ char *utf8_from_wstring(const WCHAR *wstring)
}
#endif

1
src/osd/sdl/sdlos_macosx.c
View File

@ -121,4 +121,3 @@ char *osd_get_clipboard_text(void)
return result;
}

3
src/osd/sdl/sdlos_unix.c
View File

@ -147,6 +147,3 @@ char *osd_get_clipboard_text(void)
return result;
}
#endif

1
src/osd/sdl/sdlos_win32.c
View File

@ -101,4 +101,3 @@ char *osd_get_clipboard_text(void)
return result;
}

2
src/version.c
View File

@ -8,7 +8,7 @@
***************************************************************************/
#define BARE_BUILD_VERSION "0.157"
#define BARE_BUILD_VERSION "0.158"
extern const char bare_build_version[];
extern const char build_version[];