From 9e45c67bab15a206e0eacae580eabe4ccc764124 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 28 Oct 2018 17:43:25 +1100 Subject: smioc: fix botched cleanup (nw) --- src/devices/machine/smioc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp index dee1b7d751a..3a426e8405b 100644 --- a/src/devices/machine/smioc.cpp +++ b/src/devices/machine/smioc.cpp @@ -158,7 +158,7 @@ void smioc_device::device_add_mconfig(machine_config &config) scc2698b_device &scc2698b(SCC2698B(config, "scc2698b", XTAL(3'686'400))); scc2698b.tx_callback<'a'>().set("rs232_p1", FUNC(rs232_port_device::write_txd)); scc2698b.mpp1_callback<'a'>().set("dma8237_2", FUNC(am9517a_device::dreq1_w)).invert(); - scc2698b.mpp1_callback<'a'>().set("dma8237_2", FUNC(am9517a_device::dreq0_w)).invert(); + scc2698b.mpp2_callback<'a'>().set("dma8237_2", FUNC(am9517a_device::dreq0_w)).invert(); scc2698b.tx_callback<'b'>().set("rs232_p2", FUNC(rs232_port_device::write_txd)); scc2698b.mpp1_callback<'b'>().set("dma8237_2", FUNC(am9517a_device::dreq3_w)).invert(); scc2698b.mpp2_callback<'b'>().set("dma8237_2", FUNC(am9517a_device::dreq2_w)).invert(); -- cgit v1.2.3 From 34fcc982dd520e4a9d6101ae2e2577eef9200735 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 28 Oct 2018 18:17:52 +1100 Subject: x68k_flop.xml: fix typo in title (nw) --- hash/x68k_flop.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/x68k_flop.xml b/hash/x68k_flop.xml index 1dd2246ffd5..54330d89eba 100644 --- a/hash/x68k_flop.xml +++ b/hash/x68k_flop.xml @@ -3043,7 +3043,7 @@ Most info on release dates and Jpn titles come from the following (wonderful) re - Cueb Runner + Cube Runner 1990 SPS -- cgit v1.2.3 From b069c5e914c7ef2641e262bf26d0903a12611ae3 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 28 Oct 2018 18:09:10 +0100 Subject: namcos22: increase ss22 quantum a bit more, controls were still unresponsive sometimes (nw) --- src/mame/drivers/namcos22.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index f2703405dae..319cff0948a 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -3953,7 +3953,7 @@ MACHINE_CONFIG_START(namcos22_state::namcos22s) MCFG_DEVICE_PROGRAM_MAP(mcu_program) MCFG_DEVICE_IO_MAP(mcu_io) MCFG_TIMER_DRIVER_ADD_SCANLINE("mcu_irq", namcos22_state, mcu_irq, "screen", 0, 240) - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // erratic inputs otherwise, probably mcu vs maincpu shareram + MCFG_QUANTUM_TIME(attotime::from_hz(9000)) // erratic inputs otherwise, probably mcu vs maincpu shareram MCFG_DEVICE_REMOVE("iomcu") -- cgit v1.2.3 From 9ead49ae33bf099716ead70e7be0b210e7b7d186 Mon Sep 17 00:00:00 2001 From: cracyc Date: Sun, 28 Oct 2018 18:19:54 -0500 Subject: am9517a: revert these changes which break the qx10 and pc9801 which use active low dreq (nw) --- src/devices/machine/am9517a.cpp | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp index 55a5cab0d8c..cd6955b63ed 100644 --- a/src/devices/machine/am9517a.cpp +++ b/src/devices/machine/am9517a.cpp @@ -817,22 +817,9 @@ WRITE8_MEMBER( am9517a_device::write ) switch (offset & 0x0f) { case REGISTER_COMMAND: - { - bool old_dack_active_high = COMMAND_DACK_ACTIVE_HIGH; - bool old_dreq_active_low = COMMAND_DREQ_ACTIVE_LOW; - m_command = data; - LOG("AM9517A Command Register: %02x\n", m_command); + m_command = data; - if (old_dack_active_high != COMMAND_DACK_ACTIVE_HIGH) - { - set_dack(); // Line values for DACK changed, update them to reflect the new state. - } - if (old_dreq_active_low != COMMAND_DREQ_ACTIVE_LOW) - { - // Invert the request bits because the interpretation of line levels has changed - m_status ^= 0xF0; - } - } + LOG("AM9517A Command Register: %02x\n", m_command); break; case REGISTER_REQUEST: @@ -894,12 +881,8 @@ WRITE8_MEMBER( am9517a_device::write ) case REGISTER_MASTER_CLEAR: LOG("AM9517A Master Clear\n"); - { - // Even the master reset should not clear the state of the input lines. - int stored_status = m_status; - device_reset(); - m_status = stored_status & 0xF0; - } + + device_reset(); break; case REGISTER_CLEAR_MASK: -- cgit v1.2.3 From 01d5986fd1bf553ba902956f8d91f622387b152a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 29 Oct 2018 11:27:12 +1100 Subject: add missing parent/clone relationship, mark Mac high-density floppy software as unsupported (nw) --- hash/mac_hdflop.xml | 2 +- src/mame/drivers/alg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hash/mac_hdflop.xml b/hash/mac_hdflop.xml index dc729e4dc12..8c3e5241f60 100644 --- a/hash/mac_hdflop.xml +++ b/hash/mac_hdflop.xml @@ -3,7 +3,7 @@ - + ClarisWorks (Swedish) 1993 Claris diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 3f9a997c96c..96578f72bfa 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -877,5 +877,5 @@ GAME( 199?, aplatoon, alg_bios, alg_r2, alg, alg_state, init_aplatoon, /* Web Picmatic games PAL tv standard, own rom board */ GAME( 1994, zortonbr, alg_bios, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Zorton Brothers v1.01 (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1993, zortonbr_100, alg_bios, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Zorton Brothers v1.00 (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1993, zortonbr_100, zortonbr, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Zorton Brothers v1.00 (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) GAME( 1994, marvice, alg_bios, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Marbella Vice", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) -- cgit v1.2.3 From 9d50667c5d068167c2574c09d1de489f767e882a Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 28 Oct 2018 23:08:33 -0400 Subject: ddragonba, ltd4 games: Fix regressions related to recent 6803 changes (nw) --- src/mame/drivers/ddragon.cpp | 16 ++++++---------- src/mame/drivers/ltd.cpp | 16 ++++++---------- src/mame/includes/ddragon.h | 1 - 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index b3ee1b13082..f4281f9a3b8 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -574,11 +574,6 @@ void ddragon_state::dd2_sub_map(address_map &map) map(0xe000, 0xe000).w(FUNC(ddragon_state::ddragon2_sub_irq_w)); } -void ddragon_state::ddragonba_sub_portmap(address_map &map) -{ - map(0x0000, 0x01ff).w(FUNC(ddragon_state::ddragonba_port_w)); -} - /************************************* * @@ -1008,14 +1003,15 @@ MACHINE_CONFIG_START(ddragon_state::ddragonb) MACHINE_CONFIG_END -MACHINE_CONFIG_START(ddragon_state::ddragonba) +void ddragon_state::ddragonba(machine_config &config) +{ ddragon(config); /* basic machine hardware */ - MCFG_DEVICE_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6MHz / 4 internally */ - MCFG_DEVICE_PROGRAM_MAP(ddragonba_sub_map) - MCFG_DEVICE_IO_MAP(ddragonba_sub_portmap) -MACHINE_CONFIG_END + m6803_cpu_device &sub(M6803(config.replace(), "sub", MAIN_CLOCK / 2)); // 6MHz / 4 internally + sub.set_addrmap(AS_PROGRAM, &ddragon_state::ddragonba_sub_map); + sub.out_p2_cb().set(FUNC(ddragon_state::ddragonba_port_w)); +} MACHINE_CONFIG_START(ddragon_state::ddragon6809) diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp index 3d7f5976fea..3e4f83fbdcf 100644 --- a/src/mame/drivers/ltd.cpp +++ b/src/mame/drivers/ltd.cpp @@ -81,7 +81,6 @@ private: DECLARE_WRITE8_MEMBER(count_reset_w); TIMER_DEVICE_CALLBACK_MEMBER(timer_r); void ltd3_map(address_map &map); - void ltd4_io(address_map &map); void ltd4_map(address_map &map); bool m_timer_r; @@ -123,12 +122,6 @@ void ltd_state::ltd4_map(address_map &map) map(0xc000, 0xdfff).rom().mirror(0x2000).region("roms", 0); } -void ltd_state::ltd4_io(address_map &map) -{ - map(0x0100, 0x0100).rw(FUNC(ltd_state::port1_r), FUNC(ltd_state::port1_w)); - map(0x0101, 0x0101).rw(FUNC(ltd_state::port2_r), FUNC(ltd_state::port2_w)); -} - // bits 6,7 not connected to data bus // 1=does something in Atlantis; 2=does something in Black Hole; note that sometimes pressing G or H will reboot the machine. static INPUT_PORTS_START( ltd3 ) @@ -548,9 +541,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ltd_state::ltd4) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M6803, XTAL(3'579'545)) // guess, no details available - MCFG_DEVICE_PROGRAM_MAP(ltd4_map) - MCFG_DEVICE_IO_MAP(ltd4_io) + m6803_cpu_device &maincpu(M6803(config, "maincpu", XTAL(3'579'545))); // guess, no details available + maincpu.set_addrmap(AS_PROGRAM, <d_state::ltd4_map); + maincpu.in_p1_cb().set(FUNC(ltd_state::port1_r)); + maincpu.out_p1_cb().set(FUNC(ltd_state::port1_w)); + maincpu.in_p2_cb().set(FUNC(ltd_state::port2_r)); + maincpu.out_p2_cb().set(FUNC(ltd_state::port2_w)); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index edd90fa3493..eedfce5cf5c 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -152,7 +152,6 @@ private: void dd2_sub_map(address_map &map); void ddragon_map(address_map &map); void ddragonba_sub_map(address_map &map); - void ddragonba_sub_portmap(address_map &map); void sound_map(address_map &map); void sub_map(address_map &map); }; -- cgit v1.2.3 From d5187a3a6f221f582927c381c7d7359a61c8f4d4 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 29 Oct 2018 14:39:47 +1100 Subject: let's fix this (nw) --- src/mame/drivers/crystal.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 13eea7fa338..7f8e8326e6f 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -541,7 +541,7 @@ READ32_MEMBER(crystal_state::crtc_r) switch (offset) { case 0: // CRTC Status / Mode - if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interrace + if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interlace vdisp <<= 1; if (m_screen->vpos() <= vdisp) // Vertical display enable status @@ -635,12 +635,11 @@ void crystal_state::crtc_update() // TODO : Implement other CRTC parameters uint32_t hdisp = m_crtcregs[0x0c / 4] + 1; uint32_t vdisp = m_crtcregs[0x1c / 4] + 1; - if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interrace + if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interlace vdisp <<= 1; - rectangle visarea; - visarea.set(0, hdisp - 1, 0, vdisp - 1); - m_screen->configure(hdisp, vdisp, visarea, m_screen->frame_period().attoseconds() ); + rectangle const visarea(0, hdisp - 1, 0, vdisp - 1); + m_screen->configure(hdisp, vdisp, visarea, m_screen->frame_period().attoseconds()); } void crystal_state::internal_map(address_map &map) -- cgit v1.2.3 From fc726060143d454c838fba9c82ce830c63a008c0 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 29 Oct 2018 17:09:14 +1100 Subject: _NAMES are reserved - let's not add them back in on refactoring (nw) --- src/mame/video/namco_c355spr.cpp | 4 ++-- src/mame/video/namco_c355spr.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mame/video/namco_c355spr.cpp b/src/mame/video/namco_c355spr.cpp index f93c5c4c1fc..053a9f44561 100644 --- a/src/mame/video/namco_c355spr.cpp +++ b/src/mame/video/namco_c355spr.cpp @@ -439,8 +439,8 @@ void namco_c355spr_device::get_sprites() get_list(1, &m_spriteram[buffer][0x14000/2], &m_spriteram[buffer][0x10000/2]); } -template -void namco_c355spr_device::draw_sprites(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int pri) +template +void namco_c355spr_device::draw_sprites(screen_device &screen, BitmapClass &bitmap, const rectangle &cliprect, int pri) { // int offs = spriteram16[0x18000/2]; /* end-of-sprite-list */ if (pri == 0) diff --git a/src/mame/video/namco_c355spr.h b/src/mame/video/namco_c355spr.h index 5d53120488e..5e26345b942 100644 --- a/src/mame/video/namco_c355spr.h +++ b/src/mame/video/namco_c355spr.h @@ -72,7 +72,7 @@ private: void get_single_sprite(const uint16_t *pSource, struct c355_sprite *sprite_ptr); void get_list(int no, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable); void get_sprites(); - template void draw_sprites(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int pri); + template void draw_sprites(screen_device &screen, BitmapClass &bitmap, const rectangle &cliprect, int pri); struct c355_sprite *m_spritelist[2]; const struct c355_sprite *m_sprite_end[2]; @@ -94,4 +94,3 @@ private: DECLARE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device) #endif // MAME_VIDEO_NAMCO_C355SPR_H - -- cgit v1.2.3 From b57a14010100641094b0a16b090cf51cae5bafe9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 31 Oct 2018 23:23:33 +1100 Subject: version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 413f1d5e478..02b31b3af14 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 14e89347611..a1244b74efb 100644 --- a/makefile +++ b/makefile @@ -1584,14 +1584,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.202"' > $@ + @echo '#define BARE_BUILD_VERSION "0.203"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.202" > $@ + @echo #define BARE_BUILD_VERSION "0.203" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3